From 59dc591f66c20b6417aa2baa9503a154585386f9 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 2 Jul 2014 14:34:08 -0400
Subject: update to jquery mobile 1.4.3

---
 MediaBrowser.Controller/Library/IUserManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs
index 010caa2337..0da5f92728 100644
--- a/MediaBrowser.Controller/Library/IUserManager.cs
+++ b/MediaBrowser.Controller/Library/IUserManager.cs
@@ -50,11 +50,11 @@ namespace MediaBrowser.Controller.Library
         /// <summary>
         /// Authenticates a User and returns a result indicating whether or not it succeeded
         /// </summary>
-        /// <param name="user">The user.</param>
+        /// <param name="username">The username.</param>
         /// <param name="password">The password.</param>
         /// <returns>Task{System.Boolean}.</returns>
         /// <exception cref="System.ArgumentNullException">user</exception>
-        Task<bool> AuthenticateUser(User user, string password);
+        Task<bool> AuthenticateUser(string username, string password);
 
         /// <summary>
         /// Refreshes metadata for each user
-- 
cgit v1.2.3


From 1a371276dc92e303eba8445b2ba9c97766a052b2 Mon Sep 17 00:00:00 2001
From: Luis Miguel Almánzar <ruisu15@gmail.com>
Date: Thu, 3 Jul 2014 00:01:36 -0400
Subject: add multi-episode support for filenames without seasons

---
 MediaBrowser.Controller/Library/TVUtils.cs  | 14 ++++++++++----
 MediaBrowser.Tests/Resolvers/TvUtilTests.cs |  8 ++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Controller/Library/TVUtils.cs b/MediaBrowser.Controller/Library/TVUtils.cs
index 64f3a3b4b7..0681a8cd1a 100644
--- a/MediaBrowser.Controller/Library/TVUtils.cs
+++ b/MediaBrowser.Controller/Library/TVUtils.cs
@@ -98,19 +98,19 @@ namespace MediaBrowser.Controller.Library
         private static readonly Regex[] EpisodeExpressionsWithoutSeason =
         {
             new Regex(
-                @".*[\\\/](?<epnumber>\d{1,3})\.\w+$",
+                @".*[\\\/](?<epnumber>\d{1,3})(-(?<endingepnumber>\d{2,3}))*\.\w+$",
                 RegexOptions.Compiled),
             // "01.avi"
             new Regex(
-                @".*(\\|\/)(?<epnumber>\d{1,2})\s?-\s?[^\\\/]*$",
+                @".*(\\|\/)(?<epnumber>\d{1,3})(-(?<endingepnumber>\d{2,3}))*\s?-\s?[^\\\/]*$",
                 RegexOptions.Compiled),
             // "01 - blah.avi", "01-blah.avi"
              new Regex(
-                @".*(\\|\/)(?<epnumber>\d{1,2})\.[^\\\/]+$",
+                @".*(\\|\/)(?<epnumber>\d{1,3})(-(?<endingepnumber>\d{2,3}))*\.[^\\\/]+$",
                 RegexOptions.Compiled),
             // "01.blah.avi"
             new Regex(
-                @".*[\\\/][^\\\/]* - (?<epnumber>\d{1,3})[^\\\/]*$",
+                @".*[\\\/][^\\\/]* - (?<epnumber>\d{1,3})(-(?<endingepnumber>\d{2,3}))*[^\\\/]*$",
                 RegexOptions.Compiled),
             // "blah - 01.avi", "blah 2 - 01.avi", "blah - 01 blah.avi", "blah 2 - 01 blah", "blah - 01 - blah.avi", "blah 2 - 01 - blah"
         };
@@ -284,6 +284,12 @@ namespace MediaBrowser.Controller.Library
                 if (m.Success && !string.IsNullOrEmpty(m.Groups["endingepnumber"].Value))
                     return ParseEpisodeNumber(m.Groups["endingepnumber"].Value);
             }
+            foreach (var r in EpisodeExpressionsWithoutSeason)
+            {
+                var m = r.Match(fl);
+                if (m.Success && !string.IsNullOrEmpty(m.Groups["endingepnumber"].Value))
+                    return ParseEpisodeNumber(m.Groups["endingepnumber"].Value);
+            }
             return null;
         }
 
diff --git a/MediaBrowser.Tests/Resolvers/TvUtilTests.cs b/MediaBrowser.Tests/Resolvers/TvUtilTests.cs
index 97e7907766..bffd22f3ed 100644
--- a/MediaBrowser.Tests/Resolvers/TvUtilTests.cs
+++ b/MediaBrowser.Tests/Resolvers/TvUtilTests.cs
@@ -31,6 +31,7 @@ namespace MediaBrowser.Tests.Resolvers
             Assert.AreEqual(23, TVUtils.GetEpisodeNumberFromFile(@"Season 1\S01E23-E24-E26 - The Woman.mp4", true));
             Assert.AreEqual(9, TVUtils.GetEpisodeNumberFromFile(@"Season 25\The Simpsons.S25E09.Steal this episode.mp4", true));
             Assert.AreEqual(8, TVUtils.GetEpisodeNumberFromFile(@"The Simpsons\The Simpsons.S25E08.Steal this episode.mp4", false));
+            Assert.AreEqual(136, TVUtils.GetEpisodeNumberFromFile(@"Season 2\[HorribleSubs] Hunter X Hunter - 136 [720p].mkv",true));
 
             //Four Digits seasons
             Assert.AreEqual(02, TVUtils.GetEpisodeNumberFromFile(@"Season 2009\2009x02 blah.avi", true));
@@ -128,6 +129,13 @@ namespace MediaBrowser.Tests.Resolvers
             Assert.AreEqual(null, TVUtils.GetEndingEpisodeNumberFromFile(@"Season 2\02 - blah 14 blah.avi"));
             Assert.AreEqual(null, TVUtils.GetEndingEpisodeNumberFromFile(@"Season 1\02 - blah-02 a.avi"));
             Assert.AreEqual(null, TVUtils.GetEndingEpisodeNumberFromFile(@"Season 2\02.avi"));
+
+            Assert.AreEqual(3, TVUtils.GetEndingEpisodeNumberFromFile(@"Season 1\02-03 - blah.avi"));
+            Assert.AreEqual(4, TVUtils.GetEndingEpisodeNumberFromFile(@"Season 2\02-04 - blah 14 blah.avi"));
+            Assert.AreEqual(5, TVUtils.GetEndingEpisodeNumberFromFile(@"Season 1\02-05 - blah-02 a.avi"));
+            Assert.AreEqual(4, TVUtils.GetEndingEpisodeNumberFromFile(@"Season 2\02-04.avi"));
+            Assert.AreEqual(null, TVUtils.GetEndingEpisodeNumberFromFile(@"Season 2\[HorribleSubs] Hunter X Hunter - 136 [720p].mkv"));
+
         }
 
         [TestMethod]
-- 
cgit v1.2.3


From 7fa9b14f56eabbb06e38726879b3cddc47b8e8fb Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 3 Jul 2014 22:22:57 -0400
Subject: fixes #762 - Marking unwatched doesn't update display

---
 MediaBrowser.Api/BrandingService.cs                |  28 +++
 MediaBrowser.Api/ConfigurationService.cs           |   7 +
 MediaBrowser.Api/Images/ImageService.cs            |   7 +
 MediaBrowser.Api/ItemRefreshService.cs             |  22 ++-
 MediaBrowser.Api/Library/LibraryService.cs         |   2 +
 MediaBrowser.Api/Library/SubtitleService.cs        | 184 --------------------
 MediaBrowser.Api/MediaBrowser.Api.csproj           |   4 +-
 MediaBrowser.Api/NotificationsService.cs           |   2 +
 MediaBrowser.Api/SessionsService.cs                |  12 +-
 MediaBrowser.Api/Subtitles/SubtitleService.cs      | 189 +++++++++++++++++++++
 MediaBrowser.Api/SystemService.cs                  |  70 +++++++-
 MediaBrowser.Api/UserLibrary/UserLibraryService.cs |  10 +-
 MediaBrowser.Api/UserService.cs                    |   4 +
 .../WebSocket/LogFileWebSocketListener.cs          | 149 ----------------
 MediaBrowser.Common/Net/MimeTypes.cs               |   4 +
 MediaBrowser.Controller/Dto/IDtoService.cs         |   7 -
 MediaBrowser.Controller/Entities/BaseItem.cs       |  15 ++
 MediaBrowser.Controller/Entities/Folder.cs         |  80 ++++++++-
 MediaBrowser.Controller/Entities/IHasUserData.cs   |  18 +-
 MediaBrowser.Controller/Entities/TV/Episode.cs     |   2 +-
 MediaBrowser.Controller/Entities/UserRootFolder.cs |   6 +
 MediaBrowser.Controller/Entities/UserView.cs       |   2 +-
 .../Library/IUserDataManager.cs                    |   9 +
 MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs |   4 +-
 .../Providers/MetadataRefreshOptions.cs            |  39 +++--
 MediaBrowser.Controller/Session/ISessionManager.cs |   8 +-
 .../MediaBrowser.Model.Portable.csproj             |   6 +
 .../MediaBrowser.Model.net35.csproj                |   6 +
 MediaBrowser.Model/Branding/BrandingOptions.cs     |  12 ++
 .../Configuration/ServerConfiguration.cs           |   3 -
 .../Configuration/XbmcMetadataOptions.cs           |   3 +
 MediaBrowser.Model/Dto/UserItemDataDto.cs          |  16 +-
 MediaBrowser.Model/MediaBrowser.Model.csproj       |   2 +
 .../Notifications/NotificationRequest.cs           |   3 +-
 MediaBrowser.Model/Session/SessionInfoDto.cs       |  32 +---
 MediaBrowser.Model/System/LogFile.cs               |  31 ++++
 MediaBrowser.Providers/Manager/ImageSaver.cs       |  28 ++-
 .../MediaInfo/FFProbeVideoInfo.cs                  |   4 +-
 .../Branding/BrandingConfigurationFactory.cs       |  21 +++
 .../Dto/DtoService.cs                              |  52 +++---
 .../EntryPoints/UserDataChangeNotifier.cs          |  45 +++--
 .../HttpServer/HttpListenerHost.cs                 |  26 +--
 .../HttpServer/Security/AuthorizationContext.cs    |   9 +-
 .../Library/UserDataManager.cs                     |  37 ++++
 .../LiveTv/LiveTvDtoService.cs                     |  11 +-
 .../LiveTv/LiveTvManager.cs                        |   6 +-
 .../Localization/Server/server.json                |  17 +-
 .../MediaBrowser.Server.Implementations.csproj     |   1 +
 .../Notifications/NotificationManager.cs           |   5 +-
 .../Session/SessionManager.cs                      |  27 ++-
 .../Sorting/AirTimeComparer.cs                     |  33 +++-
 MediaBrowser.ServerApplication/ApplicationHost.cs  |   2 +-
 .../Native/BrowserLauncher.cs                      |  12 --
 MediaBrowser.ServerApplication/ServerNotifyIcon.cs |  15 --
 MediaBrowser.WebDashboard/Api/DashboardService.cs  |   3 +-
 .../MediaBrowser.WebDashboard.csproj               |  22 +--
 56 files changed, 821 insertions(+), 553 deletions(-)
 create mode 100644 MediaBrowser.Api/BrandingService.cs
 delete mode 100644 MediaBrowser.Api/Library/SubtitleService.cs
 create mode 100644 MediaBrowser.Api/Subtitles/SubtitleService.cs
 delete mode 100644 MediaBrowser.Api/WebSocket/LogFileWebSocketListener.cs
 create mode 100644 MediaBrowser.Model/Branding/BrandingOptions.cs
 create mode 100644 MediaBrowser.Model/System/LogFile.cs
 create mode 100644 MediaBrowser.Server.Implementations/Branding/BrandingConfigurationFactory.cs

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Api/BrandingService.cs b/MediaBrowser.Api/BrandingService.cs
new file mode 100644
index 0000000000..4b49b411a8
--- /dev/null
+++ b/MediaBrowser.Api/BrandingService.cs
@@ -0,0 +1,28 @@
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Model.Branding;
+using ServiceStack;
+
+namespace MediaBrowser.Api
+{
+    [Route("/Branding/Configuration", "GET", Summary = "Gets branding configuration")]
+    public class GetBrandingOptions : IReturn<BrandingOptions>
+    {
+    }
+    
+    public class BrandingService : BaseApiService
+    {
+        private readonly IConfigurationManager _config;
+
+        public BrandingService(IConfigurationManager config)
+        {
+            _config = config;
+        }
+
+        public object Get(GetBrandingOptions request)
+        {
+            var result = _config.GetConfiguration<BrandingOptions>("branding");
+
+            return ToOptimizedResult(result);
+        }
+    }
+}
diff --git a/MediaBrowser.Api/ConfigurationService.cs b/MediaBrowser.Api/ConfigurationService.cs
index 39fcc50d8f..291deb3b01 100644
--- a/MediaBrowser.Api/ConfigurationService.cs
+++ b/MediaBrowser.Api/ConfigurationService.cs
@@ -4,6 +4,7 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Serialization;
@@ -27,6 +28,7 @@ namespace MediaBrowser.Api
     }
 
     [Route("/System/Configuration/{Key}", "GET", Summary = "Gets a named configuration")]
+    [Authenticated]
     public class GetNamedConfiguration
     {
         [ApiMember(Name = "Key", Description = "Key", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
@@ -37,11 +39,13 @@ namespace MediaBrowser.Api
     /// Class UpdateConfiguration
     /// </summary>
     [Route("/System/Configuration", "POST", Summary = "Updates application configuration")]
+    [Authenticated]
     public class UpdateConfiguration : ServerConfiguration, IReturnVoid
     {
     }
 
     [Route("/System/Configuration/{Key}", "POST", Summary = "Updates named configuration")]
+    [Authenticated]
     public class UpdateNamedConfiguration : IReturnVoid, IRequiresRequestStream
     {
         [ApiMember(Name = "Key", Description = "Key", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
@@ -51,18 +55,21 @@ namespace MediaBrowser.Api
     }
     
     [Route("/System/Configuration/MetadataOptions/Default", "GET", Summary = "Gets a default MetadataOptions object")]
+    [Authenticated]
     public class GetDefaultMetadataOptions : IReturn<MetadataOptions>
     {
 
     }
 
     [Route("/System/Configuration/MetadataPlugins", "GET", Summary = "Gets all available metadata plugins")]
+    [Authenticated]
     public class GetMetadataPlugins : IReturn<List<MetadataPluginSummary>>
     {
 
     }
 
     [Route("/System/Configuration/VideoImageExtraction", "POST", Summary = "Updates image extraction for all types")]
+    [Authenticated]
     public class UpdateVideoImageExtraction : IReturnVoid
     {
         public bool Enabled { get; set; }
diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs
index 4f8c348bb8..deaefe019a 100644
--- a/MediaBrowser.Api/Images/ImageService.cs
+++ b/MediaBrowser.Api/Images/ImageService.cs
@@ -3,6 +3,7 @@ using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Drawing;
@@ -26,6 +27,7 @@ namespace MediaBrowser.Api.Images
     /// </summary>
     [Route("/Items/{Id}/Images", "GET")]
     [Api(Description = "Gets information about an item's images")]
+    [Authenticated]
     public class GetItemImageInfos : IReturn<List<ImageInfo>>
     {
         /// <summary>
@@ -56,6 +58,7 @@ namespace MediaBrowser.Api.Images
     /// </summary>
     [Route("/Items/{Id}/Images/{Type}/{Index}/Index", "POST")]
     [Api(Description = "Updates the index for an item image")]
+    [Authenticated]
     public class UpdateItemImageIndex : IReturnVoid
     {
         /// <summary>
@@ -137,6 +140,7 @@ namespace MediaBrowser.Api.Images
     [Route("/Items/{Id}/Images/{Type}", "DELETE")]
     [Route("/Items/{Id}/Images/{Type}/{Index}", "DELETE")]
     [Api(Description = "Deletes an item image")]
+    [Authenticated]
     public class DeleteItemImage : DeleteImageRequest, IReturnVoid
     {
         /// <summary>
@@ -153,6 +157,7 @@ namespace MediaBrowser.Api.Images
     [Route("/Users/{Id}/Images/{Type}", "DELETE")]
     [Route("/Users/{Id}/Images/{Type}/{Index}", "DELETE")]
     [Api(Description = "Deletes a user image")]
+    [Authenticated]
     public class DeleteUserImage : DeleteImageRequest, IReturnVoid
     {
         /// <summary>
@@ -169,6 +174,7 @@ namespace MediaBrowser.Api.Images
     [Route("/Users/{Id}/Images/{Type}", "POST")]
     [Route("/Users/{Id}/Images/{Type}/{Index}", "POST")]
     [Api(Description = "Posts a user image")]
+    [Authenticated]
     public class PostUserImage : DeleteImageRequest, IRequiresRequestStream, IReturnVoid
     {
         /// <summary>
@@ -191,6 +197,7 @@ namespace MediaBrowser.Api.Images
     [Route("/Items/{Id}/Images/{Type}", "POST")]
     [Route("/Items/{Id}/Images/{Type}/{Index}", "POST")]
     [Api(Description = "Posts an item image")]
+    [Authenticated]
     public class PostItemImage : DeleteImageRequest, IRequiresRequestStream, IReturnVoid
     {
         /// <summary>
diff --git a/MediaBrowser.Api/ItemRefreshService.cs b/MediaBrowser.Api/ItemRefreshService.cs
index b95e18a0d9..993b69601c 100644
--- a/MediaBrowser.Api/ItemRefreshService.cs
+++ b/MediaBrowser.Api/ItemRefreshService.cs
@@ -13,10 +13,16 @@ namespace MediaBrowser.Api
 {
     public class BaseRefreshRequest : IReturnVoid
     {
-        [ApiMember(Name = "Forced", Description = "Indicates if a normal or forced refresh should occur.", IsRequired = false, DataType = "boolean", ParameterType = "query", Verb = "POST")]
-        public bool Forced { get; set; }
+        [ApiMember(Name = "MetadataRefreshMode", Description = "Specifies the metadata refresh mode", IsRequired = false, DataType = "boolean", ParameterType = "query", Verb = "POST")]
+        public MetadataRefreshMode MetadataRefreshMode { get; set; }
 
-        [ApiMember(Name = "ReplaceAllImages", Description = "Determines if images should be replaced during the refresh.", IsRequired = true, DataType = "boolean", ParameterType = "query", Verb = "POST")]
+        [ApiMember(Name = "ImageRefreshMode", Description = "Specifies the image refresh mode", IsRequired = false, DataType = "boolean", ParameterType = "query", Verb = "POST")]
+        public ImageRefreshMode ImageRefreshMode { get; set; }
+
+        [ApiMember(Name = "ReplaceAllMetadata", Description = "Determines if metadata should be replaced. Only applicable if mode is FullRefresh", IsRequired = false, DataType = "boolean", ParameterType = "query", Verb = "POST")]
+        public bool ReplaceAllMetadata { get; set; }
+
+        [ApiMember(Name = "ReplaceAllImages", Description = "Determines if images should be replaced. Only applicable if mode is FullRefresh", IsRequired = false, DataType = "boolean", ParameterType = "query", Verb = "POST")]
         public bool ReplaceAllImages { get; set; }
     }
 
@@ -93,7 +99,7 @@ namespace MediaBrowser.Api
         private async Task RefreshItem(RefreshItem request, BaseItem item)
         {
             var options = GetRefreshOptions(request);
-            
+
             try
             {
                 await item.RefreshMetadata(options, CancellationToken.None).ConfigureAwait(false);
@@ -148,10 +154,10 @@ namespace MediaBrowser.Api
         {
             return new MetadataRefreshOptions
             {
-                MetadataRefreshMode = MetadataRefreshMode.FullRefresh,
-                ImageRefreshMode = ImageRefreshMode.FullRefresh,
-                ReplaceAllMetadata = request.Forced,
-                ReplaceAllImages = request.ReplaceAllImages
+                MetadataRefreshMode = request.MetadataRefreshMode,
+                ImageRefreshMode = request.ImageRefreshMode,
+                ReplaceAllImages = request.ReplaceAllImages,
+                ReplaceAllMetadata = request.ReplaceAllMetadata
             };
         }
     }
diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs
index 77a714755d..10aa231265 100644
--- a/MediaBrowser.Api/Library/LibraryService.cs
+++ b/MediaBrowser.Api/Library/LibraryService.cs
@@ -5,6 +5,7 @@ using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Dto;
@@ -226,6 +227,7 @@ namespace MediaBrowser.Api.Library
     /// <summary>
     /// Class LibraryService
     /// </summary>
+    [Authenticated]
     public class LibraryService : BaseApiService
     {
         /// <summary>
diff --git a/MediaBrowser.Api/Library/SubtitleService.cs b/MediaBrowser.Api/Library/SubtitleService.cs
deleted file mode 100644
index 4fc3e00c08..0000000000
--- a/MediaBrowser.Api/Library/SubtitleService.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaEncoding;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Controller.Subtitles;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Providers;
-using ServiceStack;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Api.Library
-{
-    [Route("/Videos/{Id}/{MediaSourceId}/Subtitles/{Index}/Stream.{Format}", "GET", Summary = "Gets subtitles in a specified format (vtt).")]
-    public class GetSubtitle
-    {
-        /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        /// <value>The id.</value>
-        [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
-        public string Id { get; set; }
-
-        [ApiMember(Name = "MediaSourceId", Description = "MediaSourceId", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
-        public string MediaSourceId { get; set; }
-
-        [ApiMember(Name = "Index", Description = "The subtitle stream index", IsRequired = true, DataType = "int", ParameterType = "path", Verb = "GET")]
-        public int Index { get; set; }
-
-        [ApiMember(Name = "Format", Description = "Format", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
-        public string Format { get; set; }
-
-        [ApiMember(Name = "StartPositionTicks", Description = "StartPositionTicks", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
-        public long StartPositionTicks { get; set; }
-    }
-
-    [Route("/Videos/{Id}/Subtitles/{Index}", "DELETE", Summary = "Deletes an external subtitle file")]
-    public class DeleteSubtitle
-    {
-        /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        /// <value>The id.</value>
-        [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "DELETE")]
-        public string Id { get; set; }
-
-        [ApiMember(Name = "Index", Description = "The subtitle stream index", IsRequired = true, DataType = "int", ParameterType = "path", Verb = "DELETE")]
-        public int Index { get; set; }
-    }
-
-    [Route("/Items/{Id}/RemoteSearch/Subtitles/{Language}", "GET")]
-    public class SearchRemoteSubtitles : IReturn<List<RemoteSubtitleInfo>>
-    {
-        [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
-        public string Id { get; set; }
-
-        [ApiMember(Name = "Language", Description = "Language", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
-        public string Language { get; set; }
-    }
-
-    [Route("/Items/{Id}/RemoteSearch/Subtitles/Providers", "GET")]
-    public class GetSubtitleProviders : IReturn<List<SubtitleProviderInfo>>
-    {
-        [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
-        public string Id { get; set; }
-    }
-
-    [Route("/Items/{Id}/RemoteSearch/Subtitles/{SubtitleId}", "POST")]
-    public class DownloadRemoteSubtitles : IReturnVoid
-    {
-        [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public string Id { get; set; }
-
-        [ApiMember(Name = "SubtitleId", Description = "SubtitleId", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public string SubtitleId { get; set; }
-    }
-
-    [Route("/Providers/Subtitles/Subtitles/{Id}", "GET")]
-    public class GetRemoteSubtitles : IReturnVoid
-    {
-        [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
-        public string Id { get; set; }
-    }
-
-    [Authenticated]
-    public class SubtitleService : BaseApiService
-    {
-        private readonly ILibraryManager _libraryManager;
-        private readonly ISubtitleManager _subtitleManager;
-        private readonly ISubtitleEncoder _subtitleEncoder;
-
-        public SubtitleService(ILibraryManager libraryManager, ISubtitleManager subtitleManager, ISubtitleEncoder subtitleEncoder)
-        {
-            _libraryManager = libraryManager;
-            _subtitleManager = subtitleManager;
-            _subtitleEncoder = subtitleEncoder;
-        }
-
-        public object Get(SearchRemoteSubtitles request)
-        {
-            var video = (Video)_libraryManager.GetItemById(request.Id);
-
-            var response = _subtitleManager.SearchSubtitles(video, request.Language, CancellationToken.None).Result;
-
-            return ToOptimizedResult(response);
-        }
-        public object Get(GetSubtitle request)
-        {
-            if (string.IsNullOrEmpty(request.Format))
-            {
-                var item = (Video)_libraryManager.GetItemById(new Guid(request.Id));
-
-                var mediaSource = item.GetMediaSources(false)
-                    .First(i => string.Equals(i.Id, request.MediaSourceId ?? request.Id));
-
-                var subtitleStream = mediaSource.MediaStreams
-                    .First(i => i.Type == MediaStreamType.Subtitle && i.Index == request.Index);
-
-                return ToStaticFileResult(subtitleStream.Path);
-            }
-
-            var stream = GetSubtitles(request).Result;
-
-            return ResultFactory.GetResult(stream, Common.Net.MimeTypes.GetMimeType("file." + request.Format));
-        }
-
-        private async Task<Stream> GetSubtitles(GetSubtitle request)
-        {
-            return await _subtitleEncoder.GetSubtitles(request.Id, 
-                request.MediaSourceId, 
-                request.Index, 
-                request.Format,
-                request.StartPositionTicks,
-                CancellationToken.None).ConfigureAwait(false);
-        }
-
-        public void Delete(DeleteSubtitle request)
-        {
-            var task = _subtitleManager.DeleteSubtitles(request.Id, request.Index);
-
-            Task.WaitAll(task);
-        }
-
-        public object Get(GetSubtitleProviders request)
-        {
-            var result = _subtitleManager.GetProviders(request.Id);
-
-            return ToOptimizedResult(result);
-        }
-
-        public object Get(GetRemoteSubtitles request)
-        {
-            var result = _subtitleManager.GetRemoteSubtitles(request.Id, CancellationToken.None).Result;
-
-            return ResultFactory.GetResult(result.Stream, Common.Net.MimeTypes.GetMimeType("file." + result.Format));
-        }
-
-        public void Post(DownloadRemoteSubtitles request)
-        {
-            var video = (Video)_libraryManager.GetItemById(request.Id);
-
-            Task.Run(async () =>
-            {
-                try
-                {
-                    await _subtitleManager.DownloadSubtitles(video, request.SubtitleId, CancellationToken.None)
-                        .ConfigureAwait(false);
-
-                    await video.RefreshMetadata(new MetadataRefreshOptions(), CancellationToken.None).ConfigureAwait(false);
-                }
-                catch (Exception ex)
-                {
-                    Logger.ErrorException("Error downloading subtitles", ex);
-                }
-
-            });
-        }
-    }
-}
diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index a68966b335..ca2887d19c 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -65,11 +65,12 @@
     <Compile Include="..\SharedVersion.cs">
       <Link>Properties\SharedVersion.cs</Link>
     </Compile>
+    <Compile Include="BrandingService.cs" />
     <Compile Include="ChannelService.cs" />
     <Compile Include="Dlna\DlnaServerService.cs" />
     <Compile Include="Dlna\DlnaService.cs" />
     <Compile Include="Library\ChapterService.cs" />
-    <Compile Include="Library\SubtitleService.cs" />
+    <Compile Include="Subtitles\SubtitleService.cs" />
     <Compile Include="Movies\CollectionService.cs" />
     <Compile Include="Music\AlbumsService.cs" />
     <Compile Include="AppThemeService.cs" />
@@ -139,7 +140,6 @@
     <Compile Include="UserService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="VideosService.cs" />
-    <Compile Include="WebSocket\LogFileWebSocketListener.cs" />
     <Compile Include="WebSocket\SessionInfoWebSocketListener.cs" />
     <Compile Include="WebSocket\SystemInfoWebSocketListener.cs" />
   </ItemGroup>
diff --git a/MediaBrowser.Api/NotificationsService.cs b/MediaBrowser.Api/NotificationsService.cs
index 28edb61dd9..51a0801060 100644
--- a/MediaBrowser.Api/NotificationsService.cs
+++ b/MediaBrowser.Api/NotificationsService.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Notifications;
 using MediaBrowser.Model.Notifications;
 using ServiceStack;
@@ -82,6 +83,7 @@ namespace MediaBrowser.Api
         public string Ids { get; set; }
     }
 
+    [Authenticated]
     public class NotificationsService : BaseApiService
     {
         private readonly INotificationsRepository _notificationsRepo;
diff --git a/MediaBrowser.Api/SessionsService.cs b/MediaBrowser.Api/SessionsService.cs
index 00c307a18b..f4651601b0 100644
--- a/MediaBrowser.Api/SessionsService.cs
+++ b/MediaBrowser.Api/SessionsService.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Session;
 using ServiceStack;
@@ -14,6 +15,7 @@ namespace MediaBrowser.Api
     /// Class GetSessions
     /// </summary>
     [Route("/Sessions", "GET", Summary = "Gets a list of sessions")]
+    [Authenticated]
     public class GetSessions : IReturn<List<SessionInfoDto>>
     {
         [ApiMember(Name = "ControllableByUserId", Description = "Optional. Filter by sessions that a given user is allowed to remote control.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
@@ -27,6 +29,7 @@ namespace MediaBrowser.Api
     /// Class DisplayContent
     /// </summary>
     [Route("/Sessions/{Id}/Viewing", "POST", Summary = "Instructs a session to browse to an item or view")]
+    [Authenticated]
     public class DisplayContent : IReturnVoid
     {
         /// <summary>
@@ -59,6 +62,7 @@ namespace MediaBrowser.Api
     }
 
     [Route("/Sessions/{Id}/Playing", "POST", Summary = "Instructs a session to play an item")]
+    [Authenticated]
     public class Play : IReturnVoid
     {
         /// <summary>
@@ -91,6 +95,7 @@ namespace MediaBrowser.Api
     }
 
     [Route("/Sessions/{Id}/Playing/{Command}", "POST", Summary = "Issues a playstate command to a client")]
+    [Authenticated]
     public class SendPlaystateCommand : IReturnVoid
     {
         /// <summary>
@@ -115,6 +120,7 @@ namespace MediaBrowser.Api
     }
 
     [Route("/Sessions/{Id}/System/{Command}", "POST", Summary = "Issues a system command to a client")]
+    [Authenticated]
     public class SendSystemCommand : IReturnVoid
     {
         /// <summary>
@@ -133,6 +139,7 @@ namespace MediaBrowser.Api
     }
 
     [Route("/Sessions/{Id}/Command/{Command}", "POST", Summary = "Issues a system command to a client")]
+    [Authenticated]
     public class SendGeneralCommand : IReturnVoid
     {
         /// <summary>
@@ -151,6 +158,7 @@ namespace MediaBrowser.Api
     }
 
     [Route("/Sessions/{Id}/Command", "POST", Summary = "Issues a system command to a client")]
+    [Authenticated]
     public class SendFullGeneralCommand : GeneralCommand, IReturnVoid
     {
         /// <summary>
@@ -162,6 +170,7 @@ namespace MediaBrowser.Api
     }
 
     [Route("/Sessions/{Id}/Message", "POST", Summary = "Issues a command to a client to display a message to the user")]
+    [Authenticated]
     public class SendMessageCommand : IReturnVoid
     {
         /// <summary>
@@ -182,6 +191,7 @@ namespace MediaBrowser.Api
     }
 
     [Route("/Sessions/{Id}/Users/{UserId}", "POST", Summary = "Adds an additional user to a session")]
+    [Authenticated]
     public class AddUserToSession : IReturnVoid
     {
         [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
@@ -192,6 +202,7 @@ namespace MediaBrowser.Api
     }
 
     [Route("/Sessions/{Id}/Users/{UserId}", "DELETE", Summary = "Removes an additional user from a session")]
+    [Authenticated]
     public class RemoveUserFromSession : IReturnVoid
     {
         [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
@@ -202,7 +213,6 @@ namespace MediaBrowser.Api
     }
 
     [Route("/Sessions/Capabilities", "POST", Summary = "Updates capabilities for a device")]
-    [Route("/Sessions/{Id}/Capabilities", "POST", Summary = "Updates capabilities for a device")]
     public class PostCapabilities : IReturnVoid
     {
         /// <summary>
diff --git a/MediaBrowser.Api/Subtitles/SubtitleService.cs b/MediaBrowser.Api/Subtitles/SubtitleService.cs
new file mode 100644
index 0000000000..3e692cb22f
--- /dev/null
+++ b/MediaBrowser.Api/Subtitles/SubtitleService.cs
@@ -0,0 +1,189 @@
+using System.IO;
+using System.Linq;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Controller.Subtitles;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Providers;
+using ServiceStack;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Api.Subtitles
+{
+    [Route("/Videos/{Id}/Subtitles/{Index}", "DELETE", Summary = "Deletes an external subtitle file")]
+    [Authenticated]
+    public class DeleteSubtitle
+    {
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "DELETE")]
+        public string Id { get; set; }
+
+        [ApiMember(Name = "Index", Description = "The subtitle stream index", IsRequired = true, DataType = "int", ParameterType = "path", Verb = "DELETE")]
+        public int Index { get; set; }
+    }
+
+    [Route("/Items/{Id}/RemoteSearch/Subtitles/{Language}", "GET")]
+    [Authenticated]
+    public class SearchRemoteSubtitles : IReturn<List<RemoteSubtitleInfo>>
+    {
+        [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
+        public string Id { get; set; }
+
+        [ApiMember(Name = "Language", Description = "Language", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
+        public string Language { get; set; }
+    }
+
+    [Route("/Items/{Id}/RemoteSearch/Subtitles/Providers", "GET")]
+    [Authenticated]
+    public class GetSubtitleProviders : IReturn<List<SubtitleProviderInfo>>
+    {
+        [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
+        public string Id { get; set; }
+    }
+
+    [Route("/Items/{Id}/RemoteSearch/Subtitles/{SubtitleId}", "POST")]
+    [Authenticated]
+    public class DownloadRemoteSubtitles : IReturnVoid
+    {
+        [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public string Id { get; set; }
+
+        [ApiMember(Name = "SubtitleId", Description = "SubtitleId", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public string SubtitleId { get; set; }
+    }
+
+    [Route("/Providers/Subtitles/Subtitles/{Id}", "GET")]
+    [Authenticated]
+    public class GetRemoteSubtitles : IReturnVoid
+    {
+        [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
+        public string Id { get; set; }
+    }
+
+    [Route("/Videos/{Id}/{MediaSourceId}/Subtitles/{Index}/Stream.{Format}", "GET", Summary = "Gets subtitles in a specified format (vtt).")]
+    public class GetSubtitle
+    {
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
+        public string Id { get; set; }
+
+        [ApiMember(Name = "MediaSourceId", Description = "MediaSourceId", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
+        public string MediaSourceId { get; set; }
+
+        [ApiMember(Name = "Index", Description = "The subtitle stream index", IsRequired = true, DataType = "int", ParameterType = "path", Verb = "GET")]
+        public int Index { get; set; }
+
+        [ApiMember(Name = "Format", Description = "Format", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
+        public string Format { get; set; }
+
+        [ApiMember(Name = "StartPositionTicks", Description = "StartPositionTicks", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
+        public long StartPositionTicks { get; set; }
+    }
+
+    public class SubtitleService : BaseApiService
+    {
+        private readonly ILibraryManager _libraryManager;
+        private readonly ISubtitleManager _subtitleManager;
+        private readonly ISubtitleEncoder _subtitleEncoder;
+
+        public SubtitleService(ILibraryManager libraryManager, ISubtitleManager subtitleManager, ISubtitleEncoder subtitleEncoder)
+        {
+            _libraryManager = libraryManager;
+            _subtitleManager = subtitleManager;
+            _subtitleEncoder = subtitleEncoder;
+        }
+
+        public object Get(GetSubtitle request)
+        {
+            if (string.IsNullOrEmpty(request.Format))
+            {
+                var item = (Video)_libraryManager.GetItemById(new Guid(request.Id));
+
+                var mediaSource = item.GetMediaSources(false)
+                    .First(i => string.Equals(i.Id, request.MediaSourceId ?? request.Id));
+
+                var subtitleStream = mediaSource.MediaStreams
+                    .First(i => i.Type == MediaStreamType.Subtitle && i.Index == request.Index);
+
+                return ToStaticFileResult(subtitleStream.Path);
+            }
+
+            var stream = GetSubtitles(request).Result;
+
+            return ResultFactory.GetResult(stream, Common.Net.MimeTypes.GetMimeType("file." + request.Format));
+        }
+
+        private async Task<Stream> GetSubtitles(GetSubtitle request)
+        {
+            return await _subtitleEncoder.GetSubtitles(request.Id,
+                request.MediaSourceId,
+                request.Index,
+                request.Format,
+                request.StartPositionTicks,
+                CancellationToken.None).ConfigureAwait(false);
+        }
+
+        public object Get(SearchRemoteSubtitles request)
+        {
+            var video = (Video)_libraryManager.GetItemById(request.Id);
+
+            var response = _subtitleManager.SearchSubtitles(video, request.Language, CancellationToken.None).Result;
+
+            return ToOptimizedResult(response);
+        }
+
+        public void Delete(DeleteSubtitle request)
+        {
+            var task = _subtitleManager.DeleteSubtitles(request.Id, request.Index);
+
+            Task.WaitAll(task);
+        }
+
+        public object Get(GetSubtitleProviders request)
+        {
+            var result = _subtitleManager.GetProviders(request.Id);
+
+            return ToOptimizedResult(result);
+        }
+
+        public object Get(GetRemoteSubtitles request)
+        {
+            var result = _subtitleManager.GetRemoteSubtitles(request.Id, CancellationToken.None).Result;
+
+            return ResultFactory.GetResult(result.Stream, Common.Net.MimeTypes.GetMimeType("file." + result.Format));
+        }
+
+        public void Post(DownloadRemoteSubtitles request)
+        {
+            var video = (Video)_libraryManager.GetItemById(request.Id);
+
+            Task.Run(async () =>
+            {
+                try
+                {
+                    await _subtitleManager.DownloadSubtitles(video, request.SubtitleId, CancellationToken.None)
+                        .ConfigureAwait(false);
+
+                    await video.RefreshMetadata(new MetadataRefreshOptions(), CancellationToken.None).ConfigureAwait(false);
+                }
+                catch (Exception ex)
+                {
+                    Logger.ErrorException("Error downloading subtitles", ex);
+                }
+
+            });
+        }
+    }
+}
diff --git a/MediaBrowser.Api/SystemService.cs b/MediaBrowser.Api/SystemService.cs
index 2f0741434a..6f2e83a796 100644
--- a/MediaBrowser.Api/SystemService.cs
+++ b/MediaBrowser.Api/SystemService.cs
@@ -1,6 +1,12 @@
-using MediaBrowser.Controller;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.IO;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.System;
 using ServiceStack;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace MediaBrowser.Api
@@ -18,15 +24,30 @@ namespace MediaBrowser.Api
     /// Class RestartApplication
     /// </summary>
     [Route("/System/Restart", "POST", Summary = "Restarts the application, if needed")]
+    [Authenticated]
     public class RestartApplication
     {
     }
 
     [Route("/System/Shutdown", "POST", Summary = "Shuts down the application")]
+    [Authenticated]
     public class ShutdownApplication
     {
     }
 
+    [Route("/System/Logs", "GET", Summary = "Gets a list of available server log files")]
+    [Authenticated]
+    public class GetServerLogs : IReturn<List<LogFile>>
+    {
+    }
+
+    [Route("/System/Logs/Log", "GET", Summary = "Gets a log file")]
+    public class GetLogFile
+    {
+        [ApiMember(Name = "Name", Description = "The log file name.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
+        public string Name { get; set; }
+    }
+
     /// <summary>
     /// Class SystemInfoService
     /// </summary>
@@ -36,16 +57,59 @@ namespace MediaBrowser.Api
         /// The _app host
         /// </summary>
         private readonly IServerApplicationHost _appHost;
-
+        private readonly IApplicationPaths _appPaths;
+        private readonly IFileSystem _fileSystem;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SystemService" /> class.
         /// </summary>
         /// <param name="appHost">The app host.</param>
         /// <exception cref="System.ArgumentNullException">jsonSerializer</exception>
-        public SystemService(IServerApplicationHost appHost)
+        public SystemService(IServerApplicationHost appHost, IApplicationPaths appPaths, IFileSystem fileSystem)
         {
             _appHost = appHost;
+            _appPaths = appPaths;
+            _fileSystem = fileSystem;
+        }
+
+        public object Get(GetServerLogs request)
+        {
+            List<FileInfo> files;
+
+            try
+            {
+                files = new DirectoryInfo(_appPaths.LogDirectoryPath)
+                    .EnumerateFiles("*", SearchOption.AllDirectories)
+                    .Where(i => string.Equals(i.Extension, ".txt", System.StringComparison.OrdinalIgnoreCase))
+                    .ToList();
+            }
+            catch (DirectoryNotFoundException)
+            {
+                files = new List<FileInfo>();
+            }
+
+            var result = files.Select(i => new LogFile
+            {
+                DateCreated = _fileSystem.GetCreationTimeUtc(i),
+                DateModified = _fileSystem.GetLastWriteTimeUtc(i),
+                Name = i.Name,
+                Size = i.Length
+
+            }).OrderByDescending(i => i.DateModified)
+                .ThenByDescending(i => i.DateCreated)
+                .ThenBy(i => i.Name)
+                .ToList();
+
+            return ToOptimizedResult(result);
+        }
+
+        public object Get(GetLogFile request)
+        {
+            var file = new DirectoryInfo(_appPaths.LogDirectoryPath)
+                .EnumerateFiles("*", SearchOption.AllDirectories)
+                .First(i => string.Equals(i.Name, request.Name, System.StringComparison.OrdinalIgnoreCase));
+
+            return ResultFactory.GetStaticFileResult(Request, file.FullName, FileShare.ReadWrite);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
index d1767e7fd9..55cdc8681e 100644
--- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
@@ -717,9 +717,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             await _userDataRepository.SaveUserData(user.Id, item, data, UserDataSaveReason.UpdateUserRating, CancellationToken.None).ConfigureAwait(false);
 
-            data = _userDataRepository.GetUserData(user.Id, key);
-
-            return _dtoService.GetUserItemDataDto(data);
+            return _userDataRepository.GetUserDataDto(item, user);
         }
 
         /// <summary>
@@ -766,9 +764,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             await _userDataRepository.SaveUserData(user.Id, item, data, UserDataSaveReason.UpdateUserRating, CancellationToken.None).ConfigureAwait(false);
 
-            data = _userDataRepository.GetUserData(user.Id, key);
-
-            return _dtoService.GetUserItemDataDto(data);
+            return _userDataRepository.GetUserDataDto(item, user);
         }
 
         /// <summary>
@@ -936,7 +932,7 @@ namespace MediaBrowser.Api.UserLibrary
                 await item.MarkUnplayed(user, _userDataRepository).ConfigureAwait(false);
             }
 
-            return _dtoService.GetUserItemDataDto(_userDataRepository.GetUserData(user.Id, item.GetUserDataKey()));
+            return _userDataRepository.GetUserDataDto(item, user);
         }
     }
 }
diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs
index 64d1fcb34c..cda489c94a 100644
--- a/MediaBrowser.Api/UserService.cs
+++ b/MediaBrowser.Api/UserService.cs
@@ -51,6 +51,7 @@ namespace MediaBrowser.Api
     /// Class DeleteUser
     /// </summary>
     [Route("/Users/{Id}", "DELETE", Summary = "Deletes a user")]
+    [Authenticated]
     public class DeleteUser : IReturnVoid
     {
         /// <summary>
@@ -107,6 +108,7 @@ namespace MediaBrowser.Api
     /// Class UpdateUserPassword
     /// </summary>
     [Route("/Users/{Id}/Password", "POST", Summary = "Updates a user's password")]
+    [Authenticated]
     public class UpdateUserPassword : IReturnVoid
     {
         /// <summary>
@@ -138,6 +140,7 @@ namespace MediaBrowser.Api
     /// Class UpdateUser
     /// </summary>
     [Route("/Users/{Id}", "POST", Summary = "Updates a user")]
+    [Authenticated]
     public class UpdateUser : UserDto, IReturnVoid
     {
     }
@@ -146,6 +149,7 @@ namespace MediaBrowser.Api
     /// Class CreateUser
     /// </summary>
     [Route("/Users", "POST", Summary = "Creates a user")]
+    [Authenticated]
     public class CreateUser : UserDto, IReturn<UserDto>
     {
     }
diff --git a/MediaBrowser.Api/WebSocket/LogFileWebSocketListener.cs b/MediaBrowser.Api/WebSocket/LogFileWebSocketListener.cs
deleted file mode 100644
index 46dabb0420..0000000000
--- a/MediaBrowser.Api/WebSocket/LogFileWebSocketListener.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-using MediaBrowser.Common.IO;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.IO;
-using MediaBrowser.Model.Logging;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Api.WebSocket
-{
-    /// <summary>
-    /// Class ScheduledTasksWebSocketListener
-    /// </summary>
-    public class LogFileWebSocketListener : BasePeriodicWebSocketListener<IEnumerable<string>, LogFileWebSocketState>
-    {
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        protected override string Name
-        {
-            get { return "LogFile"; }
-        }
-
-        /// <summary>
-        /// The _kernel
-        /// </summary>
-        private readonly ILogManager _logManager;
-        private readonly IFileSystem _fileSystem;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LogFileWebSocketListener" /> class.
-        /// </summary>
-        /// <param name="logger">The logger.</param>
-        /// <param name="logManager">The log manager.</param>
-        public LogFileWebSocketListener(ILogger logger, ILogManager logManager, IFileSystem fileSystem)
-            : base(logger)
-        {
-            _logManager = logManager;
-            _fileSystem = fileSystem;
-            _logManager.LoggerLoaded += kernel_LoggerLoaded;
-        }
-
-        /// <summary>
-        /// Gets the data to send.
-        /// </summary>
-        /// <param name="state">The state.</param>
-        /// <returns>IEnumerable{System.String}.</returns>
-        protected override async Task<IEnumerable<string>> GetDataToSend(LogFileWebSocketState state)
-        {
-            if (!string.Equals(_logManager.LogFilePath, state.LastLogFilePath))
-            {
-                state.LastLogFilePath = _logManager.LogFilePath;
-                state.StartLine = 0;
-            }
-
-            var lines = await GetLogLines(state.LastLogFilePath, state.StartLine, _fileSystem).ConfigureAwait(false);
-
-            state.StartLine += lines.Count;
-
-            return lines;
-        }
-
-        /// <summary>
-        /// Releases unmanaged and - optionally - managed resources.
-        /// </summary>
-        /// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-        protected override void Dispose(bool dispose)
-        {
-            if (dispose)
-            {
-                _logManager.LoggerLoaded -= kernel_LoggerLoaded;
-            }
-            base.Dispose(dispose);
-        }
-
-        /// <summary>
-        /// Handles the LoggerLoaded event of the kernel control.
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="EventArgs" /> instance containing the event data.</param>
-        void kernel_LoggerLoaded(object sender, EventArgs e)
-        {
-            // Reset the startline for each connection whenever the logger reloads
-            lock (ActiveConnections)
-            {
-                foreach (var connection in ActiveConnections)
-                {
-                    connection.Item4.StartLine = 0;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the log lines.
-        /// </summary>
-        /// <param name="logFilePath">The log file path.</param>
-        /// <param name="startLine">The start line.</param>
-        /// <returns>Task{IEnumerable{System.String}}.</returns>
-        internal static async Task<List<string>> GetLogLines(string logFilePath, int startLine, IFileSystem fileSystem)
-        {
-            var lines = new List<string>();
-
-            using (var fs = fileSystem.GetFileStream(logFilePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, true))
-            {
-                using (var reader = new StreamReader(fs))
-                {
-                    while (!reader.EndOfStream)
-                    {
-                        var line = await reader.ReadLineAsync().ConfigureAwait(false);
-
-                        if (line.IndexOf("Info -", StringComparison.OrdinalIgnoreCase) != -1 ||
-                            line.IndexOf("Warn -", StringComparison.OrdinalIgnoreCase) != -1 ||
-                            line.IndexOf("Error -", StringComparison.OrdinalIgnoreCase) != -1)
-                        {
-                            lines.Add(line);
-                        }
-                    }
-                }
-            }
-
-            if (startLine > 0)
-            {
-                lines = lines.Skip(startLine).ToList();
-            }
-
-            return lines;
-        }
-    }
-
-    /// <summary>
-    /// Class LogFileWebSocketState
-    /// </summary>
-    public class LogFileWebSocketState : WebSocketListenerState
-    {
-        /// <summary>
-        /// Gets or sets the last log file path.
-        /// </summary>
-        /// <value>The last log file path.</value>
-        public string LastLogFilePath { get; set; }
-        /// <summary>
-        /// Gets or sets the start line.
-        /// </summary>
-        /// <value>The start line.</value>
-        public int StartLine { get; set; }
-    }
-}
diff --git a/MediaBrowser.Common/Net/MimeTypes.cs b/MediaBrowser.Common/Net/MimeTypes.cs
index 0cc4fc6b4d..dcac5e7ba6 100644
--- a/MediaBrowser.Common/Net/MimeTypes.cs
+++ b/MediaBrowser.Common/Net/MimeTypes.cs
@@ -199,6 +199,10 @@ namespace MediaBrowser.Common.Net
             {
                 return "application/x-javascript";
             }
+            if (ext.Equals(".map", StringComparison.OrdinalIgnoreCase))
+            {
+                return "application/x-javascript";
+            }
 
             if (ext.Equals(".woff", StringComparison.OrdinalIgnoreCase))
             {
diff --git a/MediaBrowser.Controller/Dto/IDtoService.cs b/MediaBrowser.Controller/Dto/IDtoService.cs
index f9d7cc21af..0d0555dc0d 100644
--- a/MediaBrowser.Controller/Dto/IDtoService.cs
+++ b/MediaBrowser.Controller/Dto/IDtoService.cs
@@ -25,13 +25,6 @@ namespace MediaBrowser.Controller.Dto
         /// <returns>System.String.</returns>
         string GetDtoId(BaseItem item);
 
-        /// <summary>
-        /// Gets the user item data dto.
-        /// </summary>
-        /// <param name="data">The data.</param>
-        /// <returns>UserItemDataDto.</returns>
-        UserItemDataDto GetUserItemDataDto(UserItemData data);
-
         /// <summary>
         /// Attaches the primary image aspect ratio.
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 524d7097ba..0428347310 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -6,6 +6,7 @@ using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Library;
 using MediaBrowser.Model.Logging;
@@ -1571,5 +1572,19 @@ namespace MediaBrowser.Controller.Entities
 
             return path;
         }
+
+        public virtual void FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, User user)
+        {
+            if (RunTimeTicks.HasValue)
+            {
+                double pct = RunTimeTicks.Value;
+
+                if (pct > 0)
+                {
+                    pct = userData.PlaybackPositionTicks / pct;
+                    dto.PlayedPercentage = 100 * pct;
+                }
+            }
+        }
     }
 }
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 584091b130..b886cef193 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -4,6 +4,7 @@ using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MoreLinq;
 using System;
@@ -769,6 +770,11 @@ namespace MediaBrowser.Controller.Entities
         /// <returns>IEnumerable{BaseItem}.</returns>
         /// <exception cref="System.ArgumentNullException"></exception>
         public virtual IEnumerable<BaseItem> GetChildren(User user, bool includeLinkedChildren)
+        {
+            return GetChildren(user, includeLinkedChildren, false);
+        }
+
+        internal IEnumerable<BaseItem> GetChildren(User user, bool includeLinkedChildren, bool includeHidden)
         {
             if (user == null)
             {
@@ -780,7 +786,7 @@ namespace MediaBrowser.Controller.Entities
 
             var list = new List<BaseItem>();
 
-            var hasLinkedChildren = AddChildrenToList(user, includeLinkedChildren, list, false);
+            var hasLinkedChildren = AddChildrenToList(user, includeLinkedChildren, list, includeHidden, false);
 
             return hasLinkedChildren ? list.DistinctBy(i => i.Id).ToList() : list;
         }
@@ -796,9 +802,10 @@ namespace MediaBrowser.Controller.Entities
         /// <param name="user">The user.</param>
         /// <param name="includeLinkedChildren">if set to <c>true</c> [include linked children].</param>
         /// <param name="list">The list.</param>
+        /// <param name="includeHidden">if set to <c>true</c> [include hidden].</param>
         /// <param name="recursive">if set to <c>true</c> [recursive].</param>
         /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
-        private bool AddChildrenToList(User user, bool includeLinkedChildren, List<BaseItem> list, bool recursive)
+        private bool AddChildrenToList(User user, bool includeLinkedChildren, List<BaseItem> list, bool includeHidden, bool recursive)
         {
             var hasLinkedChildren = false;
 
@@ -806,7 +813,7 @@ namespace MediaBrowser.Controller.Entities
             {
                 if (child.IsVisible(user))
                 {
-                    if (!child.IsHiddenFromUser(user))
+                    if (includeHidden || !child.IsHiddenFromUser(user))
                     {
                         list.Add(child);
                     }
@@ -815,7 +822,7 @@ namespace MediaBrowser.Controller.Entities
                     {
                         var folder = (Folder)child;
 
-                        if (folder.AddChildrenToList(user, includeLinkedChildren, list, true))
+                        if (folder.AddChildrenToList(user, includeLinkedChildren, list, includeHidden, true))
                         {
                             hasLinkedChildren = true;
                         }
@@ -855,7 +862,7 @@ namespace MediaBrowser.Controller.Entities
 
             var list = new List<BaseItem>();
 
-            var hasLinkedChildren = AddChildrenToList(user, includeLinkedChildren, list, true);
+            var hasLinkedChildren = AddChildrenToList(user, includeLinkedChildren, list, false, true);
 
             return hasLinkedChildren ? list.DistinctBy(i => i.Id).ToList() : list;
         }
@@ -1069,5 +1076,68 @@ namespace MediaBrowser.Controller.Entities
             return GetRecursiveChildren(user).Where(i => !i.IsFolder && i.LocationType != LocationType.Virtual)
                 .All(i => i.IsUnplayed(user));
         }
+
+        public override void FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, User user)
+        {
+            var recursiveItemCount = 0;
+            var unplayed = 0;
+
+            double totalPercentPlayed = 0;
+
+            IEnumerable<BaseItem> children;
+            var folder = this;
+
+            var season = folder as Season;
+
+            if (season != null)
+            {
+                children = season.GetEpisodes(user).Where(i => i.LocationType != LocationType.Virtual);
+            }
+            else
+            {
+                children = folder.GetRecursiveChildren(user)
+                    .Where(i => !i.IsFolder && i.LocationType != LocationType.Virtual);
+            }
+
+            // Loop through each recursive child
+            foreach (var child in children)
+            {
+                recursiveItemCount++;
+
+                var isUnplayed = true;
+
+                var itemUserData = UserDataManager.GetUserData(user.Id, child.GetUserDataKey());
+                
+                // Incrememt totalPercentPlayed
+                if (itemUserData != null)
+                {
+                    if (itemUserData.Played)
+                    {
+                        totalPercentPlayed += 100;
+
+                        isUnplayed = false;
+                    }
+                    else if (itemUserData.PlaybackPositionTicks > 0 && child.RunTimeTicks.HasValue && child.RunTimeTicks.Value > 0)
+                    {
+                        double itemPercent = itemUserData.PlaybackPositionTicks;
+                        itemPercent /= child.RunTimeTicks.Value;
+                        totalPercentPlayed += itemPercent;
+                    }
+                }
+
+                if (isUnplayed)
+                {
+                    unplayed++;
+                }
+            }
+
+            dto.UnplayedItemCount = unplayed;
+
+            if (recursiveItemCount > 0)
+            {
+                dto.PlayedPercentage = totalPercentPlayed / recursiveItemCount;
+                dto.Played = dto.PlayedPercentage.Value >= 100;
+            }
+        }
     }
 }
diff --git a/MediaBrowser.Controller/Entities/IHasUserData.cs b/MediaBrowser.Controller/Entities/IHasUserData.cs
index 780181a61d..d576d90c45 100644
--- a/MediaBrowser.Controller/Entities/IHasUserData.cs
+++ b/MediaBrowser.Controller/Entities/IHasUserData.cs
@@ -1,4 +1,6 @@
-
+using MediaBrowser.Model.Dto;
+using System;
+
 namespace MediaBrowser.Controller.Entities
 {
     /// <summary>
@@ -6,10 +8,24 @@ namespace MediaBrowser.Controller.Entities
     /// </summary>
     public interface IHasUserData
     {
+        /// <summary>
+        /// Gets or sets the identifier.
+        /// </summary>
+        /// <value>The identifier.</value>
+        Guid Id { get; set; }
+
         /// <summary>
         /// Gets the user data key.
         /// </summary>
         /// <returns>System.String.</returns>
         string GetUserDataKey();
+
+        /// <summary>
+        /// Fills the user data dto values.
+        /// </summary>
+        /// <param name="dto">The dto.</param>
+        /// <param name="userData">The user data.</param>
+        /// <param name="user">The user.</param>
+        void FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, User user);
     }
 }
diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs
index b9630a66f4..847183fd00 100644
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -91,7 +91,7 @@ namespace MediaBrowser.Controller.Entities.TV
         {
             get
             {
-                return FindParent<Season>();
+                return Season;
             }
         }
 
diff --git a/MediaBrowser.Controller/Entities/UserRootFolder.cs b/MediaBrowser.Controller/Entities/UserRootFolder.cs
index e5a8135c2d..6404e71ec6 100644
--- a/MediaBrowser.Controller/Entities/UserRootFolder.cs
+++ b/MediaBrowser.Controller/Entities/UserRootFolder.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Dto;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -51,5 +52,10 @@ namespace MediaBrowser.Controller.Entities
                 LibraryManager.RegisterItem(item);
             }
         }
+
+        public override void FillUserDataDtoValues(UserItemDataDto dto, UserItemData userData, User user)
+        {
+            // Nothing meaninful here and will only waste resources
+        }
     }
 }
diff --git a/MediaBrowser.Controller/Entities/UserView.cs b/MediaBrowser.Controller/Entities/UserView.cs
index 86099fdc01..619a497f5f 100644
--- a/MediaBrowser.Controller/Entities/UserView.cs
+++ b/MediaBrowser.Controller/Entities/UserView.cs
@@ -44,7 +44,7 @@ namespace MediaBrowser.Controller.Entities
             var excludeFolderIds = user.Configuration.ExcludeFoldersFromGrouping.Select(i => new Guid(i)).ToList();
 
             return user.RootFolder
-                .GetChildren(user, true)
+                .GetChildren(user, true, true)
                 .OfType<Folder>()
                 .Where(i => !excludeFolderIds.Contains(i.Id) && !IsExcludedFromGrouping(i));
         }
diff --git a/MediaBrowser.Controller/Library/IUserDataManager.cs b/MediaBrowser.Controller/Library/IUserDataManager.cs
index 2bec9e3deb..9db91e7f22 100644
--- a/MediaBrowser.Controller/Library/IUserDataManager.cs
+++ b/MediaBrowser.Controller/Library/IUserDataManager.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using System;
 using System.Threading;
@@ -34,5 +35,13 @@ namespace MediaBrowser.Controller.Library
         /// <param name="key">The key.</param>
         /// <returns>Task{UserItemData}.</returns>
         UserItemData GetUserData(Guid userId, string key);
+
+        /// <summary>
+        /// Gets the user data dto.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <param name="user">The user.</param>
+        /// <returns>UserItemDataDto.</returns>
+        UserItemDataDto GetUserDataDto(IHasUserData item, User user);
     }
 }
diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs b/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs
index 23610351e7..ba1cb30436 100644
--- a/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs
+++ b/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace MediaBrowser.Controller.LiveTv
 {
-    public interface ILiveTvRecording : IHasImages, IHasMediaSources
+    public interface ILiveTvRecording : IHasImages, IHasMediaSources, IHasUserData
     {
         string ServiceName { get; set; }
 
@@ -20,8 +20,6 @@ namespace MediaBrowser.Controller.LiveTv
 
         string GetClientTypeName();
 
-        string GetUserDataKey();
-
         bool IsParentalAllowed(User user);
 
         Task RefreshMetadata(MetadataRefreshOptions options, CancellationToken cancellationToken);
diff --git a/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs b/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs
index 692d6db909..7f1ddbce9b 100644
--- a/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs
+++ b/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs
@@ -1,6 +1,6 @@
-using System;
+using MediaBrowser.Model.Entities;
+using System;
 using System.Collections.Generic;
-using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Controller.Providers
 {
@@ -18,6 +18,11 @@ namespace MediaBrowser.Controller.Providers
         /// </summary>
         [Obsolete]
         public bool ForceSave { get; set; }
+
+        public MetadataRefreshOptions()
+        {
+            MetadataRefreshMode = MetadataRefreshMode.Default;
+        }
     }
 
     public class ImageRefreshOptions
@@ -38,48 +43,54 @@ namespace MediaBrowser.Controller.Providers
 
         public bool IsReplacingImage(ImageType type)
         {
-            return ReplaceAllImages || ReplaceImages.Contains(type);
+            return ImageRefreshMode == ImageRefreshMode.FullRefresh &&
+                (ReplaceAllImages || ReplaceImages.Contains(type));
         }
     }
 
     public enum MetadataRefreshMode
     {
         /// <summary>
-        /// Providers will be executed based on default rules
+        /// The none
         /// </summary>
-        EnsureMetadata = 0,
+        None = 0,
 
         /// <summary>
-        /// No providers will be executed
+        /// The validation only
         /// </summary>
-        None = 1,
+        ValidationOnly = 1,
 
         /// <summary>
-        /// All providers will be executed to search for new metadata
+        /// Providers will be executed based on default rules
         /// </summary>
-        FullRefresh = 2,
+        Default = 2,
 
         /// <summary>
-        /// The validation only
+        /// All providers will be executed to search for new metadata
         /// </summary>
-        ValidationOnly = 3
+        FullRefresh = 3
     }
 
     public enum ImageRefreshMode
     {
+        /// <summary>
+        /// The none
+        /// </summary>
+        None = 0,
+
         /// <summary>
         /// The default
         /// </summary>
-        Default = 0,
+        Default = 1,
 
         /// <summary>
         /// Existing images will be validated
         /// </summary>
-        ValidationOnly = 1,
+        ValidationOnly = 2,
 
         /// <summary>
         /// All providers will be executed to search for new metadata
         /// </summary>
-        FullRefresh = 2
+        FullRefresh = 3
     }
 }
diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs
index 6d3a9d20cf..7b20621827 100644
--- a/MediaBrowser.Controller/Session/ISessionManager.cs
+++ b/MediaBrowser.Controller/Session/ISessionManager.cs
@@ -219,7 +219,13 @@ namespace MediaBrowser.Controller.Session
         /// <param name="deviceName">Name of the device.</param>
         /// <param name="remoteEndPoint">The remote end point.</param>
         /// <returns>Task{SessionInfo}.</returns>
-        Task<AuthenticationResult> AuthenticateNewSession(string username, string password, string clientType, string appVersion, string deviceId, string deviceName, string remoteEndPoint);
+        Task<AuthenticationResult> AuthenticateNewSession(string username, 
+            string password, 
+            string clientType, 
+            string appVersion, 
+            string deviceId, 
+            string deviceName, 
+            string remoteEndPoint);
 
         /// <summary>
         /// Reports the capabilities.
diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
index 0ed49d5f89..91c1508fc1 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -77,6 +77,9 @@
     <Compile Include="..\MediaBrowser.Model\ApiClient\SessionUpdatesEventArgs.cs">
       <Link>ApiClient\SessionUpdatesEventArgs.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Branding\BrandingOptions.cs">
+      <Link>Branding\BrandingOptions.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Channels\ChannelFeatures.cs">
       <Link>Channels\ChannelFeatures.cs</Link>
     </Compile>
@@ -815,6 +818,9 @@
     <Compile Include="..\MediaBrowser.Model\Session\UserDataChangeInfo.cs">
       <Link>Session\UserDataChangeInfo.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\System\LogFile.cs">
+      <Link>System\LogFile.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\System\SystemInfo.cs">
       <Link>System\SystemInfo.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
index 12c87ca97a..782e8524db 100644
--- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
+++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
@@ -64,6 +64,9 @@
     <Compile Include="..\MediaBrowser.Model\ApiClient\SessionUpdatesEventArgs.cs">
       <Link>ApiClient\SessionUpdatesEventArgs.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Branding\BrandingOptions.cs">
+      <Link>Branding\BrandingOptions.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Channels\ChannelFeatures.cs">
       <Link>Channels\ChannelFeatures.cs</Link>
     </Compile>
@@ -796,6 +799,9 @@
     <Compile Include="..\MediaBrowser.Model\Session\UserDataChangeInfo.cs">
       <Link>Session\UserDataChangeInfo.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\System\LogFile.cs">
+      <Link>System\LogFile.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\System\SystemInfo.cs">
       <Link>System\SystemInfo.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model/Branding/BrandingOptions.cs b/MediaBrowser.Model/Branding/BrandingOptions.cs
new file mode 100644
index 0000000000..737cb5c48f
--- /dev/null
+++ b/MediaBrowser.Model/Branding/BrandingOptions.cs
@@ -0,0 +1,12 @@
+
+namespace MediaBrowser.Model.Branding
+{
+    public class BrandingOptions
+    {
+        /// <summary>
+        /// Gets or sets the login disclaimer.
+        /// </summary>
+        /// <value>The login disclaimer.</value>
+        public string LoginDisclaimer { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 36c353479f..49b731341a 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -158,9 +158,6 @@ namespace MediaBrowser.Model.Configuration
         public bool EnableTmdbUpdates { get; set; }
         public bool EnableFanArtUpdates { get; set; }
 
-        public bool RequireMobileManualLogin { get; set; }
-        public bool RequireNonMobileManualLogin { get; set; }
-
         /// <summary>
         /// Gets or sets the image saving convention.
         /// </summary>
diff --git a/MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs b/MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs
index db8b69951a..86eb40b975 100644
--- a/MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs
+++ b/MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs
@@ -10,12 +10,15 @@ namespace MediaBrowser.Model.Configuration
         public bool SaveImagePathsInNfo { get; set; }
         public bool EnablePathSubstitution { get; set; }
 
+        public bool EnableExtraThumbsDuplication { get; set; }
+
         public XbmcMetadataOptions()
         {
             ReleaseDateFormat = "yyyy-MM-dd";
 
             SaveImagePathsInNfo = true;
             EnablePathSubstitution = true;
+            EnableExtraThumbsDuplication = true;
         }
     }
 }
diff --git a/MediaBrowser.Model/Dto/UserItemDataDto.cs b/MediaBrowser.Model/Dto/UserItemDataDto.cs
index 26b0e9d9e8..6ee9f19163 100644
--- a/MediaBrowser.Model/Dto/UserItemDataDto.cs
+++ b/MediaBrowser.Model/Dto/UserItemDataDto.cs
@@ -1,6 +1,6 @@
-using System;
+using MediaBrowser.Model.Extensions;
+using System;
 using System.ComponentModel;
-using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.Dto
 {
@@ -15,6 +15,18 @@ namespace MediaBrowser.Model.Dto
         /// <value>The rating.</value>
         public double? Rating { get; set; }
 
+        /// <summary>
+        /// Gets or sets the played percentage.
+        /// </summary>
+        /// <value>The played percentage.</value>
+        public double? PlayedPercentage { get; set; }
+
+        /// <summary>
+        /// Gets or sets the unplayed item count.
+        /// </summary>
+        /// <value>The unplayed item count.</value>
+        public int? UnplayedItemCount { get; set; }
+
         /// <summary>
         /// Gets or sets the playback position ticks.
         /// </summary>
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index d758f2f394..4d4ca8e20c 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -65,6 +65,7 @@
     <Compile Include="ApiClient\IServerEvents.cs" />
     <Compile Include="ApiClient\GeneralCommandEventArgs.cs" />
     <Compile Include="ApiClient\SessionUpdatesEventArgs.cs" />
+    <Compile Include="Branding\BrandingOptions.cs" />
     <Compile Include="Channels\ChannelFeatures.cs" />
     <Compile Include="Channels\ChannelInfo.cs" />
     <Compile Include="Channels\ChannelItemQuery.cs" />
@@ -294,6 +295,7 @@
     <Compile Include="Session\SessionInfoDto.cs" />
     <Compile Include="Session\SessionUserInfo.cs" />
     <Compile Include="Session\UserDataChangeInfo.cs" />
+    <Compile Include="System\LogFile.cs" />
     <Compile Include="Themes\AppTheme.cs" />
     <Compile Include="Themes\AppThemeInfo.cs" />
     <Compile Include="Themes\ThemeImage.cs" />
diff --git a/MediaBrowser.Model/Notifications/NotificationRequest.cs b/MediaBrowser.Model/Notifications/NotificationRequest.cs
index f511d41a97..6e9368f441 100644
--- a/MediaBrowser.Model/Notifications/NotificationRequest.cs
+++ b/MediaBrowser.Model/Notifications/NotificationRequest.cs
@@ -1,5 +1,4 @@
-using MediaBrowser.Model.Configuration;
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace MediaBrowser.Model.Notifications
diff --git a/MediaBrowser.Model/Session/SessionInfoDto.cs b/MediaBrowser.Model/Session/SessionInfoDto.cs
index 40723eff83..98df3efe55 100644
--- a/MediaBrowser.Model/Session/SessionInfoDto.cs
+++ b/MediaBrowser.Model/Session/SessionInfoDto.cs
@@ -1,32 +1,20 @@
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Extensions;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
-using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.Session
 {
     [DebuggerDisplay("Client = {Client}, Username = {UserName}")]
     public class SessionInfoDto : IHasPropertyChangedEvent
     {
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance can seek.
-        /// </summary>
-        /// <value><c>true</c> if this instance can seek; otherwise, <c>false</c>.</value>
-        public bool CanSeek { get; set; }
-
         /// <summary>
         /// Gets or sets the supported commands.
         /// </summary>
         /// <value>The supported commands.</value>
         public List<string> SupportedCommands { get; set; }
-        
-        /// <summary>
-        /// Gets or sets the remote end point.
-        /// </summary>
-        /// <value>The remote end point.</value>
-        public string RemoteEndPoint { get; set; }
 
         /// <summary>
         /// Gets or sets the queueable media types.
@@ -99,18 +87,6 @@ namespace MediaBrowser.Model.Session
         /// </summary>
         /// <value>The name of the device.</value>
         public string DeviceName { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance is paused.
-        /// </summary>
-        /// <value><c>true</c> if this instance is paused; otherwise, <c>false</c>.</value>
-        public bool IsPaused { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance is muted.
-        /// </summary>
-        /// <value><c>true</c> if this instance is muted; otherwise, <c>false</c>.</value>
-        public bool IsMuted { get; set; }
         
         /// <summary>
         /// Gets or sets the now playing item.
@@ -118,12 +94,6 @@ namespace MediaBrowser.Model.Session
         /// <value>The now playing item.</value>
         public BaseItemInfo NowPlayingItem { get; set; }
 
-        /// <summary>
-        /// Gets or sets the now playing position ticks.
-        /// </summary>
-        /// <value>The now playing position ticks.</value>
-        public long? NowPlayingPositionTicks { get; set; }
-
         /// <summary>
         /// Gets or sets the device id.
         /// </summary>
diff --git a/MediaBrowser.Model/System/LogFile.cs b/MediaBrowser.Model/System/LogFile.cs
new file mode 100644
index 0000000000..ba409c5423
--- /dev/null
+++ b/MediaBrowser.Model/System/LogFile.cs
@@ -0,0 +1,31 @@
+using System;
+
+namespace MediaBrowser.Model.System
+{
+    public class LogFile
+    {
+        /// <summary>
+        /// Gets or sets the date created.
+        /// </summary>
+        /// <value>The date created.</value>
+        public DateTime DateCreated { get; set; }
+
+        /// <summary>
+        /// Gets or sets the date modified.
+        /// </summary>
+        /// <value>The date modified.</value>
+        public DateTime DateModified { get; set; }
+
+        /// <summary>
+        /// Gets or sets the size.
+        /// </summary>
+        /// <value>The size.</value>
+        public long Size { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name { get; set; }
+    }
+}
diff --git a/MediaBrowser.Providers/Manager/ImageSaver.cs b/MediaBrowser.Providers/Manager/ImageSaver.cs
index 12af93dbd1..1b2e9fa6d6 100644
--- a/MediaBrowser.Providers/Manager/ImageSaver.cs
+++ b/MediaBrowser.Providers/Manager/ImageSaver.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.IO;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
@@ -441,11 +442,16 @@ namespace MediaBrowser.Providers.Manager
 
                 var extraFanartFilename = GetBackdropSaveFilename(item.GetImages(ImageType.Backdrop), "fanart", "fanart", outputIndex);
 
-                return new[]
-                    {
-                        Path.Combine(item.ContainingFolderPath, "extrafanart", extraFanartFilename + extension),
-                        Path.Combine(item.ContainingFolderPath, "extrathumbs", "thumb" + outputIndex.ToString(UsCulture) + extension)
-                    };
+                var list = new List<string>
+                {
+                    Path.Combine(item.ContainingFolderPath, "extrafanart", extraFanartFilename + extension)
+                };
+
+                if (EnableExtraThumbsDuplication)
+                {
+                    list.Add(Path.Combine(item.ContainingFolderPath, "extrathumbs", "thumb" + outputIndex.ToString(UsCulture) + extension));
+                }
+                return list.ToArray();
             }
 
             if (type == ImageType.Primary)
@@ -528,6 +534,16 @@ namespace MediaBrowser.Providers.Manager
             return new[] { GetStandardSavePath(item, type, imageIndex, mimeType, true) };
         }
 
+        private bool EnableExtraThumbsDuplication
+        {
+            get
+            {
+                var config = _config.GetConfiguration<XbmcMetadataOptions>("xbmcmetadata");
+
+                return config.EnableExtraThumbsDuplication;
+            }
+        }
+
         /// <summary>
         /// Gets the save path for item in mixed folder.
         /// </summary>
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
index 92b4616e71..57a40741f5 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
@@ -234,7 +234,7 @@ namespace MediaBrowser.Providers.MediaInfo
             await _itemRepo.SaveMediaStreams(video.Id, mediaStreams, cancellationToken).ConfigureAwait(false);
 
             if (options.MetadataRefreshMode == MetadataRefreshMode.FullRefresh ||
-                options.MetadataRefreshMode == MetadataRefreshMode.EnsureMetadata)
+                options.MetadataRefreshMode == MetadataRefreshMode.Default)
             {
                 try
                 {
@@ -460,7 +460,7 @@ namespace MediaBrowser.Providers.MediaInfo
 
             var externalSubtitleStreams = subtitleResolver.GetExternalSubtitleStreams(video, currentStreams.Count, options.DirectoryService, false).ToList();
 
-            var enableSubtitleDownloading = options.MetadataRefreshMode == MetadataRefreshMode.EnsureMetadata ||
+            var enableSubtitleDownloading = options.MetadataRefreshMode == MetadataRefreshMode.Default ||
                                             options.MetadataRefreshMode == MetadataRefreshMode.FullRefresh;
 
             if (enableSubtitleDownloading && (_config.Configuration.SubtitleOptions.DownloadEpisodeSubtitles &&
diff --git a/MediaBrowser.Server.Implementations/Branding/BrandingConfigurationFactory.cs b/MediaBrowser.Server.Implementations/Branding/BrandingConfigurationFactory.cs
new file mode 100644
index 0000000000..d6cd3424b1
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Branding/BrandingConfigurationFactory.cs
@@ -0,0 +1,21 @@
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Model.Branding;
+using System.Collections.Generic;
+
+namespace MediaBrowser.Server.Implementations.Branding
+{
+    public class BrandingConfigurationFactory : IConfigurationFactory
+    {
+        public IEnumerable<ConfigurationStore> GetConfigurations()
+        {
+            return new[]
+            {
+                new ConfigurationStore
+                {
+                     ConfigurationType = typeof(BrandingOptions),
+                     Key = "branding"
+                }
+            };
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index 73216ca33c..62ff9f6879 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -212,6 +212,12 @@ namespace MediaBrowser.Server.Implementations.Dto
         {
             if (item.IsFolder)
             {
+                var userData = _userDataRepository.GetUserData(user.Id, item.GetUserDataKey());
+
+                // Skip the user data manager because we've already looped through the recursive tree and don't want to do it twice
+                // TODO: Improve in future
+                dto.UserData = GetUserItemDataDto(userData);
+
                 var folder = (Folder)item;
 
                 dto.ChildCount = GetChildCount(folder, user);
@@ -220,15 +226,15 @@ namespace MediaBrowser.Server.Implementations.Dto
                 {
                     SetSpecialCounts(folder, user, dto, fields);
                 }
-            }
 
-            var userData = _userDataRepository.GetUserData(user.Id, item.GetUserDataKey());
-
-            dto.UserData = GetUserItemDataDto(userData);
+                dto.UserData.Played = dto.PlayedPercentage.HasValue && dto.PlayedPercentage.Value >= 100;
+                dto.UserData.PlayedPercentage = dto.PlayedPercentage;
+                dto.UserData.UnplayedItemCount = dto.RecursiveUnplayedItemCount;
+            }
 
-            if (item.IsFolder)
+            else
             {
-                dto.UserData.Played = dto.PlayedPercentage.HasValue && dto.PlayedPercentage.Value >= 100;
+                dto.UserData = _userDataRepository.GetUserDataDto(item, user);
             }
 
             dto.PlayAccess = item.GetPlayAccess(user);
@@ -1110,16 +1116,17 @@ namespace MediaBrowser.Server.Implementations.Dto
 
             if (episode != null)
             {
-                series = item.FindParent<Series>();
+                series = episode.Series;
 
-                dto.SeriesId = GetDtoId(series);
-                dto.SeriesName = series.Name;
-                dto.AirTime = series.AirTime;
-                dto.SeriesStudio = series.Studios.FirstOrDefault();
-
-                dto.SeriesThumbImageTag = GetImageCacheTag(series, ImageType.Thumb);
-
-                dto.SeriesPrimaryImageTag = GetImageCacheTag(series, ImageType.Primary);
+                if (series != null)
+                {
+                    dto.SeriesId = GetDtoId(series);
+                    dto.SeriesName = series.Name;
+                    dto.AirTime = series.AirTime;
+                    dto.SeriesStudio = series.Studios.FirstOrDefault();
+                    dto.SeriesThumbImageTag = GetImageCacheTag(series, ImageType.Thumb);
+                    dto.SeriesPrimaryImageTag = GetImageCacheTag(series, ImageType.Primary);
+                }
             }
 
             // Add SeasonInfo
@@ -1127,14 +1134,17 @@ namespace MediaBrowser.Server.Implementations.Dto
 
             if (season != null)
             {
-                series = item.FindParent<Series>();
+                series = season.Series;
 
-                dto.SeriesId = GetDtoId(series);
-                dto.SeriesName = series.Name;
-                dto.AirTime = series.AirTime;
-                dto.SeriesStudio = series.Studios.FirstOrDefault();
+                if (series != null)
+                {
+                    dto.SeriesId = GetDtoId(series);
+                    dto.SeriesName = series.Name;
+                    dto.AirTime = series.AirTime;
+                    dto.SeriesStudio = series.Studios.FirstOrDefault();
 
-                dto.SeriesPrimaryImageTag = GetImageCacheTag(series, ImageType.Primary);
+                    dto.SeriesPrimaryImageTag = GetImageCacheTag(series, ImageType.Primary);
+                }
             }
 
             var game = item as Game;
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs b/MediaBrowser.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
index d7186aa211..c31f462150 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
@@ -1,10 +1,11 @@
-using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Session;
+using MoreLinq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -17,21 +18,21 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
     {
         private readonly ISessionManager _sessionManager;
         private readonly ILogger _logger;
-        private readonly IDtoService _dtoService;
         private readonly IUserDataManager _userDataManager;
+        private readonly IUserManager _userManager;
 
         private readonly object _syncLock = new object();
         private Timer UpdateTimer { get; set; }
         private const int UpdateDuration = 500;
 
-        private readonly Dictionary<Guid, List<string>> _changedKeys = new Dictionary<Guid, List<string>>();
+        private readonly Dictionary<Guid, List<IHasUserData>> _changedItems = new Dictionary<Guid, List<IHasUserData>>();
 
-        public UserDataChangeNotifier(IUserDataManager userDataManager, ISessionManager sessionManager, IDtoService dtoService, ILogger logger)
+        public UserDataChangeNotifier(IUserDataManager userDataManager, ISessionManager sessionManager, ILogger logger, IUserManager userManager)
         {
             _userDataManager = userDataManager;
             _sessionManager = sessionManager;
-            _dtoService = dtoService;
             _logger = logger;
+            _userManager = userManager;
         }
 
         public void Run()
@@ -58,15 +59,28 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
                     UpdateTimer.Change(UpdateDuration, Timeout.Infinite);
                 }
 
-                List<string> keys;
+                List<IHasUserData> keys;
 
-                if (!_changedKeys.TryGetValue(e.UserId, out keys))
+                if (!_changedItems.TryGetValue(e.UserId, out keys))
                 {
-                    keys = new List<string>();
-                    _changedKeys[e.UserId] = keys;
+                    keys = new List<IHasUserData>();
+                    _changedItems[e.UserId] = keys;
                 }
 
-                keys.Add(e.Key);
+                keys.Add(e.Item);
+                
+                var baseItem = e.Item as BaseItem;
+
+                // Go up one level for indicators
+                if (baseItem != null)
+                {
+                    var parent = baseItem.Parent;
+
+                    if (parent != null)
+                    {
+                        keys.Add(parent);
+                    }
+                }
             }
         }
 
@@ -75,8 +89,8 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             lock (_syncLock)
             {
                 // Remove dupes in case some were saved multiple times
-                var changes = _changedKeys.ToList();
-                _changedKeys.Clear();
+                var changes = _changedItems.ToList();
+                _changedItems.Clear();
 
                 SendNotifications(changes, CancellationToken.None);
 
@@ -88,7 +102,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             }
         }
 
-        private async Task SendNotifications(IEnumerable<KeyValuePair<Guid, List<string>>> changes, CancellationToken cancellationToken)
+        private async Task SendNotifications(IEnumerable<KeyValuePair<Guid, List<IHasUserData>>> changes, CancellationToken cancellationToken)
         {
             foreach (var pair in changes)
             {
@@ -99,8 +113,11 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
 
                 if (userSessions.Count > 0)
                 {
+                    var user = _userManager.GetUserById(userId);
+
                     var dtoList = pair.Value
-                        .Select(i => _dtoService.GetUserItemDataDto(_userDataManager.GetUserData(userId, i)))
+                        .DistinctBy(i => i.Id)
+                        .Select(i => _userDataManager.GetUserDataDto(i, user))
                         .ToList();
 
                     var info = new UserDataChangeInfo
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index 833dfc5e45..cfcbb077e9 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -363,19 +363,15 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         {
             try
             {
-                var errorResponse = new ErrorResponse
-                {
-                    ResponseStatus = new ResponseStatus
-                    {
-                        ErrorCode = ex.GetType().GetOperationName(),
-                        Message = ex.Message,
-                        StackTrace = ex.StackTrace,
-                    }
-                };
-
                 var operationName = context.Request.GetOperationName();
                 var httpReq = GetRequest(context, operationName);
                 var httpRes = httpReq.Response;
+
+                if (httpRes.IsClosed)
+                {
+                    return;
+                }
+
                 var contentType = httpReq.ResponseContentType;
 
                 var serializer = HostContext.ContentTypes.GetResponseSerializer(contentType);
@@ -398,6 +394,16 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
                 httpRes.ContentType = contentType;
 
+                var errorResponse = new ErrorResponse
+                {
+                    ResponseStatus = new ResponseStatus
+                    {
+                        ErrorCode = ex.GetType().GetOperationName(),
+                        Message = ex.Message,
+                        StackTrace = ex.StackTrace,
+                    }
+                };
+
                 serializer(httpReq, errorResponse, httpRes);
 
                 httpRes.Close();
diff --git a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthorizationContext.cs b/MediaBrowser.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
index 77343ab4ef..94be37e956 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
@@ -36,6 +36,13 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security
                 auth.TryGetValue("Version", out version);
             }
 
+            var token = httpReq.Headers["X-MediaBrowser-Token"];
+
+            if (string.IsNullOrWhiteSpace(token))
+            {
+                token = httpReq.QueryString["api_key"];
+            }
+
             return new AuthorizationInfo
             {
                 Client = client,
@@ -43,7 +50,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security
                 DeviceId = deviceId,
                 UserId = userId,
                 Version = version,
-                Token = httpReq.Headers["X-AUTH-TOKEN"]
+                Token = token
             };
         }
 
diff --git a/MediaBrowser.Server.Implementations/Library/UserDataManager.cs b/MediaBrowser.Server.Implementations/Library/UserDataManager.cs
index 79f1265116..d3030f31f9 100644
--- a/MediaBrowser.Server.Implementations/Library/UserDataManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserDataManager.cs
@@ -2,6 +2,7 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
 using System;
@@ -125,5 +126,41 @@ namespace MediaBrowser.Server.Implementations.Library
         {
             return userId + key;
         }
+
+        public UserItemDataDto GetUserDataDto(IHasUserData item, User user)
+        {
+            var userData = GetUserData(user.Id, item.GetUserDataKey());
+            var dto = GetUserItemDataDto(userData);
+
+            item.FillUserDataDtoValues(dto, userData, user);
+
+            return dto;
+        }
+
+        /// <summary>
+        /// Converts a UserItemData to a DTOUserItemData
+        /// </summary>
+        /// <param name="data">The data.</param>
+        /// <returns>DtoUserItemData.</returns>
+        /// <exception cref="System.ArgumentNullException"></exception>
+        private UserItemDataDto GetUserItemDataDto(UserItemData data)
+        {
+            if (data == null)
+            {
+                throw new ArgumentNullException("data");
+            }
+
+            return new UserItemDataDto
+            {
+                IsFavorite = data.IsFavorite,
+                Likes = data.Likes,
+                PlaybackPositionTicks = data.PlaybackPositionTicks,
+                PlayCount = data.PlayCount,
+                Rating = data.Rating,
+                Played = data.Played,
+                LastPlayedDate = data.LastPlayedDate,
+                Key = data.Key
+            };
+        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
index 412b2e7bd0..9c69e656d7 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
@@ -4,7 +4,6 @@ using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.LiveTv;
 using MediaBrowser.Model.Logging;
@@ -23,15 +22,13 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
         private readonly IUserDataManager _userDataManager;
         private readonly IDtoService _dtoService;
-        private readonly IItemRepository _itemRepo;
 
-        public LiveTvDtoService(IDtoService dtoService, IUserDataManager userDataManager, IImageProcessor imageProcessor, ILogger logger, IItemRepository itemRepo)
+        public LiveTvDtoService(IDtoService dtoService, IUserDataManager userDataManager, IImageProcessor imageProcessor, ILogger logger)
         {
             _dtoService = dtoService;
             _userDataManager = userDataManager;
             _imageProcessor = imageProcessor;
             _logger = logger;
-            _itemRepo = itemRepo;
         }
 
         public TimerInfoDto GetTimerInfoDto(TimerInfo info, ILiveTvService service, LiveTvProgram program, LiveTvChannel channel)
@@ -249,7 +246,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
             if (user != null)
             {
-                dto.UserData = _dtoService.GetUserItemDataDto(_userDataManager.GetUserData(user.Id, recording.GetUserDataKey()));
+                dto.UserData = _userDataManager.GetUserDataDto(recording, user);
 
                 dto.PlayAccess = recording.GetPlayAccess(user);
             }
@@ -322,7 +319,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
             if (user != null)
             {
-                dto.UserData = _dtoService.GetUserItemDataDto(_userDataManager.GetUserData(user.Id, info.GetUserDataKey()));
+                dto.UserData = _userDataManager.GetUserDataDto(info, user);
 
                 dto.PlayAccess = info.GetPlayAccess(user);
             }
@@ -401,7 +398,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
             if (user != null)
             {
-                dto.UserData = _dtoService.GetUserItemDataDto(_userDataManager.GetUserData(user.Id, item.GetUserDataKey()));
+                dto.UserData = _userDataManager.GetUserDataDto(item, user);
 
                 dto.PlayAccess = item.GetPlayAccess(user);
             }
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index ad1ddba881..09793f4fc7 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -40,7 +40,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv
         private readonly IUserDataManager _userDataManager;
         private readonly ILibraryManager _libraryManager;
         private readonly ITaskManager _taskManager;
-        private readonly IJsonSerializer _json;
 
         private readonly IDtoService _dtoService;
         private readonly ILocalizationManager _localization;
@@ -58,7 +57,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
         private readonly SemaphoreSlim _refreshSemaphore = new SemaphoreSlim(1, 1);
 
-        public LiveTvManager(IServerConfigurationManager config, IFileSystem fileSystem, ILogger logger, IItemRepository itemRepo, IImageProcessor imageProcessor, IUserDataManager userDataManager, IDtoService dtoService, IUserManager userManager, ILibraryManager libraryManager, ITaskManager taskManager, IJsonSerializer json, ILocalizationManager localization)
+        public LiveTvManager(IServerConfigurationManager config, IFileSystem fileSystem, ILogger logger, IItemRepository itemRepo, IImageProcessor imageProcessor, IUserDataManager userDataManager, IDtoService dtoService, IUserManager userManager, ILibraryManager libraryManager, ITaskManager taskManager, ILocalizationManager localization)
         {
             _config = config;
             _fileSystem = fileSystem;
@@ -67,12 +66,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             _userManager = userManager;
             _libraryManager = libraryManager;
             _taskManager = taskManager;
-            _json = json;
             _localization = localization;
             _dtoService = dtoService;
             _userDataManager = userDataManager;
 
-            _tvDtoService = new LiveTvDtoService(dtoService, userDataManager, imageProcessor, logger, _itemRepo);
+            _tvDtoService = new LiveTvDtoService(dtoService, userDataManager, imageProcessor, logger);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 3bd0df0eb5..d6d4bbc516 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -258,11 +258,11 @@
 	"LabelCachePath": "Cache path:",
 	"LabelCachePathHelp": "This folder contains server cache files, such as images.",
 	"LabelImagesByNamePath": "Images by name path:",
-	"LabelImagesByNamePathHelp": "This folder contains actor, artist, genre and studio images.",
+	"LabelImagesByNamePathHelp": "This folder contains downloaded actor, artist, genre and studio images.",
 	"LabelMetadataPath": "Metadata path:",
 	"LabelMetadataPathHelp": "This location contains downloaded artwork and metadata that is not configured to be stored in media folders.",
 	"LabelTranscodingTempPath": "Transcoding temporary path:",
-	"LabelTranscodingTempPathHelp": "This folder contains working files used by the transcoder.",
+	"LabelTranscodingTempPathHelp": "This folder contains working files used by the transcoder. Specify a custom path, or leave empty to use the default within the server's data folder.",
 	"TabBasics": "Basics",
 	"TabTV": "TV",
 	"TabGames": "Games",
@@ -284,7 +284,7 @@
 	"ButtonAutoScroll": "Auto-scroll",
 	"LabelImageSavingConvention": "Image saving convention:",
 	"LabelImageSavingConventionHelp": "Media Browser recognizes images from most major media applications. Choosing your downloading convention is useful if you also use other products.",
-	"OptionImageSavingCompatible": "Compatible - Media Browser/Plex/Xbmc",
+	"OptionImageSavingCompatible": "Compatible - Media Browser/Xbmc/Plex",
 	"OptionImageSavingStandard": "Standard - MB2",
 	"ButtonSignIn": "Sign In",
 	"TitleSignIn": "Sign In",
@@ -849,5 +849,14 @@
 	"LabelXbmcMetadataEnablePathSubstitutionHelp2": "See path substitution.",
 	"LabelGroupChannelsIntoViews": "Display the following channels directly within my views:",
 	"LabelGroupChannelsIntoViewsHelp": "If enabled, these channels will be displayed directly alongside other views. If disabled, they'll be displayed within a separate Channels view.",
-	"LabelDisplayCollectionsView": "Display a Collections view to show movie collections"
+	"LabelDisplayCollectionsView": "Display a Collections view to show movie collections",
+	"LabelXbmcMetadataEnableExtraThumbs": "Copy extrafanart into extrathumbs",
+	"LabelXbmcMetadataEnableExtraThumbsHelp": "When downloading images they can be saved into both extrafanart and extrathumbs for maximum Xbmc skin compatibility.",
+	"TabServices": "Services",
+	"TabLogs": "Logs",
+	"HeaderServerLogFiles": "Server log files:",
+	"TabBranding": "Branding",
+	"HeaderBrandingHelp": "Customize the appearance of Media Browser to fit the needs of your group or organization.",
+	"LabelLoginDisclaimer": "Login disclaimer:",
+	"LabelLoginDisclaimerHelp": "This will be displayed at the bottom of the login page."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index a909929ae0..1d201e0690 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -101,6 +101,7 @@
     <Compile Include="..\SharedVersion.cs">
       <Link>Properties\SharedVersion.cs</Link>
     </Compile>
+    <Compile Include="Branding\BrandingConfigurationFactory.cs" />
     <Compile Include="Channels\ChannelConfigurations.cs" />
     <Compile Include="Channels\ChannelDownloadScheduledTask.cs" />
     <Compile Include="Channels\ChannelImageProvider.cs" />
diff --git a/MediaBrowser.Server.Implementations/Notifications/NotificationManager.cs b/MediaBrowser.Server.Implementations/Notifications/NotificationManager.cs
index 964e2cd243..b832f3a06b 100644
--- a/MediaBrowser.Server.Implementations/Notifications/NotificationManager.cs
+++ b/MediaBrowser.Server.Implementations/Notifications/NotificationManager.cs
@@ -4,7 +4,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Notifications;
-using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Notifications;
 using System;
@@ -93,7 +92,9 @@ namespace MediaBrowser.Server.Implementations.Notifications
 
             if (options != null && !string.IsNullOrWhiteSpace(request.NotificationType))
             {
-                return _userManager.Users.Where(i => _config.Configuration.NotificationOptions.IsEnabledToSendToUser(request.NotificationType, i.Id.ToString("N"), i.Configuration))
+                var config = GetConfiguration();
+
+                return _userManager.Users.Where(i => config.IsEnabledToSendToUser(request.NotificationType, i.Id.ToString("N"), i.Configuration))
                    .Select(i => i.Id.ToString("N"));
             }
 
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 2f6790a3e8..2d85a3aa7f 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -1,4 +1,6 @@
-using MediaBrowser.Common.Events;
+using System.Security.Cryptography;
+using System.Text;
+using MediaBrowser.Common.Events;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
@@ -1185,6 +1187,24 @@ namespace MediaBrowser.Server.Implementations.Session
             };
         }
 
+        private bool IsLocal(string remoteEndpoint)
+        {
+            if (string.IsNullOrWhiteSpace(remoteEndpoint))
+            {
+                throw new ArgumentNullException("remoteEndpoint");
+            }
+
+            // Private address space:
+            // http://en.wikipedia.org/wiki/Private_network
+
+            return remoteEndpoint.IndexOf("localhost", StringComparison.OrdinalIgnoreCase) != -1 ||
+                remoteEndpoint.StartsWith("10.", StringComparison.OrdinalIgnoreCase) ||
+                remoteEndpoint.StartsWith("192.", StringComparison.OrdinalIgnoreCase) ||
+                remoteEndpoint.StartsWith("172.", StringComparison.OrdinalIgnoreCase) ||
+                remoteEndpoint.StartsWith("127.", StringComparison.OrdinalIgnoreCase) ||
+                remoteEndpoint.StartsWith("::", StringComparison.OrdinalIgnoreCase);
+        }
+
         /// <summary>
         /// Reports the capabilities.
         /// </summary>
@@ -1283,15 +1303,10 @@ namespace MediaBrowser.Server.Implementations.Session
                 DeviceName = session.DeviceName,
                 Id = session.Id,
                 LastActivityDate = session.LastActivityDate,
-                NowPlayingPositionTicks = session.PlayState.PositionTicks,
-                IsPaused = session.PlayState.IsPaused,
-                IsMuted = session.PlayState.IsMuted,
                 NowViewingItem = session.NowViewingItem,
                 ApplicationVersion = session.ApplicationVersion,
-                CanSeek = session.PlayState.CanSeek,
                 QueueableMediaTypes = session.QueueableMediaTypes,
                 PlayableMediaTypes = session.PlayableMediaTypes,
-                RemoteEndPoint = session.RemoteEndPoint,
                 AdditionalUsers = session.AdditionalUsers,
                 SupportedCommands = session.SupportedCommands,
                 UserName = session.UserName,
diff --git a/MediaBrowser.Server.Implementations/Sorting/AirTimeComparer.cs b/MediaBrowser.Server.Implementations/Sorting/AirTimeComparer.cs
index 46c3df07b7..7e6a252cdc 100644
--- a/MediaBrowser.Server.Implementations/Sorting/AirTimeComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/AirTimeComparer.cs
@@ -26,13 +26,36 @@ namespace MediaBrowser.Server.Implementations.Sorting
         /// <returns>System.String.</returns>
         private DateTime GetValue(BaseItem x)
         {
-            var series = (x as Series) ?? x.FindParent<Series>();
+            var series = x as Series;
 
-            DateTime result;
-            if (series != null && DateTime.TryParse(series.AirTime, out result))
+            if (series == null)
             {
-                return result;
-            } 
+                var season = x as Season;
+
+                if (season != null)
+                {
+                    series = season.Series;
+                }
+                else
+                {
+                    var episode = x as Episode;
+
+                    if (episode != null)
+                    {
+                        series = episode.Series;
+                    }
+                }
+            }
+
+            if (series != null)
+            {
+                DateTime result;
+                if (DateTime.TryParse(series.AirTime, out result))
+                {
+                    return result;
+                }
+            }
+
             return DateTime.MinValue;
         }
 
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 673a9f1519..91e92e21c5 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -654,7 +654,7 @@ namespace MediaBrowser.ServerApplication
             var collectionManager = new CollectionManager(LibraryManager, FileSystemManager, LibraryMonitor);
             RegisterSingleInstance<ICollectionManager>(collectionManager);
 
-            LiveTvManager = new LiveTvManager(ServerConfigurationManager, FileSystemManager, Logger, ItemRepository, ImageProcessor, UserDataManager, DtoService, UserManager, LibraryManager, TaskManager, JsonSerializer, LocalizationManager);
+            LiveTvManager = new LiveTvManager(ServerConfigurationManager, FileSystemManager, Logger, ItemRepository, ImageProcessor, UserDataManager, DtoService, UserManager, LibraryManager, TaskManager, LocalizationManager);
             RegisterSingleInstance(LiveTvManager);
 
             UserViewManager = new UserViewManager(LibraryManager, LocalizationManager, FileSystemManager, UserManager, ChannelManager, LiveTvManager);
diff --git a/MediaBrowser.ServerApplication/Native/BrowserLauncher.cs b/MediaBrowser.ServerApplication/Native/BrowserLauncher.cs
index 4ba98e9b69..c2c64ea4d4 100644
--- a/MediaBrowser.ServerApplication/Native/BrowserLauncher.cs
+++ b/MediaBrowser.ServerApplication/Native/BrowserLauncher.cs
@@ -86,18 +86,6 @@ namespace MediaBrowser.ServerApplication.Native
                       appHost.WebApplicationName + "/swagger-ui/index.html", logger);
         }
 
-        /// <summary>
-        /// Opens the standard API documentation.
-        /// </summary>
-        /// <param name="configurationManager">The configuration manager.</param>
-        /// <param name="appHost">The app host.</param>
-        /// <param name="logger">The logger.</param>
-        public static void OpenStandardApiDocumentation(IServerConfigurationManager configurationManager, IServerApplicationHost appHost, ILogger logger)
-        {
-            OpenUrl("http://localhost:" + configurationManager.Configuration.HttpServerPortNumber + "/" +
-                      appHost.WebApplicationName + "/metadata", logger);
-        }
-
         /// <summary>
         /// Opens the URL.
         /// </summary>
diff --git a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
index f5f9434e7d..47a4be8e36 100644
--- a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
+++ b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
@@ -29,7 +29,6 @@ namespace MediaBrowser.ServerApplication
         private System.Windows.Forms.ToolStripMenuItem cmdLogWindow;
         private System.Windows.Forms.ToolStripMenuItem cmdCommunity;
         private System.Windows.Forms.ToolStripMenuItem cmdApiDocs;
-        private System.Windows.Forms.ToolStripMenuItem cmdStandardDocs;
         private System.Windows.Forms.ToolStripMenuItem cmdSwagger;
         private System.Windows.Forms.ToolStripMenuItem cmdGtihub;
 
@@ -90,7 +89,6 @@ namespace MediaBrowser.ServerApplication
             cmdConfigure = new System.Windows.Forms.ToolStripMenuItem();
             cmdBrowse = new System.Windows.Forms.ToolStripMenuItem();
             cmdApiDocs = new System.Windows.Forms.ToolStripMenuItem();
-            cmdStandardDocs = new System.Windows.Forms.ToolStripMenuItem();
             cmdSwagger = new System.Windows.Forms.ToolStripMenuItem();
             cmdGtihub = new System.Windows.Forms.ToolStripMenuItem();
             
@@ -169,17 +167,11 @@ namespace MediaBrowser.ServerApplication
             // cmdApiDocs
             // 
             cmdApiDocs.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            cmdStandardDocs,
             cmdSwagger,
             cmdGtihub});
             cmdApiDocs.Name = "cmdApiDocs";
             cmdApiDocs.Size = new System.Drawing.Size(208, 22);
             // 
-            // cmdStandardDocs
-            // 
-            cmdStandardDocs.Name = "cmdStandardDocs";
-            cmdStandardDocs.Size = new System.Drawing.Size(136, 22);
-            // 
             // cmdSwagger
             // 
             cmdSwagger.Name = "cmdSwagger";
@@ -199,7 +191,6 @@ namespace MediaBrowser.ServerApplication
             cmdLibraryExplorer.Click += cmdLibraryExplorer_Click;
 
             cmdSwagger.Click += cmdSwagger_Click;
-            cmdStandardDocs.Click += cmdStandardDocs_Click;
             cmdGtihub.Click += cmdGtihub_Click;
 
             LoadLogWindow(null, EventArgs.Empty);
@@ -224,7 +215,6 @@ namespace MediaBrowser.ServerApplication
             cmdCommunity.Text = _localization.GetLocalizedString("LabelVisitCommunity");
             cmdGtihub.Text = _localization.GetLocalizedString("LabelGithubWiki");
             cmdSwagger.Text = _localization.GetLocalizedString("LabelSwagger");
-            cmdStandardDocs.Text = _localization.GetLocalizedString("LabelStandard");
             cmdApiDocs.Text = _localization.GetLocalizedString("LabelViewApiDocumentation");
             cmdBrowse.Text = _localization.GetLocalizedString("LabelBrowseLibrary");
             cmdConfigure.Text = _localization.GetLocalizedString("LabelConfigureMediaBrowser");
@@ -346,11 +336,6 @@ namespace MediaBrowser.ServerApplication
             BrowserLauncher.OpenGithub(_logger);
         }
 
-        void cmdStandardDocs_Click(object sender, EventArgs e)
-        {
-            BrowserLauncher.OpenStandardApiDocumentation(_configurationManager, _appHost, _logger);
-        }
-
         void cmdSwagger_Click(object sender, EventArgs e)
         {
             BrowserLauncher.OpenSwagger(_configurationManager, _appHost, _logger);
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 3ccf26c375..36adae71c7 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -521,6 +521,7 @@ namespace MediaBrowser.WebDashboard.Api
                                 "mediacontroller.js",
                                 "chromecast.js",
                                 "backdrops.js",
+                                "branding.js",
 
                                 "mediaplayer.js",
                                 "mediaplayer-video.js",
@@ -529,7 +530,6 @@ namespace MediaBrowser.WebDashboard.Api
 
                                 "ratingdialog.js",
                                 "aboutpage.js",
-                                "allusersettings.js",
                                 "alphapicker.js",
                                 "addpluginpage.js",
                                 "advancedconfigurationpage.js",
@@ -537,7 +537,6 @@ namespace MediaBrowser.WebDashboard.Api
                                 "advancedserversettings.js",
                                 "metadataadvanced.js",
                                 "appsplayback.js",
-                                "appsweather.js",
                                 "autoorganizetv.js",
                                 "autoorganizelog.js",
                                 "channels.js",
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 8f85fcb513..0099daaf19 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -98,6 +98,9 @@
     <Content Include="dashboard-ui\appsplayback.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\branding.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\channelitems.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -392,9 +395,6 @@
     <Content Include="dashboard-ui\musicalbumartists.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\allusersettings.html">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\collections.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -617,6 +617,9 @@
     <Content Include="dashboard-ui\scripts\backdrops.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\scripts\branding.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\scripts\channelitems.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -1499,9 +1502,6 @@
     <Content Include="dashboard-ui\musicvideos.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\scripts\allusersettings.js">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\scripts\alphapicker.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -1748,11 +1748,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="dashboard-ui\appsweather.html">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="dashboard-ui\useredit.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -1814,11 +1809,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="dashboard-ui\scripts\appsweather.js">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="dashboard-ui\scripts\pluginspage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-- 
cgit v1.2.3


From d6aee6a2ed9f0882c73765bb27962a30d9e4a5ce Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 4 Jul 2014 21:22:26 -0400
Subject: fixes #865 - Series Season folders

---
 MediaBrowser.Controller/Library/TVUtils.cs  | 6 ++++++
 MediaBrowser.Tests/Resolvers/TvUtilTests.cs | 2 ++
 2 files changed, 8 insertions(+)

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Controller/Library/TVUtils.cs b/MediaBrowser.Controller/Library/TVUtils.cs
index 0681a8cd1a..88eadda005 100644
--- a/MediaBrowser.Controller/Library/TVUtils.cs
+++ b/MediaBrowser.Controller/Library/TVUtils.cs
@@ -129,6 +129,12 @@ namespace MediaBrowser.Controller.Library
                 return 0;
             }
 
+            int val;
+            if (int.TryParse(filename, NumberStyles.Integer, CultureInfo.InvariantCulture, out val))
+            {
+                return val;
+            }
+
             // Look for one of the season folder names
             foreach (var name in SeasonFolderNames)
             {
diff --git a/MediaBrowser.Tests/Resolvers/TvUtilTests.cs b/MediaBrowser.Tests/Resolvers/TvUtilTests.cs
index bffd22f3ed..c10dcd3c5c 100644
--- a/MediaBrowser.Tests/Resolvers/TvUtilTests.cs
+++ b/MediaBrowser.Tests/Resolvers/TvUtilTests.cs
@@ -161,6 +161,8 @@ namespace MediaBrowser.Tests.Resolvers
             Assert.AreEqual(1, TVUtils.GetSeasonNumberFromPath(@"\Drive\Season 1"));
             Assert.AreEqual(1, TVUtils.GetSeasonNumberFromPath(@"\Drive\Season 1"));
 
+            Assert.AreEqual(2, TVUtils.GetSeasonNumberFromPath(@"\Drive\Seinfeld\2"));
+            
             //Four Digits seasons
             Assert.AreEqual(2009, TVUtils.GetSeasonNumberFromPath(@"\Drive\Season 2009"));
             Assert.AreEqual(2009, TVUtils.GetSeasonNumberFromPath(@"\Drive\Season 2009"));
-- 
cgit v1.2.3


From ce20066bc0e2c7ba1634200cdee6ac339d4dfb60 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 20 Jul 2014 00:46:29 -0400
Subject: update translations

---
 MediaBrowser.Api/ItemRefreshService.cs             |    3 +-
 MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs |    5 +
 .../BaseApplicationHost.cs                         |   48 +-
 .../ScheduledTasks/Tasks/ReloadLoggerFileTask.cs   |    2 +-
 MediaBrowser.Common/Net/IWebSocket.cs              |   14 +-
 MediaBrowser.Common/Net/IWebSocketConnection.cs    |    5 +-
 MediaBrowser.Controller/Library/TVUtils.cs         |    8 +-
 .../Configuration/ServerConfiguration.cs           |    7 -
 .../HttpServer/HttpListenerHost.cs                 |    2 +-
 .../HttpServer/NativeWebSocket.cs                  |   21 +-
 .../HttpServer/SocketSharp/SharpWebSocket.cs       |   24 +-
 .../Library/Resolvers/TV/SeriesResolver.cs         |    8 +-
 .../Localization/JavaScript/ar.json                |   10 +-
 .../Localization/JavaScript/ca.json                |   10 +-
 .../Localization/JavaScript/cs.json                |    8 +-
 .../Localization/JavaScript/da.json                |   10 +-
 .../Localization/JavaScript/de.json                |    6 +-
 .../Localization/JavaScript/el.json                |   10 +-
 .../Localization/JavaScript/en_GB.json             |   10 +-
 .../Localization/JavaScript/en_US.json             |   10 +-
 .../Localization/JavaScript/es.json                |    6 +-
 .../Localization/JavaScript/es_MX.json             |  138 +-
 .../Localization/JavaScript/fr.json                |    6 +-
 .../Localization/JavaScript/he.json                |   10 +-
 .../Localization/JavaScript/it.json                |   42 +-
 .../Localization/JavaScript/javascript.json        |   53 +-
 .../Localization/JavaScript/kk.json                |    6 +-
 .../Localization/JavaScript/ms.json                |   10 +-
 .../Localization/JavaScript/nb.json                |   10 +-
 .../Localization/JavaScript/nl.json                |   18 +-
 .../Localization/JavaScript/pl.json                |   10 +-
 .../Localization/JavaScript/pt_BR.json             |    6 +-
 .../Localization/JavaScript/pt_PT.json             |    6 +-
 .../Localization/JavaScript/ru.json                |   10 +-
 .../Localization/JavaScript/sv.json                |    6 +-
 .../Localization/JavaScript/vi.json                |   10 +-
 .../Localization/JavaScript/zh_TW.json             |   10 +-
 .../Localization/Server/ar.json                    |   22 +-
 .../Localization/Server/ca.json                    |   22 +-
 .../Localization/Server/cs.json                    |   18 +-
 .../Localization/Server/da.json                    |   16 +-
 .../Localization/Server/de.json                    |   24 +-
 .../Localization/Server/el.json                    |   22 +-
 .../Localization/Server/en_GB.json                 |   22 +-
 .../Localization/Server/en_US.json                 |   22 +-
 .../Localization/Server/es.json                    |   20 +-
 .../Localization/Server/es_MX.json                 |   30 +-
 .../Localization/Server/fr.json                    |   26 +-
 .../Localization/Server/he.json                    |   18 +-
 .../Localization/Server/it.json                    |   58 +-
 .../Localization/Server/kk.json                    |   16 +-
 .../Localization/Server/ko.json                    |   22 +-
 .../Localization/Server/ms.json                    |   22 +-
 .../Localization/Server/nb.json                    |   22 +-
 .../Localization/Server/nl.json                    |   58 +-
 .../Localization/Server/pl.json                    |   22 +-
 .../Localization/Server/pt_BR.json                 |   20 +-
 .../Localization/Server/pt_PT.json                 |   22 +-
 .../Localization/Server/ru.json                    |   34 +-
 .../Localization/Server/server.json                | 1793 ++++++++++----------
 .../Localization/Server/sv.json                    |   24 +-
 .../Localization/Server/vi.json                    |   20 +-
 .../Localization/Server/zh_TW.json                 |   16 +-
 .../ServerManager/ServerManager.cs                 |    7 +-
 .../ServerManager/WebSocketConnection.cs           |   54 +-
 MediaBrowser.ServerApplication/ApplicationHost.cs  |   22 +-
 MediaBrowser.ServerApplication/MainStartup.cs      |    8 +-
 .../Native/RegisterServer.bat                      |    6 -
 .../Native/ServerAuthorization.cs                  |    8 +-
 .../Providers/MovieDbProviderTests.cs              |    7 -
 MediaBrowser.Tests/Resolvers/TvUtilTests.cs        |    2 +-
 MediaBrowser.WebDashboard/Api/DashboardService.cs  |    4 +-
 .../MediaBrowser.WebDashboard.csproj               |   15 +-
 73 files changed, 1762 insertions(+), 1360 deletions(-)

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Api/ItemRefreshService.cs b/MediaBrowser.Api/ItemRefreshService.cs
index 993b69601c..768e9a4a82 100644
--- a/MediaBrowser.Api/ItemRefreshService.cs
+++ b/MediaBrowser.Api/ItemRefreshService.cs
@@ -157,7 +157,8 @@ namespace MediaBrowser.Api
                 MetadataRefreshMode = request.MetadataRefreshMode,
                 ImageRefreshMode = request.ImageRefreshMode,
                 ReplaceAllImages = request.ReplaceAllImages,
-                ReplaceAllMetadata = request.ReplaceAllMetadata
+                ReplaceAllMetadata = request.ReplaceAllMetadata,
+                ForceSave = true
             };
         }
     }
diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
index a098d26daa..f01d8ddf4b 100644
--- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
@@ -65,6 +65,11 @@ namespace MediaBrowser.Api.Playback.Hls
                 throw new ArgumentException("Video codec copy is not allowed here.");
             }
 
+            if (string.IsNullOrEmpty(request.MediaSourceId))
+            {
+                throw new ArgumentException("MediaSourceId is required");
+            }
+
             var result = GetAsync(request).Result;
 
             return result;
diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
index 178b840a87..850309465e 100644
--- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
+++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
@@ -211,6 +211,8 @@ namespace MediaBrowser.Common.Implementations
             JsonSerializer = CreateJsonSerializer();
 
             Logger = LogManager.GetLogger("App");
+            OnLoggerLoaded(true);
+            LogManager.LoggerLoaded += (s, e) => OnLoggerLoaded(false);
 
             IsFirstRun = !ConfigurationManager.CommonConfiguration.IsStartupWizardCompleted;
             progress.Report(2);
@@ -219,16 +221,11 @@ namespace MediaBrowser.Common.Implementations
                                          ? LogSeverity.Debug
                                          : LogSeverity.Info;
 
-            // Put the app config in the log for troubleshooting purposes
-            Logger.LogMultiline("Application Configuration:", LogSeverity.Info, new StringBuilder(JsonSerializer.SerializeToString(ConfigurationManager.CommonConfiguration)));
-
             progress.Report(3);
 
             DiscoverTypes();
             progress.Report(14);
 
-            Logger.Info("Version {0} initializing", ApplicationVersion);
-
             SetHttpLimit();
             progress.Report(15);
 
@@ -245,6 +242,47 @@ namespace MediaBrowser.Common.Implementations
             progress.Report(100);
         }
 
+        protected virtual void OnLoggerLoaded(bool isFirstLoad)
+        {
+            Logger.Info("Application version: {0}", ApplicationVersion);
+
+            if (!isFirstLoad)
+            {
+                LogEnvironmentInfo(Logger, ApplicationPaths);
+            }
+
+            // Put the app config in the log for troubleshooting purposes
+            Logger.LogMultiline("Application configuration:", LogSeverity.Info, new StringBuilder(JsonSerializer.SerializeToString(ConfigurationManager.CommonConfiguration)));
+
+            if (Plugins != null)
+            {
+                var pluginBuilder = new StringBuilder();
+
+                foreach (var plugin in Plugins)
+                {
+                    pluginBuilder.AppendLine(string.Format("{0} {1}", plugin.Name, plugin.Version));
+                }
+
+                Logger.LogMultiline("Plugins:", LogSeverity.Info, pluginBuilder);
+            }
+        }
+
+        public static void LogEnvironmentInfo(ILogger logger, IApplicationPaths appPaths)
+        {
+            logger.Info("Command line: {0}", string.Join(" ", Environment.GetCommandLineArgs()));
+
+            logger.Info("Server: {0}", Environment.MachineName);
+            logger.Info("Operating system: {0}", Environment.OSVersion.ToString());
+            logger.Info("Processor count: {0}", Environment.ProcessorCount);
+            logger.Info("64-Bit OS: {0}", Environment.Is64BitOperatingSystem);
+            logger.Info("64-Bit Process: {0}", Environment.Is64BitProcess);
+            logger.Info("Program data path: {0}", appPaths.ProgramDataPath);
+
+            logger.Info("Application Path: {0}", appPaths.ApplicationPath);
+
+            logger.Info("*** When reporting issues please include the entire log file. ***".ToUpper());
+        }
+
         protected virtual IJsonSerializer CreateJsonSerializer()
         {
             return new JsonSerializer();
diff --git a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/ReloadLoggerFileTask.cs b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/ReloadLoggerFileTask.cs
index 78f60632fa..38b6b4ad68 100644
--- a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/ReloadLoggerFileTask.cs
+++ b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/ReloadLoggerFileTask.cs
@@ -94,7 +94,7 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks.Tasks
 
         public bool IsHidden
         {
-            get { return true; }
+            get { return false; }
         }
 
         public bool IsEnabled
diff --git a/MediaBrowser.Common/Net/IWebSocket.cs b/MediaBrowser.Common/Net/IWebSocket.cs
index 05f7975bca..b31a953192 100644
--- a/MediaBrowser.Common/Net/IWebSocket.cs
+++ b/MediaBrowser.Common/Net/IWebSocket.cs
@@ -32,15 +32,23 @@ namespace MediaBrowser.Common.Net
         /// </summary>
         /// <value>The on receive.</value>
         Action<string> OnReceive { get; set; }
-        
+
         /// <summary>
         /// Sends the async.
         /// </summary>
         /// <param name="bytes">The bytes.</param>
-        /// <param name="type">The type.</param>
         /// <param name="endOfMessage">if set to <c>true</c> [end of message].</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        Task SendAsync(byte[] bytes, WebSocketMessageType type, bool endOfMessage, CancellationToken cancellationToken);
+        Task SendAsync(byte[] bytes, bool endOfMessage, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Sends the asynchronous.
+        /// </summary>
+        /// <param name="text">The text.</param>
+        /// <param name="endOfMessage">if set to <c>true</c> [end of message].</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        Task SendAsync(string text, bool endOfMessage, CancellationToken cancellationToken);
     }
 }
diff --git a/MediaBrowser.Common/Net/IWebSocketConnection.cs b/MediaBrowser.Common/Net/IWebSocketConnection.cs
index 9f9dfaeca3..b7715e20b9 100644
--- a/MediaBrowser.Common/Net/IWebSocketConnection.cs
+++ b/MediaBrowser.Common/Net/IWebSocketConnection.cs
@@ -63,11 +63,10 @@ namespace MediaBrowser.Common.Net
         /// <summary>
         /// Sends a message asynchronously.
         /// </summary>
-        /// <param name="buffer">The buffer.</param>
-        /// <param name="type">The type.</param>
+        /// <param name="text">The text.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
         /// <exception cref="System.ArgumentNullException">buffer</exception>
-        Task SendAsync(byte[] buffer, WebSocketMessageType type, CancellationToken cancellationToken);
+        Task SendAsync(string text, CancellationToken cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Library/TVUtils.cs b/MediaBrowser.Controller/Library/TVUtils.cs
index 88eadda005..af0ff8319e 100644
--- a/MediaBrowser.Controller/Library/TVUtils.cs
+++ b/MediaBrowser.Controller/Library/TVUtils.cs
@@ -200,7 +200,9 @@ namespace MediaBrowser.Controller.Library
         /// Determines whether [is series folder] [the specified path].
         /// </summary>
         /// <param name="path">The path.</param>
+        /// <param name="considerSeasonlessSeries">if set to <c>true</c> [consider seasonless series].</param>
         /// <param name="fileSystemChildren">The file system children.</param>
+        /// <param name="directoryService">The directory service.</param>
         /// <returns><c>true</c> if [is series folder] [the specified path]; otherwise, <c>false</c>.</returns>
         public static bool IsSeriesFolder(string path, bool considerSeasonlessSeries, IEnumerable<FileSystemInfo> fileSystemChildren, IDirectoryService directoryService)
         {
@@ -227,8 +229,10 @@ namespace MediaBrowser.Controller.Library
                     {
                         return true;
                     }
-
-                    nonSeriesFolders++;
+                    if (!EntityResolutionHelper.IgnoreFolders.Contains(child.Name, StringComparer.OrdinalIgnoreCase))
+                    {
+                        nonSeriesFolders++;
+                    }
 
                     if (nonSeriesFolders >= 3)
                     {
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 904c7bcddf..3448a2905f 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -34,12 +34,6 @@ namespace MediaBrowser.Model.Configuration
         /// <value>The HTTP server port number.</value>
         public int HttpServerPortNumber { get; set; }
 
-        /// <summary>
-        /// Gets or sets the legacy web socket port number.
-        /// </summary>
-        /// <value>The legacy web socket port number.</value>
-        public int LegacyWebSocketPortNumber { get; set; }
-
         /// <summary>
         /// Gets or sets a value indicating whether [enable internet providers].
         /// </summary>
@@ -216,7 +210,6 @@ namespace MediaBrowser.Model.Configuration
             MediaEncodingQuality = EncodingQuality.Auto;
             ImageSavingConvention = ImageSavingConvention.Compatible;
             HttpServerPortNumber = 8096;
-            LegacyWebSocketPortNumber = 8945;
             EnableDashboardResponseCaching = true;
 
             EnableAutomaticRestart = true;
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index 62a43751db..f530564eaa 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -157,7 +157,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             HostContext.Config.HandlerFactoryPath = ListenerRequest.GetHandlerPathIfAny(UrlPrefixes.First());
 
             _listener = NativeWebSocket.IsSupported
-                ? _listener = new HttpListenerServer(_logger, _threadPoolManager)
+                ? _listener = new WebSocketSharpListener(_logger, _threadPoolManager)
                 : _listener = new WebSocketSharpListener(_logger, _threadPoolManager);
 
             _listener.WebSocketHandler = WebSocketHandler;
diff --git a/MediaBrowser.Server.Implementations/HttpServer/NativeWebSocket.cs b/MediaBrowser.Server.Implementations/HttpServer/NativeWebSocket.cs
index f89cdac47c..c7669fecb5 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/NativeWebSocket.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/NativeWebSocket.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.Events;
+using System.Text;
+using MediaBrowser.Common.Events;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Model.Logging;
 using System;
@@ -36,7 +37,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
         /// <param name="socket">The socket.</param>
         /// <param name="logger">The logger.</param>
         /// <exception cref="System.ArgumentNullException">socket</exception>
-        public NativeWebSocket(System.Net.WebSockets.WebSocket socket, ILogger logger)
+        public NativeWebSocket(WebSocket socket, ILogger logger)
         {
             if (socket == null)
             {
@@ -155,6 +156,22 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             return WebSocket.SendAsync(new ArraySegment<byte>(bytes), nativeType, true, linkedTokenSource.Token);
         }
 
+        public Task SendAsync(byte[] bytes, bool endOfMessage, CancellationToken cancellationToken)
+        {
+            var linkedTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, _cancellationTokenSource.Token);
+
+            return WebSocket.SendAsync(new ArraySegment<byte>(bytes), System.Net.WebSockets.WebSocketMessageType.Binary, true, linkedTokenSource.Token);
+        }
+
+        public Task SendAsync(string text, bool endOfMessage, CancellationToken cancellationToken)
+        {
+            var linkedTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, _cancellationTokenSource.Token);
+
+            var bytes = Encoding.UTF8.GetBytes(text);
+
+            return WebSocket.SendAsync(new ArraySegment<byte>(bytes), System.Net.WebSockets.WebSocketMessageType.Text, true, linkedTokenSource.Token);
+        }
+
         /// <summary>
         /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
index 4127892409..7ff3a12478 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
@@ -96,22 +96,30 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
         /// Sends the async.
         /// </summary>
         /// <param name="bytes">The bytes.</param>
-        /// <param name="type">The type.</param>
         /// <param name="endOfMessage">if set to <c>true</c> [end of message].</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        public Task SendAsync(byte[] bytes, WebSocketMessageType type, bool endOfMessage, CancellationToken cancellationToken)
+        public Task SendAsync(byte[] bytes, bool endOfMessage, CancellationToken cancellationToken)
         {
-            System.Net.WebSockets.WebSocketMessageType nativeType;
+            var completionSource = new TaskCompletionSource<bool>();
 
-            if (!Enum.TryParse(type.ToString(), true, out nativeType))
-            {
-                _logger.Warn("Unrecognized WebSocketMessageType: {0}", type.ToString());
-            }
+            WebSocket.SendAsync(bytes, res => completionSource.TrySetResult(true));
+
+            return completionSource.Task;
+        }
 
+        /// <summary>
+        /// Sends the asynchronous.
+        /// </summary>
+        /// <param name="text">The text.</param>
+        /// <param name="endOfMessage">if set to <c>true</c> [end of message].</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        public Task SendAsync(string text, bool endOfMessage, CancellationToken cancellationToken)
+        {
             var completionSource = new TaskCompletionSource<bool>();
 
-            WebSocket.SendAsync(Encoding.UTF8.GetString(bytes), res => completionSource.TrySetResult(true));
+            WebSocket.SendAsync(text, res => completionSource.TrySetResult(true));
 
             return completionSource.Task;
         }
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
index 6b376d3b46..a756dc7944 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
@@ -67,14 +67,8 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
                 {
                     return null;
                 }
-
-                // Without these movies that have the name season in them could cause the parent folder to be resolved as a series
-                if (filename.IndexOf("[tmdbid=", StringComparison.OrdinalIgnoreCase) != -1)
-                {
-                    return null;
-                }
                 
-                if (args.ContainsMetaFileByName("series.xml") || filename.IndexOf("[tvdbid=", StringComparison.OrdinalIgnoreCase) != -1 || TVUtils.IsSeriesFolder(args.Path, collectionType == CollectionType.TvShows, args.FileSystemChildren, args.DirectoryService))
+                if (TVUtils.IsSeriesFolder(args.Path, collectionType == CollectionType.TvShows, args.FileSystemChildren, args.DirectoryService))
                 {
                     return new Series();
                 }
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json
index eb1334c10d..1192bafb77 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -313,5 +313,9 @@
     "ButtonAudioTracks": "Audio Tracks",
     "ButtonSubtitles": "Subtitles",
     "ButtonScenes": "Scenes",
-    "ButtonQuality": "Quality"
+    "ButtonQuality": "Quality",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "Select",
+    "ButtonNew": "New"
 }
\ 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 f317188931..37a5735e4b 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ca.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ca.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -313,5 +313,9 @@
     "ButtonAudioTracks": "Audio Tracks",
     "ButtonSubtitles": "Subtitles",
     "ButtonScenes": "Scenes",
-    "ButtonQuality": "Quality"
+    "ButtonQuality": "Quality",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "Select",
+    "ButtonNew": "New"
 }
\ 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 a7f7141754..92f352ca62 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/cs.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/cs.json
@@ -58,7 +58,7 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "P\u0159ehr\u00e1t",
     "ButtonEdit": "Upravit",
@@ -313,5 +313,9 @@
     "ButtonAudioTracks": "Audio Tracks",
     "ButtonSubtitles": "Titulky",
     "ButtonScenes": "Sc\u00e9ny",
-    "ButtonQuality": "Quality"
+    "ButtonQuality": "Quality",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "Vybrat",
+    "ButtonNew": "Nov\u00e9"
 }
\ 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 2b70bf74ed..988b036509 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/da.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/da.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Afspil",
     "ButtonEdit": "Rediger",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -313,5 +313,9 @@
     "ButtonAudioTracks": "Audio Tracks",
     "ButtonSubtitles": "Undertekster",
     "ButtonScenes": "Scener",
-    "ButtonQuality": "Quality"
+    "ButtonQuality": "Quality",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "V\u00e6lg",
+    "ButtonNew": "Ny"
 }
\ 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 be4cf1bbfa..58b273c266 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
@@ -313,5 +313,9 @@
     "ButtonAudioTracks": "Audio Tracks",
     "ButtonSubtitles": "Untertitel",
     "ButtonScenes": "Szenen",
-    "ButtonQuality": "Quality"
+    "ButtonQuality": "Quality",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "Ausw\u00e4hlen",
+    "ButtonNew": "Neu"
 }
\ 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 a033dcbc9e..9ad65edbda 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/el.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/el.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -313,5 +313,9 @@
     "ButtonAudioTracks": "Audio Tracks",
     "ButtonSubtitles": "Subtitles",
     "ButtonScenes": "Scenes",
-    "ButtonQuality": "Quality"
+    "ButtonQuality": "Quality",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "Select",
+    "ButtonNew": "New"
 }
\ 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 59dbb63e68..03694cad0a 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_GB.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_GB.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -313,5 +313,9 @@
     "ButtonAudioTracks": "Audio Tracks",
     "ButtonSubtitles": "Subtitles",
     "ButtonScenes": "Scenes",
-    "ButtonQuality": "Quality"
+    "ButtonQuality": "Quality",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "Select",
+    "ButtonNew": "New"
 }
\ 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 a0fc056bc4..bfd93b7950 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -313,5 +313,9 @@
     "ButtonAudioTracks": "Audio Tracks",
     "ButtonSubtitles": "Subtitles",
     "ButtonScenes": "Scenes",
-    "ButtonQuality": "Quality"
+    "ButtonQuality": "Quality",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "Select",
+    "ButtonNew": "New"
 }
\ 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 5c199c8ea1..05647f10d5 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json
@@ -313,5 +313,9 @@
     "ButtonAudioTracks": "Audio Tracks",
     "ButtonSubtitles": "Subt\u00edtulos",
     "ButtonScenes": "Escenas",
-    "ButtonQuality": "Quality"
+    "ButtonQuality": "Quality",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "Seleccionar",
+    "ButtonNew": "Nuevo"
 }
\ 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 1ca3aa56d7..62ecc25789 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json
@@ -233,85 +233,89 @@
     "ButtonRevoke": "Revocar",
     "MessageConfirmRevokeApiKey": "\u00bfEst\u00e1 seguro de querer revocar esta llave de API?",
     "HeaderConfirmRevokeApiKey": "Revocar llave de API",
-    "ValueContainer": "Container: {0}",
-    "ValueAudioCodec": "Audio Codec: {0}",
-    "ValueVideoCodec": "Video Codec: {0}",
-    "ValueCodec": "Codec: {0}",
-    "ValueConditions": "Conditions: {0}",
-    "LabelAll": "All",
-    "HeaderDeleteImage": "Delete Image",
-    "MessageFileNotFound": "File not found.",
-    "MessageFileReadError": "An error occurred reading this file.",
-    "ButtonNextPage": "Next Page",
-    "ButtonPreviousPage": "Previous Page",
-    "ButtonMoveLeft": "Move left",
-    "ButtonMoveRight": "Move right",
-    "ButtonBrowseOnlineImages": "Browse online images",
-    "HeaderDeleteItem": "Delete Item",
-    "ConfirmDeleteItem": "Are you sure you wish to delete this item from your library?",
-    "MessagePleaseEnterNameOrId": "Please enter a name or an external Id.",
-    "MessageValueNotCorrect": "The value entered is not correct. Please try again.",
-    "MessageItemSaved": "Item saved.",
+    "ValueContainer": "Contenedor: {0}",
+    "ValueAudioCodec": "C\u00f3dec de Audio: {0}",
+    "ValueVideoCodec": "C\u00f3dec de Video: {0}",
+    "ValueCodec": "C\u00f3dec: {0}",
+    "ValueConditions": "Condiciones: {0}",
+    "LabelAll": "Todos",
+    "HeaderDeleteImage": "Eliminar Im\u00e1gen",
+    "MessageFileNotFound": "Archivo no encontrado.",
+    "MessageFileReadError": "Ha ocurrido un error al leer este archivo.",
+    "ButtonNextPage": "P\u00e1gina Siguiente",
+    "ButtonPreviousPage": "P\u00e1gina Anterior",
+    "ButtonMoveLeft": "Mover a la izquierda",
+    "ButtonMoveRight": "Mover a la derecha",
+    "ButtonBrowseOnlineImages": "Navegar por im\u00e1genes en l\u00ednea",
+    "HeaderDeleteItem": "Eliminar \u00cdtem",
+    "ConfirmDeleteItem": "\u00bfEsta seguro de querer eleiminar este \u00edtem de su biblioteca?",
+    "MessagePleaseEnterNameOrId": "Por favor ingrese un nombre o id externo.",
+    "MessageValueNotCorrect": "El valor ingresado no es correcto. Intente nuevamente por favor.",
+    "MessageItemSaved": "\u00cdtem guardado.",
     "OptionEnded": "Finalizado",
     "OptionContinuing": "Continuando",
     "OptionOff": "No",
     "OptionOn": "Si",
-    "HeaderFields": "Fields",
-    "HeaderFieldsHelp": "Slide a field to 'off' to lock it and prevent it's data from being changed.",
-    "HeaderLiveTV": "Live TV",
-    "MissingLocalTrailer": "Missing local trailer.",
-    "MissingPrimaryImage": "Missing primary image.",
-    "MissingBackdropImage": "Missing backdrop image.",
-    "MissingLogoImage": "Missing logo image.",
-    "MissingEpisode": "Missing episode.",
-    "OptionScreenshots": "Screenshots",
-    "OptionBackdrops": "Backdrops",
-    "OptionImages": "Images",
-    "OptionKeywords": "Keywords",
-    "OptionTags": "Tags",
-    "OptionStudios": "Studios",
-    "OptionName": "Name",
-    "OptionOverview": "Overview",
-    "OptionGenres": "Genres",
+    "HeaderFields": "Campos",
+    "HeaderFieldsHelp": "Deslice un campo hacia \"apagado\" para bloquearlo y evitar que sus datos sean modificados.",
+    "HeaderLiveTV": "TV en Vivo",
+    "MissingLocalTrailer": "Falta avance local.",
+    "MissingPrimaryImage": "Falta im\u00e1gen primaria.",
+    "MissingBackdropImage": "Falta im\u00e1gen de fondo.",
+    "MissingLogoImage": "Falta im\u00e1gen de logo.",
+    "MissingEpisode": "Falta episodio.",
+    "OptionScreenshots": "Capuras de Pantalla",
+    "OptionBackdrops": "Fondos",
+    "OptionImages": "Im\u00e1genes",
+    "OptionKeywords": "Palabras clave",
+    "OptionTags": "Etiquetas",
+    "OptionStudios": "Estudios",
+    "OptionName": "Nombre",
+    "OptionOverview": "Sinopsis",
+    "OptionGenres": "G\u00e9neros",
     "OptionParentalRating": "Clasificaci\u00f3n Parental",
-    "OptionPeople": "People",
+    "OptionPeople": "Personas",
     "OptionRuntime": "Duraci\u00f3n",
-    "OptionProductionLocations": "Production Locations",
-    "OptionBirthLocation": "Birth Location",
+    "OptionProductionLocations": "Lugares de Producci\u00f3n",
+    "OptionBirthLocation": "Lugar de Nacimiento",
     "LabelAllChannels": "Todos los canales",
-    "LabelLiveProgram": "LIVE",
-    "LabelNewProgram": "NEW",
-    "LabelPremiereProgram": "PREMIERE",
-    "HeaderChangeFolderType": "Change Folder Type",
-    "HeaderChangeFolderTypeHelp": "To change the folder type, please remove and rebuild the collection with the new type.",
-    "HeaderAlert": "Alert",
-    "MessagePleaseRestart": "Please restart to finish updating.",
+    "LabelLiveProgram": "EN VIVO",
+    "LabelNewProgram": "NUEVO",
+    "LabelPremiereProgram": "ESTRENO",
+    "HeaderChangeFolderType": "Cambiar tipo de carpeta",
+    "HeaderChangeFolderTypeHelp": "Para cambiar el tipo de carpeta, por favor elimine y reconstruya la colecci\u00f3n con el nuevo tipo.",
+    "HeaderAlert": "Alerta",
+    "MessagePleaseRestart": "Por favor reinicie para finalizar la actualizaci\u00f3n.",
     "ButtonRestart": "Reiniciar",
-    "MessagePleaseRefreshPage": "Please refresh this page to receive new updates from the server.",
-    "ButtonHide": "Hide",
-    "MessageSettingsSaved": "Settings saved.",
-    "ButtonSignOut": "Sign Out",
-    "ButtonMyProfile": "My Profile",
-    "ButtonMyPreferences": "My Preferences",
-    "MessageBrowserDoesNotSupportWebSockets": "This browser does not support web sockets. For a better experience, try a newer browser such as Chrome, Firefox, IE10+, Safari (iOS) or Opera.",
-    "LabelInstallingPackage": "Installing {0}",
-    "LabelPackageInstallCompleted": "{0} installation completed.",
-    "LabelPackageInstallFailed": "{0} installation failed.",
-    "LabelPackageInstallCancelled": "{0} installation cancelled.",
+    "MessagePleaseRefreshPage": "Por favor actualice esta p\u00e1gina para recibir nuevas actualizaciones desde el servidor.",
+    "ButtonHide": "Ocultar",
+    "MessageSettingsSaved": "Configuraciones guardadas",
+    "ButtonSignOut": "Cerrar Sesi\u00f3n",
+    "ButtonMyProfile": "Mi Perf\u00edl",
+    "ButtonMyPreferences": "Mis Preferencias",
+    "MessageBrowserDoesNotSupportWebSockets": "Este navegador no soporta sockets web. Para una mejor experiencia, pruebe con un navegador m\u00e1s nuevo como Chrome, Firefox, IE10+, Safari (iOS) u Opera.",
+    "LabelInstallingPackage": "Instalando {0}",
+    "LabelPackageInstallCompleted": "{0} instalaci\u00f3n completada.",
+    "LabelPackageInstallFailed": "{0} instalaci\u00f3n fallida.",
+    "LabelPackageInstallCancelled": "{0} instalaci\u00f3n cancelada.",
     "TabServer": "Servidor",
-    "TabUsers": "Users",
-    "TabLibrary": "Library",
+    "TabUsers": "Usuarios",
+    "TabLibrary": "Biblioteca",
     "TabMetadata": "Metadatos",
     "TabDLNA": "DLNA",
-    "TabLiveTV": "Live TV",
-    "TabAutoOrganize": "Auto-Organize",
-    "TabPlugins": "Plugins",
+    "TabLiveTV": "TV en Vivo",
+    "TabAutoOrganize": "Auto-Organizar",
+    "TabPlugins": "Complementos",
     "TabAdvanced": "Avanzado",
-    "TabHelp": "Help",
-    "TabScheduledTasks": "Scheduled Tasks",
-    "ButtonFullscreen": "Fullscreen",
-    "ButtonAudioTracks": "Audio Tracks",
+    "TabHelp": "Ayuda",
+    "TabScheduledTasks": "Tareas Programadas",
+    "ButtonFullscreen": "Pantalla completa",
+    "ButtonAudioTracks": "Pistas de Sonido",
     "ButtonSubtitles": "Subt\u00edtulos",
     "ButtonScenes": "Escenas",
-    "ButtonQuality": "Quality"
+    "ButtonQuality": "Calidad",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "Seleccionar",
+    "ButtonNew": "Nuevo"
 }
\ 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 0919afc7d7..e0b199b12f 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
@@ -313,5 +313,9 @@
     "ButtonAudioTracks": "Audio Tracks",
     "ButtonSubtitles": "Sous-titres",
     "ButtonScenes": "Sc\u00e8nes",
-    "ButtonQuality": "Quality"
+    "ButtonQuality": "Quality",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "S\u00e9lectionner",
+    "ButtonNew": "Nouveau"
 }
\ 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 6310881f20..2cb25ef9b6 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/he.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/he.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "\u05e0\u05d2\u05df",
     "ButtonEdit": "\u05e2\u05e8\u05d5\u05da",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -313,5 +313,9 @@
     "ButtonAudioTracks": "Audio Tracks",
     "ButtonSubtitles": "Subtitles",
     "ButtonScenes": "Scenes",
-    "ButtonQuality": "Quality"
+    "ButtonQuality": "Quality",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "\u05d1\u05d7\u05e8",
+    "ButtonNew": "\u05d7\u05d3\u05e9"
 }
\ 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 96e71a9717..1963f249af 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/it.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/it.json
@@ -216,31 +216,31 @@
     "HeaderAlbumArtist": "Artista Album",
     "HeaderArtist": "Artista",
     "LabelAddedOnDate": "Added {0}",
-    "ButtonStart": "Start",
+    "ButtonStart": "Avvio",
     "HeaderChannels": "Canali",
     "HeaderMediaFolders": "Cartelle dei media",
-    "HeaderBlockItemsWithNoRating": "Block items with no rating information:",
-    "OptionBlockOthers": "Others",
-    "OptionBlockTvShows": "TV Shows",
-    "OptionBlockTrailers": "Trailers",
-    "OptionBlockMusic": "Music",
-    "OptionBlockMovies": "Movies",
-    "OptionBlockBooks": "Books",
-    "OptionBlockGames": "Games",
-    "OptionBlockLiveTvPrograms": "Live TV Programs",
-    "OptionBlockLiveTvChannels": "Live TV Channels",
-    "OptionBlockChannelContent": "Internet Channel Content",
-    "ButtonRevoke": "Revoke",
-    "MessageConfirmRevokeApiKey": "Are you sure you wish to revoke this api key? The application's connection to Media Browser will be abruptly terminated.",
-    "HeaderConfirmRevokeApiKey": "Revoke Api Key",
+    "HeaderBlockItemsWithNoRating": "Blocca gli elementi senza informazioni di valutazione",
+    "OptionBlockOthers": "Altri",
+    "OptionBlockTvShows": "Serie TV",
+    "OptionBlockTrailers": "Trailer",
+    "OptionBlockMusic": "Musica",
+    "OptionBlockMovies": "Film",
+    "OptionBlockBooks": "Libri",
+    "OptionBlockGames": "Giochi",
+    "OptionBlockLiveTvPrograms": "Programmi TV in onda",
+    "OptionBlockLiveTvChannels": "Canali TV in onda",
+    "OptionBlockChannelContent": "Contenuto di Canali Internet",
+    "ButtonRevoke": "Revocare",
+    "MessageConfirmRevokeApiKey": "Sei sicuro che desideri revocare le chiavi api? La connessione dell'applicazione con Media Browser sar\u00e0 improvvisamente terminata.",
+    "HeaderConfirmRevokeApiKey": "Revocare Chiave Api",
     "ValueContainer": "Container: {0}",
     "ValueAudioCodec": "Audio Codec: {0}",
     "ValueVideoCodec": "Video Codec: {0}",
     "ValueCodec": "Codec: {0}",
     "ValueConditions": "Conditions: {0}",
-    "LabelAll": "All",
-    "HeaderDeleteImage": "Delete Image",
-    "MessageFileNotFound": "File not found.",
+    "LabelAll": "Tutti",
+    "HeaderDeleteImage": "Cancella Immagine",
+    "MessageFileNotFound": "File non trovato.",
     "MessageFileReadError": "An error occurred reading this file.",
     "ButtonNextPage": "Next Page",
     "ButtonPreviousPage": "Previous Page",
@@ -313,5 +313,9 @@
     "ButtonAudioTracks": "Audio Tracks",
     "ButtonSubtitles": "Sottotitoli",
     "ButtonScenes": "Scene",
-    "ButtonQuality": "Quality"
+    "ButtonQuality": "Quality",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "Seleziona",
+    "ButtonNew": "Nuovo"
 }
\ 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 187bcb59f0..0b6e7c9c5c 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -296,29 +296,32 @@
     "MessageSettingsSaved": "Settings saved.",
     "ButtonSignOut": "Sign Out",
     "ButtonMyProfile": "My Profile",
-    "ButtonMyPreferences":  "My Preferences",
-    "MessageBrowserDoesNotSupportWebSockets":  "This browser does not support web sockets. For a better experience, try a newer browser such as Chrome, Firefox, IE10+, Safari (iOS) or Opera.",
-    "LabelInstallingPackage":  "Installing {0}",
-    "LabelPackageInstallCompleted":  "{0} installation completed.",
-    "LabelPackageInstallFailed":  "{0} installation failed.",
-    "LabelPackageInstallCancelled":  "{0} installation cancelled.",
-    "TabServer":  "Server",
-    "TabUsers":  "Users",
-    "TabLibrary":  "Library",
-    "TabMetadata":  "Metadata",
-    "TabDLNA":  "DLNA",
-    "TabLiveTV":  "Live TV",
-    "TabAutoOrganize":  "Auto-Organize",
-    "TabPlugins":  "Plugins",
-    "TabAdvanced":  "Advanced",
-    "TabHelp":  "Help",
-    "TabScheduledTasks":  "Scheduled Tasks",
-    "ButtonFullscreen":  "Fullscreen",
-    "ButtonMute":  "Mute",
-    "ButtonUnmute":  "Unmute",
-    "ButtonAudioTracks":  "Audio Tracks",
-    "ButtonSubtitles":  "Subtitles",
-    "ButtonScenes":  "Scenes",
-    "ButtonQuality":  "Quality",
-    "HeaderNotifications":  "Notifications"
+    "ButtonMyPreferences": "My Preferences",
+    "MessageBrowserDoesNotSupportWebSockets": "This browser does not support web sockets. For a better experience, try a newer browser such as Chrome, Firefox, IE10+, Safari (iOS) or Opera.",
+    "LabelInstallingPackage": "Installing {0}",
+    "LabelPackageInstallCompleted": "{0} installation completed.",
+    "LabelPackageInstallFailed": "{0} installation failed.",
+    "LabelPackageInstallCancelled": "{0} installation cancelled.",
+    "TabServer": "Server",
+    "TabUsers": "Users",
+    "TabLibrary": "Library",
+    "TabMetadata": "Metadata",
+    "TabDLNA": "DLNA",
+    "TabLiveTV": "Live TV",
+    "TabAutoOrganize": "Auto-Organize",
+    "TabPlugins": "Plugins",
+    "TabAdvanced": "Advanced",
+    "TabHelp": "Help",
+    "TabScheduledTasks": "Scheduled Tasks",
+    "ButtonFullscreen": "Fullscreen",
+    "ButtonMute": "Mute",
+    "ButtonUnmute": "Unmute",
+    "ButtonAudioTracks": "Audio Tracks",
+    "ButtonSubtitles": "Subtitles",
+    "ButtonScenes": "Scenes",
+    "ButtonQuality": "Quality",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "Select",
+    "ButtonNew": "New"
 }
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
index a15a128782..113389a11f 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
@@ -313,5 +313,9 @@
     "ButtonAudioTracks": "\u0414\u044b\u0431\u044b\u0441 \u0436\u043e\u043b\u0448\u044b\u0493\u044b",
     "ButtonSubtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440",
     "ButtonScenes": "\u0421\u0430\u0445\u043d\u0430\u043b\u0430\u0440",
-    "ButtonQuality": "\u0421\u0430\u043f\u0430"
+    "ButtonQuality": "\u0421\u0430\u043f\u0430",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "\u0411\u04e9\u043b\u0435\u043a\u0442\u0435\u0443",
+    "ButtonNew": "\u0416\u0430\u0441\u0430\u0443"
 }
\ 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 30a6b8e261..3ed0c8735c 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ms.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ms.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -313,5 +313,9 @@
     "ButtonAudioTracks": "Audio Tracks",
     "ButtonSubtitles": "Subtitles",
     "ButtonScenes": "Scenes",
-    "ButtonQuality": "Quality"
+    "ButtonQuality": "Quality",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "Select",
+    "ButtonNew": "New"
 }
\ 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 6f726759dd..c1700fe519 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/nb.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/nb.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -313,5 +313,9 @@
     "ButtonAudioTracks": "Audio Tracks",
     "ButtonSubtitles": "Subtitles",
     "ButtonScenes": "Scenes",
-    "ButtonQuality": "Quality"
+    "ButtonQuality": "Quality",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "Select",
+    "ButtonNew": "New"
 }
\ 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 3f0d010842..10275847da 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
@@ -20,11 +20,11 @@
     "OptionRelease": "Offici\u00eble Release",
     "OptionBeta": "Beta",
     "OptionDev": "Dev (Instabiel)",
-    "UninstallPluginHeader": "Plug-in de\u00efnstalleren",
+    "UninstallPluginHeader": "Invoegtoepassing de\u00efnstalleren",
     "UninstallPluginConfirmation": "Weet u zeker dat u {0} wilt de\u00efnstalleren?",
-    "NoPluginConfigurationMessage": "Deze plug-in heeft niets in te stellen",
-    "NoPluginsInstalledMessage": "U heeft geen plug-ins ge\u00efnstalleerd",
-    "BrowsePluginCatalogMessage": "Bekijk de Plug-in catalogus voor beschikbare plug-ins.",
+    "NoPluginConfigurationMessage": "Deze Invoegtoepassing heeft niets in te stellen",
+    "NoPluginsInstalledMessage": "U heeft geen Invoegtoepassingen ge\u00efnstalleerd",
+    "BrowsePluginCatalogMessage": "Bekijk de Invoegtoepassings catalogus voor beschikbare Invoegtoepassingen.",
     "MessageKeyEmailedTo": "Sleutel gemaild naar {0}.",
     "MessageKeysLinked": "Sleutels gekoppeld.",
     "HeaderConfirmation": "Bevestiging",
@@ -45,7 +45,7 @@
     "HeaderDeleteTaskTrigger": "Verwijderen Taak Trigger",
     "HeaderTaskTriggers": "Taak Triggers",
     "MessageDeleteTaskTrigger": "Weet u zeker dat u deze taak trigger wilt verwijderen?",
-    "MessageNoPluginsInstalled": "U heeft geen plug-ins ge\u00efnstalleerd.",
+    "MessageNoPluginsInstalled": "U heeft geen Invoegtoepassingen ge\u00efnstalleerd.",
     "LabelVersionInstalled": "{0} ge\u00efnstalleerd",
     "LabelNumberReviews": "{0} Recensies",
     "LabelFree": "Gratis",
@@ -305,7 +305,7 @@
     "TabDLNA": "DLNA",
     "TabLiveTV": "Live TV",
     "TabAutoOrganize": "Automatisch-Organiseren",
-    "TabPlugins": "Plugins",
+    "TabPlugins": "Invoegtoepassingen",
     "TabAdvanced": "Geavanceerd",
     "TabHelp": "Hulp",
     "TabScheduledTasks": "Geplande taken",
@@ -313,5 +313,9 @@
     "ButtonAudioTracks": "Audio Tracks",
     "ButtonSubtitles": "Ondertitels",
     "ButtonScenes": "Scenes",
-    "ButtonQuality": "Kwaliteit"
+    "ButtonQuality": "Kwaliteit",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "Selecteer",
+    "ButtonNew": "Nieuw"
 }
\ 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 b97935ddeb..3375c1a1d8 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pl.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pl.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -313,5 +313,9 @@
     "ButtonAudioTracks": "Audio Tracks",
     "ButtonSubtitles": "Subtitles",
     "ButtonScenes": "Scenes",
-    "ButtonQuality": "Quality"
+    "ButtonQuality": "Quality",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "Select",
+    "ButtonNew": "New"
 }
\ 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 367e971d8f..aac6a2c05a 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json
@@ -313,5 +313,9 @@
     "ButtonAudioTracks": "Faixas de \u00c1udio",
     "ButtonSubtitles": "Legendas",
     "ButtonScenes": "Cenas",
-    "ButtonQuality": "Qualidade"
+    "ButtonQuality": "Qualidade",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "Selecionar",
+    "ButtonNew": "Nova"
 }
\ 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 c7f7c0f69f..eb3740b84c 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
@@ -313,5 +313,9 @@
     "ButtonAudioTracks": "Audio Tracks",
     "ButtonSubtitles": "Legendas",
     "ButtonScenes": "Cenas",
-    "ButtonQuality": "Quality"
+    "ButtonQuality": "Quality",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "Selecionar",
+    "ButtonNew": "Novo"
 }
\ 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 a7d6690f04..ea32fb9329 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
@@ -68,7 +68,7 @@
     "ButtonPreviousTrack": "\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0430\u044f \u0434\u043e\u0440\u043e\u0436\u043a\u0430",
     "LabelEnabled": "\u0412\u043a\u043b\u044e\u0447\u0435\u043d\u043e",
     "LabelDisabled": "\u0412\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u043e",
-    "ButtonMoreInformation": "\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u044b\u0435 \u0441\u0432\u0435\u0434\u0435\u043d\u0438\u044f",
+    "ButtonMoreInformation": "\u0415\u0449\u0451 \u0441\u0432\u0435\u0434\u0435\u043d\u0438\u044f",
     "LabelNoUnreadNotifications": "\u041d\u0435\u0442 \u043d\u0435\u043f\u0440\u043e\u0447\u0442\u0451\u043d\u043d\u044b\u0445 \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0439.",
     "ButtonViewNotifications": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f",
     "ButtonMarkTheseRead": "\u041e\u0442\u043c\u0435\u0442\u0438\u0442\u044c \u043a\u0430\u043a \u043f\u0440\u043e\u0447\u0442\u0451\u043d\u043d\u044b\u0435",
@@ -207,7 +207,7 @@
     "MessageErrorPlayingVideo": "\u041f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430 \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u0438 \u0432\u0438\u0434\u0435\u043e.",
     "MessageEnsureOpenTuner": "\u0423\u0431\u0435\u0434\u0438\u0442\u0435\u0441\u044c, \u0447\u0442\u043e \u0442\u0430\u043c \u043e\u0442\u043a\u0440\u044b\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0439 \u0442\u044e\u043d\u0435\u0440.",
     "ButtonHome": "\u0413\u043b\u0430\u0432\u043d\u0430\u044f",
-    "ButtonDashboard": "\u041f\u0430\u043d\u0435\u043b\u044c \u043c\u043e\u043d\u0438\u0442\u043e\u0440\u0438\u043d\u0433\u0430",
+    "ButtonDashboard": "\u0418\u043d\u0444\u043e\u043f\u0430\u043d\u0435\u043b\u044c",
     "ButtonReports": "\u041e\u0442\u0447\u0451\u0442\u044b",
     "ButtonMetadataManager": "\u0414\u0438\u0441\u043f\u0435\u0442\u0447\u0435\u0440 \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445",
     "HeaderTime": "\u0412\u0440\u0435\u043c\u044f",
@@ -313,5 +313,9 @@
     "ButtonAudioTracks": "\u0410\u0443\u0434\u0438\u043e \u0434\u043e\u0440\u043e\u0436\u043a\u0438",
     "ButtonSubtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044b",
     "ButtonScenes": "\u0421\u0446\u0435\u043d\u044b",
-    "ButtonQuality": "\u041a\u0430\u0447\u0435\u0441\u0442\u0432\u043e"
+    "ButtonQuality": "\u041a\u0430\u0447\u0435\u0441\u0442\u0432\u043e",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "\u0412\u044b\u0431\u0440\u0430\u0442\u044c",
+    "ButtonNew": "\u0421\u043e\u0437\u0434\u0430\u0442\u044c"
 }
\ 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 a0ee4fdaf7..421a0dea9a 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/sv.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/sv.json
@@ -313,5 +313,9 @@
     "ButtonAudioTracks": "Audio Tracks",
     "ButtonSubtitles": "Undertexter",
     "ButtonScenes": "Scener",
-    "ButtonQuality": "Quality"
+    "ButtonQuality": "Quality",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "V\u00e4lj",
+    "ButtonNew": "Nytillkommet"
 }
\ 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 b9b21645b1..0f93d06956 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/vi.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/vi.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -313,5 +313,9 @@
     "ButtonAudioTracks": "Audio Tracks",
     "ButtonSubtitles": "Subtitles",
     "ButtonScenes": "Scenes",
-    "ButtonQuality": "Quality"
+    "ButtonQuality": "Quality",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "L\u1ef1a ch\u1ecdn",
+    "ButtonNew": "M\u1edbi"
 }
\ 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 5408f0b915..fe7d379946 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "\u64ad\u653e",
     "ButtonEdit": "\u7de8\u8f2f",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -313,5 +313,9 @@
     "ButtonAudioTracks": "Audio Tracks",
     "ButtonSubtitles": "Subtitles",
     "ButtonScenes": "Scenes",
-    "ButtonQuality": "Quality"
+    "ButtonQuality": "Quality",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "\u9078\u64c7",
+    "ButtonNew": "\u5275\u5efa"
 }
\ 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 59438e2b5e..df4178c6a4 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ar.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ar.json
@@ -190,7 +190,7 @@
     "HeaderStatus": "Status",
     "OptionContinuing": "Continuing",
     "OptionEnded": "Ended",
-    "HeaderAirDays": "Air Days:",
+    "HeaderAirDays": "Air Days",
     "OptionSunday": "Sunday",
     "OptionMonday": "Monday",
     "OptionTuesday": "Tuesday",
@@ -198,7 +198,8 @@
     "OptionThursday": "Thursday",
     "OptionFriday": "Friday",
     "OptionSaturday": "Saturday",
-    "HeaderManagement": "Management:",
+    "HeaderManagement": "Management",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "Missing IMDb Id",
     "OptionMissingTvdbId": "Missing TheTVDB Id",
     "OptionMissingOverview": "Missing Overview",
@@ -256,11 +257,11 @@
     "ButtonSelectDirectory": "Select Directory",
     "LabelCustomPaths": "Specify custom paths where desired. Leave fields empty to use the defaults.",
     "LabelCachePath": "Cache path:",
-    "LabelCachePathHelp": "This folder contains server cache files, such as images.",
+    "LabelCachePathHelp": "Specify a custom location for server cache files, such as images.",
     "LabelImagesByNamePath": "Images by name path:",
-    "LabelImagesByNamePathHelp": "This folder contains downloaded actor, artist, genre and studio images.",
+    "LabelImagesByNamePathHelp": "Specify a custom location for downloaded actor, artist, genre and studio images.",
     "LabelMetadataPath": "Metadata path:",
-    "LabelMetadataPathHelp": "This location contains downloaded artwork and metadata that is not configured to be stored in media folders.",
+    "LabelMetadataPathHelp": "Specify a custom location for downloaded artwork and metadata, if not saving within media folders.",
     "LabelTranscodingTempPath": "Transcoding temporary path:",
     "LabelTranscodingTempPathHelp": "This folder contains working files used by the transcoder. Specify a custom path, or leave empty to use the default within the server's data folder.",
     "TabBasics": "Basics",
@@ -874,5 +875,14 @@
     "LabelMatchType": "Match type:",
     "OptionEquals": "Equals",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Substring"
+    "OptionSubstring": "Substring",
+    "TabView": "View",
+    "TabSort": "Sort",
+    "TabFilter": "Filter",
+    "ButtonView": "View",
+    "LabelPageSize": "Item limit:",
+    "LabelView": "View:",
+    "TabUsers": "Users",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ca.json b/MediaBrowser.Server.Implementations/Localization/Server/ca.json
index 1de1534e7a..461e56f49e 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ca.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ca.json
@@ -190,7 +190,7 @@
     "HeaderStatus": "Status",
     "OptionContinuing": "Continuing",
     "OptionEnded": "Ended",
-    "HeaderAirDays": "Air Days:",
+    "HeaderAirDays": "Air Days",
     "OptionSunday": "Sunday",
     "OptionMonday": "Monday",
     "OptionTuesday": "Tuesday",
@@ -198,7 +198,8 @@
     "OptionThursday": "Thursday",
     "OptionFriday": "Friday",
     "OptionSaturday": "Saturday",
-    "HeaderManagement": "Management:",
+    "HeaderManagement": "Management",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "Missing IMDb Id",
     "OptionMissingTvdbId": "Missing TheTVDB Id",
     "OptionMissingOverview": "Missing Overview",
@@ -256,11 +257,11 @@
     "ButtonSelectDirectory": "Select Directory",
     "LabelCustomPaths": "Specify custom paths where desired. Leave fields empty to use the defaults.",
     "LabelCachePath": "Cache path:",
-    "LabelCachePathHelp": "This folder contains server cache files, such as images.",
+    "LabelCachePathHelp": "Specify a custom location for server cache files, such as images.",
     "LabelImagesByNamePath": "Images by name path:",
-    "LabelImagesByNamePathHelp": "This folder contains downloaded actor, artist, genre and studio images.",
+    "LabelImagesByNamePathHelp": "Specify a custom location for downloaded actor, artist, genre and studio images.",
     "LabelMetadataPath": "Metadata path:",
-    "LabelMetadataPathHelp": "This location contains downloaded artwork and metadata that is not configured to be stored in media folders.",
+    "LabelMetadataPathHelp": "Specify a custom location for downloaded artwork and metadata, if not saving within media folders.",
     "LabelTranscodingTempPath": "Transcoding temporary path:",
     "LabelTranscodingTempPathHelp": "This folder contains working files used by the transcoder. Specify a custom path, or leave empty to use the default within the server's data folder.",
     "TabBasics": "Basics",
@@ -874,5 +875,14 @@
     "LabelMatchType": "Match type:",
     "OptionEquals": "Equals",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Substring"
+    "OptionSubstring": "Substring",
+    "TabView": "View",
+    "TabSort": "Sort",
+    "TabFilter": "Filter",
+    "ButtonView": "View",
+    "LabelPageSize": "Item limit:",
+    "LabelView": "View:",
+    "TabUsers": "Users",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/cs.json b/MediaBrowser.Server.Implementations/Localization/Server/cs.json
index 507045cbbf..d6cdfe0285 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/cs.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/cs.json
@@ -199,6 +199,7 @@
     "OptionFriday": "P\u00e1tek",
     "OptionSaturday": "Sobota",
     "HeaderManagement": "Management:",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "Chyb\u011bj\u00edc\u00ed IMDb Id",
     "OptionMissingTvdbId": "Chyb\u011bj\u00edc\u00ed TheTVDB Id",
     "OptionMissingOverview": "Chyb\u011bj\u00edc\u00ed p\u0159ehled",
@@ -479,7 +480,7 @@
     "HeaderProgram": "Program",
     "HeaderClients": "Klienti",
     "LabelCompleted": "Hotovo",
-    "LabelFailed": "Chyba",
+    "LabelFailed": "Failed",
     "LabelSkipped": "P\u0159esko\u010deno",
     "HeaderEpisodeOrganization": "Organizace epizod",
     "LabelSeries": "Series:",
@@ -629,8 +630,8 @@
     "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Sc\u00e9ny",
     "ButtonSubtitles": "Titulky",
-    "ButtonAudioTracks": "Audio stopy",
-    "ButtonPreviousTrack": "P\u0159edchod\u00ed stopa",
+    "ButtonAudioTracks": "Audio tracks",
+    "ButtonPreviousTrack": "Previous track",
     "ButtonNextTrack": "Next track",
     "ButtonStop": "Stop",
     "ButtonPause": "Pause",
@@ -874,5 +875,14 @@
     "LabelMatchType": "Match type:",
     "OptionEquals": "Equals",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Substring"
+    "OptionSubstring": "Substring",
+    "TabView": "View",
+    "TabSort": "Sort",
+    "TabFilter": "Filter",
+    "ButtonView": "View",
+    "LabelPageSize": "Item limit:",
+    "LabelView": "View:",
+    "TabUsers": "Users",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/da.json b/MediaBrowser.Server.Implementations/Localization/Server/da.json
index 55c296948c..8db9c68f89 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/da.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/da.json
@@ -199,6 +199,7 @@
     "OptionFriday": "Fredag",
     "OptionSaturday": "L\u00f8rdag",
     "HeaderManagement": "Ledelse:",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "Manglende IMDB Id",
     "OptionMissingTvdbId": "Manglende TheTVDB Id",
     "OptionMissingOverview": "Manglende Overblik",
@@ -626,10 +627,10 @@
     "TabNowPlaying": "Spiler nu",
     "TabNavigation": "Navigation",
     "TabControls": "Controls",
-    "ButtonFullscreen": "Skift til fuldsk\u00e6rm",
+    "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Scener",
     "ButtonSubtitles": "Undertekster",
-    "ButtonAudioTracks": "Lyd filer",
+    "ButtonAudioTracks": "Audio tracks",
     "ButtonPreviousTrack": "Previous track",
     "ButtonNextTrack": "Next track",
     "ButtonStop": "Stop",
@@ -874,5 +875,14 @@
     "LabelMatchType": "Match type:",
     "OptionEquals": "Equals",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Substring"
+    "OptionSubstring": "Substring",
+    "TabView": "View",
+    "TabSort": "Sort",
+    "TabFilter": "Filter",
+    "ButtonView": "View",
+    "LabelPageSize": "Item limit:",
+    "LabelView": "View:",
+    "TabUsers": "Users",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/de.json b/MediaBrowser.Server.Implementations/Localization/Server/de.json
index cfb0924d22..90c4c9e529 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/de.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/de.json
@@ -199,6 +199,7 @@
     "OptionFriday": "Freitag",
     "OptionSaturday": "Samstag",
     "HeaderManagement": "Verwaltung:",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "Fehlende IMDb Id",
     "OptionMissingTvdbId": "Fehlende TheTVDB Id",
     "OptionMissingOverview": "Fehlende \u00dcbersicht",
@@ -479,10 +480,10 @@
     "HeaderProgram": "Programm",
     "HeaderClients": "Clients",
     "LabelCompleted": "Fertiggestellt",
-    "LabelFailed": "Gescheitert",
+    "LabelFailed": "Failed",
     "LabelSkipped": "\u00dcbersprungen",
     "HeaderEpisodeOrganization": "Episodensortierung",
-    "LabelSeries": "Serien:",
+    "LabelSeries": "Series:",
     "LabelSeasonNumber": "Staffelnummer",
     "LabelEpisodeNumber": "Episodennummer",
     "LabelEndingEpisodeNumber": "Ending episode number",
@@ -626,12 +627,12 @@
     "TabNowPlaying": "Aktuelle Wiedergabe",
     "TabNavigation": "Navigation",
     "TabControls": "Controls",
-    "ButtonFullscreen": "Schalte Vollbild um",
+    "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Szenen",
     "ButtonSubtitles": "Untertitel",
-    "ButtonAudioTracks": "Audiospuren",
-    "ButtonPreviousTrack": "Vorheriger Track",
-    "ButtonNextTrack": "N\u00e4chster Track",
+    "ButtonAudioTracks": "Audio tracks",
+    "ButtonPreviousTrack": "Previous track",
+    "ButtonNextTrack": "Next track",
     "ButtonStop": "Stop",
     "ButtonPause": "Pause",
     "LabelGroupMoviesIntoCollections": "Gruppiere Filme in Collections",
@@ -874,5 +875,14 @@
     "LabelMatchType": "Match type:",
     "OptionEquals": "Equals",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Substring"
+    "OptionSubstring": "Substring",
+    "TabView": "View",
+    "TabSort": "Sort",
+    "TabFilter": "Filter",
+    "ButtonView": "View",
+    "LabelPageSize": "Item limit:",
+    "LabelView": "View:",
+    "TabUsers": "Users",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/el.json b/MediaBrowser.Server.Implementations/Localization/Server/el.json
index b6c94c512f..b778dc4154 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/el.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/el.json
@@ -190,7 +190,7 @@
     "HeaderStatus": "Status",
     "OptionContinuing": "Continuing",
     "OptionEnded": "Ended",
-    "HeaderAirDays": "Air Days:",
+    "HeaderAirDays": "Air Days",
     "OptionSunday": "Sunday",
     "OptionMonday": "Monday",
     "OptionTuesday": "Tuesday",
@@ -198,7 +198,8 @@
     "OptionThursday": "Thursday",
     "OptionFriday": "Friday",
     "OptionSaturday": "Saturday",
-    "HeaderManagement": "Management:",
+    "HeaderManagement": "Management",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "Missing IMDb Id",
     "OptionMissingTvdbId": "Missing TheTVDB Id",
     "OptionMissingOverview": "Missing Overview",
@@ -256,11 +257,11 @@
     "ButtonSelectDirectory": "Select Directory",
     "LabelCustomPaths": "Specify custom paths where desired. Leave fields empty to use the defaults.",
     "LabelCachePath": "Cache path:",
-    "LabelCachePathHelp": "This folder contains server cache files, such as images.",
+    "LabelCachePathHelp": "Specify a custom location for server cache files, such as images.",
     "LabelImagesByNamePath": "Images by name path:",
-    "LabelImagesByNamePathHelp": "This folder contains downloaded actor, artist, genre and studio images.",
+    "LabelImagesByNamePathHelp": "Specify a custom location for downloaded actor, artist, genre and studio images.",
     "LabelMetadataPath": "Metadata path:",
-    "LabelMetadataPathHelp": "This location contains downloaded artwork and metadata that is not configured to be stored in media folders.",
+    "LabelMetadataPathHelp": "Specify a custom location for downloaded artwork and metadata, if not saving within media folders.",
     "LabelTranscodingTempPath": "Transcoding temporary path:",
     "LabelTranscodingTempPathHelp": "This folder contains working files used by the transcoder. Specify a custom path, or leave empty to use the default within the server's data folder.",
     "TabBasics": "Basics",
@@ -874,5 +875,14 @@
     "LabelMatchType": "Match type:",
     "OptionEquals": "Equals",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Substring"
+    "OptionSubstring": "Substring",
+    "TabView": "View",
+    "TabSort": "Sort",
+    "TabFilter": "Filter",
+    "ButtonView": "View",
+    "LabelPageSize": "Item limit:",
+    "LabelView": "View:",
+    "TabUsers": "Users",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json b/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
index 48a5cc0049..6538111571 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
@@ -190,7 +190,7 @@
     "HeaderStatus": "Status",
     "OptionContinuing": "Continuing",
     "OptionEnded": "Ended",
-    "HeaderAirDays": "Air Days:",
+    "HeaderAirDays": "Air Days",
     "OptionSunday": "Sunday",
     "OptionMonday": "Monday",
     "OptionTuesday": "Tuesday",
@@ -198,7 +198,8 @@
     "OptionThursday": "Thursday",
     "OptionFriday": "Friday",
     "OptionSaturday": "Saturday",
-    "HeaderManagement": "Management:",
+    "HeaderManagement": "Management",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "Missing IMDb Id",
     "OptionMissingTvdbId": "Missing TheTVDB Id",
     "OptionMissingOverview": "Missing Overview",
@@ -256,11 +257,11 @@
     "ButtonSelectDirectory": "Select Directory",
     "LabelCustomPaths": "Specify custom paths where desired. Leave fields empty to use the defaults.",
     "LabelCachePath": "Cache path:",
-    "LabelCachePathHelp": "This folder contains server cache files, such as images.",
+    "LabelCachePathHelp": "Specify a custom location for server cache files, such as images.",
     "LabelImagesByNamePath": "Images by name path:",
-    "LabelImagesByNamePathHelp": "This folder contains downloaded actor, artist, genre and studio images.",
+    "LabelImagesByNamePathHelp": "Specify a custom location for downloaded actor, artist, genre and studio images.",
     "LabelMetadataPath": "Metadata path:",
-    "LabelMetadataPathHelp": "This location contains downloaded artwork and metadata that is not configured to be stored in media folders.",
+    "LabelMetadataPathHelp": "Specify a custom location for downloaded artwork and metadata, if not saving within media folders.",
     "LabelTranscodingTempPath": "Transcoding temporary path:",
     "LabelTranscodingTempPathHelp": "This folder contains working files used by the transcoder. Specify a custom path, or leave empty to use the default within the server's data folder.",
     "TabBasics": "Basics",
@@ -874,5 +875,14 @@
     "LabelMatchType": "Match type:",
     "OptionEquals": "Equals",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Substring"
+    "OptionSubstring": "Substring",
+    "TabView": "View",
+    "TabSort": "Sort",
+    "TabFilter": "Filter",
+    "ButtonView": "View",
+    "LabelPageSize": "Item limit:",
+    "LabelView": "View:",
+    "TabUsers": "Users",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/en_US.json b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
index 16700e356d..f315798ec9 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
@@ -190,7 +190,7 @@
     "HeaderStatus": "Status",
     "OptionContinuing": "Continuing",
     "OptionEnded": "Ended",
-    "HeaderAirDays": "Air Days:",
+    "HeaderAirDays": "Air Days",
     "OptionSunday": "Sunday",
     "OptionMonday": "Monday",
     "OptionTuesday": "Tuesday",
@@ -198,7 +198,8 @@
     "OptionThursday": "Thursday",
     "OptionFriday": "Friday",
     "OptionSaturday": "Saturday",
-    "HeaderManagement": "Management:",
+    "HeaderManagement": "Management",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "Missing IMDb Id",
     "OptionMissingTvdbId": "Missing TheTVDB Id",
     "OptionMissingOverview": "Missing Overview",
@@ -256,11 +257,11 @@
     "ButtonSelectDirectory": "Select Directory",
     "LabelCustomPaths": "Specify custom paths where desired. Leave fields empty to use the defaults.",
     "LabelCachePath": "Cache path:",
-    "LabelCachePathHelp": "This folder contains server cache files, such as images.",
+    "LabelCachePathHelp": "Specify a custom location for server cache files, such as images.",
     "LabelImagesByNamePath": "Images by name path:",
-    "LabelImagesByNamePathHelp": "This folder contains downloaded actor, artist, genre and studio images.",
+    "LabelImagesByNamePathHelp": "Specify a custom location for downloaded actor, artist, genre and studio images.",
     "LabelMetadataPath": "Metadata path:",
-    "LabelMetadataPathHelp": "This location contains downloaded artwork and metadata that is not configured to be stored in media folders.",
+    "LabelMetadataPathHelp": "Specify a custom location for downloaded artwork and metadata, if not saving within media folders.",
     "LabelTranscodingTempPath": "Transcoding temporary path:",
     "LabelTranscodingTempPathHelp": "This folder contains working files used by the transcoder. Specify a custom path, or leave empty to use the default within the server's data folder.",
     "TabBasics": "Basics",
@@ -874,5 +875,14 @@
     "LabelMatchType": "Match type:",
     "OptionEquals": "Equals",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Substring"
+    "OptionSubstring": "Substring",
+    "TabView": "View",
+    "TabSort": "Sort",
+    "TabFilter": "Filter",
+    "ButtonView": "View",
+    "LabelPageSize": "Item limit:",
+    "LabelView": "View:",
+    "TabUsers": "Users",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/es.json b/MediaBrowser.Server.Implementations/Localization/Server/es.json
index 45b3b5c781..18e44a03cf 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/es.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es.json
@@ -199,6 +199,7 @@
     "OptionFriday": "Viernes",
     "OptionSaturday": "S\u00e1bado",
     "HeaderManagement": "Administraci\u00f3n",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "Falta IMDb Id",
     "OptionMissingTvdbId": "Falta TheTVDB Id",
     "OptionMissingOverview": "Falta argumento",
@@ -479,10 +480,10 @@
     "HeaderProgram": "Programa",
     "HeaderClients": "Clientes",
     "LabelCompleted": "Completado",
-    "LabelFailed": "Err\u00f3neo",
+    "LabelFailed": "Error",
     "LabelSkipped": "Omitido",
     "HeaderEpisodeOrganization": "Organizaci\u00f3n de episodios",
-    "LabelSeries": "Serie:",
+    "LabelSeries": "Series:",
     "LabelSeasonNumber": "Temporada n\u00famero:",
     "LabelEpisodeNumber": "Episodio n\u00famero:",
     "LabelEndingEpisodeNumber": "N\u00famero episodio final:",
@@ -626,10 +627,10 @@
     "TabNowPlaying": "Reproduciendo ahora",
     "TabNavigation": "Navegaci\u00f3n",
     "TabControls": "Controles",
-    "ButtonFullscreen": "Pantalla completa",
+    "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Escenas",
     "ButtonSubtitles": "Subt\u00edtulos",
-    "ButtonAudioTracks": "Pistas de audio",
+    "ButtonAudioTracks": "Audio tracks",
     "ButtonPreviousTrack": "Pista anterior",
     "ButtonNextTrack": "Pista siguiente",
     "ButtonStop": "Detener",
@@ -874,5 +875,14 @@
     "LabelMatchType": "Match type:",
     "OptionEquals": "Equals",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Substring"
+    "OptionSubstring": "Substring",
+    "TabView": "View",
+    "TabSort": "Sort",
+    "TabFilter": "Filter",
+    "ButtonView": "View",
+    "LabelPageSize": "Item limit:",
+    "LabelView": "View:",
+    "TabUsers": "Users",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json b/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
index 733e377065..55439632f5 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
@@ -199,6 +199,7 @@
     "OptionFriday": "Viernes",
     "OptionSaturday": "S\u00e1bado",
     "HeaderManagement": "Administraci\u00f3n:",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "Falta Id de IMDb",
     "OptionMissingTvdbId": "Falta Id de TheTVDB",
     "OptionMissingOverview": "Falta Sinopsis",
@@ -626,12 +627,12 @@
     "TabNowPlaying": "Reproduci\u00e9ndo Ahora",
     "TabNavigation": "Navegaci\u00f3n",
     "TabControls": "Controles",
-    "ButtonFullscreen": "Alternar pantalla completa",
+    "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Escenas",
     "ButtonSubtitles": "Subt\u00edtulos",
-    "ButtonAudioTracks": "Pistas de audio",
-    "ButtonPreviousTrack": "Pista Anterior",
-    "ButtonNextTrack": "Pista Siguiente",
+    "ButtonAudioTracks": "Audio tracks",
+    "ButtonPreviousTrack": "Pista anterior",
+    "ButtonNextTrack": "Pista siguiente",
     "ButtonStop": "Detener",
     "ButtonPause": "Pausar",
     "LabelGroupMoviesIntoCollections": "Agrupar pel\u00edculas en colecciones",
@@ -868,11 +869,20 @@
     "LabelAppName": "Nombre del App",
     "LabelAppNameExample": "Ejemplo: Sickbeard, NzbDrone",
     "HeaderNewApiKeyHelp": "Otorgar a la aplicaci\u00f3n persmiso para comunicarse con Media Browser.",
-    "HeaderHttpHeaders": "Http Headers",
-    "HeaderIdentificationHeader": "Identification Header",
-    "LabelValue": "Value:",
-    "LabelMatchType": "Match type:",
-    "OptionEquals": "Equals",
+    "HeaderHttpHeaders": "Encabezados Http",
+    "HeaderIdentificationHeader": "Encabezado de Identificaci\u00f3n",
+    "LabelValue": "Valor:",
+    "LabelMatchType": "Tipo de Coincidencia:",
+    "OptionEquals": "Igual a",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Substring"
+    "OptionSubstring": "Subcadena",
+    "TabView": "Vista",
+    "TabSort": "Ordenaci\u00f3n",
+    "TabFilter": "Filtro",
+    "ButtonView": "Vista",
+    "LabelPageSize": "Tama\u00f1o de Pantalla:",
+    "LabelView": "Vista:",
+    "TabUsers": "Usuarios",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/fr.json b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
index ccfccea6ae..fc02a9e8ca 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/fr.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
@@ -199,6 +199,7 @@
     "OptionFriday": "Vendredi",
     "OptionSaturday": "Samedi",
     "HeaderManagement": "Gestion:",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "ID IMDb manquant:",
     "OptionMissingTvdbId": "ID TVDB manquant:",
     "OptionMissingOverview": "R\u00e9sum\u00e9 manquant",
@@ -396,7 +397,7 @@
     "HeaderCastCrew": "\u00c9quipe de tournage",
     "HeaderAdditionalParts": "Parties Additionelles",
     "ButtonSplitVersionsApart": "S\u00e9parer les versions",
-    "ButtonPlayTrailer": "Bande-annonce",
+    "ButtonPlayTrailer": "Trailer",
     "LabelMissing": "Manquant(s)",
     "LabelOffline": "Hors ligne",
     "PathSubstitutionHelp": "Les substitutions de chemins d'acc\u00e8s sont utilis\u00e9es pour faire correspondre un chemin d'acc\u00e8s du serveur \u00e0 un chemin d'acc\u00e8s accessible par les clients. En autorisant un acc\u00e8s direct aux m\u00e9dias du serveur, les clients pourront les lire directement du r\u00e9seau et \u00e9viter l'utilisation inutiles des ressources du serveur en demandant du transcodage.",
@@ -479,10 +480,10 @@
     "HeaderProgram": "Programme",
     "HeaderClients": "Clients",
     "LabelCompleted": "Compl\u00e9t\u00e9",
-    "LabelFailed": "\u00c9chec",
+    "LabelFailed": "Failed",
     "LabelSkipped": "Saut\u00e9",
     "HeaderEpisodeOrganization": "Organisation d'\u00e9pisodes",
-    "LabelSeries": "S\u00e9ries:",
+    "LabelSeries": "Series:",
     "LabelSeasonNumber": "Num\u00e9ro de saison",
     "LabelEpisodeNumber": "Num\u00e9ro d'\u00e9pisode",
     "LabelEndingEpisodeNumber": "Num\u00e9ro d'\u00e9pisode se terminant",
@@ -626,12 +627,12 @@
     "TabNowPlaying": "En cours de lecture",
     "TabNavigation": "Navigation",
     "TabControls": "Contr\u00f4les",
-    "ButtonFullscreen": "Plein \u00e9cran",
+    "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Sc\u00e8nes",
     "ButtonSubtitles": "Sous-titres",
-    "ButtonAudioTracks": "Piste audio",
-    "ButtonPreviousTrack": "Piste pr\u00e9c\u00e9dante",
-    "ButtonNextTrack": "Piste suivante",
+    "ButtonAudioTracks": "Audio tracks",
+    "ButtonPreviousTrack": "Previous track",
+    "ButtonNextTrack": "Next track",
     "ButtonStop": "Arr\u00eat",
     "ButtonPause": "Pause",
     "LabelGroupMoviesIntoCollections": "Grouper les films en collections",
@@ -874,5 +875,14 @@
     "LabelMatchType": "Match type:",
     "OptionEquals": "Equals",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Substring"
+    "OptionSubstring": "Substring",
+    "TabView": "View",
+    "TabSort": "Sort",
+    "TabFilter": "Filter",
+    "ButtonView": "View",
+    "LabelPageSize": "Item limit:",
+    "LabelView": "View:",
+    "TabUsers": "Users",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/he.json b/MediaBrowser.Server.Implementations/Localization/Server/he.json
index 473b2523fc..effeb0ad60 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/he.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/he.json
@@ -199,6 +199,7 @@
     "OptionFriday": "\u05e9\u05d9\u05e9\u05d9",
     "OptionSaturday": "\u05e9\u05d1\u05ea",
     "HeaderManagement": "\u05e0\u05d9\u05d4\u05d5\u05dc",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "\u05d7\u05e1\u05e8 \u05de\u05d6\u05d4\u05d4 IMBb",
     "OptionMissingTvdbId": "\u05d7\u05e1\u05e8 \u05de\u05d6\u05d4\u05d4 TheTVDB",
     "OptionMissingOverview": "\u05d7\u05e1\u05e8\u05d4 \u05e1\u05e7\u05d9\u05e8\u05d4",
@@ -396,7 +397,7 @@
     "HeaderCastCrew": "\u05e9\u05d7\u05e7\u05e0\u05d9\u05dd \u05d5\u05e6\u05d5\u05d5\u05ea",
     "HeaderAdditionalParts": "\u05d7\u05dc\u05e7\u05d9\u05dd \u05e0\u05d5\u05e1\u05e4\u05d9\u05dd",
     "ButtonSplitVersionsApart": "\u05e4\u05e6\u05dc \u05d2\u05e8\u05e1\u05d0\u05d5\u05ea \u05d1\u05e0\u05e4\u05e8\u05d3",
-    "ButtonPlayTrailer": "\u05d8\u05e8\u05d9\u05d9\u05dc\u05e8\u05d9\u05dd",
+    "ButtonPlayTrailer": "Trailer",
     "LabelMissing": "\u05d7\u05e1\u05e8",
     "LabelOffline": "\u05dc\u05d0 \u05de\u05e7\u05d5\u05d5\u05df",
     "PathSubstitutionHelp": "\u05e0\u05ea\u05d9\u05d1\u05d9\u05dd \u05d7\u05dc\u05d5\u05e4\u05d9\u05d9\u05dd \u05d4\u05dd \u05dc\u05e6\u05d5\u05e8\u05da \u05de\u05d9\u05e4\u05d5\u05d9 \u05e0\u05ea\u05d9\u05d1\u05d9\u05dd \u05d1\u05e9\u05e8\u05ea \u05dc\u05e0\u05ea\u05d9\u05d1\u05d9\u05dd \u05e9\u05de\u05e9\u05ea\u05de\u05e9\u05d9\u05dd \u05d9\u05db\u05d5\u05dc\u05d9\u05dd \u05dc\u05d2\u05e9\u05ea \u05d0\u05dc\u05d9\u05d4\u05dd. \u05e2\u05dc \u05d9\u05d3\u05d9 \u05d4\u05e8\u05e9\u05d0\u05d4 \u05dc\u05de\u05e9\u05ea\u05de\u05e9\u05d9\u05dd \u05d2\u05d9\u05e9\u05d4 \u05d9\u05e9\u05d9\u05e8\u05d4 \u05dc\u05de\u05d3\u05d9\u05d4 \u05d1\u05e9\u05e8\u05ea \u05d0\u05dd \u05d9\u05db\u05d5\u05dc\u05d9\u05dd \u05dc\u05e0\u05d2\u05df \u05d0\u05ea \u05d4\u05e7\u05d1\u05e6\u05d9\u05dd \u05d9\u05e9\u05d9\u05e8\u05d5\u05ea \u05e2\u05dc \u05d2\u05d1\u05d9 \u05d4\u05e8\u05e9\u05ea \u05d5\u05dc\u05d4\u05d9\u05de\u05e0\u05e2 \u05de\u05e9\u05d9\u05de\u05d5\u05e9 \u05d1\u05de\u05e9\u05d0\u05d1\u05d9 \u05d4\u05e9\u05e8\u05ea \u05dc\u05e6\u05d5\u05e8\u05da \u05e7\u05d9\u05d3\u05d5\u05d3 \u05d5\u05e9\u05d9\u05d3\u05d5\u05e8.",
@@ -479,10 +480,10 @@
     "HeaderProgram": "\u05ea\u05d5\u05db\u05e0\u05d4",
     "HeaderClients": "\u05de\u05e9\u05ea\u05de\u05e9\u05d9\u05dd",
     "LabelCompleted": "\u05d4\u05d5\u05e9\u05dc\u05dd",
-    "LabelFailed": "\u05e0\u05db\u05e9\u05dc",
+    "LabelFailed": "Failed",
     "LabelSkipped": "\u05d3\u05d5\u05dc\u05d2",
     "HeaderEpisodeOrganization": "\u05d0\u05d9\u05e8\u05d2\u05d5\u05df \u05e4\u05e8\u05e7\u05d9\u05dd",
-    "LabelSeries": "\u05e1\u05d3\u05e8\u05d4:",
+    "LabelSeries": "Series:",
     "LabelSeasonNumber": "\u05de\u05e1\u05e4\u05e8 \u05e2\u05d5\u05e0\u05d4:",
     "LabelEpisodeNumber": "\u05de\u05e1\u05e4\u05e8 \u05e4\u05e8\u05e7:",
     "LabelEndingEpisodeNumber": "\u05de\u05e1\u05e4\u05e8 \u05e1\u05d9\u05d5\u05dd \u05e4\u05e8\u05e7:",
@@ -874,5 +875,14 @@
     "LabelMatchType": "Match type:",
     "OptionEquals": "Equals",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Substring"
+    "OptionSubstring": "Substring",
+    "TabView": "View",
+    "TabSort": "Sort",
+    "TabFilter": "Filter",
+    "ButtonView": "View",
+    "LabelPageSize": "Item limit:",
+    "LabelView": "View:",
+    "TabUsers": "Users",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/it.json b/MediaBrowser.Server.Implementations/Localization/Server/it.json
index 77d265bd48..2757333f1c 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/it.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/it.json
@@ -5,9 +5,9 @@
     "LabelSwagger": "Swagger",
     "LabelStandard": "Standard",
     "LabelViewApiDocumentation": "Documentazione Api",
-    "LabelBrowseLibrary": "Apri Media Browser",
+    "LabelBrowseLibrary": "Esplora la libreria",
     "LabelConfigureMediaBrowser": "Configura Media Browser",
-    "LabelOpenLibraryViewer": "Esplora la Libreria",
+    "LabelOpenLibraryViewer": "Apri visualizzatore libreria",
     "LabelRestartServer": "Riavvia Server",
     "LabelShowLogWindow": "Mostra Finestra log",
     "LabelPrevious": "Precedente",
@@ -199,6 +199,7 @@
     "OptionFriday": "Venerdi",
     "OptionSaturday": "Sabato",
     "HeaderManagement": "Gestione:",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "IMDB id mancante",
     "OptionMissingTvdbId": "TheTVDB Id mancante",
     "OptionMissingOverview": "Trama mancante",
@@ -479,10 +480,10 @@
     "HeaderProgram": "Programma",
     "HeaderClients": "Dispositivi",
     "LabelCompleted": "Completato",
-    "LabelFailed": "Fallito",
+    "LabelFailed": "Failed",
     "LabelSkipped": "Saltato",
     "HeaderEpisodeOrganization": "Organizzazione Episodi",
-    "LabelSeries": "Serie:",
+    "LabelSeries": "Series:",
     "LabelSeasonNumber": "Numero Stagione:",
     "LabelEpisodeNumber": "Numero Episodio:",
     "LabelEndingEpisodeNumber": "Ultimo Episodio Numero:",
@@ -626,12 +627,12 @@
     "TabNowPlaying": "In esecuzione",
     "TabNavigation": "Navigazione",
     "TabControls": "Controlli",
-    "ButtonFullscreen": "Schermo intero",
+    "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Scene",
     "ButtonSubtitles": "Sottotitoli",
-    "ButtonAudioTracks": "Traccia Audio",
-    "ButtonPreviousTrack": "Precedente",
-    "ButtonNextTrack": "Prossimo",
+    "ButtonAudioTracks": "Audio tracks",
+    "ButtonPreviousTrack": "Previous track",
+    "ButtonNextTrack": "Next track",
     "ButtonStop": "Stop",
     "ButtonPause": "Pausa",
     "LabelGroupMoviesIntoCollections": "Raggruppa i film nelle collection",
@@ -846,33 +847,42 @@
     "LabelLoginDisclaimerHelp": "Questo verr\u00e0 visualizzato nella parte inferiore della pagina di accesso.",
     "LabelAutomaticallyDonate": "Donare automaticamente questo importo ogni mese",
     "LabelAutomaticallyDonateHelp": "\u00c8 possibile annullare in qualsiasi momento tramite il vostro conto PayPal.",
-    "OptionList": "List",
-    "TabDashboard": "Dashboard",
+    "OptionList": "Lista",
+    "TabDashboard": "Pannello Controllo",
     "TitleServer": "Server",
     "LabelCache": "Cache:",
-    "LabelLogs": "Logs:",
+    "LabelLogs": "Log:",
     "LabelMetadata": "Metadata:",
-    "LabelImagesByName": "Images by name:",
-    "LabelTranscodingTemporaryFiles": "Transcoding temporary files:",
-    "HeaderLatestMusic": "Latest Music",
+    "LabelImagesByName": "Immagini per nome:",
+    "LabelTranscodingTemporaryFiles": "transcodifica file temporanei:",
+    "HeaderLatestMusic": "Musica Recente",
     "HeaderBranding": "Branding",
-    "HeaderApiKeys": "Api Keys",
-    "HeaderApiKeysHelp": "External applications are required to have an Api key in order to communicate with Media Browser. Keys are issued by logging in with a Media Browser account, or by manually granting the application a key.",
-    "HeaderApiKey": "Api Key",
+    "HeaderApiKeys": "Chiavi Api",
+    "HeaderApiKeysHelp": "Le applicazioni estrene richiedono una chiave Api per comunicare con Media Browser. Le chiavi sono create attraverso il log-in con un account Media Browse, o manualmente rilasciando una chiave all'applicazione.",
+    "HeaderApiKey": "Chiave Api",
     "HeaderApp": "App",
-    "HeaderDevice": "Device",
-    "HeaderUser": "User",
-    "HeaderDateIssued": "Date Issued",
+    "HeaderDevice": "Dispositivo",
+    "HeaderUser": "Utente",
+    "HeaderDateIssued": "data di pubblicazione",
     "LabelChapterName": "Chapter {0}",
-    "HeaderNewApiKey": "New Api Key",
-    "LabelAppName": "App name",
+    "HeaderNewApiKey": "Nessuna Chiave Api",
+    "LabelAppName": "Nome app",
     "LabelAppNameExample": "Example: Sickbeard, NzbDrone",
-    "HeaderNewApiKeyHelp": "Grant an application permission to communicate with Media Browser.",
+    "HeaderNewApiKeyHelp": "Garantisci all'applicazione il permesso di comunicare con Media Browser.",
     "HeaderHttpHeaders": "Http Headers",
     "HeaderIdentificationHeader": "Identification Header",
     "LabelValue": "Value:",
     "LabelMatchType": "Match type:",
     "OptionEquals": "Equals",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Substring"
+    "OptionSubstring": "Substring",
+    "TabView": "View",
+    "TabSort": "Sort",
+    "TabFilter": "Filter",
+    "ButtonView": "View",
+    "LabelPageSize": "Item limit:",
+    "LabelView": "View:",
+    "TabUsers": "Users",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/kk.json b/MediaBrowser.Server.Implementations/Localization/Server/kk.json
index caee463517..b588e6c11b 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/kk.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/kk.json
@@ -199,6 +199,7 @@
     "OptionFriday": "\u0436\u04b1\u043c\u0430",
     "OptionSaturday": "\u0441\u0435\u043d\u0431\u0456",
     "HeaderManagement": "\u041c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a:",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "IMDb Id \u0436\u043e\u049b",
     "OptionMissingTvdbId": "TheTVDB Id \u0436\u043e\u049b",
     "OptionMissingOverview": "\u0416\u0430\u043b\u043f\u044b \u0448\u043e\u043b\u0443 \u0436\u043e\u049b",
@@ -626,10 +627,10 @@
     "TabNowPlaying": "\u041e\u0439\u043d\u0430\u0442\u044b\u043b\u0443\u0434\u0430",
     "TabNavigation": "\u0428\u0430\u0440\u043b\u0430\u0443",
     "TabControls": "\u0411\u0430\u0441\u049b\u0430\u0440\u0443 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0442\u0435\u0440\u0456",
-    "ButtonFullscreen": "\u0422\u043e\u043b\u044b\u049b \u044d\u043a\u0440\u0430\u043d",
+    "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "\u0421\u0430\u0445\u043d\u0430\u043b\u0430\u0440",
     "ButtonSubtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440",
-    "ButtonAudioTracks": "\u0414\u044b\u0431\u044b\u0441 \u0436\u043e\u043b\u0448\u044b\u049b\u0442\u0430\u0440\u044b",
+    "ButtonAudioTracks": "Audio tracks",
     "ButtonPreviousTrack": "\u0410\u043b\u0434\u044b\u04a3\u0493\u044b \u0436\u043e\u043b\u0448\u044b\u049b",
     "ButtonNextTrack": "\u041a\u0435\u043b\u0435\u0441\u0456 \u0436\u043e\u043b\u0448\u044b\u049b",
     "ButtonStop": "\u0422\u043e\u049b\u0442\u0430\u0442\u0443",
@@ -874,5 +875,14 @@
     "LabelMatchType": "\u0421\u04d9\u0439\u043a\u0435\u0441 \u0442\u04af\u0440\u0456:",
     "OptionEquals": "\u0422\u0435\u04a3",
     "OptionRegex": "\u04b0\u0434\u0430\u0439\u044b \u04e9\u0440\u043d\u0435\u043a",
-    "OptionSubstring": "\u0406\u0448\u043a\u0456 \u0436\u043e\u043b"
+    "OptionSubstring": "\u0406\u0448\u043a\u0456 \u0436\u043e\u043b",
+    "TabView": "\u041a\u04e9\u0440\u0456\u043d\u0456\u0441",
+    "TabSort": "\u0421\u04b1\u0440\u044b\u043f\u0442\u0430\u0443",
+    "TabFilter": "\u0421\u04af\u0437\u0443",
+    "ButtonView": "\u049a\u0430\u0440\u0430\u0443",
+    "LabelPageSize": "\u042d\u043a\u0440\u0430\u043d \u04e9\u043b\u0448\u0435\u043c\u0456:",
+    "LabelView": "\u041a\u04e9\u0440\u0456\u043d\u0456\u0441:",
+    "TabUsers": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u043b\u0430\u0440",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ko.json b/MediaBrowser.Server.Implementations/Localization/Server/ko.json
index 18cc943e16..e1a405972a 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ko.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ko.json
@@ -190,7 +190,7 @@
     "HeaderStatus": "Status",
     "OptionContinuing": "Continuing",
     "OptionEnded": "Ended",
-    "HeaderAirDays": "Air Days:",
+    "HeaderAirDays": "Air Days",
     "OptionSunday": "Sunday",
     "OptionMonday": "Monday",
     "OptionTuesday": "Tuesday",
@@ -198,7 +198,8 @@
     "OptionThursday": "Thursday",
     "OptionFriday": "Friday",
     "OptionSaturday": "Saturday",
-    "HeaderManagement": "Management:",
+    "HeaderManagement": "Management",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "Missing IMDb Id",
     "OptionMissingTvdbId": "Missing TheTVDB Id",
     "OptionMissingOverview": "Missing Overview",
@@ -256,11 +257,11 @@
     "ButtonSelectDirectory": "Select Directory",
     "LabelCustomPaths": "Specify custom paths where desired. Leave fields empty to use the defaults.",
     "LabelCachePath": "Cache path:",
-    "LabelCachePathHelp": "This folder contains server cache files, such as images.",
+    "LabelCachePathHelp": "Specify a custom location for server cache files, such as images.",
     "LabelImagesByNamePath": "Images by name path:",
-    "LabelImagesByNamePathHelp": "This folder contains downloaded actor, artist, genre and studio images.",
+    "LabelImagesByNamePathHelp": "Specify a custom location for downloaded actor, artist, genre and studio images.",
     "LabelMetadataPath": "Metadata path:",
-    "LabelMetadataPathHelp": "This location contains downloaded artwork and metadata that is not configured to be stored in media folders.",
+    "LabelMetadataPathHelp": "Specify a custom location for downloaded artwork and metadata, if not saving within media folders.",
     "LabelTranscodingTempPath": "Transcoding temporary path:",
     "LabelTranscodingTempPathHelp": "This folder contains working files used by the transcoder. Specify a custom path, or leave empty to use the default within the server's data folder.",
     "TabBasics": "Basics",
@@ -874,5 +875,14 @@
     "LabelMatchType": "Match type:",
     "OptionEquals": "Equals",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Substring"
+    "OptionSubstring": "Substring",
+    "TabView": "View",
+    "TabSort": "Sort",
+    "TabFilter": "Filter",
+    "ButtonView": "View",
+    "LabelPageSize": "Item limit:",
+    "LabelView": "View:",
+    "TabUsers": "Users",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ms.json b/MediaBrowser.Server.Implementations/Localization/Server/ms.json
index f90a350182..515cd70a2d 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ms.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ms.json
@@ -190,7 +190,7 @@
     "HeaderStatus": "Status",
     "OptionContinuing": "Continuing",
     "OptionEnded": "Ended",
-    "HeaderAirDays": "Air Days:",
+    "HeaderAirDays": "Air Days",
     "OptionSunday": "Sunday",
     "OptionMonday": "Monday",
     "OptionTuesday": "Tuesday",
@@ -198,7 +198,8 @@
     "OptionThursday": "Thursday",
     "OptionFriday": "Friday",
     "OptionSaturday": "Saturday",
-    "HeaderManagement": "Management:",
+    "HeaderManagement": "Management",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "Missing IMDb Id",
     "OptionMissingTvdbId": "Missing TheTVDB Id",
     "OptionMissingOverview": "Missing Overview",
@@ -256,11 +257,11 @@
     "ButtonSelectDirectory": "Select Directory",
     "LabelCustomPaths": "Specify custom paths where desired. Leave fields empty to use the defaults.",
     "LabelCachePath": "Cache path:",
-    "LabelCachePathHelp": "This folder contains server cache files, such as images.",
+    "LabelCachePathHelp": "Specify a custom location for server cache files, such as images.",
     "LabelImagesByNamePath": "Images by name path:",
-    "LabelImagesByNamePathHelp": "This folder contains downloaded actor, artist, genre and studio images.",
+    "LabelImagesByNamePathHelp": "Specify a custom location for downloaded actor, artist, genre and studio images.",
     "LabelMetadataPath": "Metadata path:",
-    "LabelMetadataPathHelp": "This location contains downloaded artwork and metadata that is not configured to be stored in media folders.",
+    "LabelMetadataPathHelp": "Specify a custom location for downloaded artwork and metadata, if not saving within media folders.",
     "LabelTranscodingTempPath": "Transcoding temporary path:",
     "LabelTranscodingTempPathHelp": "This folder contains working files used by the transcoder. Specify a custom path, or leave empty to use the default within the server's data folder.",
     "TabBasics": "Basics",
@@ -874,5 +875,14 @@
     "LabelMatchType": "Match type:",
     "OptionEquals": "Equals",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Substring"
+    "OptionSubstring": "Substring",
+    "TabView": "View",
+    "TabSort": "Sort",
+    "TabFilter": "Filter",
+    "ButtonView": "View",
+    "LabelPageSize": "Item limit:",
+    "LabelView": "View:",
+    "TabUsers": "Users",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/nb.json b/MediaBrowser.Server.Implementations/Localization/Server/nb.json
index 94927eb12e..c2afde015a 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/nb.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/nb.json
@@ -190,7 +190,7 @@
     "HeaderStatus": "Status",
     "OptionContinuing": "Fortsetter",
     "OptionEnded": "Avsluttet",
-    "HeaderAirDays": "Air Days:",
+    "HeaderAirDays": "Air Days",
     "OptionSunday": "S\u00f8ndag",
     "OptionMonday": "Mandag",
     "OptionTuesday": "Tirsdag",
@@ -198,7 +198,8 @@
     "OptionThursday": "Torsdag",
     "OptionFriday": "Fredag",
     "OptionSaturday": "L\u00f8rdag",
-    "HeaderManagement": "Management:",
+    "HeaderManagement": "Management",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "Mangler IMDb id",
     "OptionMissingTvdbId": "Missing TheTVDB Id",
     "OptionMissingOverview": "Mangler oversikt",
@@ -256,11 +257,11 @@
     "ButtonSelectDirectory": "Select Directory",
     "LabelCustomPaths": "Specify custom paths where desired. Leave fields empty to use the defaults.",
     "LabelCachePath": "Cache path:",
-    "LabelCachePathHelp": "This folder contains server cache files, such as images.",
+    "LabelCachePathHelp": "Specify a custom location for server cache files, such as images.",
     "LabelImagesByNamePath": "Images by name path:",
-    "LabelImagesByNamePathHelp": "This folder contains downloaded actor, artist, genre and studio images.",
+    "LabelImagesByNamePathHelp": "Specify a custom location for downloaded actor, artist, genre and studio images.",
     "LabelMetadataPath": "Metadata path:",
-    "LabelMetadataPathHelp": "This location contains downloaded artwork and metadata that is not configured to be stored in media folders.",
+    "LabelMetadataPathHelp": "Specify a custom location for downloaded artwork and metadata, if not saving within media folders.",
     "LabelTranscodingTempPath": "Transcoding temporary path:",
     "LabelTranscodingTempPathHelp": "This folder contains working files used by the transcoder. Specify a custom path, or leave empty to use the default within the server's data folder.",
     "TabBasics": "Basics",
@@ -874,5 +875,14 @@
     "LabelMatchType": "Match type:",
     "OptionEquals": "Equals",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Substring"
+    "OptionSubstring": "Substring",
+    "TabView": "View",
+    "TabSort": "Sort",
+    "TabFilter": "Filter",
+    "ButtonView": "View",
+    "LabelPageSize": "Item limit:",
+    "LabelView": "View:",
+    "TabUsers": "Users",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/nl.json b/MediaBrowser.Server.Implementations/Localization/Server/nl.json
index 7f1545c2bb..4e01acfa1d 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/nl.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/nl.json
@@ -39,7 +39,7 @@
     "HeaderSetupLibrary": "Stel uw mediabibliotheek in",
     "ButtonAddMediaFolder": "Mediamap toevoegen",
     "LabelFolderType": "Maptype:",
-    "MediaFolderHelpPluginRequired": "* Hiervoor is het gebruik van een plug-in vereist, bijvoorbeeld GameBrowser of MB Bookshelf.",
+    "MediaFolderHelpPluginRequired": "* Hiervoor is het gebruik van een Invoegtoepassing vereist, bijvoorbeeld GameBrowser of MB Bookshelf.",
     "ReferToMediaLibraryWiki": "Raadpleeg de mediabibliotheek wiki.",
     "LabelCountry": "Land:",
     "LabelLanguage": "Taal:",
@@ -152,9 +152,9 @@
     "OptionResumable": "Hervatbaar",
     "ScheduledTasksHelp": "Klik op een taak om het schema aan te passen.",
     "ScheduledTasksTitle": "Geplande taken",
-    "TabMyPlugins": "Mijn Plug-ins",
+    "TabMyPlugins": "Mijn Invoegtoepassingen",
     "TabCatalog": "Catalogus",
-    "PluginsTitle": "Plug-ins",
+    "PluginsTitle": "Invoegtoepassingen",
     "HeaderAutomaticUpdates": "Automatische updates",
     "HeaderNowPlaying": "Wordt nu afgespeeld",
     "HeaderLatestAlbums": "Nieuwste Albums",
@@ -199,6 +199,7 @@
     "OptionFriday": "Vrijdag",
     "OptionSaturday": "Zaterdag",
     "HeaderManagement": "Beheer:",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "IMDb Id ontbreekt",
     "OptionMissingTvdbId": "TheTVDB Id ontbreekt",
     "OptionMissingOverview": "Overzicht ontbreekt",
@@ -284,7 +285,7 @@
     "ButtonAutoScroll": "Auto-scroll",
     "LabelImageSavingConvention": "Afbeelding opslag conventie:",
     "LabelImageSavingConventionHelp": "Media Browser herkent afbeeldingen van de meeste grote media-applicaties. Het kiezen van uw download conventie is handig als u ook gebruik wilt maken van andere producten.",
-    "OptionImageSavingCompatible": "Compatibel - Media Browser \/ Plex \/ XBMC",
+    "OptionImageSavingCompatible": "Compatibel - Media Browser \/ XBMC \/ Plex",
     "OptionImageSavingStandard": "Standaard - MB2",
     "ButtonSignIn": "Aanmelden",
     "TitleSignIn": "Aanmelden",
@@ -332,10 +333,10 @@
     "LabelNumberOfGuideDays": "Aantal dagen van de gids om te downloaden:",
     "LabelNumberOfGuideDaysHelp": "Het downloaden van meer dagen van de gids gegevens biedt de mogelijkheid verder vooruit te plannen en een beter overzicht geven, maar het zal ook langer duren om te downloaden. Auto kiest op basis van het aantal kanalen.",
     "LabelActiveService": "Actieve Service:",
-    "LabelActiveServiceHelp": "Er kunnen meerdere tv plug-ins worden ge\u00efnstalleerd, maar er kan er slechts een  per keer actief zijn.",
+    "LabelActiveServiceHelp": "Er kunnen meerdere tv Invoegtoepassingen worden ge\u00efnstalleerd, maar er kan er slechts een  per keer actief zijn.",
     "OptionAutomatic": "Automatisch",
-    "LiveTvPluginRequired": "Een Live TV service provider plug-in is vereist om door te gaan.",
-    "LiveTvPluginRequiredHelp": "Installeer a.u b een van onze beschikbare plug-ins, zoals Next PVR of ServerWmc.",
+    "LiveTvPluginRequired": "Een Live TV service provider Invoegtoepassing is vereist om door te gaan.",
+    "LiveTvPluginRequiredHelp": "Installeer a.u b een van onze beschikbare Invoegtoepassingen, zoals Next PVR of ServerWmc.",
     "LabelCustomizeOptionsPerMediaType": "Aanpassen voor mediatype",
     "OptionDownloadThumbImage": "Miniatuur",
     "OptionDownloadMenuImage": "Menu",
@@ -576,9 +577,9 @@
     "HeaderNotificationList": "Klik op een melding om de opties voor het versturen ervan te configureren .",
     "NotificationOptionApplicationUpdateAvailable": "Programma-update beschikbaar",
     "NotificationOptionApplicationUpdateInstalled": "Programma-update ge\u00efnstalleerd",
-    "NotificationOptionPluginUpdateInstalled": "Plugin-update ge\u00efnstalleerd",
-    "NotificationOptionPluginInstalled": "Plugin ge\u00efnstalleerd",
-    "NotificationOptionPluginUninstalled": "Plugin verwijderd",
+    "NotificationOptionPluginUpdateInstalled": "Invoegtoepassings-update ge\u00efnstalleerd",
+    "NotificationOptionPluginInstalled": "Invoegtoepassing ge\u00efnstalleerd",
+    "NotificationOptionPluginUninstalled": "Invoegtoepassing verwijderd",
     "NotificationOptionVideoPlayback": "Video afspelen gestart",
     "NotificationOptionAudioPlayback": "Audio afspelen gestart",
     "NotificationOptionGamePlayback": "Game gestart",
@@ -589,7 +590,7 @@
     "NotificationOptionInstallationFailed": "Mislukken van de installatie",
     "NotificationOptionNewLibraryContent": "Nieuwe content toegevoegd",
     "NotificationOptionNewLibraryContentMultiple": "Nieuwe content toegevoegd (meerdere)",
-    "SendNotificationHelp": "Meldingen worden geplaatst in de inbox op het dashboard. Blader door de Plug-ins catalogus om aanvullende opties voor meldingen te installeren.",
+    "SendNotificationHelp": "Meldingen worden geplaatst in de inbox op het dashboard. Blader door de Invoegtoepassings catalogus om aanvullende opties voor meldingen te installeren.",
     "NotificationOptionServerRestartRequired": "Server herstart nodig",
     "LabelNotificationEnabled": "Deze melding inschakelen",
     "LabelMonitorUsers": "Monitor activiteit van:",
@@ -599,10 +600,10 @@
     "CategoryUser": "Gebruiker",
     "CategorySystem": "Systeem",
     "CategoryApplication": "Toepassing",
-    "CategoryPlugin": "Plug-in",
+    "CategoryPlugin": "Invoegtoepassing",
     "LabelMessageTitle": "Titel van het bericht:",
     "LabelAvailableTokens": "Beschikbaar tokens:",
-    "AdditionalNotificationServices": "Blader door de plug-in catalogus om aanvullende meldingsdiensten te installeren.",
+    "AdditionalNotificationServices": "Blader door de Invoegtoepassings catalogus om aanvullende meldingsdiensten te installeren.",
     "OptionAllUsers": "Alle gebruikers",
     "OptionAdminUsers": "Beheerders",
     "OptionCustomUsers": "Aangepast",
@@ -626,17 +627,17 @@
     "TabNowPlaying": "Wordt nu afgespeeld",
     "TabNavigation": "Navigatie",
     "TabControls": "Besturing",
-    "ButtonFullscreen": "Volledig scherm in-\/uitschakelen",
+    "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Scenes",
     "ButtonSubtitles": "Ondertitels",
     "ButtonAudioTracks": "Audio tracks",
-    "ButtonPreviousTrack": "Vorig nummer",
-    "ButtonNextTrack": "Volgend nummer",
+    "ButtonPreviousTrack": "Vorige track",
+    "ButtonNextTrack": "Volgende track",
     "ButtonStop": "Stop",
     "ButtonPause": "Pauze",
     "LabelGroupMoviesIntoCollections": "Groepeer films in verzamelingen",
     "LabelGroupMoviesIntoCollectionsHelp": "Bij de weergave van film lijsten, zullen films die behoren tot een verzameling worden weergegeven als een gegroepeerd object.",
-    "NotificationOptionPluginError": "Plug-in fout",
+    "NotificationOptionPluginError": "Invoegtoepassings fout",
     "ButtonVolumeUp": "Volume omhoog",
     "ButtonVolumeDown": "Volume omlaag",
     "ButtonMute": "Dempen",
@@ -722,7 +723,7 @@
     "OptionReportByteRangeSeekingWhenTranscodingHelp": "Dit is vereist voor bepaalde apparaten die zo goed op tijd zoeken.",
     "HeaderSubtitleDownloadingHelp": "Bij het scannen van uw videobestanden kan Media Browser naar ontbrekende ondertiteling zoeken en deze downloaden bij ondertiteling providers zoals OpenSubtitles.org.",
     "HeaderDownloadSubtitlesFor": "Download ondertiteling voor:",
-    "MessageNoChapterProviders": "Installeer een hoofdstuk provider plug-in zoals ChapterDb of tagChimp om extra hoofdstuk opties in te schakelen.",
+    "MessageNoChapterProviders": "Installeer een hoofdstuk provider Invoegtoepassing zoals ChapterDb om extra hoofdstuk opties in te schakelen.",
     "LabelSkipIfGraphicalSubsPresent": "Overslaan als de video al grafische ondertitels  bevat",
     "LabelSkipIfGraphicalSubsPresentHelp": "Tekstversies houden van ondertitels zal resulteren in meer effici\u00ebnte levering aan mobiele clients.",
     "TabSubtitles": "Ondertiteling",
@@ -730,7 +731,7 @@
     "HeaderDownloadChaptersFor": "Download hoofdstuk namen voor:",
     "LabelOpenSubtitlesUsername": "Gebruikersnaam Open Subtitles:",
     "LabelOpenSubtitlesPassword": "Wachtwoord Open Subtitles:",
-    "HeaderChapterDownloadingHelp": "Wanneer Media Browser uw videobestanden scant kan het gebruiksvriendelijke namen voor hoofdstukken downloaden van het internet met behulp van hoofdstuk plug-ins zoals ChapterDb en tagChimp.",
+    "HeaderChapterDownloadingHelp": "Wanneer Media Browser uw videobestanden scant kan het gebruiksvriendelijke namen voor hoofdstukken downloaden van het internet met behulp van hoofdstuk Invoegtoepassing zoals ChapterDb.",
     "LabelPlayDefaultAudioTrack": "Speel standaard audio spoor ongeacht taal",
     "LabelSubtitlePlaybackMode": "Ondertitelingsmode:",
     "LabelDownloadLanguages": "Download talen:",
@@ -740,8 +741,8 @@
     "HeaderSendMessage": "Stuur bericht",
     "ButtonSend": "Stuur",
     "LabelMessageText": "Bericht tekst:",
-    "MessageNoAvailablePlugins": "Geen beschikbare plugins.",
-    "LabelDisplayPluginsFor": "Toon plugins voor:",
+    "MessageNoAvailablePlugins": "Geen beschikbare Invoegtoepassingen.",
+    "LabelDisplayPluginsFor": "Toon Invoegtoepassingen voor:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
     "LabelEpisodeName": "Naam aflevering",
@@ -802,7 +803,7 @@
     "LabelChannelDownloadPathHelp": "Geef een eigen download pad op als dit gewenst is, leeglaten voor dowloaden naar de interne program data map.",
     "LabelChannelDownloadAge": "Verwijder inhoud na: (dagen)",
     "LabelChannelDownloadAgeHelp": "Gedownloade inhoud die ouder is zal worden verwijderd. Afspelen via internet streaming blijft mogelijk.",
-    "ChannelSettingsFormHelp": "Installeer kanalen zoals Trailers en Vimeo in de plug-in catalogus.",
+    "ChannelSettingsFormHelp": "Installeer kanalen zoals Trailers en Vimeo in de Invoegtoepassings catalogus.",
     "LabelSelectCollection": "Selecteer verzameling:",
     "ViewTypeMovies": "Films",
     "ViewTypeTvShows": "TV",
@@ -844,7 +845,7 @@
     "HeaderBrandingHelp": "Pas het uiterlijk van Media Browser aan, aan de behoeften van uw groep of organisatie.",
     "LabelLoginDisclaimer": "Aanmeld vrijwaring:",
     "LabelLoginDisclaimerHelp": "Dit wordt onderaan de login pagina weergegeven.",
-    "LabelAutomaticallyDonate": "Doneer dit bedrag automatisch per maand",
+    "LabelAutomaticallyDonate": "Doneer dit bedrag automatisch elke zes maanden",
     "LabelAutomaticallyDonateHelp": "U kunt dit via uw PayPal account op elk moment annuleren.",
     "OptionList": "Lijst",
     "TabDashboard": "Dashboard",
@@ -874,5 +875,14 @@
     "LabelMatchType": "Type overeenkomst:",
     "OptionEquals": "Is gelijk aan",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Subtekenreeks"
+    "OptionSubstring": "Subtekenreeks",
+    "TabView": "Weergave",
+    "TabSort": "Sorteren",
+    "TabFilter": "Filter",
+    "ButtonView": "Weergave",
+    "LabelPageSize": "Schermgrootte:",
+    "LabelView": "Weergave:",
+    "TabUsers": "Gebruikers",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pl.json b/MediaBrowser.Server.Implementations/Localization/Server/pl.json
index 43444b6890..b5b610654d 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pl.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pl.json
@@ -190,7 +190,7 @@
     "HeaderStatus": "Status",
     "OptionContinuing": "Continuing",
     "OptionEnded": "Ended",
-    "HeaderAirDays": "Air Days:",
+    "HeaderAirDays": "Air Days",
     "OptionSunday": "Niedziela",
     "OptionMonday": "Poniedzia\u0142ek",
     "OptionTuesday": "Wtorek",
@@ -198,7 +198,8 @@
     "OptionThursday": "Czwartek",
     "OptionFriday": "Pi\u0105tek",
     "OptionSaturday": "Sobota",
-    "HeaderManagement": "Management:",
+    "HeaderManagement": "Management",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "Brakuje Id IMDb",
     "OptionMissingTvdbId": "Brakuje Id TheTVDB",
     "OptionMissingOverview": "Missing Overview",
@@ -256,11 +257,11 @@
     "ButtonSelectDirectory": "Wybierz folder",
     "LabelCustomPaths": "Specify custom paths where desired. Leave fields empty to use the defaults.",
     "LabelCachePath": "Cache path:",
-    "LabelCachePathHelp": "This folder contains server cache files, such as images.",
+    "LabelCachePathHelp": "Specify a custom location for server cache files, such as images.",
     "LabelImagesByNamePath": "Images by name path:",
-    "LabelImagesByNamePathHelp": "This folder contains downloaded actor, artist, genre and studio images.",
+    "LabelImagesByNamePathHelp": "Specify a custom location for downloaded actor, artist, genre and studio images.",
     "LabelMetadataPath": "Metadata path:",
-    "LabelMetadataPathHelp": "This location contains downloaded artwork and metadata that is not configured to be stored in media folders.",
+    "LabelMetadataPathHelp": "Specify a custom location for downloaded artwork and metadata, if not saving within media folders.",
     "LabelTranscodingTempPath": "Transcoding temporary path:",
     "LabelTranscodingTempPathHelp": "This folder contains working files used by the transcoder. Specify a custom path, or leave empty to use the default within the server's data folder.",
     "TabBasics": "Basics",
@@ -874,5 +875,14 @@
     "LabelMatchType": "Match type:",
     "OptionEquals": "Equals",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Substring"
+    "OptionSubstring": "Substring",
+    "TabView": "View",
+    "TabSort": "Sort",
+    "TabFilter": "Filter",
+    "ButtonView": "View",
+    "LabelPageSize": "Item limit:",
+    "LabelView": "View:",
+    "TabUsers": "Users",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json b/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
index e60c7b3c3c..b635d73184 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
@@ -199,6 +199,7 @@
     "OptionFriday": "Sexta-feira",
     "OptionSaturday": "S\u00e1bado",
     "HeaderManagement": "Gerenciamento:",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "Faltando Id IMDb",
     "OptionMissingTvdbId": "Faltando Id TheTVDB",
     "OptionMissingOverview": "Faltando Sinopse",
@@ -626,12 +627,12 @@
     "TabNowPlaying": "Reproduzindo Agora",
     "TabNavigation": "Navega\u00e7\u00e3o",
     "TabControls": "Controles",
-    "ButtonFullscreen": "Alternar tela cheia",
+    "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Cenas",
     "ButtonSubtitles": "Legendas",
-    "ButtonAudioTracks": "Faixas de \u00e1udio",
-    "ButtonPreviousTrack": "Faixa Anterior",
-    "ButtonNextTrack": "Pr\u00f3xima Faixa",
+    "ButtonAudioTracks": "Audio tracks",
+    "ButtonPreviousTrack": "Faixa anterior",
+    "ButtonNextTrack": "Pr\u00f3xima faixa",
     "ButtonStop": "Parar",
     "ButtonPause": "Pausar",
     "LabelGroupMoviesIntoCollections": "Agrupar filmes nas cole\u00e7\u00f5es",
@@ -874,5 +875,14 @@
     "LabelMatchType": "Tipo de correspond\u00eancia",
     "OptionEquals": "Igual",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Substring"
+    "OptionSubstring": "Substring",
+    "TabView": "Visualizar",
+    "TabSort": "Ordenar",
+    "TabFilter": "Filtro",
+    "ButtonView": "Visualizar",
+    "LabelPageSize": "Tamanho de exibi\u00e7\u00e3o:",
+    "LabelView": "Visualizar:",
+    "TabUsers": "Usu\u00e1rios",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
index c53ecd9d8e..12850f803d 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
@@ -199,6 +199,7 @@
     "OptionFriday": "Sexta",
     "OptionSaturday": "S\u00e1bado",
     "HeaderManagement": "Gest\u00e3o:",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "Id do IMDb em falta",
     "OptionMissingTvdbId": "iD do TheTVDB em falta",
     "OptionMissingOverview": "Descri\u00e7\u00e3o em falta",
@@ -479,10 +480,10 @@
     "HeaderProgram": "Programa",
     "HeaderClients": "Clientes",
     "LabelCompleted": "Terminado",
-    "LabelFailed": "Falhou",
+    "LabelFailed": "Failed",
     "LabelSkipped": "Ignorado",
     "HeaderEpisodeOrganization": "Organiza\u00e7\u00e3o dos Epis\u00f3dios",
-    "LabelSeries": "S\u00e9rie:",
+    "LabelSeries": "Series:",
     "LabelSeasonNumber": "N\u00famero da temporada",
     "LabelEpisodeNumber": "N\u00famero do epis\u00f3dio",
     "LabelEndingEpisodeNumber": "N\u00famero do epis\u00f3dio final",
@@ -629,9 +630,9 @@
     "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Cenas",
     "ButtonSubtitles": "Legendas",
-    "ButtonAudioTracks": "Faixas de \u00e1udio",
-    "ButtonPreviousTrack": "Faixa Anterior",
-    "ButtonNextTrack": "Pr\u00f3xima Faixa",
+    "ButtonAudioTracks": "Audio tracks",
+    "ButtonPreviousTrack": "Previous track",
+    "ButtonNextTrack": "Next track",
     "ButtonStop": "Parar",
     "ButtonPause": "Pausar",
     "LabelGroupMoviesIntoCollections": "Group movies into collections",
@@ -874,5 +875,14 @@
     "LabelMatchType": "Match type:",
     "OptionEquals": "Equals",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Substring"
+    "OptionSubstring": "Substring",
+    "TabView": "View",
+    "TabSort": "Sort",
+    "TabFilter": "Filter",
+    "ButtonView": "View",
+    "LabelPageSize": "Item limit:",
+    "LabelView": "View:",
+    "TabUsers": "Users",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ru.json b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
index 7d9e83cbc7..fcf3756ab0 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ru.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
@@ -19,13 +19,13 @@
     "ThisWizardWillGuideYou": "\u042d\u0442\u043e\u0442 \u043f\u043e\u043c\u043e\u0449\u043d\u0438\u043a \u043f\u043e \u043f\u0435\u0440\u0432\u043e\u043d\u0430\u0447\u0430\u043b\u044c\u043d\u043e\u043c\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044e \u043f\u0440\u043e\u0432\u0435\u0434\u0451\u0442 \u0447\u0435\u0440\u0435\u0437 \u0432\u0441\u0435 \u0444\u0430\u0437\u044b \u043f\u0440\u043e\u0446\u0435\u0441\u0441\u0430. \u0427\u0442\u043e\u0431\u044b \u043d\u0430\u0447\u0430\u0442\u044c, \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0441\u0432\u043e\u0439 \u044f\u0437\u044b\u043a.",
     "TellUsAboutYourself": "\u0420\u0430\u0441\u0441\u043a\u0430\u0436\u0438\u0442\u0435 \u043e \u0441\u0435\u0431\u0435",
     "LabelYourFirstName": "\u0412\u0430\u0448\u0435 \u0438\u043c\u044f:",
-    "MoreUsersCanBeAddedLater": "\u041f\u043e\u0442\u043e\u043c \u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0435\u0449\u0451 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 \u0447\u0435\u0440\u0435\u0437 \u041f\u0430\u043d\u0435\u043b\u044c \u043c\u043e\u043d\u0438\u0442\u043e\u0440\u0438\u043d\u0433\u0430.",
+    "MoreUsersCanBeAddedLater": "\u041f\u043e\u0442\u043e\u043c \u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0435\u0449\u0451 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 \u0447\u0435\u0440\u0435\u0437 \u0418\u043d\u0444\u043e\u043f\u0430\u043d\u0435\u043b\u044c.",
     "UserProfilesIntro": "\u0412 Media Browser \u0432\u0441\u0442\u0440\u043e\u0435\u043d\u0430 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0430 \u043f\u0440\u043e\u0444\u0438\u043b\u0435\u0439 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439, \u0447\u0442\u043e \u043f\u043e\u0437\u0432\u043e\u043b\u044f\u0435\u0442 \u043a\u0430\u0436\u0434\u043e\u043c\u0443 \u0438\u0437 \u043d\u0438\u0445 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u0441\u0432\u043e\u0438\u043c\u0438 \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u044b\u043c\u0438 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430\u043c\u0438 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f, \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u044f\u043c\u0438 \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u0438 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u043c \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435\u043c.",
     "LabelWindowsService": "\u0421\u043b\u0443\u0436\u0431\u0430 Windows",
     "AWindowsServiceHasBeenInstalled": "\u0421\u043b\u0443\u0436\u0431\u0430 Windows \u0431\u044b\u043b\u0430 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0430.",
     "WindowsServiceIntro1": "\u041e\u0431\u044b\u0447\u043d\u043e Media Browser Server \u0438\u0441\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f \u043a\u0430\u043a \u043d\u0430\u0441\u0442\u043e\u043b\u044c\u043d\u043e\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0441\u043e \u0437\u043d\u0430\u0447\u043a\u043e\u043c \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u043e\u043c \u043b\u043e\u0442\u043a\u0435, \u043d\u043e \u043f\u0440\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0435 \u0440\u0430\u0431\u043e\u0442\u044b \u0432 \u0444\u043e\u043d\u043e\u0432\u043e\u043c \u0440\u0435\u0436\u0438\u043c\u0435, \u0432\u043c\u0435\u0441\u0442\u043e \u044d\u0442\u043e\u0433\u043e \u043c\u043e\u0436\u043d\u043e \u0437\u0430\u043f\u0443\u0441\u043a\u0430\u0442\u044c \u0435\u0433\u043e \u0438\u0437 \u043a\u043e\u043d\u0441\u043e\u043b\u0438 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0441\u043b\u0443\u0436\u0431\u0430\u043c\u0438 Windows.",
     "WindowsServiceIntro2": "\u041a\u043e\u0433\u0434\u0430 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0441\u043b\u0443\u0436\u0431\u0430 Windows, \u043f\u0440\u0438\u043c\u0438\u0442\u0435 \u043a \u0441\u0432\u0435\u0434\u0435\u043d\u0438\u044e, \u0447\u0442\u043e \u043e\u043d\u0430 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0440\u0430\u0431\u043e\u0442\u0430\u0442\u044c \u043e\u0434\u043d\u043e\u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e \u0441\u043e \u0437\u043d\u0430\u0447\u043a\u043e\u043c \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u043e\u043c \u043b\u043e\u0442\u043a\u0435, \u043f\u043e\u044d\u0442\u043e\u043c\u0443 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u0437\u0430\u043a\u0440\u044b\u0442\u044c \u0437\u043d\u0430\u0447\u043e\u043a \u0432 \u043b\u043e\u0442\u043a\u0435, \u0447\u0442\u043e\u0431\u044b \u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0441\u043b\u0443\u0436\u0431\u0443. \u0421\u043b\u0443\u0436\u0431\u0443 \u0442\u0430\u043a\u0436\u0435 \u0431\u0443\u0434\u0435\u0442 \u043d\u0443\u0436\u043d\u043e \u0441\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c, \u043e\u0431\u043b\u0430\u0434\u0430\u044f \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u0438\u0432\u043d\u044b\u043c\u0438 \u043f\u0440\u0430\u0432\u0430\u043c\u0438, \u0447\u0435\u0440\u0435\u0437 \u043a\u043e\u043d\u0441\u043e\u043b\u044c \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f. \u041e\u0431\u0440\u0430\u0442\u0438\u0442\u0435 \u0432\u043d\u0438\u043c\u0430\u043d\u0438\u0435, \u0447\u0442\u043e \u0432 \u0434\u0430\u043d\u043d\u043e\u0435 \u0432\u0440\u0435\u043c\u044f \u0441\u043b\u0443\u0436\u0431\u0435 \u043d\u0435 \u0443\u0434\u0430\u0451\u0442\u0441\u044f \u0441\u0430\u043c\u043e\u043e\u0431\u043d\u043e\u0432\u043b\u044f\u0442\u044c\u0441\u044f, \u0442\u0430\u043a \u0447\u0442\u043e \u0434\u043b\u044f \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438 \u043d\u043e\u0432\u044b\u0445 \u0432\u0435\u0440\u0441\u0438\u0439 \u043f\u043e\u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0432\u0430\u0448\u0435 \u0432\u043c\u0435\u0448\u0430\u0442\u0435\u043b\u044c\u0441\u0442\u0432\u043e.",
-    "WizardCompleted": "\u042d\u0442\u043e \u0432\u0441\u0451, \u0447\u0442\u043e \u043d\u0443\u0436\u043d\u043e \u043d\u0430 \u0434\u0430\u043d\u043d\u044b\u0439 \u043c\u043e\u043c\u0435\u043d\u0442. Media Browser \u043d\u0430\u0447\u0438\u043d\u0430\u0435\u0442 \u0441\u0431\u043e\u0440 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438 \u043e \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0435. \u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 \u043d\u0435\u043a\u043e\u0442\u043e\u0440\u044b\u043c\u0438 \u0438\u0437 \u043d\u0430\u0448\u0438\u0445 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439, \u0438 \u0442\u043e\u0433\u0434\u0430 \u0449\u0451\u043b\u043a\u043d\u0438\u0442\u0435 \u043a\u043d\u043e\u043f\u043a\u0443 <b>\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c<\/b>, \u0447\u0442\u043e\u0431\u044b \u043f\u0435\u0440\u0435\u0439\u0442\u0438 \u0432 <b>\u041f\u0430\u043d\u0435\u043b\u044c \u043c\u043e\u043d\u0438\u0442\u043e\u0440\u0438\u043d\u0433\u0430<\/b>.",
+    "WizardCompleted": "\u042d\u0442\u043e \u0432\u0441\u0451, \u0447\u0442\u043e \u043d\u0443\u0436\u043d\u043e \u043d\u0430 \u0434\u0430\u043d\u043d\u044b\u0439 \u043c\u043e\u043c\u0435\u043d\u0442. Media Browser \u043d\u0430\u0447\u0438\u043d\u0430\u0435\u0442 \u0441\u0431\u043e\u0440 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438 \u043e \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0435. \u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 \u043d\u0435\u043a\u043e\u0442\u043e\u0440\u044b\u043c\u0438 \u0438\u0437 \u043d\u0430\u0448\u0438\u0445 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439, \u0438 \u0442\u043e\u0433\u0434\u0430 \u0449\u0451\u043b\u043a\u043d\u0438\u0442\u0435 \u043a\u043d\u043e\u043f\u043a\u0443 <b>\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c<\/b>, \u0447\u0442\u043e\u0431\u044b \u043f\u0435\u0440\u0435\u0439\u0442\u0438 \u0432 <b>\u0418\u043d\u0444\u043e\u043f\u0430\u043d\u0435\u043b\u044c<\/b>.",
     "LabelConfigureSettings": "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432",
     "LabelEnableVideoImageExtraction": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0438\u0437\u0432\u043b\u0435\u0447\u0435\u043d\u0438\u0435 \u0440\u0438\u0441\u0443\u043d\u043a\u0430 \u0438\u0437 \u0432\u0438\u0434\u0435\u043e",
     "VideoImageExtractionHelp": "\u0414\u043b\u044f \u0432\u0438\u0434\u0435\u043e, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u0435\u0449\u0451 \u200b\u200b\u043d\u0435 \u0438\u043c\u0435\u044e\u0442 \u043e\u0431\u043b\u043e\u0436\u043a\u0438, \u0438 \u0434\u043b\u044f \u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u043d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043d\u0430\u0439\u0442\u0438 \u0432 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u0435 \u0442\u0430\u043a\u043e\u0432\u044b\u0445. \u041f\u0440\u0438 \u044d\u0442\u043e\u043c \u043f\u0435\u0440\u0432\u043e\u043d\u0430\u0447\u0430\u043b\u044c\u043d\u043e\u0435 \u0441\u043a\u0430\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438 \u043f\u0440\u043e\u0434\u043b\u0438\u0442\u0441\u044f \u0435\u0449\u0451 \u043d\u0430 \u043d\u0435\u043a\u043e\u0442\u043e\u0440\u043e\u0435 \u0432\u0440\u0435\u043c\u044f, \u043d\u043e \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u043c \u0441\u0442\u0430\u043d\u0435\u0442 \u0431\u043e\u043b\u0435\u0435 \u043f\u0440\u0438\u044f\u0442\u043d\u043e\u0435 \u0434\u043b\u044f \u0433\u043b\u0430\u0437 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0434\u0430\u043d\u043d\u044b\u0445.",
@@ -199,6 +199,7 @@
     "OptionFriday": "\u043f\u044f\u0442\u043d\u0438\u0446\u0430",
     "OptionSaturday": "\u0441\u0443\u0431\u0431\u043e\u0442\u0430",
     "HeaderManagement": "\u0414\u043b\u044f \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445:",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "\u041f\u0440\u043e\u043f\u0443\u0449\u0435\u043d IMDb Id",
     "OptionMissingTvdbId": "\u041f\u0440\u043e\u043f\u0443\u0449\u0435\u043d TheTVDB Id",
     "OptionMissingOverview": "\u041f\u0440\u043e\u043f\u0443\u0449\u0435\u043d\u043e \u043e\u0431\u043e\u0437\u0440\u0435\u043d\u0438\u0435",
@@ -437,9 +438,9 @@
     "HeaderSystemDlnaProfiles": "\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0435 \u043f\u0440\u043e\u0444\u0438\u043b\u0438",
     "CustomDlnaProfilesHelp": "\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u044b\u0439 \u043f\u0440\u043e\u0444\u0438\u043b\u044c \u0434\u043b\u044f \u043d\u043e\u0432\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0438\u043b\u0438 \u043f\u0435\u0440\u0435\u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0439 \u043f\u0440\u043e\u0444\u0438\u043b\u044c.",
     "SystemDlnaProfilesHelp": "\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0435 \u043f\u0440\u043e\u0444\u0438\u043b\u0438 \u0442\u043e\u043b\u044c\u043a\u043e \u0434\u043b\u044f \u0447\u0442\u0435\u043d\u0438\u044f. \u0418\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u043e\u043c \u043f\u0440\u043e\u0444\u0438\u043b\u0435 \u0431\u0443\u0434\u0443\u0442 \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u044b \u0432 \u043d\u043e\u0432\u043e\u043c \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u043e\u043c \u043f\u0440\u043e\u0444\u0438\u043b\u0435.",
-    "TitleDashboard": "\u041f\u0430\u043d\u0435\u043b\u044c \u043c\u043e\u043d\u0438\u0442\u043e\u0440\u0438\u043d\u0433\u0430",
+    "TitleDashboard": "\u0418\u043d\u0444\u043e\u043f\u0430\u043d\u0435\u043b\u044c",
     "TabHome": "\u0413\u043b\u0430\u0432\u043d\u0430\u044f",
-    "TabInfo": "\u0418\u043d\u0444\u043e",
+    "TabInfo": "\u0421\u0432\u0435\u0434\u0435\u043d\u0438\u044f",
     "HeaderLinks": "\u0421\u0441\u044b\u043b\u043a\u0438",
     "HeaderSystemPaths": "\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0435 \u043f\u0443\u0442\u0438",
     "LinkCommunity": "\u0421\u043e\u043e\u0431\u0449\u0435\u0441\u0442\u0432\u043e",
@@ -479,7 +480,7 @@
     "HeaderProgram": "\u041f\u0435\u0440\u0435\u0434\u0430\u0447\u0430",
     "HeaderClients": "\u041a\u043b\u0438\u0435\u043d\u0442\u044b",
     "LabelCompleted": "\u0412\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u043e",
-    "LabelFailed": "\u041d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u043e",
+    "LabelFailed": "\u041d\u0435\u0443\u0434\u0430\u0447\u0430",
     "LabelSkipped": "\u041e\u0442\u043b\u043e\u0436\u0435\u043d\u043e",
     "HeaderEpisodeOrganization": "\u0420\u0435\u043e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u044f \u044d\u043f\u0438\u0437\u043e\u0434\u0430",
     "LabelSeries": "\u0421\u0435\u0440\u0438\u0430\u043b:",
@@ -589,7 +590,7 @@
     "NotificationOptionInstallationFailed": "\u0421\u0431\u043e\u0439 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438",
     "NotificationOptionNewLibraryContent": "\u041d\u043e\u0432\u043e\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e",
     "NotificationOptionNewLibraryContentMultiple": "\u041d\u043e\u0432\u043e\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e (\u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e)",
-    "SendNotificationHelp": "\u041f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f \u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u044e\u0442\u0441\u044f \u0432 \u044f\u0449\u0438\u043a \u0432\u0445\u043e\u0434\u044f\u0449\u0438\u0445 \u043f\u0430\u043d\u0435\u043b\u0438 \u043c\u043e\u043d\u0438\u0442\u043e\u0440\u0438\u043d\u0433\u0430. \u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0438\u0442\u0435 \u043a\u0430\u0442\u0430\u043b\u043e\u0433 \u043f\u043b\u0430\u0433\u0438\u043d\u043e\u0432, \u0447\u0442\u043e\u0431\u044b \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u0441\u0440\u0435\u0434\u0441\u0442\u0432\u0430 \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0439.",
+    "SendNotificationHelp": "\u041f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f \u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u044e\u0442\u0441\u044f \u0432 \u044f\u0449\u0438\u043a \u0432\u0445\u043e\u0434\u044f\u0449\u0438\u0445 \u0418\u043d\u0444\u043e\u043f\u0430\u043d\u0435\u043b\u0438. \u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0438\u0442\u0435 \u043a\u0430\u0442\u0430\u043b\u043e\u0433 \u043f\u043b\u0430\u0433\u0438\u043d\u043e\u0432, \u0447\u0442\u043e\u0431\u044b \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u0441\u0440\u0435\u0434\u0441\u0442\u0432\u0430 \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0439.",
     "NotificationOptionServerRestartRequired": "\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u043f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0430",
     "LabelNotificationEnabled": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0434\u0430\u043d\u043d\u043e\u0435 \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435",
     "LabelMonitorUsers": "\u041e\u0442\u0441\u043b\u0435\u0436\u0438\u0432\u0430\u043d\u0438\u0435 \u0434\u0435\u044f\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u0438 \u043e\u0442:",
@@ -626,10 +627,10 @@
     "TabNowPlaying": "\u041f\u0440\u043e\u0438\u0433\u0440\u044b\u0432\u0430\u0435\u0442\u0441\u044f",
     "TabNavigation": "\u041d\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044f",
     "TabControls": "\u042d\u043b\u0435\u043c\u0435\u043d\u0442\u044b \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f",
-    "ButtonFullscreen": "\u041f\u043e\u043b\u043d\u044b\u0439 \u044d\u043a\u0440\u0430\u043d",
+    "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "\u0421\u0446\u0435\u043d\u044b",
     "ButtonSubtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044b",
-    "ButtonAudioTracks": "\u0410\u0443\u0434\u0438\u043e\u0434\u043e\u0440\u043e\u0436\u043a\u0438",
+    "ButtonAudioTracks": "Audio tracks",
     "ButtonPreviousTrack": "\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0430\u044f \u0434\u043e\u0440\u043e\u0436\u043a\u0430",
     "ButtonNextTrack": "\u0421\u043b\u0435\u0434\u0443\u044e\u0449\u0430\u044f \u0434\u043e\u0440\u043e\u0436\u043a\u0430",
     "ButtonStop": "\u041e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c",
@@ -673,7 +674,7 @@
     "TabContainers": "\u041a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440\u044b",
     "TabCodecs": "\u041a\u043e\u0434\u0435\u043a\u0438",
     "TabResponses": "\u041e\u0442\u043a\u043b\u0438\u043a\u0438",
-    "HeaderProfileInformation": "\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e \u043f\u0440\u043e\u0444\u0438\u043b\u0435",
+    "HeaderProfileInformation": "\u0421\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043e \u043f\u0440\u043e\u0444\u0438\u043b\u0435",
     "LabelEmbedAlbumArtDidl": "\u0412\u043d\u0435\u0434\u0440\u044f\u0442\u044c \u0438\u043b\u043b\u044e\u0441\u0442\u0440\u0430\u0446\u0438\u044e \u0430\u043b\u044c\u0431\u043e\u043c\u0430 \u0432 DIDL",
     "LabelEmbedAlbumArtDidlHelp": "\u0414\u043b\u044f \u043d\u0435\u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432 \u044d\u0442\u043e\u0442 \u043c\u0435\u0442\u043e\u0434 \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0438\u043b\u043b\u044e\u0441\u0442\u0440\u0430\u0446\u0438\u0439 \u0430\u043b\u044c\u0431\u043e\u043c\u043e\u0432 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u043f\u0440\u0435\u0434\u043f\u043e\u0447\u0442\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u043c. \u0414\u043b\u044f \u0434\u0440\u0443\u0433\u0438\u0445 \u0436\u0435, \u043f\u0440\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438 \u044d\u0442\u043e\u0433\u043e \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430, \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u0435 \u043c\u043e\u0436\u0435\u0442 \u043d\u0435 \u0443\u0434\u0430\u0441\u0442\u0441\u044f.",
     "LabelAlbumArtPN": "PN \u0438\u043b\u043b\u044e\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u0430\u043b\u044c\u0431\u043e\u043c\u0430",
@@ -847,7 +848,7 @@
     "LabelAutomaticallyDonate": "\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438 \u0434\u0430\u0440\u0438\u0442\u044c \u0434\u0430\u043d\u043d\u0443\u044e \u0441\u0443\u043c\u043c\u0443 \u043a\u0430\u0436\u0434\u044b\u0435 \u0448\u0435\u0441\u0442\u044c \u043c\u0435\u0441\u044f\u0446\u0435\u0432",
     "LabelAutomaticallyDonateHelp": "\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0432 \u043b\u044e\u0431\u043e\u0435 \u0432\u0440\u0435\u043c\u044f \u043f\u0440\u0435\u043a\u0440\u0430\u0442\u0438\u0442\u044c \u044d\u0442\u043e \u0447\u0435\u0440\u0435\u0437 \u0441\u0432\u043e\u044e \u0443\u0447\u0435\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c PayPal.",
     "OptionList": "\u0421\u043f\u0438\u0441\u043e\u043a",
-    "TabDashboard": "\u041f\u0430\u043d\u0435\u043b\u044c \u043c\u043e\u043d\u0438\u0442\u043e\u0440\u0438\u043d\u0433\u0430",
+    "TabDashboard": "\u0418\u043d\u0444\u043e\u043f\u0430\u043d\u0435\u043b\u044c",
     "TitleServer": "\u0421\u0435\u0440\u0432\u0435\u0440",
     "LabelCache": "Cache:",
     "LabelLogs": "Logs:",
@@ -867,12 +868,21 @@
     "HeaderNewApiKey": "\u041d\u043e\u0432\u044b\u0439 \u043a\u043b\u044e\u0447 API",
     "LabelAppName": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f",
     "LabelAppNameExample": "\u041f\u0440\u0438\u043c\u0435\u0440: Sickbeard, NzbDrone",
-    "HeaderNewApiKeyHelp": "\u041f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044e \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f \u043d\u0430 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043a Media Browser.",
+    "HeaderNewApiKeyHelp": "\u041f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u0435 \u0434\u043b\u044f \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f, \u0447\u0442\u043e\u0431\u044b \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a Media Browser.",
     "HeaderHttpHeaders": "HTTP-\u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0438",
     "HeaderIdentificationHeader": "\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u043e\u043d\u043d\u044b\u0439 \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
     "LabelValue": "\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u0435:",
     "LabelMatchType": "\u0421\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0439 \u0442\u0438\u043f:",
     "OptionEquals": "\u0420\u0430\u0432\u043d\u044f\u0435\u0442\u0441\u044f",
     "OptionRegex": "\u0420\u0435\u0433\u0443\u043b\u044f\u0440\u043d\u043e\u0435 \u0432\u044b\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
-    "OptionSubstring": "\u041f\u043e\u0434\u0441\u0442\u0440\u043e\u043a\u0430"
+    "OptionSubstring": "\u041f\u043e\u0434\u0441\u0442\u0440\u043e\u043a\u0430",
+    "TabView": "\u0412\u0438\u0434",
+    "TabSort": "\u0421\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u043a\u0430",
+    "TabFilter": "\u0424\u0438\u043b\u044c\u0442\u0440",
+    "ButtonView": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c",
+    "LabelPageSize": "\u0420\u0430\u0437\u043c\u0435\u0440 \u044d\u043a\u0440\u0430\u043d\u0430:",
+    "LabelView": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440:",
+    "TabUsers": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 741bc52ca0..4a23b0c073 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -1,893 +1,904 @@
 {
     "LabelExit": "Exit",
-	"LabelVisitCommunity": "Visit Community",
-	"LabelGithubWiki": "Github Wiki",
-	"LabelSwagger": "Swagger",
-	"LabelStandard": "Standard",
-	"LabelViewApiDocumentation": "View Api Documentation",
-	"LabelBrowseLibrary": "Browse Library",
-	"LabelConfigureMediaBrowser": "Configure Media Browser",
-	"LabelOpenLibraryViewer": "Open Library Viewer",
-	"LabelRestartServer": "Restart Server",
-	"LabelShowLogWindow": "Show Log Window",
-	"LabelPrevious": "Previous",
-	"LabelFinish": "Finish",
-	"LabelNext": "Next",
-	"LabelYoureDone": "You're Done!",
-	"WelcomeToMediaBrowser": "Welcome to Media Browser!",
-	"TitleMediaBrowser": "Media Browser",
-	"ThisWizardWillGuideYou": "This wizard will help guide you through the setup process. To begin, please select your preferred language.",
-	"TellUsAboutYourself": "Tell us about yourself",
-	"LabelYourFirstName": "Your first name:",
-	"MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
-	"UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
-	"LabelWindowsService": "Windows Service",
-	"AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
-	"WindowsServiceIntro1": "Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.",
-	"WindowsServiceIntro2": "If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.",
-	"WizardCompleted": "That's all we need for now. Media Browser has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish</b> to view the <b>Dashboard</b>.",
-	"LabelConfigureSettings": "Configure settings",
-	"LabelEnableVideoImageExtraction": "Enable video image extraction",
-	"VideoImageExtractionHelp": "For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.",
-	"LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
-	"LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
-	"LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
-	"LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
-	"ButtonOk": "Ok",
-	"ButtonCancel": "Cancel",
-	"ButtonNew": "New",
-	"HeaderSetupLibrary": "Setup your media library",
-	"ButtonAddMediaFolder": "Add media folder",
-	"LabelFolderType": "Folder type:",
-	"MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
-	"ReferToMediaLibraryWiki": "Refer to the media library wiki.",
-	"LabelCountry": "Country:",
-	"LabelLanguage": "Language:",
-	"HeaderPreferredMetadataLanguage": "Preferred metadata language:",
-	"LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
-	"LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
-	"LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
-	"LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations.",
-	"TabPreferences": "Preferences",
-	"TabPassword": "Password",
-	"TabLibraryAccess": "Library Access",
-	"TabImage": "Image",
-	"TabProfile": "Profile",
-	"TabMetadata": "Metadata",
-	"TabImages": "Images",
-	"TabNotifications": "Notifications",
-	"TabCollectionTitles": "Titles",
-	"LabelDisplayMissingEpisodesWithinSeasons": "Display missing episodes within seasons",
-	"LabelUnairedMissingEpisodesWithinSeasons": "Display unaired episodes within seasons",
-	"HeaderVideoPlaybackSettings": "Video Playback Settings",
-	"HeaderPlaybackSettings": "Playback Settings",
-	"LabelAudioLanguagePreference": "Audio language preference:",
-	"LabelSubtitleLanguagePreference": "Subtitle language preference:",
-	"OptionDefaultSubtitles": "Default",
-	"OptionOnlyForcedSubtitles": "Only forced subtitles",
-	"OptionAlwaysPlaySubtitles": "Always play subtitles",
-	"OptionNoSubtitles": "None",
-	"OptionDefaultSubtitlesHelp": "Subtitles matching the language preference will be loaded when the audio is in a foreign language.",
-	"OptionOnlyForcedSubtitlesHelp": "Only subtitles marked as forced will be loaded.",
-	"OptionAlwaysPlaySubtitlesHelp": "Subtitles matching the language preference will be loaded regardless of the audio language.",
-	"OptionNoSubtitlesHelp": "Subtitles will not be loaded by default.",
-	"TabProfiles": "Profiles",
-	"TabSecurity": "Security",
-	"ButtonAddUser": "Add User",
-	"ButtonSave": "Save",
-	"ButtonResetPassword": "Reset Password",
-	"LabelNewPassword": "New password:",
-	"LabelNewPasswordConfirm": "New password confirm:",
-	"HeaderCreatePassword": "Create Password",
-	"LabelCurrentPassword": "Current password:",
-	"LabelMaxParentalRating": "Maximum allowed parental rating:",
-	"MaxParentalRatingHelp": "Content with a higher rating will be hidden from this user.",
-	"LibraryAccessHelp": "Select the media folders to share with this user. Administrators will be able to edit all folders using the metadata manager.",
-	"ChannelAccessHelp": "Select the channels to share with this user. Administrators will be able to edit all channels using the metadata manager.",
-	"ButtonDeleteImage": "Delete Image",
-	"LabelSelectUsers": "Select users:",
-	"ButtonUpload": "Upload",
-	"HeaderUploadNewImage": "Upload New Image",
-	"LabelDropImageHere": "Drop Image Here",
-	"ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG/PNG only.",
-	"MessageNothingHere": "Nothing here.",
-	"MessagePleaseEnsureInternetMetadata": "Please ensure downloading of internet metadata is enabled.",
-	"TabSuggested": "Suggested",
-	"TabLatest": "Latest",
-	"TabUpcoming": "Upcoming",
-	"TabShows": "Shows",
-	"TabEpisodes": "Episodes",
-	"TabGenres": "Genres",
-	"TabPeople": "People",
-	"TabNetworks": "Networks",
-	"HeaderUsers": "Users",
-	"HeaderFilters": "Filters:",
-	"ButtonFilter": "Filter",
-	"OptionFavorite": "Favorites",
-	"OptionLikes": "Likes",
-	"OptionDislikes": "Dislikes",
-	"OptionActors": "Actors",
-	"OptionGuestStars": "Guest Stars",
-	"OptionDirectors": "Directors",
-	"OptionWriters": "Writers",
-	"OptionProducers": "Producers",
-	"HeaderResume": "Resume",
-	"HeaderNextUp": "Next Up",
-	"NoNextUpItemsMessage": "None found. Start watching your shows!",
-	"HeaderLatestEpisodes": "Latest Episodes",
-	"HeaderPersonTypes": "Person Types:",
-	"TabSongs": "Songs",
-	"TabAlbums": "Albums",
-	"TabArtists": "Artists",
-	"TabAlbumArtists": "Album Artists",
-	"TabMusicVideos": "Music Videos",
-	"ButtonSort": "Sort",
-	"HeaderSortBy": "Sort By:",
-	"HeaderSortOrder": "Sort Order:",
-	"OptionPlayed": "Played",
-	"OptionUnplayed": "Unplayed",
-	"OptionAscending": "Ascending",
-	"OptionDescending": "Descending",
-	"OptionRuntime": "Runtime",
-	"OptionReleaseDate": "Release Date",
-	"OptionPlayCount": "Play Count",
-	"OptionDatePlayed": "Date Played",
-	"OptionDateAdded": "Date Added",
-	"OptionAlbumArtist": "Album Artist",
-	"OptionArtist": "Artist",
-	"OptionAlbum": "Album",
-	"OptionTrackName": "Track Name",
-	"OptionCommunityRating": "Community Rating",
-	"OptionNameSort": "Name",
-	"OptionFolderSort": "Folders",
-	"OptionBudget": "Budget",
-	"OptionRevenue": "Revenue",
-	"OptionPoster": "Poster",
-	"OptionBackdrop": "Backdrop",
-	"OptionTimeline": "Timeline",
-	"OptionThumb": "Thumb",
-	"OptionBanner": "Banner",
-	"OptionCriticRating": "Critic Rating",
-	"OptionVideoBitrate": "Video Bitrate",
-	"OptionResumable": "Resumable",
-	"ScheduledTasksHelp": "Click a task to adjust its schedule.",
-	"ScheduledTasksTitle": "Scheduled Tasks",
-	"TabMyPlugins": "My Plugins",
-	"TabCatalog": "Catalog",
-	"PluginsTitle": "Plugins",
-	"HeaderAutomaticUpdates": "Automatic Updates",
-	"HeaderNowPlaying": "Now Playing",
-	"HeaderLatestAlbums": "Latest Albums",
-	"HeaderLatestSongs": "Latest Songs",
-	"HeaderRecentlyPlayed": "Recently Played",
-	"HeaderFrequentlyPlayed": "Frequently Played",
-	"DevBuildWarning": "Dev builds are the bleeding edge. Released often, these build have not been tested. The application may crash and entire features may not work at all.",
-	"LabelVideoType": "Video Type:",
-	"OptionBluray": "Bluray",
-	"OptionDvd": "Dvd",
-	"OptionIso": "Iso",
-	"Option3D": "3D",
-	"LabelFeatures": "Features:",
-	"LabelService": "Service:",
-	"LabelStatus": "Status:",
-	"LabelVersion": "Version:",
-	"LabelLastResult": "Last result:",
-	"OptionHasSubtitles": "Subtitles",
-	"OptionHasTrailer": "Trailer",
-	"OptionHasThemeSong": "Theme Song",
-	"OptionHasThemeVideo": "Theme Video",
-	"TabMovies": "Movies",
-	"TabStudios": "Studios",
-	"TabTrailers": "Trailers",
-	"HeaderLatestMovies": "Latest Movies",
-	"HeaderLatestTrailers": "Latest Trailers",
-	"OptionHasSpecialFeatures": "Special Features",
-	"OptionImdbRating": "IMDb Rating",
-	"OptionParentalRating": "Parental Rating",
-	"OptionPremiereDate": "Premiere Date",
-	"TabBasic": "Basic",
-	"TabAdvanced": "Advanced",
-	"HeaderStatus": "Status",
-	"OptionContinuing": "Continuing",
-	"OptionEnded": "Ended",
-	"HeaderAirDays": "Air Days:",
-	"OptionSunday": "Sunday",
-	"OptionMonday": "Monday",
-	"OptionTuesday": "Tuesday",
-	"OptionWednesday": "Wednesday",
-	"OptionThursday": "Thursday",
-	"OptionFriday": "Friday",
-	"OptionSaturday": "Saturday",
-	"HeaderManagement": "Management:",
-	"OptionMissingImdbId": "Missing IMDb Id",
-	"OptionMissingTvdbId": "Missing TheTVDB Id",
-	"OptionMissingOverview": "Missing Overview",
-	"OptionFileMetadataYearMismatch": "File/Metadata Years Mismatched",
-	"TabGeneral": "General",
-	"TitleSupport": "Support",
-	"TabLog": "Log",
-	"TabAbout": "About",
-	"TabSupporterKey": "Supporter Key",
-	"TabBecomeSupporter": "Become a Supporter",
-	"MediaBrowserHasCommunity": "Media Browser has a thriving community of users and contributors.",
-	"CheckoutKnowledgeBase": "Check out our knowledge base to help you get the most out of Media Browser.",
-	"SearchKnowledgeBase": "Search the Knowledge Base",
-	"VisitTheCommunity": "Visit the Community",
-	"VisitMediaBrowserWebsite": "Visit the Media Browser Web Site",
-	"VisitMediaBrowserWebsiteLong": "Visit the Media Browser Web site to catch the latest news and keep up with the developer blog.",
-	"OptionHideUser": "Hide this user from login screens",
-	"OptionDisableUser": "Disable this user",
-	"OptionDisableUserHelp": "If disabled the server will not allow any connections from this user. Existing connections will be abruptly terminated.",
-	"HeaderAdvancedControl": "Advanced Control",
-	"LabelName": "Name:",
-	"OptionAllowUserToManageServer": "Allow this user to manage the server",
-	"HeaderFeatureAccess": "Feature Access",
-	"OptionAllowMediaPlayback": "Allow media playback",
-	"OptionAllowBrowsingLiveTv": "Allow browsing of live tv",
-	"OptionAllowDeleteLibraryContent": "Allow this user to delete library content",
-	"OptionAllowManageLiveTv": "Allow management of live tv recordings",
-	"OptionAllowRemoteControlOthers": "Allow this user to remote control other users",
-	"OptionMissingTmdbId": "Missing Tmdb Id",
-	"OptionIsHD": "HD",
-	"OptionIsSD": "SD",
-	"OptionMetascore": "Metascore",
-	"ButtonSelect": "Select",
-	"ButtonSearch": "Search",
-	"ButtonGroupVersions": "Group Versions",
-	"ButtonAddToCollection": "Add to Collection",
-	"PismoMessage": "Utilizing Pismo File Mount through a donated license.",
-	"TangibleSoftwareMessage": "Utilizing Tangible Solutions Java/C# converters through a donated license.",
-	"HeaderCredits": "Credits",
-	"PleaseSupportOtherProduces": "Please support other free products we utilize:",
-	"VersionNumber": "Version {0}",
-	"TabPaths": "Paths",
-	"TabServer": "Server",
-	"TabTranscoding": "Transcoding",
-	"TitleAdvanced": "Advanced",
-	"LabelAutomaticUpdateLevel": "Automatic update level",
-	"OptionRelease": "Official Release",
-	"OptionBeta": "Beta",
-	"OptionDev": "Dev (Unstable)",
-	"LabelAllowServerAutoRestart": "Allow the server to restart automatically to apply updates",
-	"LabelAllowServerAutoRestartHelp": "The server will only restart during idle periods, when no users are active.",
-	"LabelEnableDebugLogging": "Enable debug logging",
-	"LabelRunServerAtStartup": "Run server at startup",
-	"LabelRunServerAtStartupHelp": "This will start the tray icon on windows startup. To start the windows service, uncheck this and run the service from the windows control panel. Please note that you cannot run both at the same time, so you will need to exit the tray icon before starting the service.",
-	"ButtonSelectDirectory": "Select Directory",
-	"LabelCustomPaths": "Specify custom paths where desired. Leave fields empty to use the defaults.",
-	"LabelCachePath": "Cache path:",
-	"LabelCachePathHelp": "This folder contains server cache files, such as images.",
-	"LabelImagesByNamePath": "Images by name path:",
-	"LabelImagesByNamePathHelp": "This folder contains downloaded actor, artist, genre and studio images.",
-	"LabelMetadataPath": "Metadata path:",
-	"LabelMetadataPathHelp": "This location contains downloaded artwork and metadata that is not configured to be stored in media folders.",
-	"LabelTranscodingTempPath": "Transcoding temporary path:",
-	"LabelTranscodingTempPathHelp": "This folder contains working files used by the transcoder. Specify a custom path, or leave empty to use the default within the server's data folder.",
-	"TabBasics": "Basics",
-	"TabTV": "TV",
-	"TabGames": "Games",
-	"TabMusic": "Music",
-	"TabOthers": "Others",
-	"HeaderExtractChapterImagesFor": "Extract chapter images for:",
-	"OptionMovies": "Movies",
-	"OptionEpisodes": "Episodes",
-	"OptionOtherVideos": "Other Videos",
-	"TitleMetadata": "Metadata",
-	"LabelAutomaticUpdatesFanart": "Enable automatic updates from FanArt.tv",
-	"LabelAutomaticUpdatesTmdb": "Enable automatic updates from TheMovieDB.org",
-	"LabelAutomaticUpdatesTvdb": "Enable automatic updates from TheTVDB.com",
-	"LabelAutomaticUpdatesFanartHelp": "If enabled, new images will be downloaded automatically as they're added to fanart.tv. Existing images will not be replaced.",
-	"LabelAutomaticUpdatesTmdbHelp": "If enabled, new images will be downloaded automatically as they're added to TheMovieDB.org. Existing images will not be replaced.",
-	"LabelAutomaticUpdatesTvdbHelp": "If enabled, new images will be downloaded automatically as they're added to TheTVDB.com. Existing images will not be replaced.",
-	"ExtractChapterImagesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs when videos are discovered, and also as a nightly scheduled task at 4am. The schedule is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
-	"LabelMetadataDownloadLanguage": "Preferred download language:",
-	"ButtonAutoScroll": "Auto-scroll",
-	"LabelImageSavingConvention": "Image saving convention:",
-	"LabelImageSavingConventionHelp": "Media Browser recognizes images from most major media applications. Choosing your downloading convention is useful if you also use other products.",
-	"OptionImageSavingCompatible": "Compatible - Media Browser/Xbmc/Plex",
-	"OptionImageSavingStandard": "Standard - MB2",
-	"ButtonSignIn": "Sign In",
-	"TitleSignIn": "Sign In",
-	"HeaderPleaseSignIn": "Please sign in",
-	"LabelUser": "User:",
-	"LabelPassword": "Password:",
-	"ButtonManualLogin": "Manual Login",
-	"PasswordLocalhostMessage": "Passwords are not required when logging in from localhost.",
-	"TabGuide": "Guide",
-	"TabChannels": "Channels",
-	"TabCollections": "Collections",
-	"HeaderChannels": "Channels",
-	"TabRecordings": "Recordings",
-	"TabScheduled": "Scheduled",
-	"TabSeries": "Series",
-	"TabFavorites": "Favorites",
-	"TabMyLibrary": "My Library",
-	"ButtonCancelRecording": "Cancel Recording",
-	"HeaderPrePostPadding": "Pre/Post Padding",
-	"LabelPrePaddingMinutes": "Pre-padding minutes:",
-	"OptionPrePaddingRequired": "Pre-padding is required in order to record.",
-	"LabelPostPaddingMinutes": "Post-padding minutes:",
-	"OptionPostPaddingRequired": "Post-padding is required in order to record.",
-	"HeaderWhatsOnTV": "What's On",
-	"HeaderUpcomingTV": "Upcoming TV",
-	"TabStatus": "Status",
-	"TabSettings": "Settings",
-	"ButtonRefreshGuideData": "Refresh Guide Data",
-	"OptionPriority": "Priority",
-	"OptionRecordOnAllChannels": "Record program on all channels",
-	"OptionRecordAnytime": "Record program at any time",
-	"OptionRecordOnlyNewEpisodes": "Record only new episodes",
-	"HeaderDays": "Days",
-	"HeaderActiveRecordings": "Active Recordings",
-	"HeaderLatestRecordings": "Latest Recordings",
-	"HeaderAllRecordings": "All Recordings",
-	"ButtonPlay": "Play",
-	"ButtonEdit": "Edit",
-	"ButtonRecord": "Record",
-	"ButtonDelete": "Delete",
-	"ButtonRemove": "Remove",
-	"OptionRecordSeries": "Record Series",
-	"HeaderDetails": "Details",
-	"ButtonCancelRecording": "Cancel Recording",
-	"TitleLiveTV": "Live TV",
-	"LabelNumberOfGuideDays": "Number of days of guide data to download:",
-	"LabelNumberOfGuideDaysHelp": "Downloading more days worth of guide data provides the ability to schedule out further in advance and view more listings, but it will also take longer to download. Auto will choose based on the number of channels.",
-	"LabelActiveService": "Active Service:",
-	"LabelActiveServiceHelp": "Multiple tv plugins can be installed but only one can be active at a time.",
-	"OptionAutomatic": "Auto",
-	"LiveTvPluginRequired": "A Live TV service provider plugin is required in order to continue.",
-	"LiveTvPluginRequiredHelp": "Please install one of our available plugins, such as Next Pvr or ServerWmc.",
-	"LabelCustomizeOptionsPerMediaType": "Customize for media type:",
-	"OptionDownloadThumbImage": "Thumb",
-	"OptionDownloadMenuImage": "Menu",
-	"OptionDownloadLogoImage": "Logo",
-	"OptionDownloadBoxImage": "Box",
-	"OptionDownloadDiscImage": "Disc",
-	"OptionDownloadBannerImage": "Banner",
-	"OptionDownloadBackImage": "Back",
-	"OptionDownloadArtImage": "Art",
-	"OptionDownloadPrimaryImage": "Primary",
-	"HeaderFetchImages": "Fetch Images:",
-	"HeaderImageSettings": "Image Settings",
-	"TabOther": "Other",
-	"LabelMaxBackdropsPerItem": "Maximum number of backdrops per item:",
-	"LabelMaxScreenshotsPerItem": "Maximum number of screenshots per item:",
-	"LabelMinBackdropDownloadWidth": "Minimum backdrop download width:",
-	"LabelMinScreenshotDownloadWidth": "Minimum screenshot download width:",
-	"ButtonAddScheduledTaskTrigger": "Add Task Trigger",
-	"HeaderAddScheduledTaskTrigger": "Add Task Trigger",
-	"ButtonAdd": "Add",
-	"LabelTriggerType": "Trigger Type:",
-	"OptionDaily": "Daily",
-	"OptionWeekly": "Weekly",
-	"OptionOnInterval": "On an interval",
-	"OptionOnAppStartup": "On application startup",
-	"OptionAfterSystemEvent": "After a system event",
-	"LabelDay": "Day:",
-	"LabelTime": "Time:",
-	"LabelEvent": "Event:",
-	"OptionWakeFromSleep": "Wake from sleep",
-	"LabelEveryXMinutes": "Every:",
-	"HeaderTvTuners": "Tuners",
-	"HeaderGallery": "Gallery",
-	"HeaderLatestGames": "Latest Games",
-	"HeaderRecentlyPlayedGames": "Recently Played Games",
-	"TabGameSystems": "Game Systems",
-	"TitleMediaLibrary": "Media Library",
-	"TabFolders": "Folders",
-	"TabPathSubstitution": "Path Substitution",
-	"LabelSeasonZeroDisplayName": "Season 0 display name:",
-	"LabelEnableRealtimeMonitor": "Enable real time monitoring",
-	"LabelEnableRealtimeMonitorHelp": "Changes will be processed immediately, on supported file systems.",
-	"ButtonScanLibrary": "Scan Library",
-	"HeaderNumberOfPlayers": "Players:",
-	"OptionAnyNumberOfPlayers": "Any",
-	"Option1Player": "1+",
-	"Option2Player": "2+",
-	"Option3Player": "3+",
-	"Option4Player": "4+",
-	"HeaderMediaFolders": "Media Folders",
-	"HeaderThemeVideos": "Theme Videos",
-	"HeaderThemeSongs": "Theme Songs",
-	"HeaderScenes": "Scenes",
-	"HeaderAwardsAndReviews": "Awards and Reviews",
-	"HeaderSoundtracks": "Soundtracks",
-	"HeaderMusicVideos": "Music Videos",
-	"HeaderSpecialFeatures": "Special Features",
-	"HeaderCastCrew": "Cast & Crew",
-	"HeaderAdditionalParts": "Additional Parts",
-	"ButtonSplitVersionsApart": "Split Versions Apart",
-	"ButtonPlayTrailer": "Trailer",
-	"LabelMissing": "Missing",
-	"LabelOffline": "Offline",
-	"PathSubstitutionHelp": "Path substitutions are used for mapping a path on the server to a path that clients are able to access. By allowing clients direct access to media on the server they may be able to play them directly over the network and avoid using server resources to stream and transcode them.",
-	"HeaderFrom": "From",
-	"HeaderTo": "To",
-	"LabelFrom": "From:",
-	"LabelFromHelp": "Example: D:\\Movies (on the server)",
-	"LabelTo": "To:",
-	"LabelToHelp": "Example: \\\\MyServer\\Movies (a path clients can access)",
-	"ButtonAddPathSubstitution": "Add Substitution",
-	"OptionSpecialEpisode": "Specials",
-	"OptionMissingEpisode": "Missing Episodes",
-	"OptionUnairedEpisode": "Unaired Episodes",
-	"OptionEpisodeSortName": "Episode Sort Name",
-	"OptionSeriesSortName": "Series Name",
-	"OptionTvdbRating": "Tvdb Rating",
-	"HeaderTranscodingQualityPreference": "Transcoding Quality Preference:",
-	"OptionAutomaticTranscodingHelp": "The server will decide quality and speed",
-	"OptionHighSpeedTranscodingHelp": "Lower quality, but faster encoding",
-	"OptionHighQualityTranscodingHelp": "Higher quality, but slower encoding",
-	"OptionMaxQualityTranscodingHelp": "Best quality with slower encoding and high CPU usage",
-	"OptionHighSpeedTranscoding": "Higher speed",
-	"OptionHighQualityTranscoding": "Higher quality",
-	"OptionMaxQualityTranscoding": "Max quality",
-	"OptionEnableDebugTranscodingLogging": "Enable debug transcoding logging",
-	"OptionEnableDebugTranscodingLoggingHelp": "This will create very large log files and is only recommended as needed for troubleshooting purposes.",
-	"OptionEnableDebugTranscodingLogging": "Enable debug transcoding logging",
-	"OptionUpscaling": "Allow clients to request upscaled video",
-	"OptionUpscalingHelp": "In some cases this will result in improved video quality but will increase CPU usage.",
-	"EditCollectionItemsHelp": "Add or remove any movies, series, albums, books or games you wish to group within this collection.",
-	"HeaderAddTitles": "Add Titles",
-	"LabelEnableDlnaPlayTo": "Enable DLNA Play To",
-	"LabelEnableDlnaPlayToHelp": "Media Browser can detect devices within your network and offer the ability to remote control them.",
-	"LabelEnableDlnaDebugLogging": "Enable DLNA debug logging",
-	"LabelEnableDlnaDebugLoggingHelp": "This will create large log files and should only be used as needed for troubleshooting purposes.",
-	"LabelEnableDlnaClientDiscoveryInterval": "Client discovery interval (seconds)",
-	"LabelEnableDlnaClientDiscoveryIntervalHelp": "Determines the duration in seconds between SSDP searches performed by Media Browser.",
-	"HeaderCustomDlnaProfiles": "Custom Profiles",
-	"HeaderSystemDlnaProfiles": "System Profiles",
-	"CustomDlnaProfilesHelp": "Create a custom profile to target a new device or override a system profile.",
-	"SystemDlnaProfilesHelp": "System profiles are read-only. Changes to a system profile will be saved to a new custom profile.",
-	"TitleDashboard": "Dashboard",
-	"TabHome": "Home",
-	"TabInfo": "Info",
-	"HeaderLinks": "Links",
-	"HeaderSystemPaths": "System Paths",
-	"LinkCommunity": "Community",
-	"LinkGithub": "Github",
-	"LinkApiDocumentation": "Api Documentation",
-	"LabelFriendlyServerName": "Friendly server name:",
-	"LabelFriendlyServerNameHelp": "This name will be used to identify this server. If left blank, the computer name will be used.",
-	"LabelPreferredDisplayLanguage": "Preferred display language",
-	"LabelPreferredDisplayLanguageHelp": "Translating Media Browser is an ongoing project and is not yet complete.",
-	"LabelReadHowYouCanContribute": "Read about how you can contribute.",
-	"HeaderNewCollection": "New Collection",
-	"HeaderAddToCollection": "Add to Collection",
-	"ButtonSubmit": "Submit",
-	"NewCollectionNameExample": "Example: Star Wars Collection",
-	"OptionSearchForInternetMetadata": "Search the internet for artwork and metadata",
-	"ButtonCreate": "Create",
-	"LabelHttpServerPortNumber": "Http server port number:",
-	"LabelWebSocketPortNumber": "Web socket port number:",
-	"LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
-	"LabelEnableAutomaticPortHelp": "UPnP allows automated router configuration for remote access. This may not work with some router models.",
-	"LabelExternalDDNS": "External DDNS:",
-	"LabelExternalDDNSHelp": "If you have a dynamic DNS enter it here. Media Browser apps will use it when connecting remotely.",
-	"TabResume": "Resume",
-	"TabWeather": "Weather",
-	"TitleAppSettings": "App Settings",
-	"LabelMinResumePercentage": "Min resume percentage:",
-	"LabelMaxResumePercentage": "Max resume percentage:",
-	"LabelMinResumeDuration": "Min resume duration (seconds):",
-	"LabelMinResumePercentageHelp": "Titles are assumed unplayed if stopped before this time",
-	"LabelMaxResumePercentageHelp": "Titles are assumed fully played if stopped after this time",
-	"LabelMinResumeDurationHelp": "Titles shorter than this will not be resumable",
-	"TitleAutoOrganize": "Auto-Organize",
-	"TabActivityLog": "Activity Log",
-	"HeaderName": "Name",
-	"HeaderDate": "Date",
-	"HeaderSource": "Source",
-	"HeaderStatus": "Status",
-	"HeaderDestination": "Destination",
-	"HeaderProgram": "Program",
-	"HeaderClients": "Clients",
-	"LabelCompleted": "Completed",
-	"LabelFailed": "Failed",
-	"LabelSkipped": "Skipped",
-	"HeaderEpisodeOrganization": "Episode Organization",
-	"LabelSeries": "Series:",
-	"LabelSeasonNumber": "Season number:",
-	"LabelEpisodeNumber": "Episode number:",
-	"LabelEndingEpisodeNumber": "Ending episode number:",
-	"LabelEndingEpisodeNumberHelp": "Only required for multi-episode files",
-	"HeaderSupportTheTeam": "Support the Media Browser Team",
-	"LabelSupportAmount": "Amount (USD)",
-	"HeaderSupportTheTeamHelp": "Help ensure the continued development of this project by donating. A portion of all donations will be contributed to other free tools we depend on.",
-	"ButtonEnterSupporterKey": "Enter supporter key",
-	"DonationNextStep": "Once complete, please return and enter your supporter key, which you will receive by email.",
-	"AutoOrganizeHelp": "Auto-organize monitors your download folders for new files and moves them to your media directories.",
-	"AutoOrganizeTvHelp": "TV file organizing will only add episodes to existing series. It will not create new series folders.",
-	"OptionEnableEpisodeOrganization": "Enable new episode organization",
-	"LabelWatchFolder": "Watch folder:",
-	"LabelWatchFolderHelp": "The server will poll this folder during the 'Organize new media files' scheduled task.",
-	"ButtonViewScheduledTasks": "View scheduled tasks",
-	"LabelMinFileSizeForOrganize": "Minimum file size (MB):",
-	"LabelMinFileSizeForOrganizeHelp": "Files under this size will be ignored.",
-	"LabelSeasonFolderPattern": "Season folder pattern:",
-	"LabelSeasonZeroFolderName": "Season zero folder name:",
-	"HeaderEpisodeFilePattern": "Episode file pattern",
-	"LabelEpisodePattern": "Episode pattern:",
-	"LabelMultiEpisodePattern": "Multi-Episode pattern:",
-	"HeaderSupportedPatterns": "Supported Patterns",
-	"HeaderTerm": "Term",
-	"HeaderPattern": "Pattern",
-	"HeaderResult": "Result",
-	"LabelDeleteEmptyFolders": "Delete empty folders after organizing",
-	"LabelDeleteEmptyFoldersHelp": "Enable this to keep the download directory clean.",
-	"LabelDeleteLeftOverFiles": "Delete left over files with the following extensions:",
-	"LabelDeleteLeftOverFilesHelp": "Separate with ;. For example: .nfo;.txt",
-	"OptionOverwriteExistingEpisodes": "Overwrite existing episodes",
-	"LabelTransferMethod": "Transfer method",
-	"OptionCopy": "Copy",
-	"OptionMove": "Move",
-	"LabelTransferMethodHelp": "Copy or move files from the watch folder",
-	"HeaderLatestNews": "Latest News",
-	"HeaderHelpImproveMediaBrowser": "Help Improve Media Browser",
-	"HeaderRunningTasks": "Running Tasks",
-	"HeaderActiveDevices": "Active Devices",
-	"HeaderPendingInstallations": "Pending Installations",
-	"HeaerServerInformation": "Server Information",
-	"ButtonRestartNow": "Restart Now",
-	"ButtonRestart": "Restart",
-	"ButtonShutdown": "Shutdown",
-	"ButtonUpdateNow": "Update Now",
-	"PleaseUpdateManually": "Please shutdown the server and update manually.",
-	"NewServerVersionAvailable": "A new version of Media Browser Server is available!",
-	"ServerUpToDate": "Media Browser Server is up to date",
-	"ErrorConnectingToMediaBrowserRepository": "There was an error connecting to the remote Media Browser repository.",
-	"LabelComponentsUpdated": "The following components have been installed or updated:",
-	"MessagePleaseRestartServerToFinishUpdating": "Please restart the server to finish applying updates.",
-	"LabelDownMixAudioScale": "Audio boost when downmixing:",
-	"LabelDownMixAudioScaleHelp": "Boost audio when downmixing. Set to 1 to preserve original volume value.",
-	"ButtonLinkKeys": "Link Keys",
-	"LabelOldSupporterKey": "Old supporter key",
-	"LabelNewSupporterKey": "New supporter key",
-	"HeaderMultipleKeyLinking": "Multiple Key Linking",
-	"MultipleKeyLinkingHelp": "If you have more than one supporter key, use this form to link the old key's registrations with your new one.",
-	"LabelCurrentEmailAddress": "Current email address",
-	"LabelCurrentEmailAddressHelp": "The current email address to which your new key was sent.",
-	"HeaderForgotKey": "Forgot Key",
-	"LabelEmailAddress": "Email address",
-	"LabelSupporterEmailAddress": "The email address that was used to purchase the key.",
-	"ButtonRetrieveKey": "Retrieve Key",
-	"LabelSupporterKey": "Supporter Key (paste from email)",
-	"LabelSupporterKeyHelp": "Enter your supporter key to start enjoying additional benefits the community has developed for Media Browser.",
-	"MessageInvalidKey": "Supporter key is missing or invalid.",
-	"ErrorMessageInvalidKey": "In order for any premium content to be registered, you must also be a Media Browser Supporter. Please donate and support the continued development of the core product. Thank you.",
-	"HeaderDisplaySettings": "Display Settings",
-	"TabPlayTo": "Play To",
-	"LabelEnableDlnaServer": "Enable Dlna server",
-	"LabelEnableDlnaServerHelp": "Allows UPnP devices on your network to browse and play Media Browser content.",
-	"LabelEnableBlastAliveMessages": "Blast alive messages",
-	"LabelEnableBlastAliveMessagesHelp": "Enable this if the server is not detected reliably by other UPnP devices on your network.",
-	"LabelBlastMessageInterval": "Alive message interval (seconds)",
-	"LabelBlastMessageIntervalHelp": "Determines the duration in seconds between server alive messages.",
-	"LabelDefaultUser": "Default user:",
-	"LabelDefaultUserHelp": "Determines which user library should be displayed on connected devices. This can be overridden for each device using profiles.",
-	"TitleDlna": "DLNA",
-	"TitleChannels": "Channels",
-	"HeaderServerSettings": "Server Settings",
-	"LabelWeatherDisplayLocation": "Weather display location:",
-	"LabelWeatherDisplayLocationHelp": "US zip code / City, State, Country / City, Country",
-	"LabelWeatherDisplayUnit": "Weather display unit:",
-	"OptionCelsius": "Celsius",
-	"OptionFahrenheit": "Fahrenheit",
-	"HeaderRequireManualLogin": "Require manual username entry for:",
-	"HeaderRequireManualLoginHelp": "When disabled clients may present a login screen with a visual selection of users.",
-	"OptionOtherApps": "Other apps",
-	"OptionMobileApps": "Mobile apps",
-	"HeaderNotificationList": "Click on a notification to configure it's sending options.",
-	"NotificationOptionApplicationUpdateAvailable": "Application update available",
-	"NotificationOptionApplicationUpdateInstalled": "Application update installed",
-	"NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-	"NotificationOptionPluginInstalled": "Plugin installed",
-	"NotificationOptionPluginUninstalled": "Plugin uninstalled",
-	"NotificationOptionVideoPlayback": "Video playback started",
-	"NotificationOptionAudioPlayback": "Audio playback started",
-	"NotificationOptionGamePlayback": "Game playback started",
-	"NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-	"NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-	"NotificationOptionGamePlaybackStopped": "Game playback stopped",
-	"NotificationOptionTaskFailed": "Scheduled task failure",
-	"NotificationOptionInstallationFailed": "Installation failure",
-	"NotificationOptionNewLibraryContent": "New content added",
-	"NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
-	"SendNotificationHelp": "By default, notifications are delivered to the dashboard inbox. Browse the plugin catalog to install additional notification options.",
-	"NotificationOptionServerRestartRequired": "Server restart required",
-	"LabelNotificationEnabled": "Enable this notification",
-	"LabelMonitorUsers": "Monitor activity from:",
-	"LabelSendNotificationToUsers": "Send the notification to:",
-	"UsersNotNotifiedAboutSelfActivity": "Users will not be notified about their own activities.",
-	"LabelUseNotificationServices": "Use the following services:",
-	"CategoryUser": "User",
-	"CategorySystem": "System",
-	"CategoryApplication": "Application",
-	"CategoryPlugin": "Plugin",
-	"LabelMessageTitle": "Message title:",
-	"LabelAvailableTokens": "Available tokens:",
-	"AdditionalNotificationServices": "Browse the plugin catalog to install additional notification services.",
-	"OptionAllUsers": "All users",
-	"OptionAdminUsers": "Administrators",
-	"OptionCustomUsers": "Custom",
-	"ButtonArrowUp": "Up",
-	"ButtonArrowDown": "Down",
-	"ButtonArrowLeft": "Left",
-	"ButtonArrowRight": "Right",
-	"ButtonBack": "Back",
-	"ButtonInfo": "Info",
-	"ButtonOsd": "On screen display",
-	"ButtonPageUp": "Page Up",
-	"ButtonPageDown": "Page Down",
-	"PageAbbreviation": "PG",
-	"ButtonHome": "Home",
-	"ButtonSearch": "Search",
-	"ButtonSettings": "Settings",
-	"ButtonTakeScreenshot": "Capture Screenshot",
-	"ButtonLetterUp": "Letter Up",
-	"ButtonLetterDown": "Letter Down",
-	"PageButtonAbbreviation": "PG",
-	"LetterButtonAbbreviation": "A",
-	"TabNowPlaying": "Now Playing",
-	"TabNavigation": "Navigation",
-	"TabControls": "Controls",
-	"ButtonFullscreen": "Toggle fullscreen",
-	"ButtonScenes": "Scenes",
-	"ButtonSubtitles": "Subtitles",
-	"ButtonAudioTracks": "Audio tracks",
-	"ButtonPreviousTrack": "Previous track",
-	"ButtonNextTrack": "Next track",
-	"ButtonStop": "Stop",
-	"ButtonPlay": "Play",
-	"ButtonPause": "Pause",
-	"LabelGroupMoviesIntoCollections": "Group movies into collections",
-	"LabelGroupMoviesIntoCollectionsHelp": "When displaying movie lists, movies belonging to a collection will be displayed as one grouped item.",
-	"NotificationOptionPluginError": "Plugin failure",
-	"ButtonVolumeUp": "Volume up",
-	"ButtonVolumeDown": "Volume down",
-	"ButtonMute": "Mute",
-	"HeaderLatestMedia": "Latest Media",
-	"OptionNoSubtitles": "No Subtitles",
-	"OptionSpecialFeatures": "Special Features",
-	"HeaderCollections": "Collections",
-	"HeaderChannels": "Channels",
-	"LabelProfileCodecsHelp": "Separated by comma. This can be left empty to apply to all codecs.",
-	"LabelProfileContainersHelp": "Separated by comma. This can be left empty to apply to all containers.",
-	"HeaderResponseProfile": "Response Profile",
-	"LabelType": "Type:",
-	"LabelProfileContainer": "Container:",
-	"LabelProfileVideoCodecs": "Video codecs:",
-	"LabelProfileAudioCodecs": "Audio codecs:",
-	"LabelProfileCodecs": "Codecs:",
-	"HeaderDirectPlayProfile": "Direct Play Profile",
-	"HeaderTranscodingProfile": "Transcoding Profile",
-	"HeaderCodecProfile": "Codec Profile",
-	"HeaderCodecProfileHelp": "Define additional conditions that must be met in order for a codec to be direct played.",
-	"HeaderContainerProfile": "Container Profile",
-	"HeaderContainerProfileHelp": "Define additional conditions that must be met in order for a file to be direct played.",
-	"OptionProfileVideo": "Video",
-	"OptionProfileAudio": "Audio",
-	"OptionProfileVideoAudio": "Video Audio",
-	"OptionProfilePhoto": "Photo",
-	"LabelUserLibrary": "User library:",
-	"LabelUserLibraryHelp": "Select which user library to display to the device. Leave empty to inherit the default setting.",
-	"OptionPlainStorageFolders": "Display all folders as plain storage folders",
-	"OptionPlainStorageFoldersHelp": "If enabled, all folders are represented in DIDL as \"object.container.storageFolder\" instead of a more specific type, such as \"object.container.person.musicArtist\".",
-	"OptionPlainVideoItems": "Display all videos as plain video items",
-	"OptionPlainVideoItemsHelp": "If enabled, all videos are represented in DIDL as \"object.item.videoItem\" instead of a more specific type, such as \"object.item.videoItem.movie\".",
-	"LabelSupportedMediaTypes": "Supported Media Types:",
-	"TabIdentification": "Identification",
-	"TabDirectPlay": "Direct Play",
-	"TabContainers": "Containers",
-	"TabCodecs": "Codecs",
-	"TabResponses": "Responses",
-	"HeaderProfileInformation": "Profile Information",
-	"LabelEmbedAlbumArtDidl": "Embed album art in Didl",
-	"LabelEmbedAlbumArtDidlHelp": "Some devices prefer this method for obtaining album art. Others may fail to play with this option enabled.",
-	"LabelAlbumArtPN": "Album art PN:",
-	"LabelAlbumArtHelp": "PN used for album art, within the dlna:profileID attribute on upnp:albumArtURI. Some clients require a specific value, regardless of the size of the image.",
-	"LabelAlbumArtMaxWidth": "Album art max width:",
-	"LabelAlbumArtMaxWidthHelp": "Max resolution of album art exposed via upnp:albumArtURI.",
-	"LabelAlbumArtMaxHeight": "Album art max height:",
-	"LabelAlbumArtMaxHeightHelp": "Max resolution of album art exposed via upnp:albumArtURI.",
-	"LabelIconMaxWidth": "Icon max width:",
-	"LabelIconMaxWidthHelp": "Max resolution of icons exposed via upnp:icon.",
-	"LabelIconMaxHeight": "Icon max height:",
-	"LabelIconMaxHeightHelp": "Max resolution of icons exposed via upnp:icon.",
-	"LabelIdentificationFieldHelp": "A case-insensitive substring or regex expression.",
-	"HeaderProfileServerSettingsHelp": "These values control how Media Browser will present itself to the device.",
-	"LabelMaxBitrate": "Max bitrate:",
-	"LabelMaxBitrateHelp": "Specify a max bitrate in bandwidth constrained environments, or if the device imposes it's own limit.",
-	"OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
-	"OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
-	"LabelFriendlyName": "Friendly name",
-	"LabelManufacturer": "Manufacturer",
-	"LabelManufacturerUrl": "Manufacturer url",
-	"LabelModelName": "Model name",
-	"LabelModelNumber": "Model number",
-	"LabelModelDescription": "Model description",
-	"LabelModelUrl": "Model url",
-	"LabelSerialNumber": "Serial number",
-	"LabelDeviceDescription": "Device description",
-	"HeaderIdentificationCriteriaHelp": "Enter at least one identification criteria.",
-	"HeaderDirectPlayProfileHelp": "Add direct play profiles to indicate which formats the device can handle natively.",
-	"HeaderTranscodingProfileHelp": "Add transcoding profiles to indicate which formats should be used when transcoding is required.",
-	"HeaderContainerProfileHelp": "Container profiles indicate the limitations of a device when playing specific formats. If a limitation applies then the media will be transcoded, even if the format is configured for direct play.",
-	"HeaderCodecProfileHelp": "Codec profiles indicate the limitations of a device when playing specific codecs. If a limitation applies then the media will be transcoded, even if the codec is configured for direct play.",
-	"HeaderResponseProfileHelp": "Response profiles provide a way to customize information sent to the device when playing certain kinds of media.",
-	"LabelXDlnaCap": "X-Dlna cap:",
-	"LabelXDlnaCapHelp": "Determines the content of the X_DLNACAP element in the urn:schemas-dlna-org:device-1-0 namespace.",
-	"LabelXDlnaDoc": "X-Dlna doc:",
-	"LabelXDlnaDocHelp": "Determines the content of the X_DLNADOC element in the urn:schemas-dlna-org:device-1-0 namespace.",
-	"LabelSonyAggregationFlags": "Sony aggregation flags:",
-	"LabelSonyAggregationFlagsHelp": "Determines the content of the aggregationFlags element in the urn:schemas-sonycom:av namespace.",
-	"LabelTranscodingContainer": "Container:",
-	"LabelTranscodingVideoCodec": "Video codec:",
-	"LabelTranscodingVideoProfile": "Video profile:",
-	"LabelTranscodingAudioCodec": "Audio codec:",
-	"OptionEnableM2tsMode": "Enable M2ts mode",
-	"OptionEnableM2tsModeHelp": "Enable m2ts mode when encoding to mpegts.",
-	"OptionEstimateContentLength": "Estimate content length when transcoding",
-	"OptionReportByteRangeSeekingWhenTranscoding": "Report that the server supports byte seeking when transcoding",
-	"OptionReportByteRangeSeekingWhenTranscodingHelp": "This is required for some devices that don't time seek very well.",
-	"HeaderSubtitleDownloadingHelp": "When Media Browser scans your video files it can search for missing subtitles, and download them using a subtitle provider such as OpenSubtitles.org.",
-	"HeaderDownloadSubtitlesFor": "Download subtitles for:",
-	"MessageNoChapterProviders": "Install a chapter provider plugin such as ChapterDb to enable additional chapter options.",
-	"LabelSkipIfGraphicalSubsPresent": "Skip if the video already contains graphical subtitles",
-	"LabelSkipIfGraphicalSubsPresentHelp": "Keeping text versions of subtitles will result in more efficient delivery to mobile clients.",
-	"TabSubtitles": "Subtitles",
-	"TabChapters": "Chapters",
-	"HeaderDownloadChaptersFor": "Download chapter names for:",
-	"LabelOpenSubtitlesUsername": "Open Subtitles username:",
-	"LabelOpenSubtitlesPassword": "Open Subtitles password:",
-	"HeaderChapterDownloadingHelp": "When Media Browser scans your video files it can download friendly chapter names from the internet using chapter plugins such as ChapterDb.",
-	"LabelPlayDefaultAudioTrack": "Play default audio track regardless of language",
-	"LabelSubtitlePlaybackMode": "Subtitle mode:",
-	"LabelDownloadLanguages": "Download languages:",
-	"ButtonRegister": "Register",
-	"LabelSkipIfAudioTrackPresent": "Skip if the default audio track matches the download language",
-	"LabelSkipIfAudioTrackPresentHelp": "Uncheck this to ensure all videos have subtitles, regardless of audio language.",
-	"HeaderSendMessage": "Send Message",
-	"ButtonSend": "Send",
-	"LabelMessageText": "Message text:",
-	"LabelMessageTitle": "Message title:",
-	"MessageNoAvailablePlugins": "No available plugins.",
-	"LabelDisplayPluginsFor": "Display plugins for:",
-	"PluginTabMediaBrowserClassic": "MB Classic",
-	"PluginTabMediaBrowserTheater": "MB Theater",
-	"LabelEpisodeName": "Episode name",
-	"LabelSeriesName": "Series name",
-	"ValueSeriesNamePeriod": "Series.name",
-	"ValueSeriesNameUnderscore": "Series_name",
-	"ValueEpisodeNamePeriod": "Episode.name",
-	"ValueEpisodeNameUnderscore": "Episode_name",
-	"LabelSeasonNumber": "Season number",
-	"LabelEpisodeNumber": "Episode number",
-	"LabelEndingEpisodeNumber": "Ending episode number",
-	"HeaderTypeText": "Enter Text",
-	"LabelTypeText": "Text",
-	"HeaderSearchForSubtitles": "Search for Subtitles",
-	"MessageNoSubtitleSearchResultsFound": "No search results founds.",
-	"TabDisplay": "Display",
-	"TabLanguages": "Languages",
-	"TabWebClient": "Web Client",
-	"LabelEnableThemeSongs": "Enable theme songs",
-	"LabelEnableBackdrops": "Enable backdrops",
-	"LabelEnableThemeSongsHelp": "If enabled, theme songs will be played in the background while browsing the library.",
-	"LabelEnableBackdropsHelp": "If enabled, backdrops will be displayed in the background of some pages while browsing the library.",
-	"HeaderHomePage": "Home Page",
-	"HeaderSettingsForThisDevice": "Settings for This Device",
-	"OptionAuto": "Auto",
-	"OptionYes": "Yes",
-	"OptionNo": "No",
-	"LabelHomePageSection1": "Home page section one:",
-	"LabelHomePageSection2": "Home page section two:",
-	"LabelHomePageSection3": "Home page section three:",
-	"LabelHomePageSection4": "Home page section four:",
-	"OptionMyViewsButtons": "My views (buttons)",
-	"OptionMyViews": "My views",
-	"OptionMyViewsSmall": "My views (small)",
-	"OptionResumablemedia": "Resume",
-	"OptionLatestMedia": "Latest media",
-	"OptionLatestChannelMedia": "Latest channel items",
-	"HeaderLatestChannelItems": "Latest Channel Items",
-	"OptionNone": "None",
-	"HeaderLiveTv": "Live TV",
-	"HeaderReports": "Reports",
-	"HeaderMetadataManager": "Metadata Manager",
-	"HeaderPreferences": "Preferences",
-	"MessageLoadingChannels": "Loading channel content...",
-	"ButtonMarkRead": "Mark Read",
-	"OptionDefaultSort": "Default",
-	"OptionCommunityMostWatchedSort": "Most Watched",
-	"TabNextUp": "Next Up",
-	"MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
-	"MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the New button to start creating Collections.",
-	"HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",
-	"ButtonDismiss": "Dismiss",
-	"MessageLearnHowToCustomize": "Learn how to customize this page to your own personal tastes. Click your user icon in the top right corner of the screen to view and update your preferences.",
-	"ButtonEditOtherUserPreferences": "Edit this user's personal preferences.",
-	"LabelChannelStreamQuality": "Preferred internet stream quality:",
-	"LabelChannelStreamQualityHelp": "In a low bandwidth environment, limiting quality can help ensure a smooth streaming experience.",
-	"OptionBestAvailableStreamQuality": "Best available",
-	"LabelEnableChannelContentDownloadingFor": "Enable channel content downloading for:",
-	"LabelEnableChannelContentDownloadingForHelp": "Some channels support downloading content prior to viewing. Enable this in low bandwidth enviornments to download channel content during off hours. Content is downloaded as part of the channel download scheduled task.",
-	"LabelChannelDownloadPath": "Channel content download path:",
-	"LabelChannelDownloadPathHelp": "Specify a custom download path if desired. Leave empty to download to an internal program data folder.",
-	"LabelChannelDownloadAge": "Delete content after: (days)",
-	"LabelChannelDownloadAgeHelp": "Downloaded content older than this will be deleted. It will remain playable via internet streaming.",
-	"ChannelSettingsFormHelp": "Install channels such as Trailers and Vimeo in the plugin catalog.",
-	"LabelSelectCollection": "Select collection:",
-	"ViewTypeMovies": "Movies",
-	"ViewTypeTvShows": "TV",
-	"ViewTypeGames": "Games",
-	"ViewTypeMusic": "Music",
-	"ViewTypeBoxSets": "Collections",
-	"ViewTypeChannels": "Channels",
-	"ViewTypeLiveTV": "Live TV",
-	"HeaderOtherDisplaySettings": "Display Settings",
-	"HeaderMyViews": "My Views",
-	"LabelSelectFolderGroups": "Automatically group content from the following folders into views such as Movies, Music and TV:",
-	"LabelSelectFolderGroupsHelp": "Folders that are unchecked will be displayed by themselves in their own view.",
-	"OptionDisplayAdultContent": "Display adult content",
-	"OptionLibraryFolders": "Media folders",
-	"TitleRemoteControl": "Remote Control",
-	"OptionLatestTvRecordings": "Latest recordings",
-	"LabelProtocolInfo": "Protocol info:",
-	"LabelProtocolInfoHelp": "The value that will be used when responding to GetProtocolInfo requests from the device.",
-	"TabXbmcMetadata": "Xbmc",
-	"HeaderXbmcMetadataHelp": "Media Browser includes native support for Xbmc Nfo metadata and images. To enable or disable Xbmc metadata, use the Advanced tab to configure options for your media types.",
-	"LabelXbmcMetadataUser": "Add user watch data to nfo's for:",
-	"LabelXbmcMetadataUserHelp": "Enable this to keep watch data in sync between Media Browser and Xbmc.",
-	"LabelXbmcMetadataDateFormat": "Release date format:",
-	"LabelXbmcMetadataDateFormatHelp": "All dates within nfo's will be read and written to using this format.",
-	"LabelXbmcMetadataSaveImagePaths": "Save image paths within nfo files",
-	"LabelXbmcMetadataSaveImagePathsHelp": "This is recommended if you have image file names that don't conform to Xbmc guidelines.",
-	"LabelXbmcMetadataEnablePathSubstitution": "Enable path substitution",
-	"LabelXbmcMetadataEnablePathSubstitutionHelp": "Enables path substitution of image paths using the server's path substitution settings.",
-	"LabelXbmcMetadataEnablePathSubstitutionHelp2": "See path substitution.",
-	"LabelGroupChannelsIntoViews": "Display the following channels directly within my views:",
-	"LabelGroupChannelsIntoViewsHelp": "If enabled, these channels will be displayed directly alongside other views. If disabled, they'll be displayed within a separate Channels view.",
-	"LabelDisplayCollectionsView": "Display a collections view to show movie collections",
-	"LabelXbmcMetadataEnableExtraThumbs": "Copy extrafanart into extrathumbs",
-	"LabelXbmcMetadataEnableExtraThumbsHelp": "When downloading images they can be saved into both extrafanart and extrathumbs for maximum Xbmc skin compatibility.",
-	"TabServices": "Services",
-	"TabLogs": "Logs",
-	"HeaderServerLogFiles": "Server log files:",
-	"TabBranding": "Branding",
-	"HeaderBrandingHelp": "Customize the appearance of Media Browser to fit the needs of your group or organization.",
-	"LabelLoginDisclaimer": "Login disclaimer:",
-	"LabelLoginDisclaimerHelp": "This will be displayed at the bottom of the login page.",
-	"LabelAutomaticallyDonate": "Automatically donate this amount every six months",
-	"LabelAutomaticallyDonateHelp": "You can cancel at any time via your PayPal account.",
-	"OptionList": "List",
-	"TabDashboard": "Dashboard",
-	"TitleServer": "Server",
-	"LabelCache": "Cache:",
-	"LabelLogs": "Logs:",
-	"LabelMetadata": "Metadata:",
-	"LabelImagesByName": "Images by name:",
-	"LabelTranscodingTemporaryFiles": "Transcoding temporary files:",
-	"HeaderLatestMusic": "Latest Music",
-	"HeaderBranding": "Branding",
-	"HeaderApiKeys": "Api Keys",
-	"HeaderApiKeysHelp": "External applications are required to have an Api key in order to communicate with Media Browser. Keys are issued by logging in with a Media Browser account, or by manually granting the application a key.",
-	"HeaderApiKey": "Api Key",
-	"HeaderApp": "App",
-	"HeaderDevice": "Device",
-	"HeaderUser": "User",
-	"HeaderDateIssued": "Date Issued",
-	"LabelChapterName": "Chapter {0}",
-	"HeaderNewApiKey": "New Api Key",
-	"LabelAppName": "App name",
-	"LabelAppNameExample": "Example: Sickbeard, NzbDrone",
-	"HeaderNewApiKeyHelp": "Grant an application permission to communicate with Media Browser.",
-    "ButtonEnterSupporterKey":  "Enter supporter key",
-    "HeaderHttpHeaders":  "Http Headers",
-    "HeaderIdentificationHeader":  "Identification Header",
-    "LabelValue":  "Value:",
-    "LabelMatchType":  "Match type:",
-    "OptionEquals":  "Equals",
-    "OptionRegex":  "Regex",
-    "OptionSubstring":  "Substring"
-}
\ No newline at end of file
+    "LabelVisitCommunity": "Visit Community",
+    "LabelGithubWiki": "Github Wiki",
+    "LabelSwagger": "Swagger",
+    "LabelStandard": "Standard",
+    "LabelViewApiDocumentation": "View Api Documentation",
+    "LabelBrowseLibrary": "Browse Library",
+    "LabelConfigureMediaBrowser": "Configure Media Browser",
+    "LabelOpenLibraryViewer": "Open Library Viewer",
+    "LabelRestartServer": "Restart Server",
+    "LabelShowLogWindow": "Show Log Window",
+    "LabelPrevious": "Previous",
+    "LabelFinish": "Finish",
+    "LabelNext": "Next",
+    "LabelYoureDone": "You're Done!",
+    "WelcomeToMediaBrowser": "Welcome to Media Browser!",
+    "TitleMediaBrowser": "Media Browser",
+    "ThisWizardWillGuideYou": "This wizard will help guide you through the setup process. To begin, please select your preferred language.",
+    "TellUsAboutYourself": "Tell us about yourself",
+    "LabelYourFirstName": "Your first name:",
+    "MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
+    "UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
+    "LabelWindowsService": "Windows Service",
+    "AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
+    "WindowsServiceIntro1": "Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.",
+    "WindowsServiceIntro2": "If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.",
+    "WizardCompleted": "That's all we need for now. Media Browser has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish</b> to view the <b>Dashboard</b>.",
+    "LabelConfigureSettings": "Configure settings",
+    "LabelEnableVideoImageExtraction": "Enable video image extraction",
+    "VideoImageExtractionHelp": "For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.",
+    "LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
+    "LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+    "LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
+    "LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
+    "ButtonOk": "Ok",
+    "ButtonCancel": "Cancel",
+    "ButtonNew": "New",
+    "HeaderSetupLibrary": "Setup your media library",
+    "ButtonAddMediaFolder": "Add media folder",
+    "LabelFolderType": "Folder type:",
+    "MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
+    "ReferToMediaLibraryWiki": "Refer to the media library wiki.",
+    "LabelCountry": "Country:",
+    "LabelLanguage": "Language:",
+    "HeaderPreferredMetadataLanguage": "Preferred metadata language:",
+    "LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
+    "LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
+    "LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
+    "LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations.",
+    "TabPreferences": "Preferences",
+    "TabPassword": "Password",
+    "TabLibraryAccess": "Library Access",
+    "TabImage": "Image",
+    "TabProfile": "Profile",
+    "TabMetadata": "Metadata",
+    "TabImages": "Images",
+    "TabNotifications": "Notifications",
+    "TabCollectionTitles": "Titles",
+    "LabelDisplayMissingEpisodesWithinSeasons": "Display missing episodes within seasons",
+    "LabelUnairedMissingEpisodesWithinSeasons": "Display unaired episodes within seasons",
+    "HeaderVideoPlaybackSettings": "Video Playback Settings",
+    "HeaderPlaybackSettings": "Playback Settings",
+    "LabelAudioLanguagePreference": "Audio language preference:",
+    "LabelSubtitleLanguagePreference": "Subtitle language preference:",
+    "OptionDefaultSubtitles": "Default",
+    "OptionOnlyForcedSubtitles": "Only forced subtitles",
+    "OptionAlwaysPlaySubtitles": "Always play subtitles",
+    "OptionNoSubtitles": "None",
+    "OptionDefaultSubtitlesHelp": "Subtitles matching the language preference will be loaded when the audio is in a foreign language.",
+    "OptionOnlyForcedSubtitlesHelp": "Only subtitles marked as forced will be loaded.",
+    "OptionAlwaysPlaySubtitlesHelp": "Subtitles matching the language preference will be loaded regardless of the audio language.",
+    "OptionNoSubtitlesHelp": "Subtitles will not be loaded by default.",
+    "TabProfiles": "Profiles",
+    "TabSecurity": "Security",
+    "ButtonAddUser": "Add User",
+    "ButtonSave": "Save",
+    "ButtonResetPassword": "Reset Password",
+    "LabelNewPassword": "New password:",
+    "LabelNewPasswordConfirm": "New password confirm:",
+    "HeaderCreatePassword": "Create Password",
+    "LabelCurrentPassword": "Current password:",
+    "LabelMaxParentalRating": "Maximum allowed parental rating:",
+    "MaxParentalRatingHelp": "Content with a higher rating will be hidden from this user.",
+    "LibraryAccessHelp": "Select the media folders to share with this user. Administrators will be able to edit all folders using the metadata manager.",
+    "ChannelAccessHelp": "Select the channels to share with this user. Administrators will be able to edit all channels using the metadata manager.",
+    "ButtonDeleteImage": "Delete Image",
+    "LabelSelectUsers": "Select users:",
+    "ButtonUpload": "Upload",
+    "HeaderUploadNewImage": "Upload New Image",
+    "LabelDropImageHere": "Drop Image Here",
+    "ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG/PNG only.",
+    "MessageNothingHere": "Nothing here.",
+    "MessagePleaseEnsureInternetMetadata": "Please ensure downloading of internet metadata is enabled.",
+    "TabSuggested": "Suggested",
+    "TabLatest": "Latest",
+    "TabUpcoming": "Upcoming",
+    "TabShows": "Shows",
+    "TabEpisodes": "Episodes",
+    "TabGenres": "Genres",
+    "TabPeople": "People",
+    "TabNetworks": "Networks",
+    "HeaderUsers": "Users",
+    "HeaderFilters": "Filters:",
+    "ButtonFilter": "Filter",
+    "OptionFavorite": "Favorites",
+    "OptionLikes": "Likes",
+    "OptionDislikes": "Dislikes",
+    "OptionActors": "Actors",
+    "OptionGuestStars": "Guest Stars",
+    "OptionDirectors": "Directors",
+    "OptionWriters": "Writers",
+    "OptionProducers": "Producers",
+    "HeaderResume": "Resume",
+    "HeaderNextUp": "Next Up",
+    "NoNextUpItemsMessage": "None found. Start watching your shows!",
+    "HeaderLatestEpisodes": "Latest Episodes",
+    "HeaderPersonTypes": "Person Types:",
+    "TabSongs": "Songs",
+    "TabAlbums": "Albums",
+    "TabArtists": "Artists",
+    "TabAlbumArtists": "Album Artists",
+    "TabMusicVideos": "Music Videos",
+    "ButtonSort": "Sort",
+    "HeaderSortBy": "Sort By:",
+    "HeaderSortOrder": "Sort Order:",
+    "OptionPlayed": "Played",
+    "OptionUnplayed": "Unplayed",
+    "OptionAscending": "Ascending",
+    "OptionDescending": "Descending",
+    "OptionRuntime": "Runtime",
+    "OptionReleaseDate": "Release Date",
+    "OptionPlayCount": "Play Count",
+    "OptionDatePlayed": "Date Played",
+    "OptionDateAdded": "Date Added",
+    "OptionAlbumArtist": "Album Artist",
+    "OptionArtist": "Artist",
+    "OptionAlbum": "Album",
+    "OptionTrackName": "Track Name",
+    "OptionCommunityRating": "Community Rating",
+    "OptionNameSort": "Name",
+    "OptionFolderSort": "Folders",
+    "OptionBudget": "Budget",
+    "OptionRevenue": "Revenue",
+    "OptionPoster": "Poster",
+    "OptionBackdrop": "Backdrop",
+    "OptionTimeline": "Timeline",
+    "OptionThumb": "Thumb",
+    "OptionBanner": "Banner",
+    "OptionCriticRating": "Critic Rating",
+    "OptionVideoBitrate": "Video Bitrate",
+    "OptionResumable": "Resumable",
+    "ScheduledTasksHelp": "Click a task to adjust its schedule.",
+    "ScheduledTasksTitle": "Scheduled Tasks",
+    "TabMyPlugins": "My Plugins",
+    "TabCatalog": "Catalog",
+    "PluginsTitle": "Plugins",
+    "HeaderAutomaticUpdates": "Automatic Updates",
+    "HeaderNowPlaying": "Now Playing",
+    "HeaderLatestAlbums": "Latest Albums",
+    "HeaderLatestSongs": "Latest Songs",
+    "HeaderRecentlyPlayed": "Recently Played",
+    "HeaderFrequentlyPlayed": "Frequently Played",
+    "DevBuildWarning": "Dev builds are the bleeding edge. Released often, these build have not been tested. The application may crash and entire features may not work at all.",
+    "LabelVideoType": "Video Type:",
+    "OptionBluray": "Bluray",
+    "OptionDvd": "Dvd",
+    "OptionIso": "Iso",
+    "Option3D": "3D",
+    "LabelFeatures": "Features:",
+    "LabelService": "Service:",
+    "LabelStatus": "Status:",
+    "LabelVersion": "Version:",
+    "LabelLastResult": "Last result:",
+    "OptionHasSubtitles": "Subtitles",
+    "OptionHasTrailer": "Trailer",
+    "OptionHasThemeSong": "Theme Song",
+    "OptionHasThemeVideo": "Theme Video",
+    "TabMovies": "Movies",
+    "TabStudios": "Studios",
+    "TabTrailers": "Trailers",
+    "HeaderLatestMovies": "Latest Movies",
+    "HeaderLatestTrailers": "Latest Trailers",
+    "OptionHasSpecialFeatures": "Special Features",
+    "OptionImdbRating": "IMDb Rating",
+    "OptionParentalRating": "Parental Rating",
+    "OptionPremiereDate": "Premiere Date",
+    "TabBasic": "Basic",
+    "TabAdvanced": "Advanced",
+    "HeaderStatus": "Status",
+    "OptionContinuing": "Continuing",
+    "OptionEnded": "Ended",
+    "HeaderAirDays": "Air Days",
+    "OptionSunday": "Sunday",
+    "OptionMonday": "Monday",
+    "OptionTuesday": "Tuesday",
+    "OptionWednesday": "Wednesday",
+    "OptionThursday": "Thursday",
+    "OptionFriday": "Friday",
+    "OptionSaturday": "Saturday",
+    "HeaderManagement": "Management",
+    "LabelManagement": "Management:",
+    "OptionMissingImdbId": "Missing IMDb Id",
+    "OptionMissingTvdbId": "Missing TheTVDB Id",
+    "OptionMissingOverview": "Missing Overview",
+    "OptionFileMetadataYearMismatch": "File/Metadata Years Mismatched",
+    "TabGeneral": "General",
+    "TitleSupport": "Support",
+    "TabLog": "Log",
+    "TabAbout": "About",
+    "TabSupporterKey": "Supporter Key",
+    "TabBecomeSupporter": "Become a Supporter",
+    "MediaBrowserHasCommunity": "Media Browser has a thriving community of users and contributors.",
+    "CheckoutKnowledgeBase": "Check out our knowledge base to help you get the most out of Media Browser.",
+    "SearchKnowledgeBase": "Search the Knowledge Base",
+    "VisitTheCommunity": "Visit the Community",
+    "VisitMediaBrowserWebsite": "Visit the Media Browser Web Site",
+    "VisitMediaBrowserWebsiteLong": "Visit the Media Browser Web site to catch the latest news and keep up with the developer blog.",
+    "OptionHideUser": "Hide this user from login screens",
+    "OptionDisableUser": "Disable this user",
+    "OptionDisableUserHelp": "If disabled the server will not allow any connections from this user. Existing connections will be abruptly terminated.",
+    "HeaderAdvancedControl": "Advanced Control",
+    "LabelName": "Name:",
+    "OptionAllowUserToManageServer": "Allow this user to manage the server",
+    "HeaderFeatureAccess": "Feature Access",
+    "OptionAllowMediaPlayback": "Allow media playback",
+    "OptionAllowBrowsingLiveTv": "Allow browsing of live tv",
+    "OptionAllowDeleteLibraryContent": "Allow this user to delete library content",
+    "OptionAllowManageLiveTv": "Allow management of live tv recordings",
+    "OptionAllowRemoteControlOthers": "Allow this user to remote control other users",
+    "OptionMissingTmdbId": "Missing Tmdb Id",
+    "OptionIsHD": "HD",
+    "OptionIsSD": "SD",
+    "OptionMetascore": "Metascore",
+    "ButtonSelect": "Select",
+    "ButtonSearch": "Search",
+    "ButtonGroupVersions": "Group Versions",
+    "ButtonAddToCollection": "Add to Collection",
+    "PismoMessage": "Utilizing Pismo File Mount through a donated license.",
+    "TangibleSoftwareMessage": "Utilizing Tangible Solutions Java/C# converters through a donated license.",
+    "HeaderCredits": "Credits",
+    "PleaseSupportOtherProduces": "Please support other free products we utilize:",
+    "VersionNumber": "Version {0}",
+    "TabPaths": "Paths",
+    "TabServer": "Server",
+    "TabTranscoding": "Transcoding",
+    "TitleAdvanced": "Advanced",
+    "LabelAutomaticUpdateLevel": "Automatic update level",
+    "OptionRelease": "Official Release",
+    "OptionBeta": "Beta",
+    "OptionDev": "Dev (Unstable)",
+    "LabelAllowServerAutoRestart": "Allow the server to restart automatically to apply updates",
+    "LabelAllowServerAutoRestartHelp": "The server will only restart during idle periods, when no users are active.",
+    "LabelEnableDebugLogging": "Enable debug logging",
+    "LabelRunServerAtStartup": "Run server at startup",
+    "LabelRunServerAtStartupHelp": "This will start the tray icon on windows startup. To start the windows service, uncheck this and run the service from the windows control panel. Please note that you cannot run both at the same time, so you will need to exit the tray icon before starting the service.",
+    "ButtonSelectDirectory": "Select Directory",
+    "LabelCustomPaths": "Specify custom paths where desired. Leave fields empty to use the defaults.",
+    "LabelCachePath": "Cache path:",
+    "LabelCachePathHelp": "Specify a custom location for server cache files, such as images.",
+    "LabelImagesByNamePath": "Images by name path:",
+    "LabelImagesByNamePathHelp": "Specify a custom location for downloaded actor, artist, genre and studio images.",
+    "LabelMetadataPath": "Metadata path:",
+    "LabelMetadataPathHelp": "Specify a custom location for downloaded artwork and metadata, if not saving within media folders.",
+    "LabelTranscodingTempPath": "Transcoding temporary path:",
+    "LabelTranscodingTempPathHelp": "This folder contains working files used by the transcoder. Specify a custom path, or leave empty to use the default within the server's data folder.",
+    "TabBasics": "Basics",
+    "TabTV": "TV",
+    "TabGames": "Games",
+    "TabMusic": "Music",
+    "TabOthers": "Others",
+    "HeaderExtractChapterImagesFor": "Extract chapter images for:",
+    "OptionMovies": "Movies",
+    "OptionEpisodes": "Episodes",
+    "OptionOtherVideos": "Other Videos",
+    "TitleMetadata": "Metadata",
+    "LabelAutomaticUpdatesFanart": "Enable automatic updates from FanArt.tv",
+    "LabelAutomaticUpdatesTmdb": "Enable automatic updates from TheMovieDB.org",
+    "LabelAutomaticUpdatesTvdb": "Enable automatic updates from TheTVDB.com",
+    "LabelAutomaticUpdatesFanartHelp": "If enabled, new images will be downloaded automatically as they're added to fanart.tv. Existing images will not be replaced.",
+    "LabelAutomaticUpdatesTmdbHelp": "If enabled, new images will be downloaded automatically as they're added to TheMovieDB.org. Existing images will not be replaced.",
+    "LabelAutomaticUpdatesTvdbHelp": "If enabled, new images will be downloaded automatically as they're added to TheTVDB.com. Existing images will not be replaced.",
+    "ExtractChapterImagesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs when videos are discovered, and also as a nightly scheduled task at 4am. The schedule is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+    "LabelMetadataDownloadLanguage": "Preferred download language:",
+    "ButtonAutoScroll": "Auto-scroll",
+    "LabelImageSavingConvention": "Image saving convention:",
+    "LabelImageSavingConventionHelp": "Media Browser recognizes images from most major media applications. Choosing your downloading convention is useful if you also use other products.",
+    "OptionImageSavingCompatible": "Compatible - Media Browser/Xbmc/Plex",
+    "OptionImageSavingStandard": "Standard - MB2",
+    "ButtonSignIn": "Sign In",
+    "TitleSignIn": "Sign In",
+    "HeaderPleaseSignIn": "Please sign in",
+    "LabelUser": "User:",
+    "LabelPassword": "Password:",
+    "ButtonManualLogin": "Manual Login",
+    "PasswordLocalhostMessage": "Passwords are not required when logging in from localhost.",
+    "TabGuide": "Guide",
+    "TabChannels": "Channels",
+    "TabCollections": "Collections",
+    "HeaderChannels": "Channels",
+    "TabRecordings": "Recordings",
+    "TabScheduled": "Scheduled",
+    "TabSeries": "Series",
+    "TabFavorites": "Favorites",
+    "TabMyLibrary": "My Library",
+    "ButtonCancelRecording": "Cancel Recording",
+    "HeaderPrePostPadding": "Pre/Post Padding",
+    "LabelPrePaddingMinutes": "Pre-padding minutes:",
+    "OptionPrePaddingRequired": "Pre-padding is required in order to record.",
+    "LabelPostPaddingMinutes": "Post-padding minutes:",
+    "OptionPostPaddingRequired": "Post-padding is required in order to record.",
+    "HeaderWhatsOnTV": "What's On",
+    "HeaderUpcomingTV": "Upcoming TV",
+    "TabStatus": "Status",
+    "TabSettings": "Settings",
+    "ButtonRefreshGuideData": "Refresh Guide Data",
+    "OptionPriority": "Priority",
+    "OptionRecordOnAllChannels": "Record program on all channels",
+    "OptionRecordAnytime": "Record program at any time",
+    "OptionRecordOnlyNewEpisodes": "Record only new episodes",
+    "HeaderDays": "Days",
+    "HeaderActiveRecordings": "Active Recordings",
+    "HeaderLatestRecordings": "Latest Recordings",
+    "HeaderAllRecordings": "All Recordings",
+    "ButtonPlay": "Play",
+    "ButtonEdit": "Edit",
+    "ButtonRecord": "Record",
+    "ButtonDelete": "Delete",
+    "ButtonRemove": "Remove",
+    "OptionRecordSeries": "Record Series",
+    "HeaderDetails": "Details",
+    "ButtonCancelRecording": "Cancel Recording",
+    "TitleLiveTV": "Live TV",
+    "LabelNumberOfGuideDays": "Number of days of guide data to download:",
+    "LabelNumberOfGuideDaysHelp": "Downloading more days worth of guide data provides the ability to schedule out further in advance and view more listings, but it will also take longer to download. Auto will choose based on the number of channels.",
+    "LabelActiveService": "Active Service:",
+    "LabelActiveServiceHelp": "Multiple tv plugins can be installed but only one can be active at a time.",
+    "OptionAutomatic": "Auto",
+    "LiveTvPluginRequired": "A Live TV service provider plugin is required in order to continue.",
+    "LiveTvPluginRequiredHelp": "Please install one of our available plugins, such as Next Pvr or ServerWmc.",
+    "LabelCustomizeOptionsPerMediaType": "Customize for media type:",
+    "OptionDownloadThumbImage": "Thumb",
+    "OptionDownloadMenuImage": "Menu",
+    "OptionDownloadLogoImage": "Logo",
+    "OptionDownloadBoxImage": "Box",
+    "OptionDownloadDiscImage": "Disc",
+    "OptionDownloadBannerImage": "Banner",
+    "OptionDownloadBackImage": "Back",
+    "OptionDownloadArtImage": "Art",
+    "OptionDownloadPrimaryImage": "Primary",
+    "HeaderFetchImages": "Fetch Images:",
+    "HeaderImageSettings": "Image Settings",
+    "TabOther": "Other",
+    "LabelMaxBackdropsPerItem": "Maximum number of backdrops per item:",
+    "LabelMaxScreenshotsPerItem": "Maximum number of screenshots per item:",
+    "LabelMinBackdropDownloadWidth": "Minimum backdrop download width:",
+    "LabelMinScreenshotDownloadWidth": "Minimum screenshot download width:",
+    "ButtonAddScheduledTaskTrigger": "Add Task Trigger",
+    "HeaderAddScheduledTaskTrigger": "Add Task Trigger",
+    "ButtonAdd": "Add",
+    "LabelTriggerType": "Trigger Type:",
+    "OptionDaily": "Daily",
+    "OptionWeekly": "Weekly",
+    "OptionOnInterval": "On an interval",
+    "OptionOnAppStartup": "On application startup",
+    "OptionAfterSystemEvent": "After a system event",
+    "LabelDay": "Day:",
+    "LabelTime": "Time:",
+    "LabelEvent": "Event:",
+    "OptionWakeFromSleep": "Wake from sleep",
+    "LabelEveryXMinutes": "Every:",
+    "HeaderTvTuners": "Tuners",
+    "HeaderGallery": "Gallery",
+    "HeaderLatestGames": "Latest Games",
+    "HeaderRecentlyPlayedGames": "Recently Played Games",
+    "TabGameSystems": "Game Systems",
+    "TitleMediaLibrary": "Media Library",
+    "TabFolders": "Folders",
+    "TabPathSubstitution": "Path Substitution",
+    "LabelSeasonZeroDisplayName": "Season 0 display name:",
+    "LabelEnableRealtimeMonitor": "Enable real time monitoring",
+    "LabelEnableRealtimeMonitorHelp": "Changes will be processed immediately, on supported file systems.",
+    "ButtonScanLibrary": "Scan Library",
+    "HeaderNumberOfPlayers": "Players:",
+    "OptionAnyNumberOfPlayers": "Any",
+    "Option1Player": "1+",
+    "Option2Player": "2+",
+    "Option3Player": "3+",
+    "Option4Player": "4+",
+    "HeaderMediaFolders": "Media Folders",
+    "HeaderThemeVideos": "Theme Videos",
+    "HeaderThemeSongs": "Theme Songs",
+    "HeaderScenes": "Scenes",
+    "HeaderAwardsAndReviews": "Awards and Reviews",
+    "HeaderSoundtracks": "Soundtracks",
+    "HeaderMusicVideos": "Music Videos",
+    "HeaderSpecialFeatures": "Special Features",
+    "HeaderCastCrew": "Cast & Crew",
+    "HeaderAdditionalParts": "Additional Parts",
+    "ButtonSplitVersionsApart": "Split Versions Apart",
+    "ButtonPlayTrailer": "Trailer",
+    "LabelMissing": "Missing",
+    "LabelOffline": "Offline",
+    "PathSubstitutionHelp": "Path substitutions are used for mapping a path on the server to a path that clients are able to access. By allowing clients direct access to media on the server they may be able to play them directly over the network and avoid using server resources to stream and transcode them.",
+    "HeaderFrom": "From",
+    "HeaderTo": "To",
+    "LabelFrom": "From:",
+    "LabelFromHelp": "Example: D:\\Movies (on the server)",
+    "LabelTo": "To:",
+    "LabelToHelp": "Example: \\\\MyServer\\Movies (a path clients can access)",
+    "ButtonAddPathSubstitution": "Add Substitution",
+    "OptionSpecialEpisode": "Specials",
+    "OptionMissingEpisode": "Missing Episodes",
+    "OptionUnairedEpisode": "Unaired Episodes",
+    "OptionEpisodeSortName": "Episode Sort Name",
+    "OptionSeriesSortName": "Series Name",
+    "OptionTvdbRating": "Tvdb Rating",
+    "HeaderTranscodingQualityPreference": "Transcoding Quality Preference:",
+    "OptionAutomaticTranscodingHelp": "The server will decide quality and speed",
+    "OptionHighSpeedTranscodingHelp": "Lower quality, but faster encoding",
+    "OptionHighQualityTranscodingHelp": "Higher quality, but slower encoding",
+    "OptionMaxQualityTranscodingHelp": "Best quality with slower encoding and high CPU usage",
+    "OptionHighSpeedTranscoding": "Higher speed",
+    "OptionHighQualityTranscoding": "Higher quality",
+    "OptionMaxQualityTranscoding": "Max quality",
+    "OptionEnableDebugTranscodingLogging": "Enable debug transcoding logging",
+    "OptionEnableDebugTranscodingLoggingHelp": "This will create very large log files and is only recommended as needed for troubleshooting purposes.",
+    "OptionEnableDebugTranscodingLogging": "Enable debug transcoding logging",
+    "OptionUpscaling": "Allow clients to request upscaled video",
+    "OptionUpscalingHelp": "In some cases this will result in improved video quality but will increase CPU usage.",
+    "EditCollectionItemsHelp": "Add or remove any movies, series, albums, books or games you wish to group within this collection.",
+    "HeaderAddTitles": "Add Titles",
+    "LabelEnableDlnaPlayTo": "Enable DLNA Play To",
+    "LabelEnableDlnaPlayToHelp": "Media Browser can detect devices within your network and offer the ability to remote control them.",
+    "LabelEnableDlnaDebugLogging": "Enable DLNA debug logging",
+    "LabelEnableDlnaDebugLoggingHelp": "This will create large log files and should only be used as needed for troubleshooting purposes.",
+    "LabelEnableDlnaClientDiscoveryInterval": "Client discovery interval (seconds)",
+    "LabelEnableDlnaClientDiscoveryIntervalHelp": "Determines the duration in seconds between SSDP searches performed by Media Browser.",
+    "HeaderCustomDlnaProfiles": "Custom Profiles",
+    "HeaderSystemDlnaProfiles": "System Profiles",
+    "CustomDlnaProfilesHelp": "Create a custom profile to target a new device or override a system profile.",
+    "SystemDlnaProfilesHelp": "System profiles are read-only. Changes to a system profile will be saved to a new custom profile.",
+    "TitleDashboard": "Dashboard",
+    "TabHome": "Home",
+    "TabInfo": "Info",
+    "HeaderLinks": "Links",
+    "HeaderSystemPaths": "System Paths",
+    "LinkCommunity": "Community",
+    "LinkGithub": "Github",
+    "LinkApiDocumentation": "Api Documentation",
+    "LabelFriendlyServerName": "Friendly server name:",
+    "LabelFriendlyServerNameHelp": "This name will be used to identify this server. If left blank, the computer name will be used.",
+    "LabelPreferredDisplayLanguage": "Preferred display language",
+    "LabelPreferredDisplayLanguageHelp": "Translating Media Browser is an ongoing project and is not yet complete.",
+    "LabelReadHowYouCanContribute": "Read about how you can contribute.",
+    "HeaderNewCollection": "New Collection",
+    "HeaderAddToCollection": "Add to Collection",
+    "ButtonSubmit": "Submit",
+    "NewCollectionNameExample": "Example: Star Wars Collection",
+    "OptionSearchForInternetMetadata": "Search the internet for artwork and metadata",
+    "ButtonCreate": "Create",
+    "LabelHttpServerPortNumber": "Http server port number:",
+    "LabelWebSocketPortNumber": "Web socket port number:",
+    "LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
+    "LabelEnableAutomaticPortHelp": "UPnP allows automated router configuration for remote access. This may not work with some router models.",
+    "LabelExternalDDNS": "External DDNS:",
+    "LabelExternalDDNSHelp": "If you have a dynamic DNS enter it here. Media Browser apps will use it when connecting remotely.",
+    "TabResume": "Resume",
+    "TabWeather": "Weather",
+    "TitleAppSettings": "App Settings",
+    "LabelMinResumePercentage": "Min resume percentage:",
+    "LabelMaxResumePercentage": "Max resume percentage:",
+    "LabelMinResumeDuration": "Min resume duration (seconds):",
+    "LabelMinResumePercentageHelp": "Titles are assumed unplayed if stopped before this time",
+    "LabelMaxResumePercentageHelp": "Titles are assumed fully played if stopped after this time",
+    "LabelMinResumeDurationHelp": "Titles shorter than this will not be resumable",
+    "TitleAutoOrganize": "Auto-Organize",
+    "TabActivityLog": "Activity Log",
+    "HeaderName": "Name",
+    "HeaderDate": "Date",
+    "HeaderSource": "Source",
+    "HeaderStatus": "Status",
+    "HeaderDestination": "Destination",
+    "HeaderProgram": "Program",
+    "HeaderClients": "Clients",
+    "LabelCompleted": "Completed",
+    "LabelFailed": "Failed",
+    "LabelSkipped": "Skipped",
+    "HeaderEpisodeOrganization": "Episode Organization",
+    "LabelSeries": "Series:",
+    "LabelSeasonNumber": "Season number:",
+    "LabelEpisodeNumber": "Episode number:",
+    "LabelEndingEpisodeNumber": "Ending episode number:",
+    "LabelEndingEpisodeNumberHelp": "Only required for multi-episode files",
+    "HeaderSupportTheTeam": "Support the Media Browser Team",
+    "LabelSupportAmount": "Amount (USD)",
+    "HeaderSupportTheTeamHelp": "Help ensure the continued development of this project by donating. A portion of all donations will be contributed to other free tools we depend on.",
+    "ButtonEnterSupporterKey": "Enter supporter key",
+    "DonationNextStep": "Once complete, please return and enter your supporter key, which you will receive by email.",
+    "AutoOrganizeHelp": "Auto-organize monitors your download folders for new files and moves them to your media directories.",
+    "AutoOrganizeTvHelp": "TV file organizing will only add episodes to existing series. It will not create new series folders.",
+    "OptionEnableEpisodeOrganization": "Enable new episode organization",
+    "LabelWatchFolder": "Watch folder:",
+    "LabelWatchFolderHelp": "The server will poll this folder during the 'Organize new media files' scheduled task.",
+    "ButtonViewScheduledTasks": "View scheduled tasks",
+    "LabelMinFileSizeForOrganize": "Minimum file size (MB):",
+    "LabelMinFileSizeForOrganizeHelp": "Files under this size will be ignored.",
+    "LabelSeasonFolderPattern": "Season folder pattern:",
+    "LabelSeasonZeroFolderName": "Season zero folder name:",
+    "HeaderEpisodeFilePattern": "Episode file pattern",
+    "LabelEpisodePattern": "Episode pattern:",
+    "LabelMultiEpisodePattern": "Multi-Episode pattern:",
+    "HeaderSupportedPatterns": "Supported Patterns",
+    "HeaderTerm": "Term",
+    "HeaderPattern": "Pattern",
+    "HeaderResult": "Result",
+    "LabelDeleteEmptyFolders": "Delete empty folders after organizing",
+    "LabelDeleteEmptyFoldersHelp": "Enable this to keep the download directory clean.",
+    "LabelDeleteLeftOverFiles": "Delete left over files with the following extensions:",
+    "LabelDeleteLeftOverFilesHelp": "Separate with ;. For example: .nfo;.txt",
+    "OptionOverwriteExistingEpisodes": "Overwrite existing episodes",
+    "LabelTransferMethod": "Transfer method",
+    "OptionCopy": "Copy",
+    "OptionMove": "Move",
+    "LabelTransferMethodHelp": "Copy or move files from the watch folder",
+    "HeaderLatestNews": "Latest News",
+    "HeaderHelpImproveMediaBrowser": "Help Improve Media Browser",
+    "HeaderRunningTasks": "Running Tasks",
+    "HeaderActiveDevices": "Active Devices",
+    "HeaderPendingInstallations": "Pending Installations",
+    "HeaerServerInformation": "Server Information",
+    "ButtonRestartNow": "Restart Now",
+    "ButtonRestart": "Restart",
+    "ButtonShutdown": "Shutdown",
+    "ButtonUpdateNow": "Update Now",
+    "PleaseUpdateManually": "Please shutdown the server and update manually.",
+    "NewServerVersionAvailable": "A new version of Media Browser Server is available!",
+    "ServerUpToDate": "Media Browser Server is up to date",
+    "ErrorConnectingToMediaBrowserRepository": "There was an error connecting to the remote Media Browser repository.",
+    "LabelComponentsUpdated": "The following components have been installed or updated:",
+    "MessagePleaseRestartServerToFinishUpdating": "Please restart the server to finish applying updates.",
+    "LabelDownMixAudioScale": "Audio boost when downmixing:",
+    "LabelDownMixAudioScaleHelp": "Boost audio when downmixing. Set to 1 to preserve original volume value.",
+    "ButtonLinkKeys": "Link Keys",
+    "LabelOldSupporterKey": "Old supporter key",
+    "LabelNewSupporterKey": "New supporter key",
+    "HeaderMultipleKeyLinking": "Multiple Key Linking",
+    "MultipleKeyLinkingHelp": "If you have more than one supporter key, use this form to link the old key's registrations with your new one.",
+    "LabelCurrentEmailAddress": "Current email address",
+    "LabelCurrentEmailAddressHelp": "The current email address to which your new key was sent.",
+    "HeaderForgotKey": "Forgot Key",
+    "LabelEmailAddress": "Email address",
+    "LabelSupporterEmailAddress": "The email address that was used to purchase the key.",
+    "ButtonRetrieveKey": "Retrieve Key",
+    "LabelSupporterKey": "Supporter Key (paste from email)",
+    "LabelSupporterKeyHelp": "Enter your supporter key to start enjoying additional benefits the community has developed for Media Browser.",
+    "MessageInvalidKey": "Supporter key is missing or invalid.",
+    "ErrorMessageInvalidKey": "In order for any premium content to be registered, you must also be a Media Browser Supporter. Please donate and support the continued development of the core product. Thank you.",
+    "HeaderDisplaySettings": "Display Settings",
+    "TabPlayTo": "Play To",
+    "LabelEnableDlnaServer": "Enable Dlna server",
+    "LabelEnableDlnaServerHelp": "Allows UPnP devices on your network to browse and play Media Browser content.",
+    "LabelEnableBlastAliveMessages": "Blast alive messages",
+    "LabelEnableBlastAliveMessagesHelp": "Enable this if the server is not detected reliably by other UPnP devices on your network.",
+    "LabelBlastMessageInterval": "Alive message interval (seconds)",
+    "LabelBlastMessageIntervalHelp": "Determines the duration in seconds between server alive messages.",
+    "LabelDefaultUser": "Default user:",
+    "LabelDefaultUserHelp": "Determines which user library should be displayed on connected devices. This can be overridden for each device using profiles.",
+    "TitleDlna": "DLNA",
+    "TitleChannels": "Channels",
+    "HeaderServerSettings": "Server Settings",
+    "LabelWeatherDisplayLocation": "Weather display location:",
+    "LabelWeatherDisplayLocationHelp": "US zip code / City, State, Country / City, Country",
+    "LabelWeatherDisplayUnit": "Weather display unit:",
+    "OptionCelsius": "Celsius",
+    "OptionFahrenheit": "Fahrenheit",
+    "HeaderRequireManualLogin": "Require manual username entry for:",
+    "HeaderRequireManualLoginHelp": "When disabled clients may present a login screen with a visual selection of users.",
+    "OptionOtherApps": "Other apps",
+    "OptionMobileApps": "Mobile apps",
+    "HeaderNotificationList": "Click on a notification to configure it's sending options.",
+    "NotificationOptionApplicationUpdateAvailable": "Application update available",
+    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+    "NotificationOptionPluginInstalled": "Plugin installed",
+    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+    "NotificationOptionVideoPlayback": "Video playback started",
+    "NotificationOptionAudioPlayback": "Audio playback started",
+    "NotificationOptionGamePlayback": "Game playback started",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+    "NotificationOptionTaskFailed": "Scheduled task failure",
+    "NotificationOptionInstallationFailed": "Installation failure",
+    "NotificationOptionNewLibraryContent": "New content added",
+    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "SendNotificationHelp": "By default, notifications are delivered to the dashboard inbox. Browse the plugin catalog to install additional notification options.",
+    "NotificationOptionServerRestartRequired": "Server restart required",
+    "LabelNotificationEnabled": "Enable this notification",
+    "LabelMonitorUsers": "Monitor activity from:",
+    "LabelSendNotificationToUsers": "Send the notification to:",
+    "UsersNotNotifiedAboutSelfActivity": "Users will not be notified about their own activities.",
+    "LabelUseNotificationServices": "Use the following services:",
+    "CategoryUser": "User",
+    "CategorySystem": "System",
+    "CategoryApplication": "Application",
+    "CategoryPlugin": "Plugin",
+    "LabelMessageTitle": "Message title:",
+    "LabelAvailableTokens": "Available tokens:",
+    "AdditionalNotificationServices": "Browse the plugin catalog to install additional notification services.",
+    "OptionAllUsers": "All users",
+    "OptionAdminUsers": "Administrators",
+    "OptionCustomUsers": "Custom",
+    "ButtonArrowUp": "Up",
+    "ButtonArrowDown": "Down",
+    "ButtonArrowLeft": "Left",
+    "ButtonArrowRight": "Right",
+    "ButtonBack": "Back",
+    "ButtonInfo": "Info",
+    "ButtonOsd": "On screen display",
+    "ButtonPageUp": "Page Up",
+    "ButtonPageDown": "Page Down",
+    "PageAbbreviation": "PG",
+    "ButtonHome": "Home",
+    "ButtonSearch": "Search",
+    "ButtonSettings": "Settings",
+    "ButtonTakeScreenshot": "Capture Screenshot",
+    "ButtonLetterUp": "Letter Up",
+    "ButtonLetterDown": "Letter Down",
+    "PageButtonAbbreviation": "PG",
+    "LetterButtonAbbreviation": "A",
+    "TabNowPlaying": "Now Playing",
+    "TabNavigation": "Navigation",
+    "TabControls": "Controls",
+    "ButtonFullscreen": "Toggle fullscreen",
+    "ButtonScenes": "Scenes",
+    "ButtonSubtitles": "Subtitles",
+    "ButtonAudioTracks": "Audio tracks",
+    "ButtonPreviousTrack": "Previous track",
+    "ButtonNextTrack": "Next track",
+    "ButtonStop": "Stop",
+    "ButtonPlay": "Play",
+    "ButtonPause": "Pause",
+    "LabelGroupMoviesIntoCollections": "Group movies into collections",
+    "LabelGroupMoviesIntoCollectionsHelp": "When displaying movie lists, movies belonging to a collection will be displayed as one grouped item.",
+    "NotificationOptionPluginError": "Plugin failure",
+    "ButtonVolumeUp": "Volume up",
+    "ButtonVolumeDown": "Volume down",
+    "ButtonMute": "Mute",
+    "HeaderLatestMedia": "Latest Media",
+    "OptionNoSubtitles": "No Subtitles",
+    "OptionSpecialFeatures": "Special Features",
+    "HeaderCollections": "Collections",
+    "HeaderChannels": "Channels",
+    "LabelProfileCodecsHelp": "Separated by comma. This can be left empty to apply to all codecs.",
+    "LabelProfileContainersHelp": "Separated by comma. This can be left empty to apply to all containers.",
+    "HeaderResponseProfile": "Response Profile",
+    "LabelType": "Type:",
+    "LabelProfileContainer": "Container:",
+    "LabelProfileVideoCodecs": "Video codecs:",
+    "LabelProfileAudioCodecs": "Audio codecs:",
+    "LabelProfileCodecs": "Codecs:",
+    "HeaderDirectPlayProfile": "Direct Play Profile",
+    "HeaderTranscodingProfile": "Transcoding Profile",
+    "HeaderCodecProfile": "Codec Profile",
+    "HeaderCodecProfileHelp": "Define additional conditions that must be met in order for a codec to be direct played.",
+    "HeaderContainerProfile": "Container Profile",
+    "HeaderContainerProfileHelp": "Define additional conditions that must be met in order for a file to be direct played.",
+    "OptionProfileVideo": "Video",
+    "OptionProfileAudio": "Audio",
+    "OptionProfileVideoAudio": "Video Audio",
+    "OptionProfilePhoto": "Photo",
+    "LabelUserLibrary": "User library:",
+    "LabelUserLibraryHelp": "Select which user library to display to the device. Leave empty to inherit the default setting.",
+    "OptionPlainStorageFolders": "Display all folders as plain storage folders",
+    "OptionPlainStorageFoldersHelp": "If enabled, all folders are represented in DIDL as \"object.container.storageFolder\" instead of a more specific type, such as \"object.container.person.musicArtist\".",
+    "OptionPlainVideoItems": "Display all videos as plain video items",
+    "OptionPlainVideoItemsHelp": "If enabled, all videos are represented in DIDL as \"object.item.videoItem\" instead of a more specific type, such as \"object.item.videoItem.movie\".",
+    "LabelSupportedMediaTypes": "Supported Media Types:",
+    "TabIdentification": "Identification",
+    "TabDirectPlay": "Direct Play",
+    "TabContainers": "Containers",
+    "TabCodecs": "Codecs",
+    "TabResponses": "Responses",
+    "HeaderProfileInformation": "Profile Information",
+    "LabelEmbedAlbumArtDidl": "Embed album art in Didl",
+    "LabelEmbedAlbumArtDidlHelp": "Some devices prefer this method for obtaining album art. Others may fail to play with this option enabled.",
+    "LabelAlbumArtPN": "Album art PN:",
+    "LabelAlbumArtHelp": "PN used for album art, within the dlna:profileID attribute on upnp:albumArtURI. Some clients require a specific value, regardless of the size of the image.",
+    "LabelAlbumArtMaxWidth": "Album art max width:",
+    "LabelAlbumArtMaxWidthHelp": "Max resolution of album art exposed via upnp:albumArtURI.",
+    "LabelAlbumArtMaxHeight": "Album art max height:",
+    "LabelAlbumArtMaxHeightHelp": "Max resolution of album art exposed via upnp:albumArtURI.",
+    "LabelIconMaxWidth": "Icon max width:",
+    "LabelIconMaxWidthHelp": "Max resolution of icons exposed via upnp:icon.",
+    "LabelIconMaxHeight": "Icon max height:",
+    "LabelIconMaxHeightHelp": "Max resolution of icons exposed via upnp:icon.",
+    "LabelIdentificationFieldHelp": "A case-insensitive substring or regex expression.",
+    "HeaderProfileServerSettingsHelp": "These values control how Media Browser will present itself to the device.",
+    "LabelMaxBitrate": "Max bitrate:",
+    "LabelMaxBitrateHelp": "Specify a max bitrate in bandwidth constrained environments, or if the device imposes it's own limit.",
+    "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
+    "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
+    "LabelFriendlyName": "Friendly name",
+    "LabelManufacturer": "Manufacturer",
+    "LabelManufacturerUrl": "Manufacturer url",
+    "LabelModelName": "Model name",
+    "LabelModelNumber": "Model number",
+    "LabelModelDescription": "Model description",
+    "LabelModelUrl": "Model url",
+    "LabelSerialNumber": "Serial number",
+    "LabelDeviceDescription": "Device description",
+    "HeaderIdentificationCriteriaHelp": "Enter at least one identification criteria.",
+    "HeaderDirectPlayProfileHelp": "Add direct play profiles to indicate which formats the device can handle natively.",
+    "HeaderTranscodingProfileHelp": "Add transcoding profiles to indicate which formats should be used when transcoding is required.",
+    "HeaderContainerProfileHelp": "Container profiles indicate the limitations of a device when playing specific formats. If a limitation applies then the media will be transcoded, even if the format is configured for direct play.",
+    "HeaderCodecProfileHelp": "Codec profiles indicate the limitations of a device when playing specific codecs. If a limitation applies then the media will be transcoded, even if the codec is configured for direct play.",
+    "HeaderResponseProfileHelp": "Response profiles provide a way to customize information sent to the device when playing certain kinds of media.",
+    "LabelXDlnaCap": "X-Dlna cap:",
+    "LabelXDlnaCapHelp": "Determines the content of the X_DLNACAP element in the urn:schemas-dlna-org:device-1-0 namespace.",
+    "LabelXDlnaDoc": "X-Dlna doc:",
+    "LabelXDlnaDocHelp": "Determines the content of the X_DLNADOC element in the urn:schemas-dlna-org:device-1-0 namespace.",
+    "LabelSonyAggregationFlags": "Sony aggregation flags:",
+    "LabelSonyAggregationFlagsHelp": "Determines the content of the aggregationFlags element in the urn:schemas-sonycom:av namespace.",
+    "LabelTranscodingContainer": "Container:",
+    "LabelTranscodingVideoCodec": "Video codec:",
+    "LabelTranscodingVideoProfile": "Video profile:",
+    "LabelTranscodingAudioCodec": "Audio codec:",
+    "OptionEnableM2tsMode": "Enable M2ts mode",
+    "OptionEnableM2tsModeHelp": "Enable m2ts mode when encoding to mpegts.",
+    "OptionEstimateContentLength": "Estimate content length when transcoding",
+    "OptionReportByteRangeSeekingWhenTranscoding": "Report that the server supports byte seeking when transcoding",
+    "OptionReportByteRangeSeekingWhenTranscodingHelp": "This is required for some devices that don't time seek very well.",
+    "HeaderSubtitleDownloadingHelp": "When Media Browser scans your video files it can search for missing subtitles, and download them using a subtitle provider such as OpenSubtitles.org.",
+    "HeaderDownloadSubtitlesFor": "Download subtitles for:",
+    "MessageNoChapterProviders": "Install a chapter provider plugin such as ChapterDb to enable additional chapter options.",
+    "LabelSkipIfGraphicalSubsPresent": "Skip if the video already contains graphical subtitles",
+    "LabelSkipIfGraphicalSubsPresentHelp": "Keeping text versions of subtitles will result in more efficient delivery to mobile clients.",
+    "TabSubtitles": "Subtitles",
+    "TabChapters": "Chapters",
+    "HeaderDownloadChaptersFor": "Download chapter names for:",
+    "LabelOpenSubtitlesUsername": "Open Subtitles username:",
+    "LabelOpenSubtitlesPassword": "Open Subtitles password:",
+    "HeaderChapterDownloadingHelp": "When Media Browser scans your video files it can download friendly chapter names from the internet using chapter plugins such as ChapterDb.",
+    "LabelPlayDefaultAudioTrack": "Play default audio track regardless of language",
+    "LabelSubtitlePlaybackMode": "Subtitle mode:",
+    "LabelDownloadLanguages": "Download languages:",
+    "ButtonRegister": "Register",
+    "LabelSkipIfAudioTrackPresent": "Skip if the default audio track matches the download language",
+    "LabelSkipIfAudioTrackPresentHelp": "Uncheck this to ensure all videos have subtitles, regardless of audio language.",
+    "HeaderSendMessage": "Send Message",
+    "ButtonSend": "Send",
+    "LabelMessageText": "Message text:",
+    "LabelMessageTitle": "Message title:",
+    "MessageNoAvailablePlugins": "No available plugins.",
+    "LabelDisplayPluginsFor": "Display plugins for:",
+    "PluginTabMediaBrowserClassic": "MB Classic",
+    "PluginTabMediaBrowserTheater": "MB Theater",
+    "LabelEpisodeName": "Episode name",
+    "LabelSeriesName": "Series name",
+    "ValueSeriesNamePeriod": "Series.name",
+    "ValueSeriesNameUnderscore": "Series_name",
+    "ValueEpisodeNamePeriod": "Episode.name",
+    "ValueEpisodeNameUnderscore": "Episode_name",
+    "LabelSeasonNumber": "Season number",
+    "LabelEpisodeNumber": "Episode number",
+    "LabelEndingEpisodeNumber": "Ending episode number",
+    "HeaderTypeText": "Enter Text",
+    "LabelTypeText": "Text",
+    "HeaderSearchForSubtitles": "Search for Subtitles",
+    "MessageNoSubtitleSearchResultsFound": "No search results founds.",
+    "TabDisplay": "Display",
+    "TabLanguages": "Languages",
+    "TabWebClient": "Web Client",
+    "LabelEnableThemeSongs": "Enable theme songs",
+    "LabelEnableBackdrops": "Enable backdrops",
+    "LabelEnableThemeSongsHelp": "If enabled, theme songs will be played in the background while browsing the library.",
+    "LabelEnableBackdropsHelp": "If enabled, backdrops will be displayed in the background of some pages while browsing the library.",
+    "HeaderHomePage": "Home Page",
+    "HeaderSettingsForThisDevice": "Settings for This Device",
+    "OptionAuto": "Auto",
+    "OptionYes": "Yes",
+    "OptionNo": "No",
+    "LabelHomePageSection1": "Home page section one:",
+    "LabelHomePageSection2": "Home page section two:",
+    "LabelHomePageSection3": "Home page section three:",
+    "LabelHomePageSection4": "Home page section four:",
+    "OptionMyViewsButtons": "My views (buttons)",
+    "OptionMyViews": "My views",
+    "OptionMyViewsSmall": "My views (small)",
+    "OptionResumablemedia": "Resume",
+    "OptionLatestMedia": "Latest media",
+    "OptionLatestChannelMedia": "Latest channel items",
+    "HeaderLatestChannelItems": "Latest Channel Items",
+    "OptionNone": "None",
+    "HeaderLiveTv": "Live TV",
+    "HeaderReports": "Reports",
+    "HeaderMetadataManager": "Metadata Manager",
+    "HeaderPreferences": "Preferences",
+    "MessageLoadingChannels": "Loading channel content...",
+    "ButtonMarkRead": "Mark Read",
+    "OptionDefaultSort": "Default",
+    "OptionCommunityMostWatchedSort": "Most Watched",
+    "TabNextUp": "Next Up",
+    "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
+    "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the New button to start creating Collections.",
+    "HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",
+    "ButtonDismiss": "Dismiss",
+    "MessageLearnHowToCustomize": "Learn how to customize this page to your own personal tastes. Click your user icon in the top right corner of the screen to view and update your preferences.",
+    "ButtonEditOtherUserPreferences": "Edit this user's personal preferences.",
+    "LabelChannelStreamQuality": "Preferred internet stream quality:",
+    "LabelChannelStreamQualityHelp": "In a low bandwidth environment, limiting quality can help ensure a smooth streaming experience.",
+    "OptionBestAvailableStreamQuality": "Best available",
+    "LabelEnableChannelContentDownloadingFor": "Enable channel content downloading for:",
+    "LabelEnableChannelContentDownloadingForHelp": "Some channels support downloading content prior to viewing. Enable this in low bandwidth enviornments to download channel content during off hours. Content is downloaded as part of the channel download scheduled task.",
+    "LabelChannelDownloadPath": "Channel content download path:",
+    "LabelChannelDownloadPathHelp": "Specify a custom download path if desired. Leave empty to download to an internal program data folder.",
+    "LabelChannelDownloadAge": "Delete content after: (days)",
+    "LabelChannelDownloadAgeHelp": "Downloaded content older than this will be deleted. It will remain playable via internet streaming.",
+    "ChannelSettingsFormHelp": "Install channels such as Trailers and Vimeo in the plugin catalog.",
+    "LabelSelectCollection": "Select collection:",
+    "ViewTypeMovies": "Movies",
+    "ViewTypeTvShows": "TV",
+    "ViewTypeGames": "Games",
+    "ViewTypeMusic": "Music",
+    "ViewTypeBoxSets": "Collections",
+    "ViewTypeChannels": "Channels",
+    "ViewTypeLiveTV": "Live TV",
+    "HeaderOtherDisplaySettings": "Display Settings",
+    "HeaderMyViews": "My Views",
+    "LabelSelectFolderGroups": "Automatically group content from the following folders into views such as Movies, Music and TV:",
+    "LabelSelectFolderGroupsHelp": "Folders that are unchecked will be displayed by themselves in their own view.",
+    "OptionDisplayAdultContent": "Display adult content",
+    "OptionLibraryFolders": "Media folders",
+    "TitleRemoteControl": "Remote Control",
+    "OptionLatestTvRecordings": "Latest recordings",
+    "LabelProtocolInfo": "Protocol info:",
+    "LabelProtocolInfoHelp": "The value that will be used when responding to GetProtocolInfo requests from the device.",
+    "TabXbmcMetadata": "Xbmc",
+    "HeaderXbmcMetadataHelp": "Media Browser includes native support for Xbmc Nfo metadata and images. To enable or disable Xbmc metadata, use the Advanced tab to configure options for your media types.",
+    "LabelXbmcMetadataUser": "Add user watch data to nfo's for:",
+    "LabelXbmcMetadataUserHelp": "Enable this to keep watch data in sync between Media Browser and Xbmc.",
+    "LabelXbmcMetadataDateFormat": "Release date format:",
+    "LabelXbmcMetadataDateFormatHelp": "All dates within nfo's will be read and written to using this format.",
+    "LabelXbmcMetadataSaveImagePaths": "Save image paths within nfo files",
+    "LabelXbmcMetadataSaveImagePathsHelp": "This is recommended if you have image file names that don't conform to Xbmc guidelines.",
+    "LabelXbmcMetadataEnablePathSubstitution": "Enable path substitution",
+    "LabelXbmcMetadataEnablePathSubstitutionHelp": "Enables path substitution of image paths using the server's path substitution settings.",
+    "LabelXbmcMetadataEnablePathSubstitutionHelp2": "See path substitution.",
+    "LabelGroupChannelsIntoViews": "Display the following channels directly within my views:",
+    "LabelGroupChannelsIntoViewsHelp": "If enabled, these channels will be displayed directly alongside other views. If disabled, they'll be displayed within a separate Channels view.",
+    "LabelDisplayCollectionsView": "Display a collections view to show movie collections",
+    "LabelXbmcMetadataEnableExtraThumbs": "Copy extrafanart into extrathumbs",
+    "LabelXbmcMetadataEnableExtraThumbsHelp": "When downloading images they can be saved into both extrafanart and extrathumbs for maximum Xbmc skin compatibility.",
+    "TabServices": "Services",
+    "TabLogs": "Logs",
+    "HeaderServerLogFiles": "Server log files:",
+    "TabBranding": "Branding",
+    "HeaderBrandingHelp": "Customize the appearance of Media Browser to fit the needs of your group or organization.",
+    "LabelLoginDisclaimer": "Login disclaimer:",
+    "LabelLoginDisclaimerHelp": "This will be displayed at the bottom of the login page.",
+    "LabelAutomaticallyDonate": "Automatically donate this amount every six months",
+    "LabelAutomaticallyDonateHelp": "You can cancel at any time via your PayPal account.",
+    "OptionList": "List",
+    "TabDashboard": "Dashboard",
+    "TitleServer": "Server",
+    "LabelCache": "Cache:",
+    "LabelLogs": "Logs:",
+    "LabelMetadata": "Metadata:",
+    "LabelImagesByName": "Images by name:",
+    "LabelTranscodingTemporaryFiles": "Transcoding temporary files:",
+    "HeaderLatestMusic": "Latest Music",
+    "HeaderBranding": "Branding",
+    "HeaderApiKeys": "Api Keys",
+    "HeaderApiKeysHelp": "External applications are required to have an Api key in order to communicate with Media Browser. Keys are issued by logging in with a Media Browser account, or by manually granting the application a key.",
+    "HeaderApiKey": "Api Key",
+    "HeaderApp": "App",
+    "HeaderDevice": "Device",
+    "HeaderUser": "User",
+    "HeaderDateIssued": "Date Issued",
+    "LabelChapterName": "Chapter {0}",
+    "HeaderNewApiKey": "New Api Key",
+    "LabelAppName": "App name",
+    "LabelAppNameExample": "Example: Sickbeard, NzbDrone",
+    "HeaderNewApiKeyHelp": "Grant an application permission to communicate with Media Browser.",
+    "ButtonEnterSupporterKey": "Enter supporter key",
+    "HeaderHttpHeaders": "Http Headers",
+    "HeaderIdentificationHeader": "Identification Header",
+    "LabelValue": "Value:",
+    "LabelMatchType": "Match type:",
+    "OptionEquals": "Equals",
+    "OptionRegex": "Regex",
+    "OptionSubstring": "Substring",
+    "TabView": "View",
+    "TabSort": "Sort",
+    "TabFilter": "Filter",
+    "ButtonView": "View",
+    "LabelPageSize": "Item limit:",
+    "LabelView": "View:",
+    "TabUsers":  "Users",
+    "HeaderFeatures":  "Features",
+    "HeaderAdvanced":  "Advanced",
+    "ButtonSync":  "Sync"
+}
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/sv.json b/MediaBrowser.Server.Implementations/Localization/Server/sv.json
index 75e204f684..e28dfe231a 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/sv.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/sv.json
@@ -199,6 +199,7 @@
     "OptionFriday": "Fredag",
     "OptionSaturday": "L\u00f6rdag",
     "HeaderManagement": "Administration:",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "IMDB-ID saknas",
     "OptionMissingTvdbId": "TVDB-ID saknas",
     "OptionMissingOverview": "Synopsis saknas",
@@ -479,10 +480,10 @@
     "HeaderProgram": "Program",
     "HeaderClients": "Klienter",
     "LabelCompleted": "Klar",
-    "LabelFailed": "Misslyckades",
+    "LabelFailed": "Failed",
     "LabelSkipped": "Hoppades \u00f6ver",
     "HeaderEpisodeOrganization": "Katalogisering av avsnitt",
-    "LabelSeries": "Serie:",
+    "LabelSeries": "Series:",
     "LabelSeasonNumber": "S\u00e4songsnummer:",
     "LabelEpisodeNumber": "Avsnittsnummer:",
     "LabelEndingEpisodeNumber": "Avslutande avsnittsnummer:",
@@ -626,12 +627,12 @@
     "TabNowPlaying": "Nu spelas",
     "TabNavigation": "Navigering",
     "TabControls": "Kontroller",
-    "ButtonFullscreen": "V\u00e4xla fullsk\u00e4rmsl\u00e4ge",
+    "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Scener",
     "ButtonSubtitles": "Undertexter",
-    "ButtonAudioTracks": "Ljudsp\u00e5r",
-    "ButtonPreviousTrack": "F\u00f6reg\u00e5ende sp\u00e5r",
-    "ButtonNextTrack": "N\u00e4sta sp\u00e5r",
+    "ButtonAudioTracks": "Audio tracks",
+    "ButtonPreviousTrack": "Previous track",
+    "ButtonNextTrack": "Next track",
     "ButtonStop": "Stopp",
     "ButtonPause": "Paus",
     "LabelGroupMoviesIntoCollections": "Gruppera filmer i samlingsboxar",
@@ -874,5 +875,14 @@
     "LabelMatchType": "Match type:",
     "OptionEquals": "Equals",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Substring"
+    "OptionSubstring": "Substring",
+    "TabView": "View",
+    "TabSort": "Sort",
+    "TabFilter": "Filter",
+    "ButtonView": "View",
+    "LabelPageSize": "Item limit:",
+    "LabelView": "View:",
+    "TabUsers": "Users",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/vi.json b/MediaBrowser.Server.Implementations/Localization/Server/vi.json
index cc5a77433a..78f308b336 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/vi.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/vi.json
@@ -190,7 +190,7 @@
     "HeaderStatus": "Tr\u1ea1ng th\u00e1i",
     "OptionContinuing": "Continuing",
     "OptionEnded": "Ended",
-    "HeaderAirDays": "Air Days:",
+    "HeaderAirDays": "Air Days",
     "OptionSunday": "Ch\u1ee7 Nh\u1eadt",
     "OptionMonday": "Th\u1ee9 Hai",
     "OptionTuesday": "Tuesday",
@@ -199,6 +199,7 @@
     "OptionFriday": "Friday",
     "OptionSaturday": "Th\u1ee9 B\u1ea3y",
     "HeaderManagement": "Qu\u1ea3n l\u00fd:",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "Thi\u1ebfu IMDb ID",
     "OptionMissingTvdbId": "Missing TheTVDB Id",
     "OptionMissingOverview": "Missing Overview",
@@ -256,11 +257,11 @@
     "ButtonSelectDirectory": "L\u1ef1a ch\u1ecdn tr\u1ef1c ti\u1ebfp",
     "LabelCustomPaths": "Specify custom paths where desired. Leave fields empty to use the defaults.",
     "LabelCachePath": "Cache path:",
-    "LabelCachePathHelp": "This folder contains server cache files, such as images.",
+    "LabelCachePathHelp": "Specify a custom location for server cache files, such as images.",
     "LabelImagesByNamePath": "Images by name path:",
-    "LabelImagesByNamePathHelp": "This folder contains downloaded actor, artist, genre and studio images.",
+    "LabelImagesByNamePathHelp": "Specify a custom location for downloaded actor, artist, genre and studio images.",
     "LabelMetadataPath": "Metadata path:",
-    "LabelMetadataPathHelp": "This location contains downloaded artwork and metadata that is not configured to be stored in media folders.",
+    "LabelMetadataPathHelp": "Specify a custom location for downloaded artwork and metadata, if not saving within media folders.",
     "LabelTranscodingTempPath": "Transcoding temporary path:",
     "LabelTranscodingTempPathHelp": "This folder contains working files used by the transcoder. Specify a custom path, or leave empty to use the default within the server's data folder.",
     "TabBasics": "Basics",
@@ -874,5 +875,14 @@
     "LabelMatchType": "Match type:",
     "OptionEquals": "Equals",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Substring"
+    "OptionSubstring": "Substring",
+    "TabView": "View",
+    "TabSort": "Sort",
+    "TabFilter": "Filter",
+    "ButtonView": "View",
+    "LabelPageSize": "Item limit:",
+    "LabelView": "View:",
+    "TabUsers": "Users",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json b/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
index c2c8f50025..e67aa9f581 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
@@ -199,6 +199,7 @@
     "OptionFriday": "\u661f\u671f\u4e94",
     "OptionSaturday": "\u661f\u671f\u516d",
     "HeaderManagement": "\u7ba1\u7406\uff1a",
+    "LabelManagement": "Management:",
     "OptionMissingImdbId": "\u7f3a\u5c11IMDB\u7de8\u865f",
     "OptionMissingTvdbId": "\u7f3a\u5c11TheTVDB\u7de8\u865f",
     "OptionMissingOverview": "\u7f3a\u5c11\u6982\u8ff0",
@@ -260,7 +261,7 @@
     "LabelImagesByNamePath": "\u540d\u7a31\u5716\u50cf\u6587\u4ef6\u593e\u8def\u5f91\uff1a",
     "LabelImagesByNamePathHelp": "\u6b64\u6587\u4ef6\u593e\u5305\u542b\u6f14\u54e1\uff0c\u6b4c\u624b\uff0c\u5a92\u9ad4\u7a2e\u985e\u548c\u5de5\u4f5c\u5ba4\u7684\u5716\u50cf\u3002",
     "LabelMetadataPath": "\u5a92\u9ad4\u8cc7\u6599\u6587\u4ef6\u593e\u8def\u5f91\uff1a",
-    "LabelMetadataPathHelp": "This location contains downloaded artwork and metadata that is not configured to be stored in media folders.",
+    "LabelMetadataPathHelp": "Specify a custom location for downloaded artwork and metadata, if not saving within media folders.",
     "LabelTranscodingTempPath": "\u8f49\u78bc\u81e8\u6642\u8def\u5f91\uff1a",
     "LabelTranscodingTempPathHelp": "This folder contains working files used by the transcoder. Specify a custom path, or leave empty to use the default within the server's data folder.",
     "TabBasics": "\u57fa\u672c",
@@ -396,7 +397,7 @@
     "HeaderCastCrew": "\u62cd\u651d\u4eba\u54e1\u53ca\u6f14\u54e1",
     "HeaderAdditionalParts": "\u9644\u52a0\u90e8\u4efd",
     "ButtonSplitVersionsApart": "Split Versions Apart",
-    "ButtonPlayTrailer": "\u9810\u544a",
+    "ButtonPlayTrailer": "Trailer",
     "LabelMissing": "\u7f3a\u5c11",
     "LabelOffline": "\u96e2\u7dda",
     "PathSubstitutionHelp": "Path substitutions are used for mapping a path on the server to a path that clients are able to access. By allowing clients direct access to media on the server they may be able to play them directly over the network and avoid using server resources to stream and transcode them.",
@@ -874,5 +875,14 @@
     "LabelMatchType": "Match type:",
     "OptionEquals": "Equals",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Substring"
+    "OptionSubstring": "Substring",
+    "TabView": "View",
+    "TabSort": "Sort",
+    "TabFilter": "Filter",
+    "ButtonView": "View",
+    "LabelPageSize": "Item limit:",
+    "LabelView": "View:",
+    "TabUsers": "Users",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs b/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
index 6f14bb3223..a65184f615 100644
--- a/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
+++ b/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
@@ -249,13 +249,13 @@ namespace MediaBrowser.Server.Implementations.ServerManager
                 _logger.Info("Sending web socket message {0}", messageType);
 
                 var message = new WebSocketMessage<T> { MessageType = messageType, Data = dataFunction() };
-                var bytes = _jsonSerializer.SerializeToBytes(message);
+                var json = _jsonSerializer.SerializeToString(message);
 
                 var tasks = connectionsList.Select(s => Task.Run(() =>
                 {
                     try
                     {
-                        s.SendAsync(bytes, cancellationToken);
+                        s.SendAsync(json, cancellationToken);
                     }
                     catch (OperationCanceledException)
                     {
@@ -265,7 +265,8 @@ namespace MediaBrowser.Server.Implementations.ServerManager
                     {
                         _logger.ErrorException("Error sending web socket message {0} to {1}", ex, messageType, s.RemoteEndPoint);
                     }
-                }));
+
+                }, cancellationToken));
 
                 await Task.WhenAll(tasks).ConfigureAwait(false);
             }
diff --git a/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs b/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
index 2b60f31160..3c3d7740a0 100644
--- a/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
+++ b/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
@@ -194,9 +194,9 @@ namespace MediaBrowser.Server.Implementations.ServerManager
                 throw new ArgumentNullException("message");
             }
 
-            var bytes = _jsonSerializer.SerializeToBytes(message);
+            var json = _jsonSerializer.SerializeToString(message);
 
-            return SendAsync(bytes, cancellationToken);
+            return SendAsync(json, cancellationToken);
         }
 
         /// <summary>
@@ -205,24 +205,46 @@ namespace MediaBrowser.Server.Implementations.ServerManager
         /// <param name="buffer">The buffer.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        public Task SendAsync(byte[] buffer, CancellationToken cancellationToken)
+        public async Task SendAsync(byte[] buffer, CancellationToken cancellationToken)
         {
-            return SendAsync(buffer, WebSocketMessageType.Text, cancellationToken);
+            if (buffer == null)
+            {
+                throw new ArgumentNullException("buffer");
+            }
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            // Per msdn docs, attempting to send simultaneous messages will result in one failing.
+            // This should help us workaround that and ensure all messages get sent
+            await _sendSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
+
+            try
+            {
+                await _socket.SendAsync(buffer, true, cancellationToken);
+            }
+            catch (OperationCanceledException)
+            {
+                _logger.Info("WebSocket message to {0} was cancelled", RemoteEndPoint);
+
+                throw;
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error sending WebSocket message {0}", ex, RemoteEndPoint);
+
+                throw;
+            }
+            finally
+            {
+                _sendSemaphore.Release();
+            }
         }
 
-        /// <summary>
-        /// Sends a message asynchronously.
-        /// </summary>
-        /// <param name="buffer">The buffer.</param>
-        /// <param name="type">The type.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">buffer</exception>
-        public async Task SendAsync(byte[] buffer, WebSocketMessageType type, CancellationToken cancellationToken)
+        public async Task SendAsync(string text, CancellationToken cancellationToken)
         {
-            if (buffer == null)
+            if (string.IsNullOrWhiteSpace(text))
             {
-                throw new ArgumentNullException("buffer");
+                throw new ArgumentNullException("text");
             }
 
             cancellationToken.ThrowIfCancellationRequested();
@@ -233,7 +255,7 @@ namespace MediaBrowser.Server.Implementations.ServerManager
 
             try
             {
-                await _socket.SendAsync(buffer, type, true, cancellationToken);
+                await _socket.SendAsync(text, true, cancellationToken);
             }
             catch (OperationCanceledException)
             {
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 3d6865f854..7c36a7c5eb 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -208,12 +208,13 @@ namespace MediaBrowser.ServerApplication
         private IUserViewManager UserViewManager { get; set; }
 
         private IAuthenticationRepository AuthenticationRepository { get; set; }
-        
+
         /// <summary>
-        /// Initializes a new instance of the <see cref="ApplicationHost"/> class.
+        /// Initializes a new instance of the <see cref="ApplicationHost" /> class.
         /// </summary>
         /// <param name="applicationPaths">The application paths.</param>
         /// <param name="logManager">The log manager.</param>
+        /// <param name="isRunningAsService">if set to <c>true</c> [is running as service].</param>
         public ApplicationHost(ServerApplicationPaths applicationPaths, ILogManager logManager, bool isRunningAsService)
             : base(applicationPaths, logManager)
         {
@@ -284,7 +285,6 @@ namespace MediaBrowser.ServerApplication
             await base.Init(progress).ConfigureAwait(false);
 
             MigrateModularConfigurations();
-            ApplyDefaultMetadataSettings();
         }
 
         private void PerformVersionMigration()
@@ -330,21 +330,6 @@ namespace MediaBrowser.ServerApplication
             }
         }
 
-        private void ApplyDefaultMetadataSettings()
-        {
-            if (!ServerConfigurationManager.Configuration.DefaultMetadataSettingsApplied &&
-                ServerConfigurationManager.Configuration.IsStartupWizardCompleted)
-            {
-                // Make sure xbmc metadata is disabled for existing users.
-                // New users will be handled by the startup wizard.
-
-                ServerConfigurationManager.DisableMetadataService("Xbmc Nfo");
-            }
-
-            ServerConfigurationManager.Configuration.DefaultMetadataSettingsApplied = true;
-            ServerConfigurationManager.SaveConfiguration();
-        }
-
         private void DeleteDeprecatedModules()
         {
             try
@@ -1111,7 +1096,6 @@ namespace MediaBrowser.ServerApplication
                 ServerAuthorization.AuthorizeServer(
                     ServerConfigurationManager.Configuration.HttpServerPortNumber,
                     HttpServerUrlPrefixes.First(),
-                    ServerConfigurationManager.Configuration.LegacyWebSocketPortNumber,
                     UdpServerEntryPoint.PortNumber,
                     ConfigurationManager.CommonApplicationPaths.TempDirectory);
             }
diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs
index 9e31fc800c..f8b03bbc25 100644
--- a/MediaBrowser.ServerApplication/MainStartup.cs
+++ b/MediaBrowser.ServerApplication/MainStartup.cs
@@ -194,13 +194,7 @@ namespace MediaBrowser.ServerApplication
         private static void BeginLog(ILogger logger, IApplicationPaths appPaths)
         {
             logger.Info("Media Browser Server started");
-            logger.Info("Command line: {0}", string.Join(" ", Environment.GetCommandLineArgs()));
-
-            logger.Info("Server: {0}", Environment.MachineName);
-            logger.Info("Operating system: {0}", Environment.OSVersion.ToString());
-            logger.Info("Program data path: {0}", appPaths.ProgramDataPath);
-
-            logger.Info("Application Path: {0}", appPaths.ApplicationPath);
+            ApplicationHost.LogEnvironmentInfo(logger, appPaths);
         }
 
         private static readonly TaskCompletionSource<bool> ApplicationTaskCompletionSource = new TaskCompletionSource<bool>();
diff --git a/MediaBrowser.ServerApplication/Native/RegisterServer.bat b/MediaBrowser.ServerApplication/Native/RegisterServer.bat
index d762dfaf76..3504123444 100644
--- a/MediaBrowser.ServerApplication/Native/RegisterServer.bat
+++ b/MediaBrowser.ServerApplication/Native/RegisterServer.bat
@@ -1,7 +1,6 @@
 rem %1 = http server port
 rem %2 = http server url
 rem %3 = udp server port
-rem %4 = tcp server port (web socket)
 
 if [%1]==[] GOTO DONE
 
@@ -18,11 +17,6 @@ if [%3]==[] GOTO DONE
 netsh advfirewall firewall delete rule name="Port %3" protocol=UDP localport=%3
 netsh advfirewall firewall add rule name="Port %3" dir=in action=allow protocol=UDP localport=%3
 
-if [%4]==[] GOTO DONE
-
-netsh advfirewall firewall delete rule name="Port %4" protocol=TCP localport=%4
-netsh advfirewall firewall add rule name="Port %4" dir=in action=allow protocol=TCP localport=%4
-
 
 :DONE
 Exit
\ No newline at end of file
diff --git a/MediaBrowser.ServerApplication/Native/ServerAuthorization.cs b/MediaBrowser.ServerApplication/Native/ServerAuthorization.cs
index d2e5425367..e5989db3bf 100644
--- a/MediaBrowser.ServerApplication/Native/ServerAuthorization.cs
+++ b/MediaBrowser.ServerApplication/Native/ServerAuthorization.cs
@@ -15,10 +15,9 @@ namespace MediaBrowser.ServerApplication.Native
         /// </summary>
         /// <param name="httpServerPort">The HTTP server port.</param>
         /// <param name="httpServerUrlPrefix">The HTTP server URL prefix.</param>
-        /// <param name="webSocketPort">The web socket port.</param>
         /// <param name="udpPort">The UDP port.</param>
         /// <param name="tempDirectory">The temp directory.</param>
-        public static void AuthorizeServer(int httpServerPort, string httpServerUrlPrefix, int webSocketPort, int udpPort, string tempDirectory)
+        public static void AuthorizeServer(int httpServerPort, string httpServerUrlPrefix, int udpPort, string tempDirectory)
         {
             Directory.CreateDirectory(tempDirectory);
 
@@ -38,10 +37,9 @@ namespace MediaBrowser.ServerApplication.Native
             {
                 FileName = tmpFile,
 
-                Arguments = string.Format("{0} {1} {2} {3}", httpServerPort,
+                Arguments = string.Format("{0} {1} {2}", httpServerPort,
                 httpServerUrlPrefix,
-                udpPort,
-                webSocketPort),
+                udpPort),
 
                 CreateNoWindow = true,
                 WindowStyle = ProcessWindowStyle.Hidden,
diff --git a/MediaBrowser.Tests/Providers/MovieDbProviderTests.cs b/MediaBrowser.Tests/Providers/MovieDbProviderTests.cs
index cbd0ce4a18..545894b0d1 100644
--- a/MediaBrowser.Tests/Providers/MovieDbProviderTests.cs
+++ b/MediaBrowser.Tests/Providers/MovieDbProviderTests.cs
@@ -1,5 +1,4 @@
 using MediaBrowser.Controller.Providers;
-using MediaBrowser.Providers.Movies;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace MediaBrowser.Tests.Providers {
@@ -20,12 +19,6 @@ namespace MediaBrowser.Tests.Providers {
             Assert.AreEqual("My Movie 2", name);
             Assert.AreEqual(2013, year);
 
-            name = string.Empty;
-            year = null;
-            NameParser.ParseName("2013 - My Movie 2", out name, out year);
-            Assert.AreEqual(2013, year);
-            Assert.AreEqual("My Movie 2", name);
-
             name = string.Empty;
             year = null;
             NameParser.ParseName("My Movie 2001 (2013)", out name, out year);
diff --git a/MediaBrowser.Tests/Resolvers/TvUtilTests.cs b/MediaBrowser.Tests/Resolvers/TvUtilTests.cs
index 725a5edcbe..104e634472 100644
--- a/MediaBrowser.Tests/Resolvers/TvUtilTests.cs
+++ b/MediaBrowser.Tests/Resolvers/TvUtilTests.cs
@@ -9,7 +9,7 @@ namespace MediaBrowser.Tests.Resolvers
         [TestMethod]
         public void TestGetEpisodeNumberFromFile()
         {
-            Assert.AreEqual(03, TVUtils.GetEpisodeNumberFromFile(@"S02E03 blah.avi", true));
+            Assert.AreEqual(03, TVUtils.GetEpisodeNumberFromFile(@"Season 02\S02E03 blah.avi", true));
 
             Assert.AreEqual(02, TVUtils.GetEpisodeNumberFromFile(@"Season 1\01x02 blah.avi", true));
             Assert.AreEqual(02, TVUtils.GetEpisodeNumberFromFile(@"Season 1\S01x02 blah.avi", true));
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index b50cb254fc..64c055ba00 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -446,7 +446,7 @@ namespace MediaBrowser.WebDashboard.Api
             var newLineBytes = Encoding.UTF8.GetBytes(Environment.NewLine);
 
             // jQuery + jQuery mobile
-            await AppendResource(memoryStream, "thirdparty/jquery-2.0.3.min.js", newLineBytes).ConfigureAwait(false);
+            await AppendResource(memoryStream, "thirdparty/jquery-2.1.1.min.js", newLineBytes).ConfigureAwait(false);
             await AppendResource(memoryStream, "thirdparty/jquerymobile-1.4.3/jquery.mobile-1.4.3.min.js", newLineBytes).ConfigureAwait(false);
 
             await AppendResource(memoryStream, "thirdparty/jquery.unveil-custom.js", newLineBytes).ConfigureAwait(false);
@@ -534,8 +534,6 @@ namespace MediaBrowser.WebDashboard.Api
                                 "alphapicker.js",
                                 "addpluginpage.js",
                                 "advancedconfigurationpage.js",
-                                "advancedpaths.js",
-                                "advancedserversettings.js",
                                 "metadataadvanced.js",
                                 "appsplayback.js",
                                 "autoorganizetv.js",
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 176094b752..06a44d747c 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -89,12 +89,6 @@
     <EmbeddedResource Include="dashboard-ui\thirdparty\mediabrowser.apiclient.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
-    <Content Include="dashboard-ui\advancedpaths.html">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="dashboard-ui\advancedserversettings.html">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\appsplayback.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -590,12 +584,6 @@
     <Content Include="dashboard-ui\nowplaying.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\scripts\advancedpaths.js">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="dashboard-ui\scripts\advancedserversettings.js">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\scripts\appsplayback.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -800,6 +788,9 @@
     <Content Include="dashboard-ui\thirdparty\jquery-2.0.3.min.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\thirdparty\jquery-2.1.1.min.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\thirdparty\jquery.unveil-custom.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-- 
cgit v1.2.3


From 37c27a26e90b7eff62cec9e2b6a6c003e79fcbe4 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 26 Jul 2014 13:30:15 -0400
Subject: added sync job database

---
 MediaBrowser.Api/Images/ImageByNameService.cs      |   8 +-
 MediaBrowser.Api/Library/LibraryHelpers.cs         |   2 +-
 MediaBrowser.Api/Sync/SyncService.cs               |  67 +---
 .../IO/CommonFileSystem.cs                         |  15 +
 MediaBrowser.Common/IO/IFileSystem.cs              |  14 +
 MediaBrowser.Controller/Entities/BaseItem.cs       |   8 +-
 MediaBrowser.Controller/Library/TVUtils.cs         |  14 +-
 .../MediaBrowser.Controller.csproj                 |   1 +
 MediaBrowser.Controller/Sync/ISyncManager.cs       |  22 +-
 MediaBrowser.Controller/Sync/ISyncRepository.cs    |  58 +++
 MediaBrowser.Dlna/Channels/DlnaChannelFactory.cs   | 112 +++++-
 .../ContentDirectory/ContentDirectoryBrowser.cs    | 126 ++++++
 MediaBrowser.Dlna/DlnaManager.cs                   |   2 +-
 MediaBrowser.Dlna/MediaBrowser.Dlna.csproj         |   1 +
 MediaBrowser.Dlna/PlayTo/Device.cs                 |   4 +-
 .../Images/CollectionFolderImageProvider.cs        |  12 +-
 .../Images/EpisodeLocalImageProvider.cs            |  14 +-
 .../Images/ImagesByNameImageProvider.cs            |   2 +-
 .../Images/InternalMetadataFolderImageProvider.cs  |  11 +-
 .../Images/LocalImageProvider.cs                   |  27 +-
 .../Providers/GameXmlProvider.cs                   |   2 +-
 .../Providers/MovieXmlProvider.cs                  |  10 +-
 .../MediaBrowser.Model.Portable.csproj             |  12 +-
 .../MediaBrowser.Model.net35.csproj                |  12 +-
 MediaBrowser.Model/MediaBrowser.Model.csproj       |   4 +-
 MediaBrowser.Model/Sync/SyncJob.cs                 |  80 +++-
 MediaBrowser.Model/Sync/SyncJobCreationResult.cs   |   8 +
 MediaBrowser.Model/Sync/SyncJobItem.cs             |  48 +++
 MediaBrowser.Model/Sync/SyncJobQuery.cs            |  10 +
 MediaBrowser.Model/Sync/SyncJobRequest.cs          |  32 +-
 MediaBrowser.Model/Sync/SyncJobStatus.cs           |  28 +-
 MediaBrowser.Model/Sync/SyncSchedule.cs            |  12 -
 MediaBrowser.Model/Sync/SyncScheduleQuery.cs       |   7 -
 .../BoxSets/MovieDbBoxSetProvider.cs               |   6 -
 MediaBrowser.Providers/Manager/ImageSaver.cs       |  10 +-
 .../MediaInfo/FFProbeProvider.cs                   |   2 +-
 .../MediaInfo/FFProbeVideoInfo.cs                  |   6 +-
 .../MediaInfo/SubtitleResolver.cs                  |  19 +-
 MediaBrowser.Providers/Movies/MovieDbProvider.cs   |   2 +-
 .../Subtitles/SubtitleManager.cs                   |   2 +-
 .../FileOrganization/EpisodeFileOrganizer.cs       |   6 +-
 .../HttpServer/HttpListenerHost.cs                 |  14 +-
 .../HttpServer/NetListener/HttpListenerServer.cs   |  18 +-
 .../SocketSharp/WebSocketSharpListener.cs          |  21 +-
 .../Library/CoreResolutionIgnoreRule.cs            |   2 +-
 .../Library/LibraryManager.cs                      |  17 +-
 .../Library/Resolvers/Audio/MusicAlbumResolver.cs  |  43 ++-
 .../Library/Resolvers/Audio/MusicArtistResolver.cs |  15 +-
 .../Library/Resolvers/FolderResolver.cs            |  12 +-
 .../Library/Resolvers/LocalTrailerResolver.cs      |  12 +-
 .../Library/Resolvers/Movies/MovieResolver.cs      |   7 +-
 .../Library/Resolvers/TV/SeriesResolver.cs         |  12 +-
 .../Library/UserManager.cs                         |   2 +-
 .../Localization/JavaScript/es_MX.json             |   8 +-
 .../Localization/JavaScript/fr.json                |   2 +-
 .../Localization/JavaScript/nl.json                |  14 +-
 .../Localization/JavaScript/pt_BR.json             |   4 +-
 .../Localization/JavaScript/ru.json                |   4 +-
 .../Localization/LocalizationManager.cs            |   4 +-
 .../Localization/Server/ar.json                    |  12 +-
 .../Localization/Server/ca.json                    |  12 +-
 .../Localization/Server/cs.json                    |  12 +-
 .../Localization/Server/da.json                    |  12 +-
 .../Localization/Server/de.json                    |  12 +-
 .../Localization/Server/el.json                    |  12 +-
 .../Localization/Server/en_GB.json                 |  12 +-
 .../Localization/Server/en_US.json                 |  12 +-
 .../Localization/Server/es.json                    |   4 +-
 .../Localization/Server/es_MX.json                 |  28 +-
 .../Localization/Server/fr.json                    |   8 +-
 .../Localization/Server/he.json                    |  12 +-
 .../Localization/Server/it.json                    |   4 +-
 .../Localization/Server/kk.json                    |   4 +-
 .../Localization/Server/ko.json                    |  12 +-
 .../Localization/Server/ms.json                    |  12 +-
 .../Localization/Server/nb.json                    |  12 +-
 .../Localization/Server/nl.json                    |  48 +--
 .../Localization/Server/pl.json                    |  12 +-
 .../Localization/Server/pt_BR.json                 |  26 +-
 .../Localization/Server/pt_PT.json                 |  12 +-
 .../Localization/Server/ru.json                    |  18 +-
 .../Localization/Server/server.json                |  24 +-
 .../Localization/Server/sv.json                    |   4 +-
 .../Localization/Server/vi.json                    |  12 +-
 .../Localization/Server/zh_TW.json                 |  12 +-
 .../MediaBrowser.Server.Implementations.csproj     |   5 +-
 .../Sync/SyncManager.cs                            | 150 ++++++-
 .../Sync/SyncRepository.cs                         | 429 +++++++++++++++++++++
 .../packages.config                                |   2 +-
 MediaBrowser.ServerApplication/ApplicationHost.cs  |  15 +-
 .../FFMpeg/FFMpegDownloader.cs                     |   2 +-
 MediaBrowser.Tests/Resolvers/MovieResolverTests.cs |   2 +
 MediaBrowser.WebDashboard/Api/DashboardService.cs  |   2 +
 .../MediaBrowser.WebDashboard.csproj               |  12 +
 MediaBrowser.XbmcMetadata/Images/XbmcImageSaver.cs |   2 +-
 .../Providers/BaseVideoNfoProvider.cs              |   6 +-
 MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs  |   6 +-
 97 files changed, 1537 insertions(+), 505 deletions(-)
 create mode 100644 MediaBrowser.Controller/Sync/ISyncRepository.cs
 create mode 100644 MediaBrowser.Dlna/ContentDirectory/ContentDirectoryBrowser.cs
 create mode 100644 MediaBrowser.Model/Sync/SyncJobCreationResult.cs
 create mode 100644 MediaBrowser.Model/Sync/SyncJobItem.cs
 delete mode 100644 MediaBrowser.Model/Sync/SyncSchedule.cs
 delete mode 100644 MediaBrowser.Model/Sync/SyncScheduleQuery.cs
 create mode 100644 MediaBrowser.Server.Implementations/Sync/SyncRepository.cs

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Api/Images/ImageByNameService.cs b/MediaBrowser.Api/Images/ImageByNameService.cs
index d407629644..99d2f144b1 100644
--- a/MediaBrowser.Api/Images/ImageByNameService.cs
+++ b/MediaBrowser.Api/Images/ImageByNameService.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.IO;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Dto;
@@ -100,13 +101,16 @@ namespace MediaBrowser.Api.Images
         /// </summary>
         private readonly IServerApplicationPaths _appPaths;
 
+        private readonly IFileSystem _fileSystem;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageByNameService" /> class.
         /// </summary>
         /// <param name="appPaths">The app paths.</param>
-        public ImageByNameService(IServerApplicationPaths appPaths)
+        public ImageByNameService(IServerApplicationPaths appPaths, IFileSystem fileSystem)
         {
             _appPaths = appPaths;
+            _fileSystem = fileSystem;
         }
 
         public object Get(GetMediaInfoImages request)
@@ -133,7 +137,7 @@ namespace MediaBrowser.Api.Images
                     .Where(i => BaseItem.SupportedImageExtensions.Contains(i.Extension, StringComparer.Ordinal))
                     .Select(i => new ImageByNameInfo
                     {
-                        Name = Path.GetFileNameWithoutExtension(i.FullName),
+                        Name = _fileSystem.GetFileNameWithoutExtension(i),
                         FileLength = i.Length,
 
                         // For themeable images, use the Theme property
diff --git a/MediaBrowser.Api/Library/LibraryHelpers.cs b/MediaBrowser.Api/Library/LibraryHelpers.cs
index be9f00a615..e21dc4a73b 100644
--- a/MediaBrowser.Api/Library/LibraryHelpers.cs
+++ b/MediaBrowser.Api/Library/LibraryHelpers.cs
@@ -65,7 +65,7 @@ namespace MediaBrowser.Api.Library
             var rootFolderPath = appPaths.DefaultUserViewsPath;
             var virtualFolderPath = Path.Combine(rootFolderPath, virtualFolderName);
 
-            var shortcutFilename = Path.GetFileNameWithoutExtension(path);
+            var shortcutFilename = fileSystem.GetFileNameWithoutExtension(path);
 
             var lnk = Path.Combine(virtualFolderPath, shortcutFilename + ShortcutFileExtension);
 
diff --git a/MediaBrowser.Api/Sync/SyncService.cs b/MediaBrowser.Api/Sync/SyncService.cs
index 929d0a4639..e0dc07cdcf 100644
--- a/MediaBrowser.Api/Sync/SyncService.cs
+++ b/MediaBrowser.Api/Sync/SyncService.cs
@@ -15,13 +15,6 @@ namespace MediaBrowser.Api.Sync
         public string Id { get; set; }
     }
 
-    [Route("/Sync/Schedules/{Id}", "DELETE", Summary = "Cancels a sync job.")]
-    public class CancelSyncSchedule : IReturnVoid
-    {
-        [ApiMember(Name = "Id", Description = "Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
-        public string Id { get; set; }
-    }
-
     [Route("/Sync/Jobs/{Id}", "GET", Summary = "Gets a sync job.")]
     public class GetSyncJob : IReturn<SyncJob>
     {
@@ -29,25 +22,26 @@ namespace MediaBrowser.Api.Sync
         public string Id { get; set; }
     }
 
-    [Route("/Sync/Schedules/{Id}", "GET", Summary = "Gets a sync job.")]
-    public class GetSyncSchedule : IReturn<SyncSchedule>
-    {
-        [ApiMember(Name = "Id", Description = "Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
-        public string Id { get; set; }
-    }
-
     [Route("/Sync/Jobs", "GET", Summary = "Gets sync jobs.")]
     public class GetSyncJobs : IReturn<QueryResult<SyncJob>>
     {
-    }
-
-    [Route("/Sync/Schedules", "GET", Summary = "Gets sync schedules.")]
-    public class GetSyncSchedules : IReturn<QueryResult<SyncSchedule>>
-    {
+        /// <summary>
+        /// Skips over a given number of items within the results. Use for paging.
+        /// </summary>
+        /// <value>The start index.</value>
+        [ApiMember(Name = "StartIndex", Description = "Optional. The record index to start at. All items with a lower index will be dropped from the results.", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
+        public int? StartIndex { get; set; }
+
+        /// <summary>
+        /// The maximum number of items to return
+        /// </summary>
+        /// <value>The limit.</value>
+        [ApiMember(Name = "Limit", Description = "Optional. The maximum number of records to return", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
+        public int? Limit { get; set; }
     }
 
     [Route("/Sync/Jobs", "POST", Summary = "Gets sync jobs.")]
-    public class CreateSyncJob : SyncJobRequest
+    public class CreateSyncJob : SyncJobRequest, IReturn<SyncJobCreationResult>
     {
     }
 
@@ -79,22 +73,13 @@ namespace MediaBrowser.Api.Sync
         {
             var result = _syncManager.GetJobs(new SyncJobQuery
             {
-                 
+                 StartIndex = request.StartIndex,
+                 Limit = request.Limit
             });
 
             return ToOptimizedResult(result);
         }
 
-        public object Get(GetSyncSchedules request)
-        {
-            var result = _syncManager.GetSchedules(new SyncScheduleQuery
-            {
-                 
-            }); 
-
-            return ToOptimizedResult(result);
-        }
-
         public object Get(GetSyncJob request)
         {
             var result = _syncManager.GetJob(request.Id);
@@ -102,13 +87,6 @@ namespace MediaBrowser.Api.Sync
             return ToOptimizedResult(result);
         }
 
-        public object Get(GetSyncSchedule request)
-        {
-            var result = _syncManager.GetSchedule(request.Id);
-
-            return ToOptimizedResult(result);
-        }
-
         public void Delete(CancelSyncJob request)
         {
             var task = _syncManager.CancelJob(request.Id);
@@ -116,18 +94,11 @@ namespace MediaBrowser.Api.Sync
             Task.WaitAll(task);
         }
 
-        public void Delete(CancelSyncSchedule request)
+        public object Post(CreateSyncJob request)
         {
-            var task = _syncManager.CancelSchedule(request.Id);
+            var result = _syncManager.CreateJob(request);
 
-            Task.WaitAll(task);
-        }
-
-        public void Post(CreateSyncJob request)
-        {
-            var task = _syncManager.CreateJob(request);
-
-            Task.WaitAll(task);
+            return ToOptimizedResult(result);
         }
     }
 }
diff --git a/MediaBrowser.Common.Implementations/IO/CommonFileSystem.cs b/MediaBrowser.Common.Implementations/IO/CommonFileSystem.cs
index dfe93c5c93..2d67ec9756 100644
--- a/MediaBrowser.Common.Implementations/IO/CommonFileSystem.cs
+++ b/MediaBrowser.Common.Implementations/IO/CommonFileSystem.cs
@@ -367,5 +367,20 @@ namespace MediaBrowser.Common.Implementations.IO
 
             return newPath;
         }
+
+        public string GetFileNameWithoutExtension(FileSystemInfo info)
+        {
+            if (info is DirectoryInfo)
+            {
+                return info.Name;
+            }
+
+            return Path.GetFileNameWithoutExtension(info.FullName);
+        }
+
+        public string GetFileNameWithoutExtension(string path)
+        {
+            return Path.GetFileNameWithoutExtension(path);
+        }
     }
 }
diff --git a/MediaBrowser.Common/IO/IFileSystem.cs b/MediaBrowser.Common/IO/IFileSystem.cs
index de9b7e88ac..27307a0e9d 100644
--- a/MediaBrowser.Common/IO/IFileSystem.cs
+++ b/MediaBrowser.Common/IO/IFileSystem.cs
@@ -112,5 +112,19 @@ namespace MediaBrowser.Common.IO
         /// <param name="to">To.</param>
         /// <returns>System.String.</returns>
         string SubstitutePath(string path, string from, string to);
+
+        /// <summary>
+        /// Gets the file name without extension.
+        /// </summary>
+        /// <param name="info">The information.</param>
+        /// <returns>System.String.</returns>
+        string GetFileNameWithoutExtension(FileSystemInfo info);
+
+        /// <summary>
+        /// Gets the file name without extension.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns>System.String.</returns>
+        string GetFileNameWithoutExtension(string path);
     }
 }
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index b891bcfb2a..2bdbab0848 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -529,10 +529,10 @@ namespace MediaBrowser.Controller.Entities
                 .Where(i => string.Equals(i.Name, TrailerFolderName, StringComparison.OrdinalIgnoreCase))
                 .SelectMany(i => i.EnumerateFiles("*", SearchOption.TopDirectoryOnly))
                 .ToList();
-
+            
             // Support plex/xbmc convention
             files.AddRange(fileSystemChildren.OfType<FileInfo>()
-                .Where(i => System.IO.Path.GetFileNameWithoutExtension(i.Name).EndsWith(XbmcTrailerFileSuffix, StringComparison.OrdinalIgnoreCase) && !string.Equals(Path, i.FullName, StringComparison.OrdinalIgnoreCase))
+                .Where(i => FileSystem.GetFileNameWithoutExtension(i).EndsWith(XbmcTrailerFileSuffix, StringComparison.OrdinalIgnoreCase) && !string.Equals(Path, i.FullName, StringComparison.OrdinalIgnoreCase))
                 );
 
             return LibraryManager.ResolvePaths<Trailer>(files, directoryService, null).Select(video =>
@@ -564,7 +564,7 @@ namespace MediaBrowser.Controller.Entities
 
             // Support plex/xbmc convention
             files.AddRange(fileSystemChildren.OfType<FileInfo>()
-                .Where(i => string.Equals(System.IO.Path.GetFileNameWithoutExtension(i.Name), ThemeSongFilename, StringComparison.OrdinalIgnoreCase))
+                .Where(i => string.Equals(FileSystem.GetFileNameWithoutExtension(i), ThemeSongFilename, StringComparison.OrdinalIgnoreCase))
                 );
 
             return LibraryManager.ResolvePaths<Audio.Audio>(files, directoryService, null).Select(audio =>
@@ -1564,7 +1564,7 @@ namespace MediaBrowser.Controller.Entities
 
             if (string.IsNullOrEmpty(Name) && !string.IsNullOrEmpty(Path))
             {
-                Name = System.IO.Path.GetFileNameWithoutExtension(Path);
+                Name = FileSystem.GetFileNameWithoutExtension(Path);
                 hasChanges = true;
             }
 
diff --git a/MediaBrowser.Controller/Library/TVUtils.cs b/MediaBrowser.Controller/Library/TVUtils.cs
index af0ff8319e..86699272e8 100644
--- a/MediaBrowser.Controller/Library/TVUtils.cs
+++ b/MediaBrowser.Controller/Library/TVUtils.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Common.IO;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Resolvers;
 using System;
@@ -189,11 +190,14 @@ namespace MediaBrowser.Controller.Library
         /// </summary>
         /// <param name="path">The path.</param>
         /// <param name="directoryService">The directory service.</param>
+        /// <param name="fileSystem">The file system.</param>
         /// <returns><c>true</c> if [is season folder] [the specified path]; otherwise, <c>false</c>.</returns>
-        private static bool IsSeasonFolder(string path, IDirectoryService directoryService)
+        private static bool IsSeasonFolder(string path, IDirectoryService directoryService, IFileSystem fileSystem)
         {
             // It's a season folder if it's named as such and does not contain any audio files, apart from theme.mp3
-            return GetSeasonNumberFromPath(path) != null && !directoryService.GetFiles(path).Any(i => EntityResolutionHelper.IsAudioFile(i.FullName) && !string.Equals(Path.GetFileNameWithoutExtension(i.FullName), BaseItem.ThemeSongFilename));
+            return GetSeasonNumberFromPath(path) != null && 
+                !directoryService.GetFiles(path)
+                .Any(i => EntityResolutionHelper.IsAudioFile(i.FullName) && !string.Equals(fileSystem.GetFileNameWithoutExtension(i), BaseItem.ThemeSongFilename));
         }
 
         /// <summary>
@@ -204,7 +208,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="fileSystemChildren">The file system children.</param>
         /// <param name="directoryService">The directory service.</param>
         /// <returns><c>true</c> if [is series folder] [the specified path]; otherwise, <c>false</c>.</returns>
-        public static bool IsSeriesFolder(string path, bool considerSeasonlessSeries, IEnumerable<FileSystemInfo> fileSystemChildren, IDirectoryService directoryService)
+        public static bool IsSeriesFolder(string path, bool considerSeasonlessSeries, IEnumerable<FileSystemInfo> fileSystemChildren, IDirectoryService directoryService, IFileSystem fileSystem)
         {
             // A folder with more than 3 non-season folders in will not becounted as a series
             var nonSeriesFolders = 0;
@@ -225,7 +229,7 @@ namespace MediaBrowser.Controller.Library
 
                 if ((attributes & FileAttributes.Directory) == FileAttributes.Directory)
                 {
-                    if (IsSeasonFolder(child.FullName, directoryService))
+                    if (IsSeasonFolder(child.FullName, directoryService, fileSystem))
                     {
                         return true;
                     }
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 5c3f10b54f..aee118f9ac 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -322,6 +322,7 @@
     <Compile Include="Sync\ICloudSyncProvider.cs" />
     <Compile Include="Sync\ISyncManager.cs" />
     <Compile Include="Sync\ISyncProvider.cs" />
+    <Compile Include="Sync\ISyncRepository.cs" />
     <Compile Include="Themes\IAppThemeManager.cs" />
     <Compile Include="Themes\InternalThemeImage.cs" />
   </ItemGroup>
diff --git a/MediaBrowser.Controller/Sync/ISyncManager.cs b/MediaBrowser.Controller/Sync/ISyncManager.cs
index 714e71a1f8..1d5ab7d3e7 100644
--- a/MediaBrowser.Controller/Sync/ISyncManager.cs
+++ b/MediaBrowser.Controller/Sync/ISyncManager.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Controller.Sync
         /// </summary>
         /// <param name="request">The request.</param>
         /// <returns>Task.</returns>
-        Task<List<SyncJob>> CreateJob(SyncJobRequest request);
+        Task<SyncJobCreationResult> CreateJob(SyncJobRequest request);
 
         /// <summary>
         /// Gets the jobs.
@@ -21,25 +21,12 @@ namespace MediaBrowser.Controller.Sync
         /// <returns>QueryResult&lt;SyncJob&gt;.</returns>
         QueryResult<SyncJob> GetJobs(SyncJobQuery query);
 
-        /// <summary>
-        /// Gets the schedules.
-        /// </summary>
-        /// <returns>QueryResult&lt;SyncSchedule&gt;.</returns>
-        QueryResult<SyncSchedule> GetSchedules(SyncScheduleQuery query);
-
         /// <summary>
         /// Gets the job.
         /// </summary>
         /// <param name="id">The identifier.</param>
         /// <returns>SyncJob.</returns>
         SyncJob GetJob(string id);
-
-        /// <summary>
-        /// Gets the schedule.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <returns>SyncSchedule.</returns>
-        SyncSchedule GetSchedule(string id);
         
         /// <summary>
         /// Cancels the job.
@@ -48,13 +35,6 @@ namespace MediaBrowser.Controller.Sync
         /// <returns>Task.</returns>
         Task CancelJob(string id);
 
-        /// <summary>
-        /// Cancels the schedule.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <returns>Task.</returns>
-        Task CancelSchedule(string id);
-
         /// <summary>
         /// Adds the parts.
         /// </summary>
diff --git a/MediaBrowser.Controller/Sync/ISyncRepository.cs b/MediaBrowser.Controller/Sync/ISyncRepository.cs
new file mode 100644
index 0000000000..9cce69bdc2
--- /dev/null
+++ b/MediaBrowser.Controller/Sync/ISyncRepository.cs
@@ -0,0 +1,58 @@
+using MediaBrowser.Model.Querying;
+using MediaBrowser.Model.Sync;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Controller.Sync
+{
+    public interface ISyncRepository
+    {
+        /// <summary>
+        /// Gets the job.
+        /// </summary>
+        /// <param name="id">The identifier.</param>
+        /// <returns>SyncJob.</returns>
+        SyncJob GetJob(string id);
+
+        /// <summary>
+        /// Creates the specified job.
+        /// </summary>
+        /// <param name="job">The job.</param>
+        /// <returns>Task.</returns>
+        Task Create(SyncJob job);
+
+        /// <summary>
+        /// Updates the specified job.
+        /// </summary>
+        /// <param name="job">The job.</param>
+        /// <returns>Task.</returns>
+        Task Update(SyncJob job);
+
+        /// <summary>
+        /// Gets the jobs.
+        /// </summary>
+        /// <param name="query">The query.</param>
+        /// <returns>QueryResult&lt;SyncJob&gt;.</returns>
+        QueryResult<SyncJob> GetJobs(SyncJobQuery query);
+
+        /// <summary>
+        /// Gets the job item.
+        /// </summary>
+        /// <param name="id">The identifier.</param>
+        /// <returns>SyncJobItem.</returns>
+        SyncJobItem GetJobItem(string id);
+
+        /// <summary>
+        /// Creates the specified job item.
+        /// </summary>
+        /// <param name="jobItem">The job item.</param>
+        /// <returns>Task.</returns>
+        Task Create(SyncJobItem jobItem);
+
+        /// <summary>
+        /// Updates the specified job item.
+        /// </summary>
+        /// <param name="jobItem">The job item.</param>
+        /// <returns>Task.</returns>
+        Task Update(SyncJobItem jobItem);
+    }
+}
diff --git a/MediaBrowser.Dlna/Channels/DlnaChannelFactory.cs b/MediaBrowser.Dlna/Channels/DlnaChannelFactory.cs
index 230b5e145e..fc5fd4061e 100644
--- a/MediaBrowser.Dlna/Channels/DlnaChannelFactory.cs
+++ b/MediaBrowser.Dlna/Channels/DlnaChannelFactory.cs
@@ -1,7 +1,9 @@
-using MediaBrowser.Common.Net;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Providers;
+using MediaBrowser.Dlna.ContentDirectory;
 using MediaBrowser.Dlna.PlayTo;
 using MediaBrowser.Dlna.Ssdp;
 using MediaBrowser.Model.Channels;
@@ -20,7 +22,7 @@ namespace MediaBrowser.Dlna.Channels
         private readonly IServerConfigurationManager _config;
         private readonly ILogger _logger;
         private readonly IHttpClient _httpClient;
-        
+
         private DeviceDiscovery _deviceDiscovery;
 
         private readonly SemaphoreSlim _syncLock = new SemaphoreSlim(1, 1);
@@ -96,7 +98,7 @@ namespace MediaBrowser.Dlna.Channels
             }
             catch (Exception ex)
             {
-                
+
             }
             finally
             {
@@ -123,7 +125,7 @@ namespace MediaBrowser.Dlna.Channels
             }
 
             await _syncLock.WaitAsync().ConfigureAwait(false);
-            
+
             try
             {
                 var list = _servers.ToList();
@@ -163,7 +165,23 @@ namespace MediaBrowser.Dlna.Channels
 
         public IEnumerable<IChannel> GetChannels()
         {
-            return _servers.Select(i => new ServerChannel(i)).ToList();
+            //if (_servers.Count > 0)
+            //{
+            //    var service = _servers[0].Properties.Services
+            //        .FirstOrDefault(i => string.Equals(i.ServiceType, "urn:schemas-upnp-org:service:ContentDirectory:1", StringComparison.OrdinalIgnoreCase));
+
+            //    var controlUrl = service == null ? null : (_servers[0].Properties.BaseUrl.TrimEnd('/') + "/" + service.ControlUrl.TrimStart('/'));
+
+            //    if (!string.IsNullOrEmpty(controlUrl))
+            //    {
+            //        return new List<IChannel>
+            //    {
+            //        new ServerChannel(_servers.ToList(), _httpClient, _logger, controlUrl)
+            //    };
+            //    }
+            //}
+
+            return new List<IChannel>();
         }
 
         public void Dispose()
@@ -178,31 +196,37 @@ namespace MediaBrowser.Dlna.Channels
 
     public class ServerChannel : IChannel, IFactoryChannel
     {
-        private readonly Device _device;
+        private readonly List<Device> _servers = new List<Device>();
+        private readonly IHttpClient _httpClient;
+        private readonly ILogger _logger;
+        private readonly string _controlUrl;
 
-        public ServerChannel(Device device)
+        public ServerChannel(List<Device> servers, IHttpClient httpClient, ILogger logger, string controlUrl)
         {
-            _device = device;
+            _servers = servers;
+            _httpClient = httpClient;
+            _logger = logger;
+            _controlUrl = controlUrl;
         }
 
         public string Name
         {
-            get { return _device.Properties.Name; }
+            get { return "Devices"; }
         }
 
         public string Description
         {
-            get { return _device.Properties.ModelDescription; }
+            get { return string.Empty; }
         }
 
         public string DataVersion
         {
-            get { return "1"; }
+            get { return DateTime.UtcNow.Ticks.ToString(); }
         }
 
         public string HomePageUrl
         {
-            get { return _device.Properties.ModelUrl; }
+            get { return string.Empty; }
         }
 
         public ChannelParentalRating ParentalRating
@@ -234,10 +258,68 @@ namespace MediaBrowser.Dlna.Channels
             return true;
         }
 
-        public Task<ChannelItemResult> GetChannelItems(InternalChannelItemQuery query, CancellationToken cancellationToken)
+        public async Task<ChannelItemResult> GetChannelItems(InternalChannelItemQuery query, CancellationToken cancellationToken)
         {
-            // TODO: Implement
-            return Task.FromResult(new ChannelItemResult());
+            IEnumerable<ChannelItemInfo> items;
+
+            if (string.IsNullOrWhiteSpace(query.FolderId))
+            {
+                items = _servers.Select(i => new ChannelItemInfo
+                {
+                    FolderType = ChannelFolderType.Container,
+                    Id = GetServerId(i),
+                    Name = i.Properties.Name,
+                    Overview = i.Properties.ModelDescription,
+                    Type = ChannelItemType.Folder
+                });
+            }
+            else
+            {
+                var idParts = query.FolderId.Split('|');
+                var folderId = idParts.Length == 2 ? idParts[1] : null;
+
+                var result = await new ContentDirectoryBrowser(_httpClient, _logger).Browse(new ContentDirectoryBrowseRequest
+                {
+                    Limit = query.Limit,
+                    StartIndex = query.StartIndex,
+                    ParentId = folderId,
+                    ContentDirectoryUrl = _controlUrl
+
+                }, cancellationToken).ConfigureAwait(false);
+
+                items = result.Items.ToList();
+            }
+
+            var list = items.ToList();
+            var count = list.Count;
+
+            list = ApplyPaging(list, query).ToList();
+
+            return new ChannelItemResult
+            {
+                Items = list,
+                TotalRecordCount = count
+            };
+        }
+
+        private string GetServerId(Device device)
+        {
+            return device.Properties.UUID.GetMD5().ToString("N");
+        }
+
+        private IEnumerable<T> ApplyPaging<T>(IEnumerable<T> items, InternalChannelItemQuery query)
+        {
+            if (query.StartIndex.HasValue)
+            {
+                items = items.Skip(query.StartIndex.Value);
+            }
+
+            if (query.Limit.HasValue)
+            {
+                items = items.Take(query.Limit.Value);
+            }
+
+            return items;
         }
 
         public Task<DynamicImageResponse> GetChannelImage(ImageType type, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Dlna/ContentDirectory/ContentDirectoryBrowser.cs b/MediaBrowser.Dlna/ContentDirectory/ContentDirectoryBrowser.cs
new file mode 100644
index 0000000000..0c62ada809
--- /dev/null
+++ b/MediaBrowser.Dlna/ContentDirectory/ContentDirectoryBrowser.cs
@@ -0,0 +1,126 @@
+using System.Linq;
+using System.Xml.Linq;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Channels;
+using MediaBrowser.Dlna.PlayTo;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Querying;
+using System;
+using System.Globalization;
+using System.IO;
+using System.Security;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Dlna.ContentDirectory
+{
+    public class ContentDirectoryBrowser
+    {
+        private readonly IHttpClient _httpClient;
+        private readonly ILogger _logger;
+
+        public ContentDirectoryBrowser(IHttpClient httpClient, ILogger logger)
+        {
+            _httpClient = httpClient;
+            _logger = logger;
+        }
+
+        private static XNamespace UNamespace = "u";
+        
+        public async Task<QueryResult<ChannelItemInfo>> Browse(ContentDirectoryBrowseRequest request, CancellationToken cancellationToken)
+        {
+            var options = new HttpRequestOptions
+            {
+                CancellationToken = cancellationToken,
+                UserAgent = "Media Browser",
+                RequestContentType = "text/xml; charset=\"utf-8\"",
+                LogErrorResponseBody = true,
+                Url = request.ContentDirectoryUrl
+            };
+
+            options.RequestHeaders["SOAPACTION"] = "urn:schemas-upnp-org:service:ContentDirectory:1#Browse";
+
+            options.RequestContent = GetRequestBody(request);
+
+            var response = await _httpClient.SendAsync(options, "POST");
+
+            using (var reader = new StreamReader(response.Content))
+            {
+                var doc = XDocument.Parse(reader.ReadToEnd(), LoadOptions.PreserveWhitespace);
+
+                var queryResult = new QueryResult<ChannelItemInfo>();
+
+                if (doc.Document == null)
+                    return queryResult;
+
+                var responseElement = doc.Document.Descendants(UNamespace + "BrowseResponse").ToList();
+
+                var countElement = responseElement.Select(i => i.Element("TotalMatches")).FirstOrDefault(i => i != null);
+                var countValue = countElement == null ? null : countElement.Value;
+
+                int count;
+                if (!string.IsNullOrWhiteSpace(countValue) && int.TryParse(countValue, NumberStyles.Integer, CultureInfo.InvariantCulture, out count))
+                {
+                    queryResult.TotalRecordCount = count;
+
+                    var resultElement = responseElement.Select(i => i.Element("Result")).FirstOrDefault(i => i != null);
+                    var resultString = (string)resultElement;
+
+                    if (resultElement != null)
+                    {
+                        var xElement = XElement.Parse(resultString);
+                    }
+                }
+
+                return queryResult;
+            }
+        }
+
+        private string GetRequestBody(ContentDirectoryBrowseRequest request)
+        {
+            var builder = new StringBuilder();
+
+            builder.Append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+
+            builder.Append("<s:Envelope s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\" xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Body>");
+            builder.Append("<u:Browse xmlns:u=\"urn:schemas-upnp-org:service:ContentDirectory:1\">");
+
+            if (string.IsNullOrWhiteSpace(request.ParentId))
+            {
+                request.ParentId = "1";
+            }
+
+            builder.AppendFormat("<ObjectID>{0}</ObjectID>", SecurityElement.Escape(request.ParentId));
+            builder.Append("<BrowseFlag>BrowseDirectChildren</BrowseFlag>");
+
+            //builder.Append("<BrowseFlag>BrowseMetadata</BrowseFlag>");
+
+            builder.Append("<Filter>*</Filter>");
+
+            request.StartIndex = request.StartIndex ?? 0;
+            builder.AppendFormat("<StartingIndex>{0}</StartingIndex>", SecurityElement.Escape(request.StartIndex.Value.ToString(CultureInfo.InvariantCulture)));
+
+            request.Limit = request.Limit ?? 20;
+            if (request.Limit.HasValue)
+            {
+                builder.AppendFormat("<RequestedCount>{0}</RequestedCount>", SecurityElement.Escape(request.Limit.Value.ToString(CultureInfo.InvariantCulture)));
+            }
+
+            builder.Append("<SortCriteria></SortCriteria>");
+
+            builder.Append("</u:Browse>");
+            builder.Append("</s:Body></s:Envelope>");
+
+            return builder.ToString();
+        }
+    }
+
+    public class ContentDirectoryBrowseRequest
+    {
+        public int? StartIndex { get; set; }
+        public int? Limit { get; set; }
+        public string ParentId { get; set; }
+        public string ContentDirectoryUrl { get; set; }
+    }
+}
diff --git a/MediaBrowser.Dlna/DlnaManager.cs b/MediaBrowser.Dlna/DlnaManager.cs
index 333521bb57..29bd21407b 100644
--- a/MediaBrowser.Dlna/DlnaManager.cs
+++ b/MediaBrowser.Dlna/DlnaManager.cs
@@ -372,7 +372,7 @@ namespace MediaBrowser.Dlna
                         Info = new DeviceProfileInfo
                         {
                             Id = i.FullName.ToLower().GetMD5().ToString("N"),
-                            Name = Path.GetFileNameWithoutExtension(i.FullName),
+                            Name = _fileSystem.GetFileNameWithoutExtension(i),
                             Type = type
                         }
                     })
diff --git a/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj b/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj
index ec85277384..461470b7ac 100644
--- a/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj
+++ b/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj
@@ -57,6 +57,7 @@
     <Compile Include="ConnectionManager\ConnectionManagerXmlBuilder.cs" />
     <Compile Include="ConnectionManager\ControlHandler.cs" />
     <Compile Include="ConnectionManager\ServiceActionListBuilder.cs" />
+    <Compile Include="ContentDirectory\ContentDirectoryBrowser.cs" />
     <Compile Include="Didl\Filter.cs" />
     <Compile Include="DlnaManager.cs" />
     <Compile Include="Common\Argument.cs" />
diff --git a/MediaBrowser.Dlna/PlayTo/Device.cs b/MediaBrowser.Dlna/PlayTo/Device.cs
index 0d7c450d61..85e18150ed 100644
--- a/MediaBrowser.Dlna/PlayTo/Device.cs
+++ b/MediaBrowser.Dlna/PlayTo/Device.cs
@@ -819,12 +819,12 @@ namespace MediaBrowser.Dlna.PlayTo
             foreach (var services in document.Descendants(uPnpNamespaces.ud.GetName("serviceList")))
             {
                 if (services == null)
-                    return null;
+                    continue;
 
                 var servicesList = services.Descendants(uPnpNamespaces.ud.GetName("service"));
 
                 if (servicesList == null)
-                    return null;
+                    continue;
 
                 foreach (var element in servicesList)
                 {
diff --git a/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs b/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs
index 29fd76aa56..ccb2acd1d6 100644
--- a/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs
@@ -1,11 +1,19 @@
-using System.Collections.Generic;
+using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
+using System.Collections.Generic;
 
 namespace MediaBrowser.LocalMetadata.Images
 {
     public class CollectionFolderLocalImageProvider : ILocalImageFileProvider, IHasOrder
     {
+        private readonly IFileSystem _fileSystem;
+
+        public CollectionFolderLocalImageProvider(IFileSystem fileSystem)
+        {
+            _fileSystem = fileSystem;
+        }
+
         public string Name
         {
             get { return "Collection Folder Images"; }
@@ -29,7 +37,7 @@ namespace MediaBrowser.LocalMetadata.Images
         {
             var collectionFolder = (CollectionFolder)item;
 
-            return new LocalImageProvider().GetImages(item, collectionFolder.PhysicalLocations, directoryService);
+            return new LocalImageProvider(_fileSystem).GetImages(item, collectionFolder.PhysicalLocations, directoryService);
         }
     }
 }
diff --git a/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
index f40020c84e..cd9b78201e 100644
--- a/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Common.IO;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
@@ -11,6 +12,13 @@ namespace MediaBrowser.LocalMetadata.Images
 {
     public class EpisodeLocalLocalImageProvider : ILocalImageFileProvider
     {
+        private readonly IFileSystem _fileSystem;
+
+        public EpisodeLocalLocalImageProvider(IFileSystem fileSystem)
+        {
+            _fileSystem = fileSystem;
+        }
+
         public string Name
         {
             get { return "Local Images"; }
@@ -27,7 +35,7 @@ namespace MediaBrowser.LocalMetadata.Images
 
             var parentPathFiles = directoryService.GetFileSystemEntries(parentPath);
 
-            var nameWithoutExtension = Path.GetFileNameWithoutExtension(item.Path);
+            var nameWithoutExtension = _fileSystem.GetFileNameWithoutExtension(item.Path);
 
             var files = GetFilesFromParentFolder(nameWithoutExtension, parentPathFiles);
 
@@ -60,7 +68,7 @@ namespace MediaBrowser.LocalMetadata.Images
                   
                   if (BaseItem.SupportedImageExtensions.Contains(i.Extension, StringComparer.OrdinalIgnoreCase))
                   {
-                      var currentNameWithoutExtension = Path.GetFileNameWithoutExtension(i.Name);
+                      var currentNameWithoutExtension = _fileSystem.GetFileNameWithoutExtension(i);
 
                       if (string.Equals(filenameWithoutExtension, currentNameWithoutExtension, StringComparison.OrdinalIgnoreCase))
                       {
diff --git a/MediaBrowser.LocalMetadata/Images/ImagesByNameImageProvider.cs b/MediaBrowser.LocalMetadata/Images/ImagesByNameImageProvider.cs
index 3f84df462d..d992e20262 100644
--- a/MediaBrowser.LocalMetadata/Images/ImagesByNameImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/ImagesByNameImageProvider.cs
@@ -45,7 +45,7 @@ namespace MediaBrowser.LocalMetadata.Images
 
             try
             {
-                return new LocalImageProvider().GetImages(item, path, directoryService);
+                return new LocalImageProvider(_fileSystem).GetImages(item, path, directoryService);
             }
             catch (DirectoryNotFoundException)
             {
diff --git a/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs b/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs
index 8c4f6247cb..c126af884b 100644
--- a/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs
@@ -1,19 +1,22 @@
-using System.Collections.Generic;
-using System.IO;
+using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Providers;
+using System.Collections.Generic;
+using System.IO;
 
 namespace MediaBrowser.LocalMetadata.Images
 {
     public class InternalMetadataFolderImageProvider : ILocalImageFileProvider, IHasOrder
     {
         private readonly IServerConfigurationManager _config;
+        private readonly IFileSystem _fileSystem;
 
-        public InternalMetadataFolderImageProvider(IServerConfigurationManager config)
+        public InternalMetadataFolderImageProvider(IServerConfigurationManager config, IFileSystem fileSystem)
         {
             _config = config;
+            _fileSystem = fileSystem;
         }
 
         public string Name
@@ -57,7 +60,7 @@ namespace MediaBrowser.LocalMetadata.Images
 
             try
             {
-                return new LocalImageProvider().GetImages(item, path, directoryService);
+                return new LocalImageProvider(_fileSystem).GetImages(item, path, directoryService);
             }
             catch (DirectoryNotFoundException)
             {
diff --git a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
index 5d77628231..f69c261d8a 100644
--- a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
@@ -1,19 +1,27 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
+using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
 
 namespace MediaBrowser.LocalMetadata.Images
 {
     public class LocalImageProvider : ILocalImageFileProvider
     {
+        private readonly IFileSystem _fileSystem;
+
+        public LocalImageProvider(IFileSystem fileSystem)
+        {
+            _fileSystem = fileSystem;
+        }
+        
         public string Name
         {
             get { return "Local Images"; }
@@ -117,7 +125,7 @@ namespace MediaBrowser.LocalMetadata.Images
             var baseItem = item as BaseItem;
             if (baseItem != null && baseItem.IsInMixedFolder)
             {
-                imagePrefix = Path.GetFileNameWithoutExtension(item.Path) + "-";
+                imagePrefix = _fileSystem.GetFileNameWithoutExtension(item.Path) + "-";
             }
 
             PopulatePrimaryImages(item, images, files, imagePrefix);
@@ -172,7 +180,7 @@ namespace MediaBrowser.LocalMetadata.Images
 
             if (!string.IsNullOrEmpty(item.Path))
             {
-                var name = Path.GetFileNameWithoutExtension(item.Path);
+                var name = _fileSystem.GetFileNameWithoutExtension(item.Path);
 
                 if (!string.IsNullOrEmpty(name))
                 {
@@ -188,7 +196,7 @@ namespace MediaBrowser.LocalMetadata.Images
 
             if (!string.IsNullOrEmpty(item.Path))
             {
-                var name = Path.GetFileNameWithoutExtension(item.Path);
+                var name = _fileSystem.GetFileNameWithoutExtension(item.Path);
 
                 if (!string.IsNullOrEmpty(name))
                 {
@@ -259,6 +267,7 @@ namespace MediaBrowser.LocalMetadata.Images
         }
 
         private readonly CultureInfo _usCulture = new CultureInfo("en-US");
+
         private void PopulateSeasonImagesFromSeriesFolder(Season season, List<LocalImageInfo> images, IDirectoryService directoryService)
         {
             var seasonNumber = season.IndexNumber;
@@ -316,7 +325,7 @@ namespace MediaBrowser.LocalMetadata.Images
         private FileSystemInfo GetImage(IEnumerable<FileSystemInfo> files, string name)
         {
             var candidates = files
-                .Where(i => string.Equals(name, Path.GetFileNameWithoutExtension(i.Name), StringComparison.OrdinalIgnoreCase))
+                .Where(i => string.Equals(name, _fileSystem.GetFileNameWithoutExtension(i), StringComparison.OrdinalIgnoreCase))
                 .ToList();
 
             return BaseItem.SupportedImageExtensions
diff --git a/MediaBrowser.LocalMetadata/Providers/GameXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/GameXmlProvider.cs
index 681706321b..83ef6e4243 100644
--- a/MediaBrowser.LocalMetadata/Providers/GameXmlProvider.cs
+++ b/MediaBrowser.LocalMetadata/Providers/GameXmlProvider.cs
@@ -36,7 +36,7 @@ namespace MediaBrowser.LocalMetadata.Providers
 
             var directoryPath = directoryInfo.FullName;
 
-            var specificFile = Path.Combine(directoryPath, Path.GetFileNameWithoutExtension(info.Path) + ".xml");
+            var specificFile = Path.Combine(directoryPath, FileSystem.GetFileNameWithoutExtension(info.Path) + ".xml");
 
             var file = new FileInfo(specificFile);
 
diff --git a/MediaBrowser.LocalMetadata/Providers/MovieXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/MovieXmlProvider.cs
index 6ba1912a5d..fb3a01bf26 100644
--- a/MediaBrowser.LocalMetadata/Providers/MovieXmlProvider.cs
+++ b/MediaBrowser.LocalMetadata/Providers/MovieXmlProvider.cs
@@ -1,12 +1,12 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using MediaBrowser.Common.IO;
+using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.LocalMetadata.Parsers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
 
 namespace MediaBrowser.LocalMetadata.Providers
 {
@@ -47,7 +47,7 @@ namespace MediaBrowser.LocalMetadata.Providers
 
             var directoryPath = directoryInfo.FullName;
 
-            var specificFile = Path.Combine(directoryPath, Path.GetFileNameWithoutExtension(info.Path) + ".xml");
+            var specificFile = Path.Combine(directoryPath, fileSystem.GetFileNameWithoutExtension(info.Path) + ".xml");
 
             var file = new FileInfo(specificFile);
 
diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
index a892f8bf16..c397cdcd52 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -848,6 +848,12 @@
     <Compile Include="..\MediaBrowser.Model\Sync\SyncJob.cs">
       <Link>Sync\SyncJob.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Sync\SyncJobCreationResult.cs">
+      <Link>Sync\SyncJobCreationResult.cs</Link>
+    </Compile>
+    <Compile Include="..\MediaBrowser.Model\Sync\SyncJobItem.cs">
+      <Link>Sync\SyncJobItem.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Sync\SyncJobQuery.cs">
       <Link>Sync\SyncJobQuery.cs</Link>
     </Compile>
@@ -860,12 +866,6 @@
     <Compile Include="..\MediaBrowser.Model\Sync\SyncQuality.cs">
       <Link>Sync\SyncQuality.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Sync\SyncSchedule.cs">
-      <Link>Sync\SyncSchedule.cs</Link>
-    </Compile>
-    <Compile Include="..\MediaBrowser.Model\Sync\SyncScheduleQuery.cs">
-      <Link>Sync\SyncScheduleQuery.cs</Link>
-    </Compile>
     <Compile Include="..\MediaBrowser.Model\Sync\SyncTarget.cs">
       <Link>Sync\SyncTarget.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
index ab2a99109e..1b74fcf51c 100644
--- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
+++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
@@ -805,6 +805,12 @@
     <Compile Include="..\MediaBrowser.Model\Sync\SyncJob.cs">
       <Link>Sync\SyncJob.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Sync\SyncJobCreationResult.cs">
+      <Link>Sync\SyncJobCreationResult.cs</Link>
+    </Compile>
+    <Compile Include="..\MediaBrowser.Model\Sync\SyncJobItem.cs">
+      <Link>Sync\SyncJobItem.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Sync\SyncJobQuery.cs">
       <Link>Sync\SyncJobQuery.cs</Link>
     </Compile>
@@ -817,12 +823,6 @@
     <Compile Include="..\MediaBrowser.Model\Sync\SyncQuality.cs">
       <Link>Sync\SyncQuality.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Sync\SyncSchedule.cs">
-      <Link>Sync\SyncSchedule.cs</Link>
-    </Compile>
-    <Compile Include="..\MediaBrowser.Model\Sync\SyncScheduleQuery.cs">
-      <Link>Sync\SyncScheduleQuery.cs</Link>
-    </Compile>
     <Compile Include="..\MediaBrowser.Model\Sync\SyncTarget.cs">
       <Link>Sync\SyncTarget.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 6cdd2b8f5e..fd38ff7239 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -297,12 +297,12 @@
     <Compile Include="Session\SessionUserInfo.cs" />
     <Compile Include="Session\UserDataChangeInfo.cs" />
     <Compile Include="Sync\SyncJob.cs" />
+    <Compile Include="Sync\SyncJobCreationResult.cs" />
+    <Compile Include="Sync\SyncJobItem.cs" />
     <Compile Include="Sync\SyncJobQuery.cs" />
     <Compile Include="Sync\SyncJobRequest.cs" />
     <Compile Include="Sync\SyncJobStatus.cs" />
     <Compile Include="Sync\SyncQuality.cs" />
-    <Compile Include="Sync\SyncSchedule.cs" />
-    <Compile Include="Sync\SyncScheduleQuery.cs" />
     <Compile Include="Sync\SyncTarget.cs" />
     <Compile Include="System\LogFile.cs" />
     <Compile Include="Themes\AppTheme.cs" />
diff --git a/MediaBrowser.Model/Sync/SyncJob.cs b/MediaBrowser.Model/Sync/SyncJob.cs
index 74dd79497c..f69fccae50 100644
--- a/MediaBrowser.Model/Sync/SyncJob.cs
+++ b/MediaBrowser.Model/Sync/SyncJob.cs
@@ -1,4 +1,6 @@
-
+using System;
+using System.Collections.Generic;
+
 namespace MediaBrowser.Model.Sync
 {
     public class SyncJob
@@ -14,39 +16,79 @@ namespace MediaBrowser.Model.Sync
         /// <value>The device identifier.</value>
         public string TargetId { get; set; }
         /// <summary>
-        /// Gets or sets the item identifier.
-        /// </summary>
-        /// <value>The item identifier.</value>
-        public string ItemId { get; set; }
-        /// <summary>
         /// Gets or sets the quality.
         /// </summary>
         /// <value>The quality.</value>
         public SyncQuality Quality { get; set; }
         /// <summary>
+        /// Gets or sets the current progress.
+        /// </summary>
+        /// <value>The current progress.</value>
+        public double? Progress { get; set; }
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name { get; set; }
+        /// <summary>
         /// Gets or sets the status.
         /// </summary>
         /// <value>The status.</value>
-        public SyncJobStatus Status { get; set; }
+        public SyncJobStatus Status { get; set; }        
         /// <summary>
-        /// Gets or sets the current progress.
+        /// Gets or sets the user identifier.
         /// </summary>
-        /// <value>The current progress.</value>
-        public double? CurrentProgress { get; set; }
+        /// <value>The user identifier.</value>
+        public string UserId { get; set; }
         /// <summary>
-        /// Gets or sets the synchronize rule identifier.
+        /// Gets or sets a value indicating whether [unwatched only].
         /// </summary>
-        /// <value>The synchronize rule identifier.</value>
-        public string SyncScheduleId { get; set; }
+        /// <value><c>true</c> if [unwatched only]; otherwise, <c>false</c>.</value>
+        public bool UnwatchedOnly { get; set; }
         /// <summary>
-        /// Gets or sets the transcoded path.
+        /// Gets or sets the limit.
         /// </summary>
-        /// <value>The transcoded path.</value>
-        public string TranscodedPath { get; set; }
+        /// <value>The limit.</value>
+        public long? Limit { get; set; }
         /// <summary>
-        /// Gets or sets the name.
+        /// Gets or sets the type of the limit.
         /// </summary>
-        /// <value>The name.</value>
-        public string Name { get; set; }
+        /// <value>The type of the limit.</value>
+        public SyncLimitType? LimitType { get; set; }
+        /// <summary>
+        /// Gets or sets the requested item ids.
+        /// </summary>
+        /// <value>The requested item ids.</value>
+        public List<string> RequestedItemIds { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is dynamic.
+        /// </summary>
+        /// <value><c>true</c> if this instance is dynamic; otherwise, <c>false</c>.</value>
+        public bool IsDynamic { get; set; }
+        /// <summary>
+        /// Gets or sets the date created.
+        /// </summary>
+        /// <value>The date created.</value>
+        public DateTime DateCreated { get; set; }
+        /// <summary>
+        /// Gets or sets the date last modified.
+        /// </summary>
+        /// <value>The date last modified.</value>
+        public DateTime DateLastModified { get; set; }
+        /// <summary>
+        /// Gets or sets the item count.
+        /// </summary>
+        /// <value>The item count.</value>
+        public int ItemCount { get; set; }
+
+        public string ParentName { get; set; }
+        public string PrimaryImageItemId { get; set; }
+        public string PrimaryImageTag { get; set; }
+        public double? PrimaryImageAspectRatio { get; set; }
+
+        public SyncJob()
+        {
+            RequestedItemIds = new List<string>();
+        }
     }
 }
diff --git a/MediaBrowser.Model/Sync/SyncJobCreationResult.cs b/MediaBrowser.Model/Sync/SyncJobCreationResult.cs
new file mode 100644
index 0000000000..797318b2a9
--- /dev/null
+++ b/MediaBrowser.Model/Sync/SyncJobCreationResult.cs
@@ -0,0 +1,8 @@
+
+namespace MediaBrowser.Model.Sync
+{
+    public class SyncJobCreationResult
+    {
+        public SyncJob Job { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Sync/SyncJobItem.cs b/MediaBrowser.Model/Sync/SyncJobItem.cs
new file mode 100644
index 0000000000..141546eb5a
--- /dev/null
+++ b/MediaBrowser.Model/Sync/SyncJobItem.cs
@@ -0,0 +1,48 @@
+
+namespace MediaBrowser.Model.Sync
+{
+    public class SyncJobItem
+    {
+        /// <summary>
+        /// Gets or sets the identifier.
+        /// </summary>
+        /// <value>The identifier.</value>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets the job identifier.
+        /// </summary>
+        /// <value>The job identifier.</value>
+        public string JobId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the item identifier.
+        /// </summary>
+        /// <value>The item identifier.</value>
+        public string ItemId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the target identifier.
+        /// </summary>
+        /// <value>The target identifier.</value>
+        public string TargetId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the output path.
+        /// </summary>
+        /// <value>The output path.</value>
+        public string OutputPath { get; set; }
+
+        /// <summary>
+        /// Gets or sets the status.
+        /// </summary>
+        /// <value>The status.</value>
+        public SyncJobStatus Status { get; set; }
+
+        /// <summary>
+        /// Gets or sets the current progress.
+        /// </summary>
+        /// <value>The current progress.</value>
+        public double? CurrentProgress { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Sync/SyncJobQuery.cs b/MediaBrowser.Model/Sync/SyncJobQuery.cs
index f41544db9a..74b35186e0 100644
--- a/MediaBrowser.Model/Sync/SyncJobQuery.cs
+++ b/MediaBrowser.Model/Sync/SyncJobQuery.cs
@@ -3,5 +3,15 @@ namespace MediaBrowser.Model.Sync
 {
     public class SyncJobQuery
     {
+        /// <summary>
+        /// Gets or sets the start index.
+        /// </summary>
+        /// <value>The start index.</value>
+        public int? StartIndex { get; set; }
+        /// <summary>
+        /// Gets or sets the limit.
+        /// </summary>
+        /// <value>The limit.</value>
+        public int? Limit { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Sync/SyncJobRequest.cs b/MediaBrowser.Model/Sync/SyncJobRequest.cs
index cd833068ee..7728aad9bd 100644
--- a/MediaBrowser.Model/Sync/SyncJobRequest.cs
+++ b/MediaBrowser.Model/Sync/SyncJobRequest.cs
@@ -5,10 +5,10 @@ namespace MediaBrowser.Model.Sync
     public class SyncJobRequest
     {
         /// <summary>
-        /// Gets or sets the device identifier.
+        /// Gets or sets the target identifier.
         /// </summary>
-        /// <value>The device identifier.</value>
-        public List<string> TargetIds { get; set; }
+        /// <value>The target identifier.</value>
+        public string TargetId { get; set; }
         /// <summary>
         /// Gets or sets the item ids.
         /// </summary>
@@ -24,11 +24,35 @@ namespace MediaBrowser.Model.Sync
         /// </summary>
         /// <value>The name.</value>
         public string Name { get; set; }
+        /// <summary>
+        /// Gets or sets the user identifier.
+        /// </summary>
+        /// <value>The user identifier.</value>
+        public string UserId { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating whether [unwatched only].
+        /// </summary>
+        /// <value><c>true</c> if [unwatched only]; otherwise, <c>false</c>.</value>
+        public bool UnwatchedOnly { get; set; }
+        /// <summary>
+        /// Gets or sets the limit.
+        /// </summary>
+        /// <value>The limit.</value>
+        public long? Limit { get; set; }
+        /// <summary>
+        /// Gets or sets the type of the limit.
+        /// </summary>
+        /// <value>The type of the limit.</value>
+        public SyncLimitType? LimitType { get; set; }
 
         public SyncJobRequest()
         {
-            TargetIds = new List<string>();
             ItemIds = new List<string>();
         }
     }
+
+    public enum SyncLimitType
+    {
+        ItemCount = 0
+    }
 }
diff --git a/MediaBrowser.Model/Sync/SyncJobStatus.cs b/MediaBrowser.Model/Sync/SyncJobStatus.cs
index 2a216fe044..ef4d8d7bfc 100644
--- a/MediaBrowser.Model/Sync/SyncJobStatus.cs
+++ b/MediaBrowser.Model/Sync/SyncJobStatus.cs
@@ -3,33 +3,11 @@ namespace MediaBrowser.Model.Sync
 {
     public enum SyncJobStatus
     {
-        /// <summary>
-        /// The queued
-        /// </summary>
         Queued = 0,
-        /// <summary>
-        /// The transcoding
-        /// </summary>
         Transcoding = 1,
-        /// <summary>
-        /// The transcoding failed
-        /// </summary>
         TranscodingFailed = 2,
-        /// <summary>
-        /// The transcoding completed
-        /// </summary>
-        TranscodingCompleted = 3,
-        /// <summary>
-        /// The transfering
-        /// </summary>
-        Transfering = 4,
-        /// <summary>
-        /// The transfer failed
-        /// </summary>
-        TransferFailed = 4,
-        /// <summary>
-        /// The completed
-        /// </summary>
-        Completed = 6
+        Transfering = 3,
+        Completed = 4,
+        Cancelled = 5
     }
 }
diff --git a/MediaBrowser.Model/Sync/SyncSchedule.cs b/MediaBrowser.Model/Sync/SyncSchedule.cs
deleted file mode 100644
index 297cbd1450..0000000000
--- a/MediaBrowser.Model/Sync/SyncSchedule.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-
-namespace MediaBrowser.Model.Sync
-{
-    public class SyncSchedule
-    {
-        /// <summary>
-        /// Gets or sets the identifier.
-        /// </summary>
-        /// <value>The identifier.</value>
-        public string Id { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/Sync/SyncScheduleQuery.cs b/MediaBrowser.Model/Sync/SyncScheduleQuery.cs
deleted file mode 100644
index b704a358ca..0000000000
--- a/MediaBrowser.Model/Sync/SyncScheduleQuery.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-
-namespace MediaBrowser.Model.Sync
-{
-    public class SyncScheduleQuery
-    {
-    }
-}
diff --git a/MediaBrowser.Providers/BoxSets/MovieDbBoxSetProvider.cs b/MediaBrowser.Providers/BoxSets/MovieDbBoxSetProvider.cs
index cf7904e5cb..e17a96a43e 100644
--- a/MediaBrowser.Providers/BoxSets/MovieDbBoxSetProvider.cs
+++ b/MediaBrowser.Providers/BoxSets/MovieDbBoxSetProvider.cs
@@ -216,12 +216,6 @@ namespace MediaBrowser.Providers.BoxSets
                     {
                         mainResult = _json.DeserializeFromStream<RootObject>(json);
                     }
-
-                    if (String.IsNullOrEmpty(mainResult.overview))
-                    {
-                        _logger.Error("Unable to find information for (id:" + id + ")");
-                        return null;
-                    }
                 }
             }
             return mainResult;
diff --git a/MediaBrowser.Providers/Manager/ImageSaver.cs b/MediaBrowser.Providers/Manager/ImageSaver.cs
index 1b2e9fa6d6..d7110c1ec5 100644
--- a/MediaBrowser.Providers/Manager/ImageSaver.cs
+++ b/MediaBrowser.Providers/Manager/ImageSaver.cs
@@ -292,7 +292,7 @@ namespace MediaBrowser.Providers.Manager
         private string GetStandardSavePath(IHasImages item, ImageType type, int? imageIndex, string mimeType, bool saveLocally)
         {
             string filename;
-
+            
             switch (type)
             {
                 case ImageType.Art:
@@ -305,7 +305,7 @@ namespace MediaBrowser.Providers.Manager
                     filename = item is MusicAlbum ? "cdart" : "disc";
                     break;
                 case ImageType.Primary:
-                    filename = item is Episode ? Path.GetFileNameWithoutExtension(item.Path) : "folder";
+                    filename = item is Episode ? _fileSystem.GetFileNameWithoutExtension(item.Path) : "folder";
                     break;
                 case ImageType.Backdrop:
                     filename = GetBackdropSaveFilename(item.GetImages(type), "backdrop", "backdrop", imageIndex);
@@ -367,7 +367,7 @@ namespace MediaBrowser.Providers.Manager
                 return zeroIndexFilename;
             }
 
-            var filenames = images.Select(i => Path.GetFileNameWithoutExtension(i.Path)).ToList();
+            var filenames = images.Select(i => _fileSystem.GetFileNameWithoutExtension(i.Path)).ToList();
 
             var current = 1;
             while (filenames.Contains(numberedIndexPrefix + current.ToString(UsCulture), StringComparer.OrdinalIgnoreCase))
@@ -473,7 +473,7 @@ namespace MediaBrowser.Providers.Manager
                 {
                     var seasonFolder = Path.GetDirectoryName(item.Path);
 
-                    var imageFilename = Path.GetFileNameWithoutExtension(item.Path) + "-thumb" + extension;
+                    var imageFilename = _fileSystem.GetFileNameWithoutExtension(item.Path) + "-thumb" + extension;
 
                     return new[] { Path.Combine(seasonFolder, imageFilename) };
                 }
@@ -560,7 +560,7 @@ namespace MediaBrowser.Providers.Manager
             }
             var folder = Path.GetDirectoryName(item.Path);
 
-            return Path.Combine(folder, Path.GetFileNameWithoutExtension(item.Path) + "-" + imageFilename + extension);
+            return Path.Combine(folder, _fileSystem.GetFileNameWithoutExtension(item.Path) + "-" + imageFilename + extension);
         }
     }
 }
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs b/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
index 9e9936cab4..33b69d71a9 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
@@ -175,7 +175,7 @@ namespace MediaBrowser.Providers.MediaInfo
                 if (video != null && !video.IsPlaceHolder)
                 {
                     return !video.SubtitleFiles
-                        .SequenceEqual(SubtitleResolver.GetSubtitleFiles(video, directoryService, false)
+                        .SequenceEqual(SubtitleResolver.GetSubtitleFiles(video, directoryService, _fileSystem, false)
                         .Select(i => i.FullName)
                         .OrderBy(i => i), StringComparer.OrdinalIgnoreCase);
                 }
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
index c0313561ae..a2e1ba05a7 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
@@ -477,7 +477,7 @@ namespace MediaBrowser.Providers.MediaInfo
             MetadataRefreshOptions options,
             CancellationToken cancellationToken)
         {
-            var subtitleResolver = new SubtitleResolver(_localization);
+            var subtitleResolver = new SubtitleResolver(_localization, _fileSystem);
 
             var externalSubtitleStreams = subtitleResolver.GetExternalSubtitleStreams(video, currentStreams.Count, options.DirectoryService, false).ToList();
 
@@ -790,7 +790,7 @@ namespace MediaBrowser.Providers.MediaInfo
             // Assuming they're named "vts_05_01", take all files whose second part matches that of the first file
             if (files.Count > 0)
             {
-                var parts = Path.GetFileNameWithoutExtension(files[0].FullName).Split('_');
+                var parts = _fileSystem.GetFileNameWithoutExtension(files[0]).Split('_');
 
                 if (parts.Length == 3)
                 {
@@ -798,7 +798,7 @@ namespace MediaBrowser.Providers.MediaInfo
 
                     files = files.TakeWhile(f =>
                     {
-                        var fileParts = Path.GetFileNameWithoutExtension(f.FullName).Split('_');
+                        var fileParts = _fileSystem.GetFileNameWithoutExtension(f).Split('_');
 
                         return fileParts.Length == 3 && string.Equals(title, fileParts[1], StringComparison.OrdinalIgnoreCase);
 
diff --git a/MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs b/MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs
index c12f74fa61..78d1fac479 100644
--- a/MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs
+++ b/MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Providers;
@@ -13,10 +14,12 @@ namespace MediaBrowser.Providers.MediaInfo
     public class SubtitleResolver
     {
         private readonly ILocalizationManager _localization;
+        private readonly IFileSystem _fileSystem;
 
-        public SubtitleResolver(ILocalizationManager localization)
+        public SubtitleResolver(ILocalizationManager localization, IFileSystem fileSystem)
         {
             _localization = localization;
+            _fileSystem = fileSystem;
         }
 
         public IEnumerable<MediaStream> GetExternalSubtitleStreams(Video video,
@@ -24,17 +27,17 @@ namespace MediaBrowser.Providers.MediaInfo
           IDirectoryService directoryService,
           bool clearCache)
         {
-            var files = GetSubtitleFiles(video, directoryService, clearCache);
+            var files = GetSubtitleFiles(video, directoryService, _fileSystem, clearCache);
 
             var streams = new List<MediaStream>();
 
-            var videoFileNameWithoutExtension = Path.GetFileNameWithoutExtension(video.Path);
+            var videoFileNameWithoutExtension = _fileSystem.GetFileNameWithoutExtension(video.Path);
 
             foreach (var file in files)
             {
                 var fullName = file.FullName;
 
-                var fileNameWithoutExtension = Path.GetFileNameWithoutExtension(fullName);
+                var fileNameWithoutExtension = _fileSystem.GetFileNameWithoutExtension(file);
 
                 var codec = Path.GetExtension(fullName).ToLower().TrimStart('.');
 
@@ -96,7 +99,7 @@ namespace MediaBrowser.Providers.MediaInfo
             }
         }
 
-        public static IEnumerable<FileSystemInfo> GetSubtitleFiles(Video video, IDirectoryService directoryService, bool clearCache)
+        public static IEnumerable<FileSystemInfo> GetSubtitleFiles(Video video, IDirectoryService directoryService, IFileSystem fileSystem, bool clearCache)
         {
             var containingPath = video.ContainingFolderPath;
 
@@ -107,16 +110,14 @@ namespace MediaBrowser.Providers.MediaInfo
 
             var files = directoryService.GetFiles(containingPath, clearCache);
 
-            var videoFileNameWithoutExtension = Path.GetFileNameWithoutExtension(video.Path);
+            var videoFileNameWithoutExtension = fileSystem.GetFileNameWithoutExtension(video.Path);
 
             return files.Where(i =>
             {
                 if (!i.Attributes.HasFlag(FileAttributes.Directory) &&
                     SubtitleExtensions.Contains(i.Extension, StringComparer.OrdinalIgnoreCase))
                 {
-                    var fullName = i.FullName;
-
-                    var fileNameWithoutExtension = Path.GetFileNameWithoutExtension(fullName);
+                    var fileNameWithoutExtension = fileSystem.GetFileNameWithoutExtension(i);
 
                     if (string.Equals(videoFileNameWithoutExtension, fileNameWithoutExtension, StringComparison.OrdinalIgnoreCase))
                     {
diff --git a/MediaBrowser.Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
index 65fe32a991..32d53db436 100644
--- a/MediaBrowser.Providers/Movies/MovieDbProvider.cs
+++ b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
@@ -252,7 +252,7 @@ namespace MediaBrowser.Providers.Movies
             var path = GetMovieDataPath(_configurationManager.ApplicationPaths, tmdbId);
 
             var filename = string.Format("all-{0}.json",
-                preferredLanguage ?? string.Empty);
+                preferredLanguage);
 
             return Path.Combine(path, filename);
         }
diff --git a/MediaBrowser.Providers/Subtitles/SubtitleManager.cs b/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
index 08499a20ba..34656f05bc 100644
--- a/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
+++ b/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
@@ -105,7 +105,7 @@ namespace MediaBrowser.Providers.Subtitles
             using (var stream = response.Stream)
             {
                 var savePath = Path.Combine(Path.GetDirectoryName(video.Path),
-                    Path.GetFileNameWithoutExtension(video.Path) + "." + response.Language.ToLower());
+                    _fileSystem.GetFileNameWithoutExtension(video.Path) + "." + response.Language.ToLower());
 
                 if (response.IsForced)
                 {
diff --git a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
index d448118860..594ba9d235 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
@@ -248,12 +248,12 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
                 .ToList();
 
             var folder = Path.GetDirectoryName(targetPath);
-            var targetFileNameWithoutExtension = Path.GetFileNameWithoutExtension(targetPath);
-
+            var targetFileNameWithoutExtension = _fileSystem.GetFileNameWithoutExtension(targetPath);
+            
             try
             {
                 var filesOfOtherExtensions = Directory.EnumerateFiles(folder, "*", SearchOption.TopDirectoryOnly)
-                    .Where(i => EntityResolutionHelper.IsVideoFile(i) && string.Equals(Path.GetFileNameWithoutExtension(i), targetFileNameWithoutExtension, StringComparison.OrdinalIgnoreCase));
+                    .Where(i => EntityResolutionHelper.IsVideoFile(i) && string.Equals(_fileSystem.GetFileNameWithoutExtension(i), targetFileNameWithoutExtension, StringComparison.OrdinalIgnoreCase));
 
                 episodePaths.AddRange(filesOfOtherExtensions);
             }
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index d0ea070563..6e0b654fd9 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -1,5 +1,4 @@
-using Amib.Threading;
-using Funq;
+using Funq;
 using MediaBrowser.Common;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
@@ -15,7 +14,6 @@ using ServiceStack.Host.HttpListener;
 using ServiceStack.Logging;
 using ServiceStack.Web;
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -37,7 +35,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
         private IHttpListener _listener;
 
-        private readonly SmartThreadPool _threadPoolManager;
         private const int IdleTimeout = 300;
 
         private readonly ContainerAdapter _containerAdapter;
@@ -62,9 +59,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             _logger = logManager.GetLogger("HttpServer");
 
             _containerAdapter = new ContainerAdapter(applicationHost);
-
-            _threadPoolManager = new SmartThreadPool(IdleTimeout,
-                maxWorkerThreads: Math.Max(16, Environment.ProcessorCount * 2));
         }
 
         public override void Configure(Container container)
@@ -158,8 +152,8 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             HostContext.Config.HandlerFactoryPath = ListenerRequest.GetHandlerPathIfAny(UrlPrefixes.First());
 
             _listener = NativeWebSocket.IsSupported
-                ? _listener = new HttpListenerServer(_logger, _threadPoolManager)
-                : _listener = new WebSocketSharpListener(_logger, _threadPoolManager);
+                ? _listener = new HttpListenerServer(_logger)
+                : _listener = new WebSocketSharpListener(_logger);
 
             _listener.WebSocketHandler = WebSocketHandler;
             _listener.ErrorHandler = ErrorHandler;
@@ -356,8 +350,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
                 if (disposing)
                 {
-                    _threadPoolManager.Dispose();
-
                     Stop();
                 }
 
diff --git a/MediaBrowser.Server.Implementations/HttpServer/NetListener/HttpListenerServer.cs b/MediaBrowser.Server.Implementations/HttpServer/NetListener/HttpListenerServer.cs
index 7f766129e7..12106c32e0 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/NetListener/HttpListenerServer.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/NetListener/HttpListenerServer.cs
@@ -1,6 +1,4 @@
-using System.Text;
-using Amib.Threading;
-using MediaBrowser.Common.Net;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Model.Logging;
 using ServiceStack;
 using ServiceStack.Host.HttpListener;
@@ -10,6 +8,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -20,7 +19,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer.NetListener
         private readonly ILogger _logger;
         private HttpListener _listener;
         private readonly AutoResetEvent _listenForNextRequest = new AutoResetEvent(false);
-        private readonly SmartThreadPool _threadPoolManager;
 
         public System.Action<Exception, IRequest> ErrorHandler { get; set; }
         public Action<WebSocketConnectEventArgs> WebSocketHandler { get; set; }
@@ -28,11 +26,9 @@ namespace MediaBrowser.Server.Implementations.HttpServer.NetListener
 
         private readonly ConcurrentDictionary<string, string> _localEndPoints = new ConcurrentDictionary<string, string>(StringComparer.OrdinalIgnoreCase);
         
-        public HttpListenerServer(ILogger logger, SmartThreadPool threadPoolManager)
+        public HttpListenerServer(ILogger logger)
         {
             _logger = logger;
-
-            _threadPoolManager = threadPoolManager;
         }
 
         /// <summary>
@@ -63,7 +59,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.NetListener
 
             _listener.Start();
 
-            ThreadPool.QueueUserWorkItem(Listen);
+            Task.Factory.StartNew(Listen, TaskCreationOptions.LongRunning);
         }
 
         private bool IsListening
@@ -72,7 +68,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.NetListener
         }
 
         // Loop here to begin processing of new requests.
-        private void Listen(object state)
+        private void Listen()
         {
             while (IsListening)
             {
@@ -130,7 +126,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.NetListener
                 _listenForNextRequest.Set();
             }
 
-            _threadPoolManager.QueueWorkItem(() => InitTask(context));
+            Task.Factory.StartNew(() => InitTask(context));
         }
 
         private void InitTask(HttpListenerContext context)
@@ -287,8 +283,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer.NetListener
 
                 if (disposing)
                 {
-                    _threadPoolManager.Dispose();
-
                     Stop();
                 }
 
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
index cf756d9f27..b18d0df5eb 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
@@ -1,14 +1,13 @@
-using System;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Model.Logging;
+using ServiceStack;
+using ServiceStack.Web;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Amib.Threading;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Model.Logging;
-using ServiceStack;
-using ServiceStack.Web;
 using WebSocketSharp.Net;
 using WebSocketSharp.Server;
 
@@ -20,12 +19,10 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
         private WebSocketSharp.Server.HttpServer _httpsv;
 
         private readonly ILogger _logger;
-        private readonly SmartThreadPool _threadPoolManager;
 
-        public WebSocketSharpListener(ILogger logger, SmartThreadPool threadPoolManager)
+        public WebSocketSharpListener(ILogger logger)
         {
             _logger = logger;
-            _threadPoolManager = threadPoolManager;
         }
 
         public IEnumerable<string> LocalEndPoints
@@ -33,9 +30,9 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
             get { return _localEndPoints.Keys.ToList(); }
         }
 
-        public System.Action<Exception, IRequest> ErrorHandler { get; set; }
+        public Action<Exception, IRequest> ErrorHandler { get; set; }
 
-        public System.Func<IHttpRequest, Uri, Task> RequestHandler { get; set; }
+        public Func<IHttpRequest, Uri, Task> RequestHandler { get; set; }
 
         public Action<WebSocketConnectEventArgs> WebSocketHandler { get; set; }
 
@@ -50,7 +47,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
 
         void _httpsv_OnRequest(object sender, HttpRequestEventArgs e)
         {
-            _threadPoolManager.QueueWorkItem(() => InitTask(e.Context));
+            Task.Factory.StartNew(() => InitTask(e.Context));
         }
 
         private void InitTask(HttpListenerContext context)
diff --git a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
index 8229c8a2f3..7b58dd7c48 100644
--- a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
+++ b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
@@ -90,7 +90,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 if (args.Parent != null)
                 {
                     // Don't resolve these into audio files
-                    if (string.Equals(Path.GetFileNameWithoutExtension(filename), BaseItem.ThemeSongFilename) && EntityResolutionHelper.IsAudioFile(filename))
+                    if (string.Equals(_fileSystem.GetFileNameWithoutExtension(filename), BaseItem.ThemeSongFilename) && EntityResolutionHelper.IsAudioFile(filename))
                     {
                         return true;
                     }
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 64e0a6662f..8310895e67 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -1157,7 +1157,7 @@ namespace MediaBrowser.Server.Implementations.Library
         private string GetCollectionType(string path)
         {
             return new DirectoryInfo(path).EnumerateFiles("*.collection", SearchOption.TopDirectoryOnly)
-                .Select(i => Path.GetFileNameWithoutExtension(i.FullName))
+                .Select(i => _fileSystem.GetFileNameWithoutExtension(i))
                 .FirstOrDefault();
         }
 
@@ -1486,23 +1486,22 @@ namespace MediaBrowser.Server.Implementations.Library
 
         public async Task<UserView> GetNamedView(string name, string type, string sortName, CancellationToken cancellationToken)
         {
-            var id = "namedview_3_" + name;
-            var guid = id.GetMD5();
+            var path = Path.Combine(ConfigurationManager.ApplicationPaths.ItemsByNamePath,
+                "views",
+                _fileSystem.GetValidFilename(type));
 
-            var item = GetItemById(guid) as UserView;
+            var id = (path + "_namedview_" + name).GetMBId(typeof(UserView));
+
+            var item = GetItemById(id) as UserView;
             
             if (item == null)
             {
-                var path = Path.Combine(ConfigurationManager.ApplicationPaths.ItemsByNamePath,
-                    "views",
-                    _fileSystem.GetValidFilename(type));
-
                 Directory.CreateDirectory(Path.GetDirectoryName(path));
 
                 item = new UserView
                 {
                     Path = path,
-                    Id = guid,
+                    Id = id,
                     DateCreated = DateTime.UtcNow,
                     Name = name,
                     ViewType = type,
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
index 64d2db2e45..2ee3d49a44 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Common.IO;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
@@ -6,6 +7,7 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Resolvers;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -17,6 +19,15 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
     /// </summary>
     public class MusicAlbumResolver : ItemResolver<MusicAlbum>
     {
+        private readonly ILogger _logger;
+        private readonly IFileSystem _fileSystem;
+
+        public MusicAlbumResolver(ILogger logger, IFileSystem fileSystem)
+        {
+            _logger = logger;
+            _fileSystem = fileSystem;
+        }
+
         /// <summary>
         /// Gets the priority.
         /// </summary>
@@ -64,10 +75,12 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
         /// </summary>
         /// <param name="path">The path.</param>
         /// <param name="directoryService">The directory service.</param>
+        /// <param name="logger">The logger.</param>
+        /// <param name="fileSystem">The file system.</param>
         /// <returns><c>true</c> if [is music album] [the specified data]; otherwise, <c>false</c>.</returns>
-        public static bool IsMusicAlbum(string path, IDirectoryService directoryService)
+        public static bool IsMusicAlbum(string path, IDirectoryService directoryService, ILogger logger, IFileSystem fileSystem)
         {
-            return ContainsMusic(directoryService.GetFileSystemEntries(path), true, directoryService);
+            return ContainsMusic(directoryService.GetFileSystemEntries(path), true, directoryService, logger, fileSystem);
         }
 
         /// <summary>
@@ -75,13 +88,13 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
         /// </summary>
         /// <param name="args">The args.</param>
         /// <returns><c>true</c> if [is music album] [the specified args]; otherwise, <c>false</c>.</returns>
-        public static bool IsMusicAlbum(ItemResolveArgs args)
+        private bool IsMusicAlbum(ItemResolveArgs args)
         {
             // Args points to an album if parent is an Artist folder or it directly contains music
             if (args.IsDirectory)
             {
                 //if (args.Parent is MusicArtist) return true;  //saves us from testing children twice
-                if (ContainsMusic(args.FileSystemChildren, true, args.DirectoryService)) return true;
+                if (ContainsMusic(args.FileSystemChildren, true, args.DirectoryService, _logger, _fileSystem)) return true;
             }
 
             return false;
@@ -93,19 +106,23 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
         /// <param name="list">The list.</param>
         /// <param name="allowSubfolders">if set to <c>true</c> [allow subfolders].</param>
         /// <param name="directoryService">The directory service.</param>
+        /// <param name="logger">The logger.</param>
+        /// <param name="fileSystem">The file system.</param>
         /// <returns><c>true</c> if the specified list contains music; otherwise, <c>false</c>.</returns>
-        private static bool ContainsMusic(IEnumerable<FileSystemInfo> list, bool allowSubfolders, IDirectoryService directoryService)
+        private static bool ContainsMusic(IEnumerable<FileSystemInfo> list, bool allowSubfolders, IDirectoryService directoryService, ILogger logger, IFileSystem fileSystem)
         {
             // If list contains at least 2 audio files or at least one and no video files consider it to contain music
             var foundAudio = 0;
 
+            var discSubfolderCount = 0;
+
             foreach (var fileSystemInfo in list)
             {
                 if ((fileSystemInfo.Attributes & FileAttributes.Directory) == FileAttributes.Directory)
                 {
-                    if (allowSubfolders && IsAlbumSubfolder(fileSystemInfo, directoryService))
+                    if (allowSubfolders && IsAlbumSubfolder(fileSystemInfo, directoryService, logger, fileSystem))
                     {
-                        return true;
+                        discSubfolderCount++;
                     }
                     if (!IsAdditionalSubfolderAllowed(fileSystemInfo))
                     {
@@ -118,7 +135,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
                 if (EntityResolutionHelper.IsAudioFile(fullName))
                 {
                     // Don't resolve these into audio files
-                    if (string.Equals(Path.GetFileNameWithoutExtension(fullName), BaseItem.ThemeSongFilename) && EntityResolutionHelper.IsAudioFile(fullName))
+                    if (string.Equals(fileSystem.GetFileNameWithoutExtension(fullName), BaseItem.ThemeSongFilename) && EntityResolutionHelper.IsAudioFile(fullName))
                     {
                         continue;
                     }
@@ -135,16 +152,18 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
             }
 
             //  or a single audio file and no video files
-            return foundAudio > 0;
+            return foundAudio > 0 || discSubfolderCount > 0;
         }
 
-        private static bool IsAlbumSubfolder(FileSystemInfo directory, IDirectoryService directoryService)
+        private static bool IsAlbumSubfolder(FileSystemInfo directory, IDirectoryService directoryService, ILogger logger, IFileSystem fileSystem)
         {
             var path = directory.FullName;
 
             if (IsMultiDiscFolder(path))
             {
-                return ContainsMusic(directoryService.GetFileSystemEntries(path), false, directoryService);
+                logger.Debug("Found multi-disc folder: " + path);
+
+                return ContainsMusic(directoryService.GetFileSystemEntries(path), false, directoryService, logger, fileSystem);
             }
 
             return false;
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
index 4fa97fc9db..19a284d15c 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
@@ -1,9 +1,11 @@
-using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Common.IO;
+using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Resolvers;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Logging;
 using System;
 using System.IO;
 using System.Linq;
@@ -15,6 +17,15 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
     /// </summary>
     public class MusicArtistResolver : ItemResolver<MusicArtist>
     {
+        private readonly ILogger _logger;
+        private readonly IFileSystem _fileSystem;
+
+        public MusicArtistResolver(ILogger logger, IFileSystem fileSystem)
+        {
+            _logger = logger;
+            _fileSystem = fileSystem;
+        }
+
         /// <summary>
         /// Gets the priority.
         /// </summary>
@@ -61,7 +72,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
             var directoryService = args.DirectoryService;
             
             // If we contain an album assume we are an artist folder
-            return args.FileSystemChildren.Where(i => (i.Attributes & FileAttributes.Directory) == FileAttributes.Directory).Any(i => MusicAlbumResolver.IsMusicAlbum(i.FullName, directoryService)) ? new MusicArtist() : null;
+            return args.FileSystemChildren.Where(i => (i.Attributes & FileAttributes.Directory) == FileAttributes.Directory).Any(i => MusicAlbumResolver.IsMusicAlbum(i.FullName, directoryService, _logger, _fileSystem)) ? new MusicArtist() : null;
         }
 
     }
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/FolderResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/FolderResolver.cs
index 594277ef72..166465f72c 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/FolderResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/FolderResolver.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Common.IO;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Resolvers;
 using System;
@@ -12,6 +13,13 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers
     /// </summary>
     public class FolderResolver : FolderResolver<Folder>
     {
+        private readonly IFileSystem _fileSystem;
+
+        public FolderResolver(IFileSystem fileSystem)
+        {
+            _fileSystem = fileSystem;
+        }
+
         /// <summary>
         /// Gets the priority.
         /// </summary>
@@ -69,7 +77,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers
                     }
 
                 })
-                .Select(i => Path.GetFileNameWithoutExtension(i.FullName))
+                .Select(i => _fileSystem.GetFileNameWithoutExtension(i))
                 .FirstOrDefault();
         }
     }
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/LocalTrailerResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/LocalTrailerResolver.cs
index 10ee3586d7..b483f7c421 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/LocalTrailerResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/LocalTrailerResolver.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Common.IO;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Resolvers;
 using System;
@@ -11,6 +12,13 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers
     /// </summary>
     public class LocalTrailerResolver : BaseVideoResolver<Trailer>
     {
+        private readonly IFileSystem _fileSystem;
+
+        public LocalTrailerResolver(IFileSystem fileSystem)
+        {
+            _fileSystem = fileSystem;
+        }
+
         /// <summary>
         /// Resolves the specified args.
         /// </summary>
@@ -33,7 +41,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers
                 }
 
                 // Support xbmc local trailer convention, but only when looking for local trailers (hence the parent == null check)
-                if (args.Parent == null && Path.GetFileNameWithoutExtension(args.Path).EndsWith(BaseItem.XbmcTrailerFileSuffix, StringComparison.OrdinalIgnoreCase))
+                if (args.Parent == null && _fileSystem.GetFileNameWithoutExtension(args.Path).EndsWith(BaseItem.XbmcTrailerFileSuffix, StringComparison.OrdinalIgnoreCase))
                 {
                     return base.Resolve(args);
                 }
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index f3e6fcdba4..215cff22fc 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.IO;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
@@ -22,12 +23,14 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
         private readonly IServerApplicationPaths _applicationPaths;
         private readonly ILibraryManager _libraryManager;
         private readonly ILogger _logger;
+        private readonly IFileSystem _fileSystem;
 
-        public MovieResolver(IServerApplicationPaths appPaths, ILibraryManager libraryManager, ILogger logger)
+        public MovieResolver(IServerApplicationPaths appPaths, ILibraryManager libraryManager, ILogger logger, IFileSystem fileSystem)
         {
             _applicationPaths = appPaths;
             _libraryManager = libraryManager;
             _logger = logger;
+            _fileSystem = fileSystem;
         }
 
         /// <summary>
@@ -407,7 +410,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
 
             if (!string.IsNullOrWhiteSpace(filenamePrefix))
             {
-                if (sortedMovies.All(i => Path.GetFileNameWithoutExtension(i.Path).StartsWith(filenamePrefix + " - ", StringComparison.OrdinalIgnoreCase)))
+                if (sortedMovies.All(i => _fileSystem.GetFileNameWithoutExtension(i.Path).StartsWith(filenamePrefix + " - ", StringComparison.OrdinalIgnoreCase)))
                 {
                     firstMovie.HasLocalAlternateVersions = true;
 
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
index a756dc7944..519d775ded 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
@@ -14,6 +15,13 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
     /// </summary>
     public class SeriesResolver : FolderResolver<Series>
     {
+        private readonly IFileSystem _fileSystem;
+
+        public SeriesResolver(IFileSystem fileSystem)
+        {
+            _fileSystem = fileSystem;
+        }
+
         /// <summary>
         /// Gets the priority.
         /// </summary>
@@ -67,8 +75,8 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
                 {
                     return null;
                 }
-                
-                if (TVUtils.IsSeriesFolder(args.Path, collectionType == CollectionType.TvShows, args.FileSystemChildren, args.DirectoryService))
+
+                if (TVUtils.IsSeriesFolder(args.Path, collectionType == CollectionType.TvShows, args.FileSystemChildren, args.DirectoryService, _fileSystem))
                 {
                     return new Series();
                 }
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index dbe0209082..43c9f3b9c2 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -282,7 +282,7 @@ namespace MediaBrowser.Server.Implementations.Library
         /// <exception cref="System.ArgumentException"></exception>
         public async Task<User> CreateUser(string name)
         {
-            if (string.IsNullOrEmpty(name))
+            if (string.IsNullOrWhiteSpace(name))
             {
                 throw new ArgumentNullException("name");
             }
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json
index 53047104cf..d9855c52ff 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json
@@ -314,10 +314,10 @@
     "ButtonSubtitles": "Subt\u00edtulos",
     "ButtonScenes": "Escenas",
     "ButtonQuality": "Calidad",
-    "HeaderNotifications": "Notifications",
-    "HeaderSelectPlayer": "Select Player:",
+    "HeaderNotifications": "Notificaciones",
+    "HeaderSelectPlayer": "Seleccionar Reproductor:",
     "ButtonSelect": "Seleccionar",
     "ButtonNew": "Nuevo",
-    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
-    "HeaderVideoError": "Video Error"
+    "MessageInternetExplorerWebm": "Para mejores resultados con Internet Explorer por favor instale el complemento WebM para IE.",
+    "HeaderVideoError": "Error de Video"
 }
\ 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 6bcb5aed5a..5086dcfacf 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
@@ -77,7 +77,7 @@
     "MessageInvalidUser": "Nom d'utilisateur et mot de passe invalides.",
     "HeaderAllRecordings": "Tous les enregistrements",
     "RecommendationBecauseYouLike": "Parce-que vous aimez {0}",
-    "RecommendationBecauseYouWatched": "Parece-que vous avez regard\u00e9 {0}",
+    "RecommendationBecauseYouWatched": "Parce que vous avez regard\u00e9 {0}",
     "RecommendationDirectedBy": "R\u00e9alis\u00e9 par {0}",
     "RecommendationStarring": "Mettant en vedette {0}",
     "HeaderConfirmRecordingCancellation": "Confirmer l'annulation de l'enregistrement.",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
index 191a89000d..37cff9888e 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
@@ -20,11 +20,11 @@
     "OptionRelease": "Offici\u00eble Release",
     "OptionBeta": "Beta",
     "OptionDev": "Dev (Instabiel)",
-    "UninstallPluginHeader": "Invoegtoepassing de\u00efnstalleren",
+    "UninstallPluginHeader": "Plug-in de\u00efnstalleren",
     "UninstallPluginConfirmation": "Weet u zeker dat u {0} wilt de\u00efnstalleren?",
-    "NoPluginConfigurationMessage": "Deze Invoegtoepassing heeft niets in te stellen",
-    "NoPluginsInstalledMessage": "U heeft geen Invoegtoepassingen ge\u00efnstalleerd",
-    "BrowsePluginCatalogMessage": "Bekijk de Invoegtoepassings catalogus voor beschikbare Invoegtoepassingen.",
+    "NoPluginConfigurationMessage": "Deze Plug-in heeft niets in te stellen",
+    "NoPluginsInstalledMessage": "U heeft geen Plug-in ge\u00efnstalleerd",
+    "BrowsePluginCatalogMessage": "Bekijk de Plug-in catalogus voor beschikbare Plug-ins.",
     "MessageKeyEmailedTo": "Sleutel gemaild naar {0}.",
     "MessageKeysLinked": "Sleutels gekoppeld.",
     "HeaderConfirmation": "Bevestiging",
@@ -45,7 +45,7 @@
     "HeaderDeleteTaskTrigger": "Verwijderen Taak Trigger",
     "HeaderTaskTriggers": "Taak Triggers",
     "MessageDeleteTaskTrigger": "Weet u zeker dat u deze taak trigger wilt verwijderen?",
-    "MessageNoPluginsInstalled": "U heeft geen Invoegtoepassingen ge\u00efnstalleerd.",
+    "MessageNoPluginsInstalled": "U heeft geen Plug-ins ge\u00efnstalleerd.",
     "LabelVersionInstalled": "{0} ge\u00efnstalleerd",
     "LabelNumberReviews": "{0} Recensies",
     "LabelFree": "Gratis",
@@ -305,7 +305,7 @@
     "TabDLNA": "DLNA",
     "TabLiveTV": "Live TV",
     "TabAutoOrganize": "Automatisch-Organiseren",
-    "TabPlugins": "Invoegtoepassingen",
+    "TabPlugins": "Plug-ins",
     "TabAdvanced": "Geavanceerd",
     "TabHelp": "Hulp",
     "TabScheduledTasks": "Geplande taken",
@@ -318,6 +318,6 @@
     "HeaderSelectPlayer": "Selecteer Speler:",
     "ButtonSelect": "Selecteer",
     "ButtonNew": "Nieuw",
-    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "MessageInternetExplorerWebm": "Voor het beste resultaat met Internet Explorer installeert u de WebM plugin voor IE.",
     "HeaderVideoError": "Video Fout"
 }
\ 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 51559053da..622ad2c059 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json
@@ -318,6 +318,6 @@
     "HeaderSelectPlayer": "Selecione onde executar:",
     "ButtonSelect": "Selecionar",
     "ButtonNew": "Nova",
-    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
-    "HeaderVideoError": "Video Error"
+    "MessageInternetExplorerWebm": "Para melhores resultados com o Internet Explorer, por favor instale o plugin WebM para IE.",
+    "HeaderVideoError": "Erro de V\u00eddeo"
 }
\ 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 2fa7f2ea7a..80bdc43f7c 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
@@ -60,7 +60,7 @@
     "ButtonStop": "\u041e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c",
     "ButtonNextTrack": "\u0421\u043b\u0435\u0434\u0443\u044e\u0449\u0430\u044f \u0434\u043e\u0440\u043e\u0436\u043a\u0430",
     "ButtonPause": "\u041f\u0430\u0443\u0437\u0430",
-    "ButtonPlay": "\u0412\u043e\u0441\u043f\u0440",
+    "ButtonPlay": "\u0412\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0441\u0442\u0438",
     "ButtonEdit": "\u041f\u0440\u0430\u0432\u0438\u0442\u044c",
     "ButtonQueue": "\u041e\u0447\u0435\u0440\u0435\u0434\u044c",
     "ButtonPlayTrailer": "\u0412\u043e\u0441\u043f\u0440 \u0442\u0440\u0435\u0439\u043b\u0435\u0440",
@@ -276,7 +276,7 @@
     "OptionParentalRating": "\u0412\u043e\u0437\u0440\u0430\u0441\u0442\u043d\u0430\u044f \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f",
     "OptionPeople": "\u041b\u044e\u0434\u0438",
     "OptionRuntime": "\u0414\u043b\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c",
-    "OptionProductionLocations": "\u041c\u0435\u0441\u0442\u0430 \u043f\u0440\u043e\u0438\u0437\u0432\u043e\u0434\u0441\u0442\u0432\u0430",
+    "OptionProductionLocations": "\u041c\u0435\u0441\u0442\u0430 \u0441\u044a\u0451\u043c\u043e\u043a",
     "OptionBirthLocation": "\u041c\u0435\u0441\u0442\u043e \u0440\u043e\u0436\u0434\u0435\u043d\u0438\u044f",
     "LabelAllChannels": "\u0412\u0441\u0435 \u043a\u0430\u043d\u0430\u043b\u044b",
     "LabelLiveProgram": "\u041f\u0420\u042f\u041c\u041e\u0419 \u042d\u0424\u0418\u0420",
diff --git a/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs b/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
index 05de4d65aa..1f993f0d4a 100644
--- a/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
+++ b/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
@@ -235,7 +235,9 @@ namespace MediaBrowser.Server.Implementations.Localization
             .Where(i => i != null)
             .ToDictionary(i => i.Name, StringComparer.OrdinalIgnoreCase);
 
-            var countryCode = Path.GetFileNameWithoutExtension(file).Split('-').Last();
+            var countryCode = _fileSystem.GetFileNameWithoutExtension(file)
+                .Split('-')
+                .Last();
 
             _allParentalRatings.TryAdd(countryCode, dict);
         }
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ar.json b/MediaBrowser.Server.Implementations/Localization/Server/ar.json
index 81922f713b..667245839a 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ar.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ar.json
@@ -767,10 +767,10 @@
     "OptionAuto": "Auto",
     "OptionYes": "Yes",
     "OptionNo": "No",
-    "LabelHomePageSection1": "Home page section one:",
-    "LabelHomePageSection2": "Home page section two:",
-    "LabelHomePageSection3": "Home page section three:",
-    "LabelHomePageSection4": "Home page section four:",
+    "LabelHomePageSection1": "Home page section 1:",
+    "LabelHomePageSection2": "Home page section 2:",
+    "LabelHomePageSection3": "Home page section 3:",
+    "LabelHomePageSection4": "Home page section 4:",
     "OptionMyViewsButtons": "My views (buttons)",
     "OptionMyViews": "My views",
     "OptionMyViewsSmall": "My views (small)",
@@ -888,5 +888,7 @@
     "ButtonSync": "Sync",
     "TabScheduledTasks": "Scheduled Tasks",
     "HeaderChapters": "Chapters",
-    "HeaderResumeSettings": "Resume Settings"
+    "HeaderResumeSettings": "Resume Settings",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ca.json b/MediaBrowser.Server.Implementations/Localization/Server/ca.json
index a56ccf4de3..bcca3aeb9c 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ca.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ca.json
@@ -767,10 +767,10 @@
     "OptionAuto": "Auto",
     "OptionYes": "Yes",
     "OptionNo": "No",
-    "LabelHomePageSection1": "Home page section one:",
-    "LabelHomePageSection2": "Home page section two:",
-    "LabelHomePageSection3": "Home page section three:",
-    "LabelHomePageSection4": "Home page section four:",
+    "LabelHomePageSection1": "Home page section 1:",
+    "LabelHomePageSection2": "Home page section 2:",
+    "LabelHomePageSection3": "Home page section 3:",
+    "LabelHomePageSection4": "Home page section 4:",
     "OptionMyViewsButtons": "My views (buttons)",
     "OptionMyViews": "My views",
     "OptionMyViewsSmall": "My views (small)",
@@ -888,5 +888,7 @@
     "ButtonSync": "Sync",
     "TabScheduledTasks": "Scheduled Tasks",
     "HeaderChapters": "Chapters",
-    "HeaderResumeSettings": "Resume Settings"
+    "HeaderResumeSettings": "Resume Settings",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/cs.json b/MediaBrowser.Server.Implementations/Localization/Server/cs.json
index 729768b78d..71ca6fc498 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/cs.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/cs.json
@@ -767,10 +767,10 @@
     "OptionAuto": "Auto",
     "OptionYes": "Ano",
     "OptionNo": "Ne",
-    "LabelHomePageSection1": "Home page section one:",
-    "LabelHomePageSection2": "Home page section two:",
-    "LabelHomePageSection3": "Home page section three:",
-    "LabelHomePageSection4": "Home page section four:",
+    "LabelHomePageSection1": "Home page section 1:",
+    "LabelHomePageSection2": "Home page section 2:",
+    "LabelHomePageSection3": "Home page section 3:",
+    "LabelHomePageSection4": "Home page section 4:",
     "OptionMyViewsButtons": "My views (buttons)",
     "OptionMyViews": "My views",
     "OptionMyViewsSmall": "My views (small)",
@@ -888,5 +888,7 @@
     "ButtonSync": "Sync",
     "TabScheduledTasks": "Scheduled Tasks",
     "HeaderChapters": "Chapters",
-    "HeaderResumeSettings": "Resume Settings"
+    "HeaderResumeSettings": "Resume Settings",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/da.json b/MediaBrowser.Server.Implementations/Localization/Server/da.json
index c2fafba45f..7a5bd76322 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/da.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/da.json
@@ -767,10 +767,10 @@
     "OptionAuto": "Auto",
     "OptionYes": "Yes",
     "OptionNo": "No",
-    "LabelHomePageSection1": "Home page section one:",
-    "LabelHomePageSection2": "Home page section two:",
-    "LabelHomePageSection3": "Home page section three:",
-    "LabelHomePageSection4": "Home page section four:",
+    "LabelHomePageSection1": "Home page section 1:",
+    "LabelHomePageSection2": "Home page section 2:",
+    "LabelHomePageSection3": "Home page section 3:",
+    "LabelHomePageSection4": "Home page section 4:",
     "OptionMyViewsButtons": "My views (buttons)",
     "OptionMyViews": "My views",
     "OptionMyViewsSmall": "My views (small)",
@@ -888,5 +888,7 @@
     "ButtonSync": "Sync",
     "TabScheduledTasks": "Scheduled Tasks",
     "HeaderChapters": "Chapters",
-    "HeaderResumeSettings": "Resume Settings"
+    "HeaderResumeSettings": "Resume Settings",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/de.json b/MediaBrowser.Server.Implementations/Localization/Server/de.json
index 5ffff96dde..ea1b4a1bc5 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/de.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/de.json
@@ -767,10 +767,10 @@
     "OptionAuto": "Auto",
     "OptionYes": "Ja",
     "OptionNo": "Nein",
-    "LabelHomePageSection1": "Home page section one:",
-    "LabelHomePageSection2": "Home page section two:",
-    "LabelHomePageSection3": "Home page section three:",
-    "LabelHomePageSection4": "Home page section four:",
+    "LabelHomePageSection1": "Home page section 1:",
+    "LabelHomePageSection2": "Home page section 2:",
+    "LabelHomePageSection3": "Home page section 3:",
+    "LabelHomePageSection4": "Home page section 4:",
     "OptionMyViewsButtons": "My views (buttons)",
     "OptionMyViews": "My views",
     "OptionMyViewsSmall": "My views (small)",
@@ -888,5 +888,7 @@
     "ButtonSync": "Sync",
     "TabScheduledTasks": "Scheduled Tasks",
     "HeaderChapters": "Chapters",
-    "HeaderResumeSettings": "Resume Settings"
+    "HeaderResumeSettings": "Resume Settings",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/el.json b/MediaBrowser.Server.Implementations/Localization/Server/el.json
index fe7451fed9..2edf373264 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/el.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/el.json
@@ -767,10 +767,10 @@
     "OptionAuto": "Auto",
     "OptionYes": "Yes",
     "OptionNo": "No",
-    "LabelHomePageSection1": "Home page section one:",
-    "LabelHomePageSection2": "Home page section two:",
-    "LabelHomePageSection3": "Home page section three:",
-    "LabelHomePageSection4": "Home page section four:",
+    "LabelHomePageSection1": "Home page section 1:",
+    "LabelHomePageSection2": "Home page section 2:",
+    "LabelHomePageSection3": "Home page section 3:",
+    "LabelHomePageSection4": "Home page section 4:",
     "OptionMyViewsButtons": "My views (buttons)",
     "OptionMyViews": "My views",
     "OptionMyViewsSmall": "My views (small)",
@@ -888,5 +888,7 @@
     "ButtonSync": "Sync",
     "TabScheduledTasks": "Scheduled Tasks",
     "HeaderChapters": "Chapters",
-    "HeaderResumeSettings": "Resume Settings"
+    "HeaderResumeSettings": "Resume Settings",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json b/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
index 5044e6d959..7ff88733ae 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
@@ -767,10 +767,10 @@
     "OptionAuto": "Auto",
     "OptionYes": "Yes",
     "OptionNo": "No",
-    "LabelHomePageSection1": "Home page section one:",
-    "LabelHomePageSection2": "Home page section two:",
-    "LabelHomePageSection3": "Home page section three:",
-    "LabelHomePageSection4": "Home page section four:",
+    "LabelHomePageSection1": "Home page section 1:",
+    "LabelHomePageSection2": "Home page section 2:",
+    "LabelHomePageSection3": "Home page section 3:",
+    "LabelHomePageSection4": "Home page section 4:",
     "OptionMyViewsButtons": "My views (buttons)",
     "OptionMyViews": "My views",
     "OptionMyViewsSmall": "My views (small)",
@@ -888,5 +888,7 @@
     "ButtonSync": "Sync",
     "TabScheduledTasks": "Scheduled Tasks",
     "HeaderChapters": "Chapters",
-    "HeaderResumeSettings": "Resume Settings"
+    "HeaderResumeSettings": "Resume Settings",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/en_US.json b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
index dc4ac80cbc..930401e5cb 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
@@ -767,10 +767,10 @@
     "OptionAuto": "Auto",
     "OptionYes": "Yes",
     "OptionNo": "No",
-    "LabelHomePageSection1": "Home page section one:",
-    "LabelHomePageSection2": "Home page section two:",
-    "LabelHomePageSection3": "Home page section three:",
-    "LabelHomePageSection4": "Home page section four:",
+    "LabelHomePageSection1": "Home page section 1:",
+    "LabelHomePageSection2": "Home page section 2:",
+    "LabelHomePageSection3": "Home page section 3:",
+    "LabelHomePageSection4": "Home page section 4:",
     "OptionMyViewsButtons": "My views (buttons)",
     "OptionMyViews": "My views",
     "OptionMyViewsSmall": "My views (small)",
@@ -888,5 +888,7 @@
     "ButtonSync": "Sync",
     "TabScheduledTasks": "Scheduled Tasks",
     "HeaderChapters": "Chapters",
-    "HeaderResumeSettings": "Resume Settings"
+    "HeaderResumeSettings": "Resume Settings",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/es.json b/MediaBrowser.Server.Implementations/Localization/Server/es.json
index 9c43a9c9e2..94c6c9ec47 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/es.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es.json
@@ -888,5 +888,7 @@
     "ButtonSync": "Sync",
     "TabScheduledTasks": "Scheduled Tasks",
     "HeaderChapters": "Chapters",
-    "HeaderResumeSettings": "Resume Settings"
+    "HeaderResumeSettings": "Resume Settings",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json b/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
index 98a36f8dd7..f1a323e6d1 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
@@ -190,7 +190,7 @@
     "HeaderStatus": "Estado",
     "OptionContinuing": "Continuando",
     "OptionEnded": "Finalizado",
-    "HeaderAirDays": "D\u00edas de Emisi\u00f3n:",
+    "HeaderAirDays": "D\u00edas de Emisi\u00f3n",
     "OptionSunday": "Domingo",
     "OptionMonday": "Lunes",
     "OptionTuesday": "Martes",
@@ -198,8 +198,8 @@
     "OptionThursday": "Jueves",
     "OptionFriday": "Viernes",
     "OptionSaturday": "S\u00e1bado",
-    "HeaderManagement": "Administraci\u00f3n:",
-    "LabelManagement": "Management:",
+    "HeaderManagement": "Administraci\u00f3n",
+    "LabelManagement": "Administraci\u00f3n:",
     "OptionMissingImdbId": "Falta Id de IMDb",
     "OptionMissingTvdbId": "Falta Id de TheTVDB",
     "OptionMissingOverview": "Falta Sinopsis",
@@ -257,11 +257,11 @@
     "ButtonSelectDirectory": "Seleccionar Carpeta",
     "LabelCustomPaths": "Especificar rutas personalizadas cuando se desee. Deje los campos vac\u00edos para usar los valores predeterminados.",
     "LabelCachePath": "Ruta para el Cach\u00e9:",
-    "LabelCachePathHelp": "Esta carpeta contiene los archivos de cach\u00e9 del servidor, por ejemplo im\u00e1genes.",
+    "LabelCachePathHelp": "Especifique una ubicaci\u00f3n personalizada para los archivos de cach\u00e9 del servidor, tales como im\u00e1genes.",
     "LabelImagesByNamePath": "Ruta para Im\u00e1genes por nombre:",
-    "LabelImagesByNamePathHelp": "Esta carpeta contiene im\u00e1genes descargadas de actores, artistas, g\u00e9neros y estudios.",
+    "LabelImagesByNamePathHelp": "Especifique una ubicaci\u00f3n personalizada para im\u00e1genes descargadas de actores, artistas, g\u00e9neros y estudios.",
     "LabelMetadataPath": "Ruta para metadatos:",
-    "LabelMetadataPathHelp": "Esta ubicaci\u00f3n contiene ilustraciones descargadas y metadatos cuando no han sido configurados para almacenarse en carpetas de medios.",
+    "LabelMetadataPathHelp": "Especifique una ubicaci\u00f3n personalizada para ilustraciones descargadas y metadatos cuando no han sido configurados para almacenarse en carpetas de medios.",
     "LabelTranscodingTempPath": "Ruta para transcodificaci\u00f3n temporal:",
     "LabelTranscodingTempPathHelp": "Esta carpeta contiene archivos de trabajo usados por el transcodificador. Especifique una trayectoria personalizada, o d\u00e9jela vac\u00eda para utilizar su valor por omisi\u00f3n en la carpeta de datos del servidor.",
     "TabBasics": "B\u00e1sicos",
@@ -627,10 +627,10 @@
     "TabNowPlaying": "Reproduci\u00e9ndo Ahora",
     "TabNavigation": "Navegaci\u00f3n",
     "TabControls": "Controles",
-    "ButtonFullscreen": "Toggle fullscreen",
+    "ButtonFullscreen": "Cambiar a pantalla completa",
     "ButtonScenes": "Escenas",
     "ButtonSubtitles": "Subt\u00edtulos",
-    "ButtonAudioTracks": "Audio tracks",
+    "ButtonAudioTracks": "Pistas de audio",
     "ButtonPreviousTrack": "Pista anterior",
     "ButtonNextTrack": "Pista siguiente",
     "ButtonStop": "Detener",
@@ -880,13 +880,13 @@
     "TabSort": "Ordenaci\u00f3n",
     "TabFilter": "Filtro",
     "ButtonView": "Vista",
-    "LabelPageSize": "Tama\u00f1o de Pantalla:",
+    "LabelPageSize": "Cantidad de \u00cdtems:",
     "LabelView": "Vista:",
     "TabUsers": "Usuarios",
-    "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced",
-    "ButtonSync": "Sync",
+    "HeaderFeatures": "Caracter\u00edsticas",
+    "HeaderAdvanced": "Avanzado",
+    "ButtonSync": "Sincronizar",
     "TabScheduledTasks": "Tareas Programadas",
-    "HeaderChapters": "Chapters",
-    "HeaderResumeSettings": "Resume Settings"
+    "HeaderChapters": "Cap\u00edtulos",
+    "HeaderResumeSettings": "Configuraci\u00f3n para Continuar"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/fr.json b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
index f5f3d93879..275cd20c33 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/fr.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
@@ -824,8 +824,8 @@
     "LabelProtocolInfoHelp": "La valeur sera utilis\u00e9e par le p\u00e9riph\u00e9rique pour r\u00e9pondre aux requ\u00eates GetProtocolInfo.",
     "TabXbmcMetadata": "Xbmc",
     "HeaderXbmcMetadataHelp": "Media Browser inclut un support natif pour les m\u00e9tadonn\u00e9es Nfo Xbmc et les images. Pour activer ou d\u00e9sactiver les m\u00e9tadonn\u00e9es Xbmc, utiliser l'onglet Avanc\u00e9 pour configurer les options de vos types de m\u00e9dia.",
-    "LabelXbmcMetadataUser": "Add user watch data to nfo's for:",
-    "LabelXbmcMetadataUserHelp": "Activer ceci pour synchroniser en permanence Media Browser et Xbmc",
+    "LabelXbmcMetadataUser": "Ajouter aux nfo, les donn\u00e9es de surveillance de l'utilisateur :",
+    "LabelXbmcMetadataUserHelp": "Activer ceci pour synchroniser les donn\u00e9es de surveillance entre Media Browser et Xbmc",
     "LabelXbmcMetadataDateFormat": "Format de la date de sortie :",
     "LabelXbmcMetadataDateFormatHelp": "Toutes les dates provenant des nfo seront lues et \u00e9crites en utilisant ce format.",
     "LabelXbmcMetadataSaveImagePaths": "Sauvegarder les chemins d'images dans les fichiers nfo.",
@@ -888,5 +888,7 @@
     "ButtonSync": "Sync",
     "TabScheduledTasks": "T\u00e2ches planifi\u00e9es",
     "HeaderChapters": "Chapitres",
-    "HeaderResumeSettings": "Reprendre les param\u00e8tres"
+    "HeaderResumeSettings": "Reprendre les param\u00e8tres",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/he.json b/MediaBrowser.Server.Implementations/Localization/Server/he.json
index 43135ec818..51a27549e7 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/he.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/he.json
@@ -767,10 +767,10 @@
     "OptionAuto": "Auto",
     "OptionYes": "Yes",
     "OptionNo": "No",
-    "LabelHomePageSection1": "Home page section one:",
-    "LabelHomePageSection2": "Home page section two:",
-    "LabelHomePageSection3": "Home page section three:",
-    "LabelHomePageSection4": "Home page section four:",
+    "LabelHomePageSection1": "Home page section 1:",
+    "LabelHomePageSection2": "Home page section 2:",
+    "LabelHomePageSection3": "Home page section 3:",
+    "LabelHomePageSection4": "Home page section 4:",
     "OptionMyViewsButtons": "My views (buttons)",
     "OptionMyViews": "My views",
     "OptionMyViewsSmall": "My views (small)",
@@ -888,5 +888,7 @@
     "ButtonSync": "Sync",
     "TabScheduledTasks": "Scheduled Tasks",
     "HeaderChapters": "Chapters",
-    "HeaderResumeSettings": "Resume Settings"
+    "HeaderResumeSettings": "Resume Settings",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/it.json b/MediaBrowser.Server.Implementations/Localization/Server/it.json
index e76d47a044..dba80e2b4f 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/it.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/it.json
@@ -888,5 +888,7 @@
     "ButtonSync": "Sync",
     "TabScheduledTasks": "Operazioni pianificate",
     "HeaderChapters": "Chapters",
-    "HeaderResumeSettings": "Resume Settings"
+    "HeaderResumeSettings": "Resume Settings",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/kk.json b/MediaBrowser.Server.Implementations/Localization/Server/kk.json
index 9a1847ea45..a3120ffe4b 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/kk.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/kk.json
@@ -888,5 +888,7 @@
     "ButtonSync": "\u0421\u0438\u043d\u0445\u0440\u043e\u043d\u0434\u0430\u0443",
     "TabScheduledTasks": "\u0416\u043e\u0441\u043f\u0430\u0440\u043b\u0430\u0443\u0448\u044b",
     "HeaderChapters": "\u0421\u0430\u0445\u043d\u0430\u043b\u0430\u0440",
-    "HeaderResumeSettings": "\u0416\u0430\u043b\u0493\u0430\u0441\u0442\u044b\u0440\u0443 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043b\u0435\u0440\u0456"
+    "HeaderResumeSettings": "\u0416\u0430\u043b\u0493\u0430\u0441\u0442\u044b\u0440\u0443 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043b\u0435\u0440\u0456",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ko.json b/MediaBrowser.Server.Implementations/Localization/Server/ko.json
index f474225fd9..c558cbe8dc 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ko.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ko.json
@@ -767,10 +767,10 @@
     "OptionAuto": "Auto",
     "OptionYes": "Yes",
     "OptionNo": "No",
-    "LabelHomePageSection1": "Home page section one:",
-    "LabelHomePageSection2": "Home page section two:",
-    "LabelHomePageSection3": "Home page section three:",
-    "LabelHomePageSection4": "Home page section four:",
+    "LabelHomePageSection1": "Home page section 1:",
+    "LabelHomePageSection2": "Home page section 2:",
+    "LabelHomePageSection3": "Home page section 3:",
+    "LabelHomePageSection4": "Home page section 4:",
     "OptionMyViewsButtons": "My views (buttons)",
     "OptionMyViews": "My views",
     "OptionMyViewsSmall": "My views (small)",
@@ -888,5 +888,7 @@
     "ButtonSync": "Sync",
     "TabScheduledTasks": "Scheduled Tasks",
     "HeaderChapters": "Chapters",
-    "HeaderResumeSettings": "Resume Settings"
+    "HeaderResumeSettings": "Resume Settings",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ms.json b/MediaBrowser.Server.Implementations/Localization/Server/ms.json
index 232e94a72a..134ff44d8e 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ms.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ms.json
@@ -767,10 +767,10 @@
     "OptionAuto": "Auto",
     "OptionYes": "Yes",
     "OptionNo": "No",
-    "LabelHomePageSection1": "Home page section one:",
-    "LabelHomePageSection2": "Home page section two:",
-    "LabelHomePageSection3": "Home page section three:",
-    "LabelHomePageSection4": "Home page section four:",
+    "LabelHomePageSection1": "Home page section 1:",
+    "LabelHomePageSection2": "Home page section 2:",
+    "LabelHomePageSection3": "Home page section 3:",
+    "LabelHomePageSection4": "Home page section 4:",
     "OptionMyViewsButtons": "My views (buttons)",
     "OptionMyViews": "My views",
     "OptionMyViewsSmall": "My views (small)",
@@ -888,5 +888,7 @@
     "ButtonSync": "Sync",
     "TabScheduledTasks": "Scheduled Tasks",
     "HeaderChapters": "Chapters",
-    "HeaderResumeSettings": "Resume Settings"
+    "HeaderResumeSettings": "Resume Settings",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/nb.json b/MediaBrowser.Server.Implementations/Localization/Server/nb.json
index c10e19102b..165bf3f66d 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/nb.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/nb.json
@@ -767,10 +767,10 @@
     "OptionAuto": "Auto",
     "OptionYes": "Yes",
     "OptionNo": "No",
-    "LabelHomePageSection1": "Home page section one:",
-    "LabelHomePageSection2": "Home page section two:",
-    "LabelHomePageSection3": "Home page section three:",
-    "LabelHomePageSection4": "Home page section four:",
+    "LabelHomePageSection1": "Home page section 1:",
+    "LabelHomePageSection2": "Home page section 2:",
+    "LabelHomePageSection3": "Home page section 3:",
+    "LabelHomePageSection4": "Home page section 4:",
     "OptionMyViewsButtons": "My views (buttons)",
     "OptionMyViews": "My views",
     "OptionMyViewsSmall": "My views (small)",
@@ -888,5 +888,7 @@
     "ButtonSync": "Sync",
     "TabScheduledTasks": "Scheduled Tasks",
     "HeaderChapters": "Chapters",
-    "HeaderResumeSettings": "Resume Settings"
+    "HeaderResumeSettings": "Resume Settings",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/nl.json b/MediaBrowser.Server.Implementations/Localization/Server/nl.json
index c1a8710959..5862688a60 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/nl.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/nl.json
@@ -39,7 +39,7 @@
     "HeaderSetupLibrary": "Stel uw mediabibliotheek in",
     "ButtonAddMediaFolder": "Mediamap toevoegen",
     "LabelFolderType": "Maptype:",
-    "MediaFolderHelpPluginRequired": "* Hiervoor is het gebruik van een Invoegtoepassing vereist, bijvoorbeeld GameBrowser of MB Bookshelf.",
+    "MediaFolderHelpPluginRequired": "* Hiervoor is het gebruik van een Plug-in vereist, bijvoorbeeld GameBrowser of MB Bookshelf.",
     "ReferToMediaLibraryWiki": "Raadpleeg de mediabibliotheek wiki.",
     "LabelCountry": "Land:",
     "LabelLanguage": "Taal:",
@@ -152,16 +152,16 @@
     "OptionResumable": "Hervatbaar",
     "ScheduledTasksHelp": "Klik op een taak om het schema aan te passen.",
     "ScheduledTasksTitle": "Geplande taken",
-    "TabMyPlugins": "Mijn Invoegtoepassingen",
+    "TabMyPlugins": "Mijn Plug-ins",
     "TabCatalog": "Catalogus",
-    "PluginsTitle": "Invoegtoepassingen",
+    "PluginsTitle": "Plug-ins",
     "HeaderAutomaticUpdates": "Automatische updates",
     "HeaderNowPlaying": "Wordt nu afgespeeld",
     "HeaderLatestAlbums": "Nieuwste Albums",
     "HeaderLatestSongs": "Nieuwste Songs",
     "HeaderRecentlyPlayed": "Recent afgespeeld",
     "HeaderFrequentlyPlayed": "Vaak afgespeeld",
-    "DevBuildWarning": "Development versies zijn voor eigen risico. Ze worden vaak uitgegeven, deze versies zijn niet getest!. De Applicatie kan crashen en sommige functies kunnen mogelijk niet meer werken.",
+    "DevBuildWarning": "Development versies zijn geheel voor eigen risico. Deze versies worden vaak vrijgegeven en zijn niet getest!. De Applicatie kan crashen en sommige functies kunnen mogelijk niet meer werken.",
     "LabelVideoType": "Video Type:",
     "OptionBluray": "Blu-ray",
     "OptionDvd": "Dvd",
@@ -249,11 +249,11 @@
     "OptionRelease": "Offici\u00eble Release",
     "OptionBeta": "Beta",
     "OptionDev": "Dev (Instabiel)",
-    "LabelAllowServerAutoRestart": "Sta de server toe automatisch te herstarten om updates toe te passen",
-    "LabelAllowServerAutoRestartHelp": "De server zal alleen opnieuw op tijdens inactieve perioden, wanneer er geen gebruikers actief zijn.",
+    "LabelAllowServerAutoRestart": "Automatisch herstarten van de server toestaan om updates toe te passen",
+    "LabelAllowServerAutoRestartHelp": "De server zal alleen opnieuw opstarten tijdens inactieve perioden, wanneer er geen gebruikers actief zijn.",
     "LabelEnableDebugLogging": "Foutopsporings logboek inschakelen",
     "LabelRunServerAtStartup": "Start server bij het aanmelden",
-    "LabelRunServerAtStartupHelp": "Dit zal de applicatie starten als pictogram in het systeemvak tijdens het aanmelden van Windows. Om de Windows-service te starten, schakelt u deze uit en start u de service via het Configuratiescherm van Windows. Houd er rekening mee dat u de service en de applicatie niet tegelijk kunt uitvoeren, u moet dus eerst de applicatie sluiten alvorens u de service start.",
+    "LabelRunServerAtStartupHelp": "Dit start de applicatie als pictogram in het systeemvak tijdens het aanmelden van Windows. Om de Windows-service te starten, schakelt u deze uit en start u de service via het Configuratiescherm van Windows. Houd er rekening mee dat u de service en de applicatie niet tegelijk kunt uitvoeren, u moet dus eerst de applicatie sluiten alvorens u de service start.",
     "ButtonSelectDirectory": "Selecteer map",
     "LabelCustomPaths": "Geef aangepaste paden op waar gewenst. Laat velden leeg om de standaardinstellingen te gebruiken.",
     "LabelCachePath": "Cache pad:",
@@ -333,10 +333,10 @@
     "LabelNumberOfGuideDays": "Aantal dagen van de gids om te downloaden:",
     "LabelNumberOfGuideDaysHelp": "Het downloaden van meer dagen van de gids gegevens biedt de mogelijkheid verder vooruit te plannen en een beter overzicht geven, maar het zal ook langer duren om te downloaden. Auto kiest op basis van het aantal kanalen.",
     "LabelActiveService": "Actieve Service:",
-    "LabelActiveServiceHelp": "Er kunnen meerdere tv Invoegtoepassingen worden ge\u00efnstalleerd, maar er kan er slechts een  per keer actief zijn.",
+    "LabelActiveServiceHelp": "Er kunnen meerdere tv Plug-ins worden ge\u00efnstalleerd, maar er kan er slechts een per keer actief zijn.",
     "OptionAutomatic": "Automatisch",
-    "LiveTvPluginRequired": "Een Live TV service provider Invoegtoepassing is vereist om door te gaan.",
-    "LiveTvPluginRequiredHelp": "Installeer a.u b een van onze beschikbare Invoegtoepassingen, zoals Next PVR of ServerWmc.",
+    "LiveTvPluginRequired": "Een Live TV service provider Plug-in is vereist om door te gaan.",
+    "LiveTvPluginRequiredHelp": "Installeer a.u b een van onze beschikbare Plug-ins, zoals Next PVR of ServerWmc.",
     "LabelCustomizeOptionsPerMediaType": "Aanpassen voor mediatype",
     "OptionDownloadThumbImage": "Miniatuur",
     "OptionDownloadMenuImage": "Menu",
@@ -577,9 +577,9 @@
     "HeaderNotificationList": "Klik op een melding om de opties voor het versturen ervan te configureren .",
     "NotificationOptionApplicationUpdateAvailable": "Programma-update beschikbaar",
     "NotificationOptionApplicationUpdateInstalled": "Programma-update ge\u00efnstalleerd",
-    "NotificationOptionPluginUpdateInstalled": "Invoegtoepassings-update ge\u00efnstalleerd",
-    "NotificationOptionPluginInstalled": "Invoegtoepassing ge\u00efnstalleerd",
-    "NotificationOptionPluginUninstalled": "Invoegtoepassing verwijderd",
+    "NotificationOptionPluginUpdateInstalled": "Plug-in-update ge\u00efnstalleerd",
+    "NotificationOptionPluginInstalled": "Plug-in ge\u00efnstalleerd",
+    "NotificationOptionPluginUninstalled": "Plug-in verwijderd",
     "NotificationOptionVideoPlayback": "Video afspelen gestart",
     "NotificationOptionAudioPlayback": "Audio afspelen gestart",
     "NotificationOptionGamePlayback": "Game gestart",
@@ -590,7 +590,7 @@
     "NotificationOptionInstallationFailed": "Mislukken van de installatie",
     "NotificationOptionNewLibraryContent": "Nieuwe content toegevoegd",
     "NotificationOptionNewLibraryContentMultiple": "Nieuwe content toegevoegd (meerdere)",
-    "SendNotificationHelp": "Meldingen worden geplaatst in de inbox op het dashboard. Blader door de Invoegtoepassings catalogus om aanvullende opties voor meldingen te installeren.",
+    "SendNotificationHelp": "Meldingen worden geplaatst in de inbox op het dashboard. Blader door de Plug-in catalogus om aanvullende opties voor meldingen te installeren.",
     "NotificationOptionServerRestartRequired": "Server herstart nodig",
     "LabelNotificationEnabled": "Deze melding inschakelen",
     "LabelMonitorUsers": "Monitor activiteit van:",
@@ -600,10 +600,10 @@
     "CategoryUser": "Gebruiker",
     "CategorySystem": "Systeem",
     "CategoryApplication": "Toepassing",
-    "CategoryPlugin": "Invoegtoepassing",
+    "CategoryPlugin": "Plug-in",
     "LabelMessageTitle": "Titel van het bericht:",
     "LabelAvailableTokens": "Beschikbaar tokens:",
-    "AdditionalNotificationServices": "Blader door de Invoegtoepassings catalogus om aanvullende meldingsdiensten te installeren.",
+    "AdditionalNotificationServices": "Blader door de  Plug-in catalogus om aanvullende meldingsdiensten te installeren.",
     "OptionAllUsers": "Alle gebruikers",
     "OptionAdminUsers": "Beheerders",
     "OptionCustomUsers": "Aangepast",
@@ -637,7 +637,7 @@
     "ButtonPause": "Pauze",
     "LabelGroupMoviesIntoCollections": "Groepeer films in verzamelingen",
     "LabelGroupMoviesIntoCollectionsHelp": "Bij de weergave van film lijsten, zullen films die behoren tot een verzameling worden weergegeven als een gegroepeerd object.",
-    "NotificationOptionPluginError": "Invoegtoepassings fout",
+    "NotificationOptionPluginError": "Plug-in fout",
     "ButtonVolumeUp": "Volume omhoog",
     "ButtonVolumeDown": "Volume omlaag",
     "ButtonMute": "Dempen",
@@ -723,7 +723,7 @@
     "OptionReportByteRangeSeekingWhenTranscodingHelp": "Dit is vereist voor bepaalde apparaten die zo goed op tijd zoeken.",
     "HeaderSubtitleDownloadingHelp": "Bij het scannen van uw videobestanden kan Media Browser naar ontbrekende ondertiteling zoeken en deze downloaden bij ondertiteling providers zoals OpenSubtitles.org.",
     "HeaderDownloadSubtitlesFor": "Download ondertiteling voor:",
-    "MessageNoChapterProviders": "Installeer een hoofdstuk provider Invoegtoepassing zoals ChapterDb om extra hoofdstuk opties in te schakelen.",
+    "MessageNoChapterProviders": "Installeer een hoofdstuk provider Plug-in zoals ChapterDb om extra hoofdstuk opties in te schakelen.",
     "LabelSkipIfGraphicalSubsPresent": "Overslaan als de video al grafische ondertitels  bevat",
     "LabelSkipIfGraphicalSubsPresentHelp": "Tekstversies houden van ondertitels zal resulteren in meer effici\u00ebnte levering aan mobiele clients.",
     "TabSubtitles": "Ondertiteling",
@@ -731,7 +731,7 @@
     "HeaderDownloadChaptersFor": "Download hoofdstuk namen voor:",
     "LabelOpenSubtitlesUsername": "Gebruikersnaam Open Subtitles:",
     "LabelOpenSubtitlesPassword": "Wachtwoord Open Subtitles:",
-    "HeaderChapterDownloadingHelp": "Wanneer Media Browser uw videobestanden scant kan het gebruiksvriendelijke namen voor hoofdstukken downloaden van het internet met behulp van hoofdstuk Invoegtoepassing zoals ChapterDb.",
+    "HeaderChapterDownloadingHelp": "Wanneer Media Browser uw videobestanden scant kan het gebruiksvriendelijke namen voor hoofdstukken downloaden van het internet met behulp van hoofdstuk Plug-in zoals ChapterDb.",
     "LabelPlayDefaultAudioTrack": "Speel standaard audio spoor ongeacht taal",
     "LabelSubtitlePlaybackMode": "Ondertitelingsmode:",
     "LabelDownloadLanguages": "Download talen:",
@@ -741,8 +741,8 @@
     "HeaderSendMessage": "Stuur bericht",
     "ButtonSend": "Stuur",
     "LabelMessageText": "Bericht tekst:",
-    "MessageNoAvailablePlugins": "Geen beschikbare Invoegtoepassingen.",
-    "LabelDisplayPluginsFor": "Toon Invoegtoepassingen voor:",
+    "MessageNoAvailablePlugins": "Geen beschikbare Plug-ins.",
+    "LabelDisplayPluginsFor": "Toon Plug-ins voor:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
     "LabelEpisodeName": "Naam aflevering",
@@ -803,7 +803,7 @@
     "LabelChannelDownloadPathHelp": "Geef een eigen download pad op als dit gewenst is, leeglaten voor dowloaden naar de interne program data map.",
     "LabelChannelDownloadAge": "Verwijder inhoud na: (dagen)",
     "LabelChannelDownloadAgeHelp": "Gedownloade inhoud die ouder is zal worden verwijderd. Afspelen via internet streaming blijft mogelijk.",
-    "ChannelSettingsFormHelp": "Installeer kanalen zoals Trailers en Vimeo in de Invoegtoepassings catalogus.",
+    "ChannelSettingsFormHelp": "Installeer kanalen zoals Trailers en Vimeo in de Plug-in catalogus.",
     "LabelSelectCollection": "Selecteer verzameling:",
     "ViewTypeMovies": "Films",
     "ViewTypeTvShows": "TV",
@@ -888,5 +888,7 @@
     "ButtonSync": "Sync",
     "TabScheduledTasks": "Geplande taken",
     "HeaderChapters": "Hoofdstukken",
-    "HeaderResumeSettings": "Resume Settings"
+    "HeaderResumeSettings": "Instellingen voor Hervatten",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pl.json b/MediaBrowser.Server.Implementations/Localization/Server/pl.json
index 3032f71f08..135b640f28 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pl.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pl.json
@@ -767,10 +767,10 @@
     "OptionAuto": "Auto",
     "OptionYes": "Yes",
     "OptionNo": "No",
-    "LabelHomePageSection1": "Home page section one:",
-    "LabelHomePageSection2": "Home page section two:",
-    "LabelHomePageSection3": "Home page section three:",
-    "LabelHomePageSection4": "Home page section four:",
+    "LabelHomePageSection1": "Home page section 1:",
+    "LabelHomePageSection2": "Home page section 2:",
+    "LabelHomePageSection3": "Home page section 3:",
+    "LabelHomePageSection4": "Home page section 4:",
     "OptionMyViewsButtons": "My views (buttons)",
     "OptionMyViews": "My views",
     "OptionMyViewsSmall": "My views (small)",
@@ -888,5 +888,7 @@
     "ButtonSync": "Sync",
     "TabScheduledTasks": "Scheduled Tasks",
     "HeaderChapters": "Chapters",
-    "HeaderResumeSettings": "Resume Settings"
+    "HeaderResumeSettings": "Resume Settings",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json b/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
index a80d352b92..55d76aa8b6 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
@@ -190,7 +190,7 @@
     "HeaderStatus": "Status",
     "OptionContinuing": "Em Exibi\u00e7\u00e3o",
     "OptionEnded": "Finalizada",
-    "HeaderAirDays": "Dias de Exibi\u00e7\u00e3o:",
+    "HeaderAirDays": "Dias de Exibi\u00e7\u00e3o",
     "OptionSunday": "Domingo",
     "OptionMonday": "Segunda-feira",
     "OptionTuesday": "Ter\u00e7a-feira",
@@ -198,7 +198,7 @@
     "OptionThursday": "Quinta-feira",
     "OptionFriday": "Sexta-feira",
     "OptionSaturday": "S\u00e1bado",
-    "HeaderManagement": "Gerenciamento:",
+    "HeaderManagement": "Gerenciamento",
     "LabelManagement": "Administra\u00e7\u00e3o:",
     "OptionMissingImdbId": "Faltando Id IMDb",
     "OptionMissingTvdbId": "Faltando Id TheTVDB",
@@ -257,11 +257,11 @@
     "ButtonSelectDirectory": "Selecionar Diret\u00f3rio",
     "LabelCustomPaths": "Defina caminhos personalizados. Deixe os campos em branco para usar o padr\u00e3o.",
     "LabelCachePath": "Caminho do cache:",
-    "LabelCachePathHelp": "Esta pasta cont\u00e9m arquivos de cache do servidor como, por exemplo, imagens.",
+    "LabelCachePathHelp": "Defina uma localiza\u00e7\u00e3o para os arquivos de cache como, por exemplo, imagens.",
     "LabelImagesByNamePath": "Caminho do Images by name:",
-    "LabelImagesByNamePathHelp": "Esta pasta cont\u00e9m imagens transferidas para ator, artista, g\u00eanero e est\u00fadio.",
+    "LabelImagesByNamePathHelp": "Defina uma localiza\u00e7\u00e3o para imagens baixadas para ator, artista, g\u00eanero e est\u00fadio.",
     "LabelMetadataPath": "Caminho dos Metadados:",
-    "LabelMetadataPathHelp": "Esta localiza\u00e7\u00e3o cont\u00e9m artwork e metadados transferidos que n\u00e3o foram configurados para serem armazenados nas pastas de m\u00eddia.",
+    "LabelMetadataPathHelp": "Defina uma localiza\u00e7\u00e3o para artwork e metadados baixados, caso n\u00e3o sejam salvos dentro das pastas de m\u00eddia.",
     "LabelTranscodingTempPath": "Caminho tempor\u00e1rio para transcodifica\u00e7\u00e3o:",
     "LabelTranscodingTempPathHelp": "Esta pasta cont\u00e9m arquivos ativos usados pelo transcodificador. Especifique um caminho personalizado ou deixe em branco para usar o padr\u00e3o dentro da pasta de dados do servidor.",
     "TabBasics": "B\u00e1sico",
@@ -692,7 +692,7 @@
     "LabelMaxBitrate": "Taxa de bits m\u00e1xima:",
     "LabelMaxBitrateHelp": "Especifique uma taxa de bits m\u00e1xima para ambientes com restri\u00e7\u00e3o de tamanho de banda, ou se o dispositivo  imp\u00f5e esse limite.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignorar requisi\u00e7\u00f5es de extens\u00e3o do byte de transcodifica\u00e7\u00e3o",
-    "OptionIgnoreTranscodeByteRangeRequestsHelp": "Se ativado, estas requisi\u00e7\u00f5es ser\u00e3o honradas mas ir\u00e3o ignorar o cabe\u00e7alho da extens\u00e3o do byte.",
+    "OptionIgnoreTranscodeByteRangeRequestsHelp": "Se ativadas, estas requisi\u00e7\u00f5es ser\u00e3o honradas mas ir\u00e3o ignorar o cabe\u00e7alho da extens\u00e3o do byte.",
     "LabelFriendlyName": "Nome amig\u00e1vel",
     "LabelManufacturer": "Fabricante",
     "LabelManufacturerUrl": "Url do fabricante",
@@ -834,7 +834,7 @@
     "LabelXbmcMetadataEnablePathSubstitutionHelp": "Ativa a substitui\u00e7\u00e3o do caminho da imagem usando as configura\u00e7\u00f5es de suvbstitui\u00e7\u00e3o de caminho do servidor.",
     "LabelXbmcMetadataEnablePathSubstitutionHelp2": "Ver substitui\u00e7\u00e3o de caminho.",
     "LabelGroupChannelsIntoViews": "Exibir os seguintes canais diretamente dentro de minhas visualiza\u00e7\u00f5es:",
-    "LabelGroupChannelsIntoViewsHelp": "Se ativado, estes canais ser\u00e3o exibidos imediatamente ao lado de outras visualiza\u00e7\u00f5es. Se desativado, eles ser\u00e3o exibidos dentro de uma visualiza\u00e7\u00e3o separada de Canais.",
+    "LabelGroupChannelsIntoViewsHelp": "Se ativados, estes canais ser\u00e3o exibidos imediatamente ao lado de outras visualiza\u00e7\u00f5es. Se desativado, eles ser\u00e3o exibidos dentro de uma visualiza\u00e7\u00e3o separada de Canais.",
     "LabelDisplayCollectionsView": "Exibir uma visualiza\u00e7\u00e3o de cole\u00e7\u00f5es para mostrar colet\u00e2neas de filmes",
     "LabelXbmcMetadataEnableExtraThumbs": "Copiar extrafanart para dentro de extrathumbs",
     "LabelXbmcMetadataEnableExtraThumbsHelp": "Ao fazer o download de imagens elas podem ser salvas em ambas extrafanart e extrathumbs para uma maior compatibilidade com a skin do Xbmc.",
@@ -842,7 +842,7 @@
     "TabLogs": "Logs",
     "HeaderServerLogFiles": "Arquivos de log do servidor:",
     "TabBranding": "Marca",
-    "HeaderBrandingHelp": "Personalizar a apar\u00eancia do Media Browser para as necessidades de seu grupo ou organiza\u00e7\u00e3o.",
+    "HeaderBrandingHelp": "Personalize a apar\u00eancia do Media Browser para as necessidades de seu grupo ou organiza\u00e7\u00e3o.",
     "LabelLoginDisclaimer": "Aviso legal no login:",
     "LabelLoginDisclaimerHelp": "Isto ser\u00e1 exibido na parte inferior da p\u00e1gina de login.",
     "LabelAutomaticallyDonate": "Doar automaticamente esta quantidade a cada seis meses",
@@ -880,13 +880,15 @@
     "TabSort": "Ordenar",
     "TabFilter": "Filtro",
     "ButtonView": "Visualizar",
-    "LabelPageSize": "Tamanho de exibi\u00e7\u00e3o:",
+    "LabelPageSize": "Limite do item:",
     "LabelView": "Visualizar:",
     "TabUsers": "Usu\u00e1rios",
     "HeaderFeatures": "Inclui",
     "HeaderAdvanced": "Avan\u00e7ado",
-    "ButtonSync": "Sync",
+    "ButtonSync": "Sincronizar",
     "TabScheduledTasks": "Tarefas Agendadas",
-    "HeaderChapters": "Chapters",
-    "HeaderResumeSettings": "Resume Settings"
+    "HeaderChapters": "Cap\u00edtulos",
+    "HeaderResumeSettings": "Ajustes para Retomar",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
index 83e82070a4..966365f7c0 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
@@ -767,10 +767,10 @@
     "OptionAuto": "Auto",
     "OptionYes": "Yes",
     "OptionNo": "No",
-    "LabelHomePageSection1": "Home page section one:",
-    "LabelHomePageSection2": "Home page section two:",
-    "LabelHomePageSection3": "Home page section three:",
-    "LabelHomePageSection4": "Home page section four:",
+    "LabelHomePageSection1": "Home page section 1:",
+    "LabelHomePageSection2": "Home page section 2:",
+    "LabelHomePageSection3": "Home page section 3:",
+    "LabelHomePageSection4": "Home page section 4:",
     "OptionMyViewsButtons": "My views (buttons)",
     "OptionMyViews": "My views",
     "OptionMyViewsSmall": "My views (small)",
@@ -888,5 +888,7 @@
     "ButtonSync": "Sync",
     "TabScheduledTasks": "Scheduled Tasks",
     "HeaderChapters": "Chapters",
-    "HeaderResumeSettings": "Resume Settings"
+    "HeaderResumeSettings": "Resume Settings",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ru.json b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
index abdb98e976..c5ea589e86 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ru.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
@@ -322,7 +322,7 @@
     "HeaderActiveRecordings": "\u0410\u043a\u0442\u0438\u0432\u043d\u044b\u0435 \u0437\u0430\u043f\u0438\u0441\u0438",
     "HeaderLatestRecordings": "\u041d\u043e\u0432\u0438\u043d\u043a\u0438 \u0437\u0430\u043f\u0438\u0441\u0435\u0439",
     "HeaderAllRecordings": "\u0412\u0441\u0435 \u0437\u0430\u043f\u0438\u0441\u0438",
-    "ButtonPlay": "\u0412\u043e\u0441\u043f\u0440",
+    "ButtonPlay": "\u0412\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0441\u0442\u0438",
     "ButtonEdit": "\u041f\u0440\u0430\u0432\u0438\u0442\u044c",
     "ButtonRecord": "\u0417\u0430\u043f\u0438\u0441\u0430\u0442\u044c",
     "ButtonDelete": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c",
@@ -551,7 +551,7 @@
     "LabelSupporterKey": "\u041a\u043b\u044e\u0447 \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u0430 (\u0432\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0438\u0437 \u043f\u0438\u0441\u044c\u043c\u0430 \u043f\u043e \u042d-\u043f\u043e\u0447\u0442\u0435)",
     "LabelSupporterKeyHelp": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043a\u043b\u044e\u0447 \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u0430, \u0447\u0442\u043e\u0431\u044b \u043d\u0430\u0447\u0430\u0442\u044c \u043d\u0430\u0441\u043b\u0430\u0436\u0434\u0430\u0442\u044c\u0441\u044f \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u043c\u0438 \u043f\u0440\u0435\u0438\u043c\u0443\u0449\u0435\u0441\u0442\u0432\u0430\u043c\u0438, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u0431\u044b\u043b\u0438 \u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0430\u043d\u044b \u0441\u043e\u043e\u0431\u0449\u0435\u0441\u0442\u0432\u043e\u043c \u0434\u043b\u044f Media Browser.",
     "MessageInvalidKey": "\u041a\u043b\u044e\u0447 \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u0430 \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u0438\u043b\u0438 \u043d\u0435\u0432\u0435\u0440\u0435\u043d",
-    "ErrorMessageInvalidKey": "\u0414\u043b\u044f \u0442\u043e\u0433\u043e, \u0447\u0442\u043e\u0431\u044b \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043b\u044e\u0431\u043e\u0435 \u043f\u0440\u0435\u043c\u0438\u0443\u043c \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435, \u0432\u044b \u0442\u0430\u043a\u0436\u0435 \u0434\u043e\u043b\u0436\u043d\u044b \u0431\u044b\u0442\u044c \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u043e\u043c Media Browser. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0434\u0430\u0440\u0441\u0442\u0432\u0443\u0439\u0442\u0435 \u0438 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0439\u0442\u0435 \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0430\u044e\u0449\u0435\u0435\u0441\u044f \u0440\u0430\u0437\u0432\u0438\u0442\u0438\u0435 \u043e\u0441\u043d\u043e\u0432\u043e\u043f\u043e\u043b\u0430\u0433\u0430\u044e\u0449\u0435\u0433\u043e \u043f\u0440\u043e\u0434\u0443\u043a\u0442\u0430. \u0411\u043b\u0430\u0433\u043e\u0434\u0430\u0440\u0438\u043c \u0432\u0430\u0441.",
+    "ErrorMessageInvalidKey": "\u0414\u043b\u044f \u0442\u043e\u0433\u043e, \u0447\u0442\u043e\u0431\u044b \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043b\u044e\u0431\u043e\u0435 \u043f\u0440\u0435\u043c\u0438\u0443\u043c \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435, \u0432\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0431\u044b\u0442\u044c \u0442\u0430\u043a\u0436\u0435 \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u043e\u043c Media Browser. \u0416\u0435\u0440\u0442\u0432\u0443\u0439\u0442\u0435 \u0438 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0439\u0442\u0435 \u0434\u0430\u043b\u044c\u043d\u0435\u0439\u0448\u0443\u044e \u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u043a\u0443 \u043e\u0441\u043d\u043e\u0432\u043e\u043f\u043e\u043b\u0430\u0433\u0430\u044e\u0449\u0435\u0433\u043e \u043f\u0440\u043e\u0434\u0443\u043a\u0442\u0430.",
     "HeaderDisplaySettings": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f",
     "TabPlayTo": "\u0412\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0441\u0442\u0438 \u041d\u0430",
     "LabelEnableDlnaServer": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c DLNA-\u0441\u0435\u0440\u0432\u0435\u0440",
@@ -845,8 +845,8 @@
     "HeaderBrandingHelp": "\u041f\u043e\u0434\u0433\u043e\u043d\u043a\u0430 \u0432\u043d\u0435\u0448\u043d\u0435\u0433\u043e \u0432\u0438\u0434\u0430 Media Browser \u0432 \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0438 \u0441 \u043f\u043e\u0442\u0440\u0435\u0431\u043d\u043e\u0441\u0442\u044f\u043c\u0438 \u0432\u0430\u0448\u0435\u0439 \u0433\u0440\u0443\u043f\u043f\u044b \u0438\u043b\u0438 \u043e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u0438.",
     "LabelLoginDisclaimer": "\u041e\u0433\u043e\u0432\u043e\u0440\u043a\u0430 \u043d\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0435 \u0432\u0445\u043e\u0434\u0430:",
     "LabelLoginDisclaimerHelp": "\u042d\u0442\u043e \u0431\u0443\u0434\u0435\u0442 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c\u0441\u044f \u0432 \u043d\u0438\u0436\u043d\u0435\u0439 \u0447\u0430\u0441\u0442\u0438 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b \u0432\u0445\u043e\u0434\u0430 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0443.",
-    "LabelAutomaticallyDonate": "\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438 \u0434\u0430\u0440\u0438\u0442\u044c \u0434\u0430\u043d\u043d\u0443\u044e \u0441\u0443\u043c\u043c\u0443 \u043a\u0430\u0436\u0434\u044b\u0435 \u0448\u0435\u0441\u0442\u044c \u043c\u0435\u0441\u044f\u0446\u0435\u0432",
-    "LabelAutomaticallyDonateHelp": "\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0432 \u043b\u044e\u0431\u043e\u0435 \u0432\u0440\u0435\u043c\u044f \u043f\u0440\u0435\u043a\u0440\u0430\u0442\u0438\u0442\u044c \u044d\u0442\u043e \u0447\u0435\u0440\u0435\u0437 \u0441\u0432\u043e\u044e \u0443\u0447\u0435\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c PayPal.",
+    "LabelAutomaticallyDonate": "\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438 \u0436\u0435\u0440\u0442\u0432\u043e\u0432\u0430\u0442\u044c \u0434\u0430\u043d\u043d\u0443\u044e \u0441\u0443\u043c\u043c\u0443 \u043a\u0430\u0436\u0434\u044b\u0435 \u0448\u0435\u0441\u0442\u044c \u043c\u0435\u0441\u044f\u0446\u0435\u0432",
+    "LabelAutomaticallyDonateHelp": "\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0432 \u043b\u044e\u0431\u043e\u0435 \u0432\u0440\u0435\u043c\u044f \u043e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u044d\u0442\u043e \u0447\u0435\u0440\u0435\u0437 \u0441\u0432\u043e\u044e \u0443\u0447\u0435\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c PayPal.",
     "OptionList": "\u0421\u043f\u0438\u0441\u043e\u043a",
     "TabDashboard": "\u0418\u043d\u0444\u043e\u043f\u0430\u043d\u0435\u043b\u044c",
     "TitleServer": "\u0421\u0435\u0440\u0432\u0435\u0440",
@@ -878,15 +878,17 @@
     "OptionSubstring": "\u041f\u043e\u0434\u0441\u0442\u0440\u043e\u043a\u0430",
     "TabView": "\u0412\u0438\u0434",
     "TabSort": "\u0421\u043e\u0440\u0442-\u043a\u0430",
-    "TabFilter": "\u0424\u0438\u043b\u044c\u0442\u0440-\u043a\u0430",
+    "TabFilter": "\u0424\u0438\u043b\u044c\u0442\u0440\u044b",
     "ButtonView": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c",
     "LabelPageSize": "\u041c\u0430\u043a\u0441. \u0447\u0438\u0441\u043b\u043e \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u043e\u0432:",
-    "LabelView": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440:",
+    "LabelView": "\u041f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435:",
     "TabUsers": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438",
     "HeaderFeatures": "\u041c\u0430\u0442\u0435\u0440\u0438\u0430\u043b\u044b",
     "HeaderAdvanced": "\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e",
-    "ButtonSync": "\u0421\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u0442\u044c",
+    "ButtonSync": "\u0421\u0438\u043d\u0445\u0440\u043e",
     "TabScheduledTasks": "\u041f\u043b\u0430\u043d\u0438\u0440\u043e\u0432\u0449\u0438\u043a",
     "HeaderChapters": "\u0421\u0446\u0435\u043d\u044b",
-    "HeaderResumeSettings": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0432\u043e\u0437\u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f"
+    "HeaderResumeSettings": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0432\u043e\u0437\u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 3a49024f93..8b3a5e8c9e 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -781,10 +781,10 @@
     "OptionAuto": "Auto",
     "OptionYes": "Yes",
     "OptionNo": "No",
-    "LabelHomePageSection1": "Home page section one:",
-    "LabelHomePageSection2": "Home page section two:",
-    "LabelHomePageSection3": "Home page section three:",
-    "LabelHomePageSection4": "Home page section four:",
+    "LabelHomePageSection1": "Home page section 1:",
+    "LabelHomePageSection2": "Home page section 2:",
+    "LabelHomePageSection3": "Home page section 3:",
+    "LabelHomePageSection4": "Home page section 4:",
     "OptionMyViewsButtons": "My views (buttons)",
     "OptionMyViews": "My views",
     "OptionMyViewsSmall": "My views (small)",
@@ -897,11 +897,13 @@
     "ButtonView": "View",
     "LabelPageSize": "Item limit:",
     "LabelView": "View:",
-    "TabUsers":  "Users",
-    "HeaderFeatures":  "Features",
-    "HeaderAdvanced":  "Advanced",
-    "ButtonSync":  "Sync",
-    "TabScheduledTasks":  "Scheduled Tasks",
-    "HeaderChapters":  "Chapters",
-    "HeaderResumeSettings":  "Resume Settings"
+    "TabUsers": "Users",
+    "HeaderFeatures": "Features",
+    "HeaderAdvanced": "Advanced",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "Scheduled Tasks",
+    "HeaderChapters": "Chapters",
+    "HeaderResumeSettings": "Resume Settings",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/sv.json b/MediaBrowser.Server.Implementations/Localization/Server/sv.json
index 9988af0fa4..c6c0426408 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/sv.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/sv.json
@@ -888,5 +888,7 @@
     "ButtonSync": "Sync",
     "TabScheduledTasks": "Scheduled Tasks",
     "HeaderChapters": "Chapters",
-    "HeaderResumeSettings": "Resume Settings"
+    "HeaderResumeSettings": "Resume Settings",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/vi.json b/MediaBrowser.Server.Implementations/Localization/Server/vi.json
index 98f1084215..17748ecc7f 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/vi.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/vi.json
@@ -767,10 +767,10 @@
     "OptionAuto": "Auto",
     "OptionYes": "Yes",
     "OptionNo": "No",
-    "LabelHomePageSection1": "Home page section one:",
-    "LabelHomePageSection2": "Home page section two:",
-    "LabelHomePageSection3": "Home page section three:",
-    "LabelHomePageSection4": "Home page section four:",
+    "LabelHomePageSection1": "Home page section 1:",
+    "LabelHomePageSection2": "Home page section 2:",
+    "LabelHomePageSection3": "Home page section 3:",
+    "LabelHomePageSection4": "Home page section 4:",
     "OptionMyViewsButtons": "My views (buttons)",
     "OptionMyViews": "My views",
     "OptionMyViewsSmall": "My views (small)",
@@ -888,5 +888,7 @@
     "ButtonSync": "Sync",
     "TabScheduledTasks": "Scheduled Tasks",
     "HeaderChapters": "Chapters",
-    "HeaderResumeSettings": "Resume Settings"
+    "HeaderResumeSettings": "Resume Settings",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json b/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
index 6511dd7d06..352a031e1b 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
@@ -767,10 +767,10 @@
     "OptionAuto": "Auto",
     "OptionYes": "Yes",
     "OptionNo": "No",
-    "LabelHomePageSection1": "Home page section one:",
-    "LabelHomePageSection2": "Home page section two:",
-    "LabelHomePageSection3": "Home page section three:",
-    "LabelHomePageSection4": "Home page section four:",
+    "LabelHomePageSection1": "Home page section 1:",
+    "LabelHomePageSection2": "Home page section 2:",
+    "LabelHomePageSection3": "Home page section 3:",
+    "LabelHomePageSection4": "Home page section 4:",
     "OptionMyViewsButtons": "My views (buttons)",
     "OptionMyViews": "My views",
     "OptionMyViewsSmall": "My views (small)",
@@ -888,5 +888,7 @@
     "ButtonSync": "Sync",
     "TabScheduledTasks": "Scheduled Tasks",
     "HeaderChapters": "Chapters",
-    "HeaderResumeSettings": "Resume Settings"
+    "HeaderResumeSettings": "Resume Settings",
+    "TabSync": "Sync",
+    "TitleUsers": "Users"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 9655771c66..ef6730b75b 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -45,9 +45,9 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Mono.Nat, Version=1.2.20.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Mono.Nat, Version=1.2.21.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Mono.Nat.1.2.20.0\lib\net40\Mono.Nat.dll</HintPath>
+      <HintPath>..\packages\Mono.Nat.1.2.21.0\lib\net40\Mono.Nat.dll</HintPath>
     </Reference>
     <Reference Include="Nowin">
       <HintPath>..\ThirdParty\Nowin\Nowin.dll</HintPath>
@@ -274,6 +274,7 @@
     <Compile Include="Sync\CloudSyncProvider.cs" />
     <Compile Include="Sync\MockSyncProvider.cs" />
     <Compile Include="Sync\SyncManager.cs" />
+    <Compile Include="Sync\SyncRepository.cs" />
     <Compile Include="Themes\AppThemeManager.cs" />
     <Compile Include="Udp\UdpMessageReceivedEventArgs.cs" />
     <Compile Include="Udp\UdpServer.cs" />
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
index 50f1030f3c..a8d723ce3c 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
@@ -1,9 +1,14 @@
 using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Sync;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Sync;
+using MoreLinq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,56 +18,131 @@ namespace MediaBrowser.Server.Implementations.Sync
 {
     public class SyncManager : ISyncManager
     {
-        private ISyncProvider[] _providers = new ISyncProvider[] { };
+        private readonly ILibraryManager _libraryManager;
+        private readonly ISyncRepository _repo;
+        private readonly IImageProcessor _imageProcessor;
+        private readonly ILogger _logger;
+
+        private ISyncProvider[] _providers = { };
+
+        public SyncManager(ILibraryManager libraryManager, ISyncRepository repo, IImageProcessor imageProcessor, ILogger logger)
+        {
+            _libraryManager = libraryManager;
+            _repo = repo;
+            _imageProcessor = imageProcessor;
+            _logger = logger;
+        }
 
         public void AddParts(IEnumerable<ISyncProvider> providers)
         {
             _providers = providers.ToArray();
         }
 
-        public Task<List<SyncJob>> CreateJob(SyncJobRequest request)
+        public async Task<SyncJobCreationResult> CreateJob(SyncJobRequest request)
         {
-            throw new NotImplementedException();
+            var items = GetItemsForSync(request.ItemIds).ToList();
+
+            if (items.Count == 1)
+            {
+                request.Name = GetDefaultName(items[0]);
+            }
+
+            if (string.IsNullOrWhiteSpace(request.Name))
+            {
+                throw new ArgumentException("Please supply a name for the sync job.");
+            }
+
+            var target = GetSyncTargets(request.UserId)
+                .First(i => string.Equals(request.TargetId, i.Id));
+
+            var jobId = Guid.NewGuid().ToString("N");
+
+            var job = new SyncJob
+            {
+                Id = jobId,
+                Name = request.Name,
+                TargetId = target.Id,
+                UserId = request.UserId,
+                UnwatchedOnly = request.UnwatchedOnly,
+                Limit = request.Limit,
+                LimitType = request.LimitType,
+                RequestedItemIds = request.ItemIds,
+                DateCreated = DateTime.UtcNow,
+                DateLastModified = DateTime.UtcNow
+            };
+
+            await _repo.Create(job).ConfigureAwait(false);
+
+            return new SyncJobCreationResult
+            {
+                Job = GetJob(jobId)
+            };
         }
 
         public QueryResult<SyncJob> GetJobs(SyncJobQuery query)
         {
-            throw new NotImplementedException();
-        }
+            var result = _repo.GetJobs(query);
 
-        public QueryResult<SyncSchedule> GetSchedules(SyncScheduleQuery query)
-        {
-            throw new NotImplementedException();
-        }
+            result.Items.ForEach(FillMetadata);
 
-        public Task CancelJob(string id)
-        {
-            throw new NotImplementedException();
+            return result;
         }
 
-        public Task CancelSchedule(string id)
+        private void FillMetadata(SyncJob job)
         {
-            throw new NotImplementedException();
+            var item = GetItemsForSync(job.RequestedItemIds)
+                .FirstOrDefault();
+
+            if (item != null)
+            {
+                var hasSeries = item as IHasSeries;
+                if (hasSeries != null)
+                {
+                    job.ParentName = hasSeries.SeriesName;
+                }
+
+                var hasAlbumArtist = item as IHasAlbumArtist;
+                if (hasAlbumArtist != null)
+                {
+                    job.ParentName = hasAlbumArtist.AlbumArtists.FirstOrDefault();
+                }
+
+                var primaryImage = item.GetImageInfo(ImageType.Primary, 0);
+
+                if (primaryImage != null)
+                {
+                    try
+                    {
+                        job.PrimaryImageTag = _imageProcessor.GetImageCacheTag(item, ImageType.Primary);
+                        job.PrimaryImageItemId = item.Id.ToString("N");
+
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.ErrorException("Error getting image info", ex);
+                    }
+                }
+            }
         }
 
-        public SyncJob GetJob(string id)
+        public Task CancelJob(string id)
         {
             throw new NotImplementedException();
         }
 
-        public SyncSchedule GetSchedule(string id)
+        public SyncJob GetJob(string id)
         {
-            throw new NotImplementedException();
+            return _repo.GetJob(id);
         }
 
         public IEnumerable<SyncTarget> GetSyncTargets(string userId)
         {
             return _providers
-                .SelectMany(GetSyncTargets)
+                .SelectMany(i => GetSyncTargets(i, userId))
                 .OrderBy(i => i.Name);
         }
 
-        private IEnumerable<SyncTarget> GetSyncTargets(ISyncProvider provider)
+        private IEnumerable<SyncTarget> GetSyncTargets(ISyncProvider provider, string userId)
         {
             var providerId = GetSyncProviderId(provider);
 
@@ -120,5 +200,37 @@ namespace MediaBrowser.Server.Implementations.Sync
 
             return false;
         }
+
+        private IEnumerable<BaseItem> GetItemsForSync(IEnumerable<string> itemIds)
+        {
+            return itemIds.SelectMany(GetItemsForSync).DistinctBy(i => i.Id);
+        }
+
+        private IEnumerable<BaseItem> GetItemsForSync(string id)
+        {
+            var item = _libraryManager.GetItemById(id);
+
+            if (item == null)
+            {
+                throw new ArgumentException("Item with Id " + id + " not found.");
+            }
+
+            if (!SupportsSync(item))
+            {
+                throw new ArgumentException("Item with Id " + id + " does not support sync.");
+            }
+
+            return GetItemsForSync(item);
+        }
+
+        private IEnumerable<BaseItem> GetItemsForSync(BaseItem item)
+        {
+            return new[] { item };
+        }
+
+        private string GetDefaultName(BaseItem item)
+        {
+            return item.Name;
+        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs b/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs
new file mode 100644
index 0000000000..bb22e992b6
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs
@@ -0,0 +1,429 @@
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Sync;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Querying;
+using MediaBrowser.Model.Sync;
+using MediaBrowser.Server.Implementations.Persistence;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Server.Implementations.Sync
+{
+    public class SyncRepository : ISyncRepository
+    {
+        private IDbConnection _connection;
+        private readonly ILogger _logger;
+        private readonly SemaphoreSlim _writeLock = new SemaphoreSlim(1, 1);
+        private readonly IServerApplicationPaths _appPaths;
+        private readonly CultureInfo _usCulture = new CultureInfo("en-US");
+
+        private IDbCommand _saveJobCommand;
+        private IDbCommand _saveJobItemCommand;
+
+        public SyncRepository(ILogger logger, IServerApplicationPaths appPaths)
+        {
+            _logger = logger;
+            _appPaths = appPaths;
+        }
+
+        public async Task Initialize()
+        {
+            var dbFile = Path.Combine(_appPaths.DataPath, "sync.db");
+
+            _connection = await SqliteExtensions.ConnectToDb(dbFile, _logger).ConfigureAwait(false);
+
+            string[] queries = {
+
+                                "create table if not exists SyncJobs (Id GUID PRIMARY KEY, TargetId TEXT NOT NULL, Name TEXT NOT NULL, Quality TEXT NOT NULL, Status TEXT NOT NULL, Progress FLOAT, UserId TEXT NOT NULL, ItemIds TEXT NOT NULL, UnwatchedOnly BIT, SyncLimit BigInt, LimitType TEXT, IsDynamic BIT, DateCreated DateTime, DateLastModified DateTime, ItemCount int)",
+                                "create index if not exists idx_SyncJobs on SyncJobs(Id)",
+
+                                "create table if not exists SyncJobItems (Id GUID PRIMARY KEY, ItemId TEXT, JobId TEXT, OutputPath TEXT, Status TEXT, TargetId TEXT)",
+                                "create index if not exists idx_SyncJobItems on SyncJobs(Id)",
+
+                                //pragmas
+                                "pragma temp_store = memory",
+
+                                "pragma shrink_memory"
+                               };
+
+            _connection.RunQueries(queries, _logger);
+
+            PrepareStatements();
+        }
+
+        private void PrepareStatements()
+        {
+            _saveJobCommand = _connection.CreateCommand();
+            _saveJobCommand.CommandText = "replace into SyncJobs (Id, TargetId, Name, Quality, Status, Progress, UserId, ItemIds, UnwatchedOnly, SyncLimit, LimitType, IsDynamic, DateCreated, DateLastModified, ItemCount) values (@Id, @TargetId, @Name, @Quality, @Status, @Progress, @UserId, @ItemIds, @UnwatchedOnly, @SyncLimit, @LimitType, @IsDynamic, @DateCreated, @DateLastModified, @ItemCount)";
+
+            _saveJobCommand.Parameters.Add(_saveJobCommand, "@Id");
+            _saveJobCommand.Parameters.Add(_saveJobCommand, "@TargetId");
+            _saveJobCommand.Parameters.Add(_saveJobCommand, "@Name");
+            _saveJobCommand.Parameters.Add(_saveJobCommand, "@Quality");
+            _saveJobCommand.Parameters.Add(_saveJobCommand, "@Status");
+            _saveJobCommand.Parameters.Add(_saveJobCommand, "@Progress");
+            _saveJobCommand.Parameters.Add(_saveJobCommand, "@UserId");
+            _saveJobCommand.Parameters.Add(_saveJobCommand, "@ItemIds");
+            _saveJobCommand.Parameters.Add(_saveJobCommand, "@UnwatchedOnly");
+            _saveJobCommand.Parameters.Add(_saveJobCommand, "@SyncLimit");
+            _saveJobCommand.Parameters.Add(_saveJobCommand, "@LimitType");
+            _saveJobCommand.Parameters.Add(_saveJobCommand, "@IsDynamic");
+            _saveJobCommand.Parameters.Add(_saveJobCommand, "@DateCreated");
+            _saveJobCommand.Parameters.Add(_saveJobCommand, "@DateLastModified");
+            _saveJobCommand.Parameters.Add(_saveJobCommand, "@ItemCount");
+
+            _saveJobItemCommand = _connection.CreateCommand();
+            _saveJobItemCommand.CommandText = "replace into SyncJobItems (Id, ItemId, JobId, OutputPath, Status, TargetId) values (@Id, @ItemId, @JobId, @OutputPath, @Status, @TargetId)";
+
+            _saveJobItemCommand.Parameters.Add(_saveJobCommand, "@Id");
+            _saveJobItemCommand.Parameters.Add(_saveJobCommand, "@ItemId");
+            _saveJobItemCommand.Parameters.Add(_saveJobCommand, "@JobId");
+            _saveJobItemCommand.Parameters.Add(_saveJobCommand, "@OutputPath");
+            _saveJobItemCommand.Parameters.Add(_saveJobCommand, "@Status");
+        }
+
+        private const string BaseJobSelectText = "select Id, TargetId, Name, Quality, Status, Progress, UserId, ItemIds, UnwatchedOnly, SyncLimit, LimitType, IsDynamic, DateCreated, DateLastModified, ItemCount from SyncJobs";
+        private const string BaseJobItemSelectText = "select Id, ItemId, JobId, OutputPath, Status, TargetId from SyncJobItems";
+
+        public SyncJob GetJob(string id)
+        {
+            if (string.IsNullOrEmpty(id))
+            {
+                throw new ArgumentNullException("id");
+            }
+
+            var guid = new Guid(id);
+
+            using (var cmd = _connection.CreateCommand())
+            {
+                cmd.CommandText = BaseJobSelectText + " where Id=@Id";
+
+                cmd.Parameters.Add(cmd, "@Id", DbType.Guid).Value = guid;
+
+                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow))
+                {
+                    if (reader.Read())
+                    {
+                        return GetJob(reader);
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private SyncJob GetJob(IDataReader reader)
+        {
+            var info = new SyncJob
+            {
+                Id = reader.GetGuid(0).ToString("N"),
+                TargetId = reader.GetString(1),
+                Name = reader.GetString(2)
+            };
+
+            if (!reader.IsDBNull(3))
+            {
+                info.Quality = (SyncQuality)Enum.Parse(typeof(SyncQuality), reader.GetString(3), true);
+            }
+
+            if (!reader.IsDBNull(4))
+            {
+                info.Status = (SyncJobStatus)Enum.Parse(typeof(SyncJobStatus), reader.GetString(4), true);
+            }
+
+            if (!reader.IsDBNull(5))
+            {
+                info.Progress = reader.GetDouble(5);
+            }
+
+            if (!reader.IsDBNull(6))
+            {
+                info.UserId = reader.GetString(6);
+            }
+
+            if (!reader.IsDBNull(7))
+            {
+                info.RequestedItemIds = reader.GetString(7).Split(',').ToList();
+            }
+
+            if (!reader.IsDBNull(8))
+            {
+                info.UnwatchedOnly = reader.GetBoolean(8);
+            }
+
+            if (!reader.IsDBNull(9))
+            {
+                info.Limit = reader.GetInt64(9);
+            }
+
+            if (!reader.IsDBNull(10))
+            {
+                info.LimitType = (SyncLimitType)Enum.Parse(typeof(SyncLimitType), reader.GetString(10), true);
+            }
+
+            info.IsDynamic = reader.GetBoolean(11);
+            info.DateCreated = reader.GetDateTime(12).ToUniversalTime();
+            info.DateLastModified = reader.GetDateTime(13).ToUniversalTime();
+            info.ItemCount = reader.GetInt32(14);
+
+            return info;
+        }
+
+        public Task Create(SyncJob job)
+        {
+            return Update(job);
+        }
+
+        public async Task Update(SyncJob job)
+        {
+            if (job == null)
+            {
+                throw new ArgumentNullException("job");
+            }
+
+            await _writeLock.WaitAsync().ConfigureAwait(false);
+
+            IDbTransaction transaction = null;
+
+            try
+            {
+                transaction = _connection.BeginTransaction();
+
+                var index = 0;
+
+                _saveJobCommand.GetParameter(index++).Value = new Guid(job.Id);
+                _saveJobCommand.GetParameter(index++).Value = job.TargetId;
+                _saveJobCommand.GetParameter(index++).Value = job.Name;
+                _saveJobCommand.GetParameter(index++).Value = job.Quality;
+                _saveJobCommand.GetParameter(index++).Value = job.Status;
+                _saveJobCommand.GetParameter(index++).Value = job.Progress;
+                _saveJobCommand.GetParameter(index++).Value = job.UserId;
+                _saveJobCommand.GetParameter(index++).Value = string.Join(",", job.RequestedItemIds.ToArray());
+                _saveJobCommand.GetParameter(index++).Value = job.UnwatchedOnly;
+                _saveJobCommand.GetParameter(index++).Value = job.Limit;
+                _saveJobCommand.GetParameter(index++).Value = job.LimitType;
+                _saveJobCommand.GetParameter(index++).Value = job.IsDynamic;
+                _saveJobCommand.GetParameter(index++).Value = job.DateCreated;
+                _saveJobCommand.GetParameter(index++).Value = job.DateLastModified;
+                _saveJobCommand.GetParameter(index++).Value = job.ItemCount;
+
+                _saveJobCommand.Transaction = transaction;
+
+                _saveJobCommand.ExecuteNonQuery();
+
+                transaction.Commit();
+            }
+            catch (OperationCanceledException)
+            {
+                if (transaction != null)
+                {
+                    transaction.Rollback();
+                }
+
+                throw;
+            }
+            catch (Exception e)
+            {
+                _logger.ErrorException("Failed to save record:", e);
+
+                if (transaction != null)
+                {
+                    transaction.Rollback();
+                }
+
+                throw;
+            }
+            finally
+            {
+                if (transaction != null)
+                {
+                    transaction.Dispose();
+                }
+
+                _writeLock.Release();
+            }
+        }
+
+        public QueryResult<SyncJob> GetJobs(SyncJobQuery query)
+        {
+            if (query == null)
+            {
+                throw new ArgumentNullException("query");
+            }
+
+            using (var cmd = _connection.CreateCommand())
+            {
+                cmd.CommandText = BaseJobSelectText;
+
+                var whereClauses = new List<string>();
+
+                var startIndex = query.StartIndex ?? 0;
+
+                if (startIndex > 0)
+                {
+                    whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM SyncJobs ORDER BY DateLastModified DESC LIMIT {0})",
+                        startIndex.ToString(_usCulture)));
+                }
+
+                if (whereClauses.Count > 0)
+                {
+                    cmd.CommandText += " where " + string.Join(" AND ", whereClauses.ToArray());
+                }
+
+                cmd.CommandText += " ORDER BY DateLastModified DESC";
+
+                if (query.Limit.HasValue)
+                {
+                    cmd.CommandText += " LIMIT " + query.Limit.Value.ToString(_usCulture);
+                }
+
+                cmd.CommandText += "; select count (Id) from SyncJobs";
+
+                var list = new List<SyncJob>();
+                var count = 0;
+
+                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
+                {
+                    while (reader.Read())
+                    {
+                        list.Add(GetJob(reader));
+                    }
+
+                    if (reader.NextResult() && reader.Read())
+                    {
+                        count = reader.GetInt32(0);
+                    }
+                }
+
+                return new QueryResult<SyncJob>()
+                {
+                    Items = list.ToArray(),
+                    TotalRecordCount = count
+                };
+            }
+        }
+
+        public SyncJobItem GetJobItem(string id)
+        {
+            if (string.IsNullOrEmpty(id))
+            {
+                throw new ArgumentNullException("id");
+            }
+
+            var guid = new Guid(id);
+
+            using (var cmd = _connection.CreateCommand())
+            {
+                cmd.CommandText = BaseJobItemSelectText + " where Id=@Id";
+
+                cmd.Parameters.Add(cmd, "@Id", DbType.Guid).Value = guid;
+
+                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow))
+                {
+                    if (reader.Read())
+                    {
+                        return GetSyncJobItem(reader);
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        public Task Create(SyncJobItem jobItem)
+        {
+            return Update(jobItem);
+        }
+
+        public async Task Update(SyncJobItem jobItem)
+        {
+            if (jobItem == null)
+            {
+                throw new ArgumentNullException("jobItem");
+            }
+
+            await _writeLock.WaitAsync().ConfigureAwait(false);
+
+            IDbTransaction transaction = null;
+
+            try
+            {
+                transaction = _connection.BeginTransaction();
+
+                var index = 0;
+
+                _saveJobItemCommand.GetParameter(index++).Value = new Guid(jobItem.Id);
+                _saveJobItemCommand.GetParameter(index++).Value = jobItem.ItemId;
+                _saveJobItemCommand.GetParameter(index++).Value = jobItem.JobId;
+                _saveJobItemCommand.GetParameter(index++).Value = jobItem.OutputPath;
+                _saveJobItemCommand.GetParameter(index++).Value = jobItem.Status;
+                _saveJobItemCommand.GetParameter(index++).Value = jobItem.TargetId;
+
+                _saveJobItemCommand.Transaction = transaction;
+
+                _saveJobItemCommand.ExecuteNonQuery();
+
+                transaction.Commit();
+            }
+            catch (OperationCanceledException)
+            {
+                if (transaction != null)
+                {
+                    transaction.Rollback();
+                }
+
+                throw;
+            }
+            catch (Exception e)
+            {
+                _logger.ErrorException("Failed to save record:", e);
+
+                if (transaction != null)
+                {
+                    transaction.Rollback();
+                }
+
+                throw;
+            }
+            finally
+            {
+                if (transaction != null)
+                {
+                    transaction.Dispose();
+                }
+
+                _writeLock.Release();
+            }
+        }
+
+        private SyncJobItem GetSyncJobItem(IDataReader reader)
+        {
+            var info = new SyncJobItem
+            {
+                Id = reader.GetGuid(0).ToString("N"),
+                ItemId = reader.GetString(1),
+                JobId = reader.GetString(2)
+            };
+
+            if (!reader.IsDBNull(3))
+            {
+                info.OutputPath = reader.GetString(3);
+            }
+
+            if (!reader.IsDBNull(4))
+            {
+                info.Status = (SyncJobStatus)Enum.Parse(typeof(SyncJobStatus), reader.GetString(4), true);
+            }
+
+            info.TargetId = reader.GetString(5);
+            
+            return info;
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config
index 907500ae35..18739ddb32 100644
--- a/MediaBrowser.Server.Implementations/packages.config
+++ b/MediaBrowser.Server.Implementations/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Mono.Nat" version="1.2.20.0" targetFramework="net45" />
+  <package id="Mono.Nat" version="1.2.21.0" targetFramework="net45" />
   <package id="morelinq" version="1.0.16006" targetFramework="net45" />
   <package id="System.Data.SQLite.Core" version="1.0.91.3" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 55843bbdbe..5c086c8cc7 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -209,6 +209,7 @@ namespace MediaBrowser.ServerApplication
         private IUserViewManager UserViewManager { get; set; }
 
         private IAuthenticationRepository AuthenticationRepository { get; set; }
+        private ISyncRepository SyncRepository { get; set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ApplicationHost" /> class.
@@ -525,6 +526,9 @@ namespace MediaBrowser.ServerApplication
             AuthenticationRepository = await GetAuthenticationRepository().ConfigureAwait(false);
             RegisterSingleInstance(AuthenticationRepository);
 
+            SyncRepository = await GetSyncRepository().ConfigureAwait(false);
+            RegisterSingleInstance(SyncRepository);
+
             UserManager = new UserManager(LogManager.GetLogger("UserManager"), ServerConfigurationManager, UserRepository, XmlSerializer);
             RegisterSingleInstance(UserManager);
 
@@ -561,7 +565,7 @@ namespace MediaBrowser.ServerApplication
             ImageProcessor = new ImageProcessor(LogManager.GetLogger("ImageProcessor"), ServerConfigurationManager.ApplicationPaths, FileSystemManager, JsonSerializer, MediaEncoder);
             RegisterSingleInstance(ImageProcessor);
 
-            SyncManager = new SyncManager();
+            SyncManager = new SyncManager(LibraryManager, SyncRepository, ImageProcessor, LogManager.GetLogger("SyncManager"));
             RegisterSingleInstance(SyncManager);
 
             DtoService = new DtoService(Logger, LibraryManager, UserDataManager, ItemRepository, ImageProcessor, ServerConfigurationManager, FileSystemManager, ProviderManager, () => ChannelManager, SyncManager);
@@ -706,6 +710,15 @@ namespace MediaBrowser.ServerApplication
             return repo;
         }
 
+        private async Task<ISyncRepository> GetSyncRepository()
+        {
+            var repo = new SyncRepository(LogManager.GetLogger("SyncRepository"), ServerConfigurationManager.ApplicationPaths);
+
+            await repo.Initialize().ConfigureAwait(false);
+
+            return repo;
+        }
+
         /// <summary>
         /// Configures the repositories.
         /// </summary>
diff --git a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs
index a93ed91960..2642ffde73 100644
--- a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs
+++ b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs
@@ -101,7 +101,7 @@ namespace MediaBrowser.ServerApplication.FFMpeg
                     {
                          EncoderPath = encoder,
                          ProbePath = probe,
-                         Version = Path.GetFileNameWithoutExtension(Path.GetDirectoryName(probe))
+                         Version = Path.GetFileName(Path.GetDirectoryName(probe))
                     };
                 }
             }
diff --git a/MediaBrowser.Tests/Resolvers/MovieResolverTests.cs b/MediaBrowser.Tests/Resolvers/MovieResolverTests.cs
index 768e4ee5c6..af24609e8c 100644
--- a/MediaBrowser.Tests/Resolvers/MovieResolverTests.cs
+++ b/MediaBrowser.Tests/Resolvers/MovieResolverTests.cs
@@ -38,6 +38,8 @@ namespace MediaBrowser.Tests.Resolvers
         public void TestMultiPartFolders()
         {
             Assert.IsFalse(EntityResolutionHelper.IsMultiPartFolder(@"blah blah"));
+            Assert.IsFalse(EntityResolutionHelper.IsMultiPartFolder(@"d:\\music\weezer\\03 Pinkerton"));
+            Assert.IsFalse(EntityResolutionHelper.IsMultiPartFolder(@"d:\\music\\michael jackson\\Bad (2012 Remaster)"));
 
             Assert.IsTrue(EntityResolutionHelper.IsMultiPartFolder(@"blah blah - cd1"));
             Assert.IsTrue(EntityResolutionHelper.IsMultiPartFolder(@"blah blah - disc1"));
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 92487959db..9235beacf5 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -548,6 +548,7 @@ namespace MediaBrowser.WebDashboard.Api
                                 "channelsettings.js",
                                 "dashboardgeneral.js",
                                 "dashboardpage.js",
+                                "dashboardsync.js",
                                 "directorybrowser.js",
                                 "dlnaprofile.js",
                                 "dlnaprofiles.js",
@@ -676,6 +677,7 @@ namespace MediaBrowser.WebDashboard.Api
                                       "librarybrowser.css",
                                       "detailtable.css",
                                       "posteritem.css",
+                                      "card.css",
                                       "tileitem.css",
                                       "metadataeditor.css",
                                       "notifications.css",
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 25cff11cfa..73174dacf8 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -287,9 +287,15 @@
     <Content Include="dashboard-ui\css\nowplaying.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\css\card.css">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\dashboardgeneral.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\dashboardsync.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\dlnaprofile.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -602,6 +608,9 @@
     <Content Include="dashboard-ui\scripts\dashboardgeneral.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\scripts\dashboardsync.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\scripts\dlnaprofile.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -2074,6 +2083,9 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
+    <None Include="dashboard-ui\css\fonts\RobotoBold.woff">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="dashboard-ui\css\fonts\OpenSans-ExtraBold.woff">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/MediaBrowser.XbmcMetadata/Images/XbmcImageSaver.cs b/MediaBrowser.XbmcMetadata/Images/XbmcImageSaver.cs
index a45a449044..6071db6b5a 100644
--- a/MediaBrowser.XbmcMetadata/Images/XbmcImageSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Images/XbmcImageSaver.cs
@@ -88,7 +88,7 @@ namespace MediaBrowser.XbmcMetadata.Images
                 if (item is Episode)
                 {
                     var seasonFolder = Path.GetDirectoryName(item.Path);
-
+                    
                     var imageFilename = Path.GetFileNameWithoutExtension(item.Path) + "-thumb" + extension;
 
                     return new[] { Path.Combine(seasonFolder, imageFilename) };
diff --git a/MediaBrowser.XbmcMetadata/Providers/BaseVideoNfoProvider.cs b/MediaBrowser.XbmcMetadata/Providers/BaseVideoNfoProvider.cs
index d51c44ad4e..c4edfb4612 100644
--- a/MediaBrowser.XbmcMetadata/Providers/BaseVideoNfoProvider.cs
+++ b/MediaBrowser.XbmcMetadata/Providers/BaseVideoNfoProvider.cs
@@ -35,18 +35,18 @@ namespace MediaBrowser.XbmcMetadata.Providers
 
         protected override FileSystemInfo GetXmlFile(ItemInfo info, IDirectoryService directoryService)
         {
-            var path = GetMovieSavePath(info);
+            var path = GetMovieSavePath(info, FileSystem);
 
             return directoryService.GetFile(path);
         }
 
-        public static string GetMovieSavePath(ItemInfo item)
+        public static string GetMovieSavePath(ItemInfo item, IFileSystem fileSystem)
         {
             if (Directory.Exists(item.Path))
             {
                 var path = item.Path;
 
-                return Path.Combine(path, Path.GetFileNameWithoutExtension(path) + ".nfo");
+                return Path.Combine(path, fileSystem.GetFileNameWithoutExtension(path) + ".nfo");
             }
 
             return Path.ChangeExtension(item.Path, ".nfo");
diff --git a/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
index b23473295c..210c743bf3 100644
--- a/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
@@ -21,10 +21,10 @@ namespace MediaBrowser.XbmcMetadata.Savers
 
         public override string GetSavePath(IHasMetadata item)
         {
-            return GetMovieSavePath(item);
+            return GetMovieSavePath(item, FileSystem);
         }
 
-        public static string GetMovieSavePath(IHasMetadata item)
+        public static string GetMovieSavePath(IHasMetadata item, IFileSystem fileSystem)
         {
             var video = (Video)item;
 
@@ -32,7 +32,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
             {
                 var path = item.ContainingFolderPath;
 
-                return Path.Combine(path, Path.GetFileNameWithoutExtension(path) + ".nfo");
+                return Path.Combine(path, fileSystem.GetFileNameWithoutExtension(path) + ".nfo");
             }
 
             return Path.ChangeExtension(item.Path, ".nfo");
-- 
cgit v1.2.3


From 51e964dae394ae4a211482d562dbc28e79c00c3c Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 29 Jul 2014 23:31:35 -0400
Subject: support channels with dlna

---
 MediaBrowser.Api/Playback/BaseStreamingService.cs  |   2 +-
 MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs |   2 +-
 MediaBrowser.Api/Playback/Hls/VideoHlsService.cs   |   2 +-
 .../Playback/Progressive/VideoService.cs           |   2 +-
 .../ScheduledTasks/Tasks/ReloadLoggerFileTask.cs   |   2 +-
 MediaBrowser.Common/Net/IServerManager.cs          |   6 -
 .../Channels/IChannelManager.cs                    |  16 ++
 .../Entities/BasePluginFolder.cs                   |   2 +-
 MediaBrowser.Controller/Entities/UserView.cs       |  31 +++
 MediaBrowser.Controller/Library/TVUtils.cs         |  89 ++++++++-
 MediaBrowser.Dlna/Channels/DlnaChannelFactory.cs   |  23 +--
 .../ContentDirectory/ContentDirectory.cs           |  11 +-
 .../ContentDirectory/ControlHandler.cs             | 220 +++++++++++++++------
 MediaBrowser.Dlna/Didl/DidlBuilder.cs              |  10 +-
 MediaBrowser.Dlna/Images/logo120.jpg               | Bin 6745 -> 8879 bytes
 MediaBrowser.Dlna/Images/logo120.png               | Bin 4124 -> 13621 bytes
 MediaBrowser.Dlna/Images/logo240.jpg               | Bin 0 -> 22073 bytes
 MediaBrowser.Dlna/Images/logo240.png               | Bin 0 -> 33252 bytes
 MediaBrowser.Dlna/Images/logo48.jpg                | Bin 2484 -> 2997 bytes
 MediaBrowser.Dlna/Images/logo48.png                | Bin 1661 -> 3837 bytes
 MediaBrowser.Dlna/MediaBrowser.Dlna.csproj         |   4 +
 MediaBrowser.Dlna/PlayTo/Device.cs                 |   4 +-
 MediaBrowser.Dlna/PlayTo/PlayToManager.cs          |  67 ++++---
 MediaBrowser.Dlna/Profiles/DefaultProfile.cs       |   2 +
 MediaBrowser.Dlna/Profiles/Xml/Android.xml         |   2 +-
 MediaBrowser.Dlna/Profiles/Xml/Default.xml         |   2 +-
 MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml       |   2 +-
 MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml     |   2 +-
 MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml |   2 +-
 MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml     |   2 +-
 MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml |   2 +-
 .../Profiles/Xml/Sony Blu-ray Player 2013.xml      |   2 +-
 .../Profiles/Xml/Sony Blu-ray Player.xml           |   2 +-
 .../Profiles/Xml/Sony Bravia (2010).xml            |   2 +-
 .../Profiles/Xml/Sony Bravia (2011).xml            |   2 +-
 .../Profiles/Xml/Sony Bravia (2012).xml            |   2 +-
 .../Profiles/Xml/Sony Bravia (2013).xml            |   2 +-
 .../Profiles/Xml/Sony PlayStation 3.xml            |   2 +-
 MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml       |   2 +-
 MediaBrowser.Dlna/Profiles/Xml/Windows 8 RT.xml    |   2 +-
 MediaBrowser.Dlna/Profiles/Xml/Windows Phone.xml   |   2 +-
 MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml        |   2 +-
 MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml        |   2 +-
 MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml      |   2 +-
 MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs  |  18 ++
 MediaBrowser.Dlna/Ssdp/SsdpHandler.cs              |   9 +-
 MediaBrowser.Model/Dlna/SortCriteria.cs            |   8 +-
 .../Channels/ChannelDownloadScheduledTask.cs       |   2 +-
 .../Channels/ChannelManager.cs                     |  67 ++++++-
 .../EntryPoints/ExternalPortForwarding.cs          |   5 -
 .../EntryPoints/UdpServerEntryPoint.cs             |   7 +-
 .../Library/Resolvers/Audio/MusicAlbumResolver.cs  |  43 ++--
 .../Library/Resolvers/Audio/MusicArtistResolver.cs |   8 +-
 .../Library/Resolvers/TV/SeriesResolver.cs         |  18 +-
 .../Library/UserViewManager.cs                     |  42 +++-
 .../LiveTv/CleanDatabaseScheduledTask.cs           |   2 +-
 .../Localization/JavaScript/javascript.json        |   1 -
 .../Localization/JavaScript/kk.json                |   8 +-
 .../Localization/JavaScript/pt_PT.json             |   2 +-
 .../Localization/JavaScript/ru.json                |   6 +-
 .../Localization/Server/ar.json                    |  12 +-
 .../Localization/Server/ca.json                    |  12 +-
 .../Localization/Server/cs.json                    |  12 +-
 .../Localization/Server/da.json                    |  12 +-
 .../Localization/Server/de.json                    |  12 +-
 .../Localization/Server/el.json                    |  12 +-
 .../Localization/Server/en_GB.json                 |  12 +-
 .../Localization/Server/en_US.json                 |  12 +-
 .../Localization/Server/es.json                    |  12 +-
 .../Localization/Server/es_MX.json                 |  14 +-
 .../Localization/Server/fr.json                    |  12 +-
 .../Localization/Server/he.json                    |  12 +-
 .../Localization/Server/it.json                    |  12 +-
 .../Localization/Server/kk.json                    |  26 ++-
 .../Localization/Server/ko.json                    |  12 +-
 .../Localization/Server/ms.json                    |  12 +-
 .../Localization/Server/nb.json                    |  12 +-
 .../Localization/Server/nl.json                    |  46 +++--
 .../Localization/Server/pl.json                    |  12 +-
 .../Localization/Server/pt_BR.json                 |  22 ++-
 .../Localization/Server/pt_PT.json                 |  44 +++--
 .../Localization/Server/ru.json                    |  28 ++-
 .../Localization/Server/sv.json                    |  12 +-
 .../Localization/Server/vi.json                    |  12 +-
 .../Localization/Server/zh_TW.json                 |  12 +-
 .../ServerManager/ServerManager.cs                 |   9 -
 .../Session/WebSocketController.cs                 |  25 +++
 .../Udp/UdpServer.cs                               |  14 +-
 .../Native/ServerAuthorization.cs                  |   2 +-
 MediaBrowser.ServerApplication/ApplicationHost.cs  |  14 +-
 .../FFMpeg/FFMpegDownloadInfo.cs                   |   8 +-
 .../FFMpeg/FFMpegDownloader.cs                     |   8 +-
 MediaBrowser.Tests/Resolvers/TvUtilTests.cs        |   2 +
 93 files changed, 951 insertions(+), 320 deletions(-)
 create mode 100644 MediaBrowser.Dlna/Images/logo240.jpg
 create mode 100644 MediaBrowser.Dlna/Images/logo240.png

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 5cae4c3f7f..df85ca3cbc 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -626,7 +626,7 @@ namespace MediaBrowser.Api.Playback
         /// <param name="state">The state.</param>
         /// <param name="outputVideoCodec">The output video codec.</param>
         /// <returns>System.String.</returns>
-        protected string GetInternalGraphicalSubtitleParam(StreamState state, string outputVideoCodec)
+        protected string GetGraphicalSubtitleParam(StreamState state, string outputVideoCodec)
         {
             var outputSizeParam = string.Empty;
 
diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
index fc1c627e94..ccaa918ec7 100644
--- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
@@ -522,7 +522,7 @@ namespace MediaBrowser.Api.Playback.Hls
             // This is for internal graphical subs
             if (hasGraphicalSubs)
             {
-                args += GetInternalGraphicalSubtitleParam(state, codec);
+                args += GetGraphicalSubtitleParam(state, codec);
             }
 
             return args;
diff --git a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
index 28c0219fce..1dffa54114 100644
--- a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
@@ -186,7 +186,7 @@ namespace MediaBrowser.Api.Playback.Hls
             // This is for internal graphical subs
             if (hasGraphicalSubs)
             {
-                args += GetInternalGraphicalSubtitleParam(state, codec);
+                args += GetGraphicalSubtitleParam(state, codec);
             }
 
             return args;
diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
index bedacc0d29..cdaa99130b 100644
--- a/MediaBrowser.Api/Playback/Progressive/VideoService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
@@ -167,7 +167,7 @@ namespace MediaBrowser.Api.Playback.Progressive
             // This is for internal graphical subs
             if (hasGraphicalSubs)
             {
-                args += GetInternalGraphicalSubtitleParam(state, codec);
+                args += GetGraphicalSubtitleParam(state, codec);
             }
 
             return args;
diff --git a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/ReloadLoggerFileTask.cs b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/ReloadLoggerFileTask.cs
index 38b6b4ad68..78f60632fa 100644
--- a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/ReloadLoggerFileTask.cs
+++ b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/ReloadLoggerFileTask.cs
@@ -94,7 +94,7 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks.Tasks
 
         public bool IsHidden
         {
-            get { return false; }
+            get { return true; }
         }
 
         public bool IsEnabled
diff --git a/MediaBrowser.Common/Net/IServerManager.cs b/MediaBrowser.Common/Net/IServerManager.cs
index f6ac0ab68a..84e5785799 100644
--- a/MediaBrowser.Common/Net/IServerManager.cs
+++ b/MediaBrowser.Common/Net/IServerManager.cs
@@ -10,12 +10,6 @@ namespace MediaBrowser.Common.Net
     /// </summary>
     public interface IServerManager : IDisposable
     {
-        /// <summary>
-        /// Gets the web socket port number.
-        /// </summary>
-        /// <value>The web socket port number.</value>
-        int WebSocketPortNumber { get; }
-
         /// <summary>
         /// Starts this instance.
         /// </summary>
diff --git a/MediaBrowser.Controller/Channels/IChannelManager.cs b/MediaBrowser.Controller/Channels/IChannelManager.cs
index 744eab96e0..252e2aee53 100644
--- a/MediaBrowser.Controller/Channels/IChannelManager.cs
+++ b/MediaBrowser.Controller/Channels/IChannelManager.cs
@@ -43,6 +43,14 @@ namespace MediaBrowser.Controller.Channels
         /// <returns>Channel.</returns>
         Channel GetChannel(string id);
 
+        /// <summary>
+        /// Gets the channels internal.
+        /// </summary>
+        /// <param name="query">The query.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task&lt;QueryResult&lt;Channel&gt;&gt;.</returns>
+        Task<QueryResult<Channel>> GetChannelsInternal(ChannelQuery query, CancellationToken cancellationToken);
+
         /// <summary>
         /// Gets the channels.
         /// </summary>
@@ -75,6 +83,14 @@ namespace MediaBrowser.Controller.Channels
         /// <returns>Task{QueryResult{BaseItemDto}}.</returns>
         Task<QueryResult<BaseItemDto>> GetChannelItems(ChannelItemQuery query, CancellationToken cancellationToken);
 
+        /// <summary>
+        /// Gets the channel items internal.
+        /// </summary>
+        /// <param name="query">The query.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task&lt;QueryResult&lt;BaseItem&gt;&gt;.</returns>
+        Task<QueryResult<BaseItem>> GetChannelItemsInternal(ChannelItemQuery query, CancellationToken cancellationToken);
+
         /// <summary>
         /// Gets the cached channel item media sources.
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/BasePluginFolder.cs b/MediaBrowser.Controller/Entities/BasePluginFolder.cs
index e1383923f6..fa2b49a60b 100644
--- a/MediaBrowser.Controller/Entities/BasePluginFolder.cs
+++ b/MediaBrowser.Controller/Entities/BasePluginFolder.cs
@@ -14,7 +14,7 @@ namespace MediaBrowser.Controller.Entities
 
         public virtual string CollectionType
         {
-            get { return Model.Entities.CollectionType.BoxSets; }
+            get { return null; }
         }
     }
 }
diff --git a/MediaBrowser.Controller/Entities/UserView.cs b/MediaBrowser.Controller/Entities/UserView.cs
index 619a497f5f..be426d99eb 100644
--- a/MediaBrowser.Controller/Entities/UserView.cs
+++ b/MediaBrowser.Controller/Entities/UserView.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Model.Entities;
+using MoreLinq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -29,6 +30,10 @@ namespace MediaBrowser.Controller.Entities
                 case CollectionType.Trailers:
                     return mediaFolders.SelectMany(i => i.GetRecursiveChildren(user, includeLinkedChildren))
                         .OfType<Trailer>();
+                case CollectionType.Movies:
+                    return mediaFolders.SelectMany(i => i.GetRecursiveChildren(user, includeLinkedChildren))
+                        .Where(i => i is Movie || i is BoxSet)
+                        .DistinctBy(i => i.Id);
                 default:
                     return mediaFolders.SelectMany(i => i.GetChildren(user, includeLinkedChildren));
             }
@@ -70,4 +75,30 @@ namespace MediaBrowser.Controller.Entities
             return standaloneTypes.Contains(collectionFolder.CollectionType ?? string.Empty);
         }
     }
+
+    public class SpecialFolder : Folder
+    {
+        public SpecialFolderType SpecialFolderType { get; set; }
+        public string ItemTypeName { get; set; }
+        public string ParentId { get; set; }
+
+        public override IEnumerable<BaseItem> GetChildren(User user, bool includeLinkedChildren)
+        {
+            var parent = (Folder)LibraryManager.GetItemById(new Guid(ParentId));
+
+            if (SpecialFolderType == SpecialFolderType.ItemsByType)
+            {
+                var items = parent.GetRecursiveChildren(user, includeLinkedChildren);
+
+                return items.Where(i => string.Equals(i.GetType().Name, ItemTypeName, StringComparison.OrdinalIgnoreCase));
+            }
+
+            return new List<BaseItem>();
+        }
+    }
+
+    public enum SpecialFolderType
+    {
+        ItemsByType = 1
+    }
 }
diff --git a/MediaBrowser.Controller/Library/TVUtils.cs b/MediaBrowser.Controller/Library/TVUtils.cs
index 86699272e8..6ef1fb6f72 100644
--- a/MediaBrowser.Controller/Library/TVUtils.cs
+++ b/MediaBrowser.Controller/Library/TVUtils.cs
@@ -8,6 +8,7 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using MediaBrowser.Model.Logging;
 
 namespace MediaBrowser.Controller.Library
 {
@@ -136,6 +137,16 @@ namespace MediaBrowser.Controller.Library
                 return val;
             }
 
+            if (filename.StartsWith("s", StringComparison.OrdinalIgnoreCase))
+            {
+                var testFilename = filename.Substring(1);
+
+                if (int.TryParse(testFilename, NumberStyles.Integer, CultureInfo.InvariantCulture, out val))
+                {
+                    return val;
+                }
+            }
+
             // Look for one of the season folder names
             foreach (var name in SeasonFolderNames)
             {
@@ -182,7 +193,7 @@ namespace MediaBrowser.Controller.Library
                 return null;
             }
 
-            return int.Parse(path.Substring(numericStart, length));
+            return int.Parse(path.Substring(numericStart, length), CultureInfo.InvariantCulture);
         }
 
         /// <summary>
@@ -194,21 +205,59 @@ namespace MediaBrowser.Controller.Library
         /// <returns><c>true</c> if [is season folder] [the specified path]; otherwise, <c>false</c>.</returns>
         private static bool IsSeasonFolder(string path, IDirectoryService directoryService, IFileSystem fileSystem)
         {
+            var seasonNumber = GetSeasonNumberFromPath(path);
+            var hasSeasonNumber = seasonNumber != null;
+
+            if (!hasSeasonNumber)
+            {
+                return false;
+            }
+
             // It's a season folder if it's named as such and does not contain any audio files, apart from theme.mp3
-            return GetSeasonNumberFromPath(path) != null && 
-                !directoryService.GetFiles(path)
-                .Any(i => EntityResolutionHelper.IsAudioFile(i.FullName) && !string.Equals(fileSystem.GetFileNameWithoutExtension(i), BaseItem.ThemeSongFilename));
+            foreach (var fileSystemInfo in directoryService.GetFileSystemEntries(path))
+            {
+                var attributes = fileSystemInfo.Attributes;
+
+                if ((attributes & FileAttributes.Hidden) == FileAttributes.Hidden)
+                {
+                    continue;
+                }
+
+                if ((attributes & FileAttributes.System) == FileAttributes.System)
+                {
+                    continue;
+                }
+
+                if ((attributes & FileAttributes.Directory) == FileAttributes.Directory)
+                {
+                    //if (IsBadFolder(fileSystemInfo.Name))
+                    //{
+                    //    return false;
+                    //}
+                }
+                else
+                {
+                    if (EntityResolutionHelper.IsAudioFile(fileSystemInfo.FullName) &&
+                        !string.Equals(fileSystem.GetFileNameWithoutExtension(fileSystemInfo), BaseItem.ThemeSongFilename))
+                    {
+                        return false;
+                    }
+                }
+            }
+
+            return true;
         }
 
         /// <summary>
         /// Determines whether [is series folder] [the specified path].
         /// </summary>
         /// <param name="path">The path.</param>
-        /// <param name="considerSeasonlessSeries">if set to <c>true</c> [consider seasonless series].</param>
+        /// <param name="considerSeasonlessEntries">if set to <c>true</c> [consider seasonless entries].</param>
         /// <param name="fileSystemChildren">The file system children.</param>
         /// <param name="directoryService">The directory service.</param>
+        /// <param name="fileSystem">The file system.</param>
         /// <returns><c>true</c> if [is series folder] [the specified path]; otherwise, <c>false</c>.</returns>
-        public static bool IsSeriesFolder(string path, bool considerSeasonlessSeries, IEnumerable<FileSystemInfo> fileSystemChildren, IDirectoryService directoryService, IFileSystem fileSystem)
+        public static bool IsSeriesFolder(string path, bool considerSeasonlessEntries, IEnumerable<FileSystemInfo> fileSystemChildren, IDirectoryService directoryService, IFileSystem fileSystem, ILogger logger)
         {
             // A folder with more than 3 non-season folders in will not becounted as a series
             var nonSeriesFolders = 0;
@@ -231,15 +280,20 @@ namespace MediaBrowser.Controller.Library
                 {
                     if (IsSeasonFolder(child.FullName, directoryService, fileSystem))
                     {
+                        logger.Debug("{0} is a series because of season folder {1}.", path, child.FullName);
                         return true;
                     }
-                    if (!EntityResolutionHelper.IgnoreFolders.Contains(child.Name, StringComparer.OrdinalIgnoreCase))
+
+                    if (IsBadFolder(child.Name))
                     {
+                        logger.Debug("Invalid folder under series: {0}", child.FullName);
+
                         nonSeriesFolders++;
                     }
 
                     if (nonSeriesFolders >= 3)
                     {
+                        logger.Debug("{0} not a series due to 3 or more invalid folders.", path);
                         return false;
                     }
                 }
@@ -249,7 +303,7 @@ namespace MediaBrowser.Controller.Library
 
                     if (EntityResolutionHelper.IsVideoFile(fullName) || EntityResolutionHelper.IsVideoPlaceHolder(fullName))
                     {
-                        if (GetEpisodeNumberFromFile(fullName, considerSeasonlessSeries).HasValue)
+                        if (GetEpisodeNumberFromFile(fullName, considerSeasonlessEntries).HasValue)
                         {
                             return true;
                         }
@@ -257,9 +311,28 @@ namespace MediaBrowser.Controller.Library
                 }
             }
 
+            logger.Debug("{0} is not a series folder.", path);
             return false;
         }
 
+        private static bool IsBadFolder(string name)
+        {
+            if (string.Equals(name, BaseItem.ThemeSongsFolderName, StringComparison.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+            if (string.Equals(name, BaseItem.ThemeVideosFolderName, StringComparison.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+            if (string.Equals(name, BaseItem.TrailerFolderName, StringComparison.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+
+            return !EntityResolutionHelper.IgnoreFolders.Contains(name, StringComparer.OrdinalIgnoreCase);
+        }
+
         /// <summary>
         /// Episodes the number from file.
         /// </summary>
diff --git a/MediaBrowser.Dlna/Channels/DlnaChannelFactory.cs b/MediaBrowser.Dlna/Channels/DlnaChannelFactory.cs
index cc5cb1b1a2..78db68f63f 100644
--- a/MediaBrowser.Dlna/Channels/DlnaChannelFactory.cs
+++ b/MediaBrowser.Dlna/Channels/DlnaChannelFactory.cs
@@ -45,7 +45,7 @@ namespace MediaBrowser.Dlna.Channels
             _localServersLookup = localServersLookup;
 
             _deviceDiscovery = deviceDiscovery;
-            deviceDiscovery.DeviceDiscovered += deviceDiscovery_DeviceDiscovered;
+            //deviceDiscovery.DeviceDiscovered += deviceDiscovery_DeviceDiscovered;
             deviceDiscovery.DeviceLeft += deviceDiscovery_DeviceLeft;
         }
 
@@ -196,25 +196,16 @@ namespace MediaBrowser.Dlna.Channels
 
     public class ServerChannel : IChannel, IFactoryChannel
     {
-        private readonly List<Device> _servers = new List<Device>();
         private readonly IHttpClient _httpClient;
         private readonly ILogger _logger;
-        private readonly string _controlUrl;
+        public  string ControlUrl { get; set; }
+        public List<Device> Servers { get; set; }
 
-        /// <summary>
-        /// Prevents core from throwing an exception
-        /// </summary>
-        public ServerChannel()
+        public ServerChannel(IHttpClient httpClient, ILogger logger)
         {
-            
-        }
-
-        public ServerChannel(List<Device> servers, IHttpClient httpClient, ILogger logger, string controlUrl)
-        {
-            _servers = servers;
             _httpClient = httpClient;
             _logger = logger;
-            _controlUrl = controlUrl;
+            Servers = new List<Device>();
         }
 
         public string Name
@@ -272,7 +263,7 @@ namespace MediaBrowser.Dlna.Channels
 
             if (string.IsNullOrWhiteSpace(query.FolderId))
             {
-                items = _servers.Select(i => new ChannelItemInfo
+                items = Servers.Select(i => new ChannelItemInfo
                 {
                     FolderType = ChannelFolderType.Container,
                     Id = GetServerId(i),
@@ -291,7 +282,7 @@ namespace MediaBrowser.Dlna.Channels
                     Limit = query.Limit,
                     StartIndex = query.StartIndex,
                     ParentId = folderId,
-                    ContentDirectoryUrl = _controlUrl
+                    ContentDirectoryUrl = ControlUrl
 
                 }, cancellationToken).ConfigureAwait(false);
 
diff --git a/MediaBrowser.Dlna/ContentDirectory/ContentDirectory.cs b/MediaBrowser.Dlna/ContentDirectory/ContentDirectory.cs
index f594b4471d..f5731b8938 100644
--- a/MediaBrowser.Dlna/ContentDirectory/ContentDirectory.cs
+++ b/MediaBrowser.Dlna/ContentDirectory/ContentDirectory.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Drawing;
@@ -21,6 +22,8 @@ namespace MediaBrowser.Dlna.ContentDirectory
         private readonly IDlnaManager _dlna;
         private readonly IServerConfigurationManager _config;
         private readonly IUserManager _userManager;
+        private readonly IUserViewManager _userViewManager;
+        private readonly IChannelManager _channelManager;
 
         public ContentDirectory(IDlnaManager dlna,
             IUserDataManager userDataManager,
@@ -29,7 +32,7 @@ namespace MediaBrowser.Dlna.ContentDirectory
             IServerConfigurationManager config,
             IUserManager userManager,
             ILogger logger,
-            IHttpClient httpClient)
+            IHttpClient httpClient, IUserViewManager userViewManager, IChannelManager channelManager)
             : base(logger, httpClient)
         {
             _dlna = dlna;
@@ -38,6 +41,8 @@ namespace MediaBrowser.Dlna.ContentDirectory
             _libraryManager = libraryManager;
             _config = config;
             _userManager = userManager;
+            _userViewManager = userViewManager;
+            _channelManager = channelManager;
         }
 
         private int SystemUpdateId
@@ -73,7 +78,9 @@ namespace MediaBrowser.Dlna.ContentDirectory
                 _userDataManager,
                 user,
                 SystemUpdateId,
-                _config)
+                _config,
+                _userViewManager,
+                _channelManager)
                 .ProcessControlRequest(request);
         }
 
diff --git a/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs b/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
index b4f918e68b..1553435aeb 100644
--- a/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
+++ b/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Entities;
@@ -9,8 +10,10 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Dlna.Didl;
 using MediaBrowser.Dlna.Server;
 using MediaBrowser.Dlna.Service;
+using MediaBrowser.Model.Channels;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Library;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Querying;
 using System;
@@ -19,6 +22,7 @@ using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Xml;
 
 namespace MediaBrowser.Dlna.ContentDirectory
@@ -40,14 +44,18 @@ namespace MediaBrowser.Dlna.ContentDirectory
         private readonly DidlBuilder _didlBuilder;
 
         private readonly DeviceProfile _profile;
+        private readonly IUserViewManager _userViewManager;
+        private readonly IChannelManager _channelManager;
 
-        public ControlHandler(ILogger logger, ILibraryManager libraryManager, DeviceProfile profile, string serverAddress, IImageProcessor imageProcessor, IUserDataManager userDataManager, User user, int systemUpdateId, IServerConfigurationManager config)
+        public ControlHandler(ILogger logger, ILibraryManager libraryManager, DeviceProfile profile, string serverAddress, IImageProcessor imageProcessor, IUserDataManager userDataManager, User user, int systemUpdateId, IServerConfigurationManager config, IUserViewManager userViewManager, IChannelManager channelManager)
             : base(config, logger)
         {
             _libraryManager = libraryManager;
             _userDataManager = userDataManager;
             _user = user;
             _systemUpdateId = systemUpdateId;
+            _userViewManager = userViewManager;
+            _channelManager = channelManager;
             _profile = profile;
 
             _didlBuilder = new DidlBuilder(profile, user, imageProcessor, serverAddress);
@@ -69,7 +77,7 @@ namespace MediaBrowser.Dlna.ContentDirectory
                 return HandleGetSystemUpdateID();
 
             if (string.Equals(methodName, "Browse", StringComparison.OrdinalIgnoreCase))
-                return HandleBrowse(methodParams, user, deviceId);
+                return HandleBrowse(methodParams, user, deviceId).Result;
 
             if (string.Equals(methodName, "X_GetFeatureList", StringComparison.OrdinalIgnoreCase))
                 return HandleXGetFeatureList();
@@ -78,7 +86,7 @@ namespace MediaBrowser.Dlna.ContentDirectory
                 return HandleXSetBookmark(methodParams, user);
 
             if (string.Equals(methodName, "Search", StringComparison.OrdinalIgnoreCase))
-                return HandleSearch(methodParams, user, deviceId);
+                return HandleSearch(methodParams, user, deviceId).Result;
 
             throw new ResourceNotFoundException("Unexpected control request name: " + methodName);
         }
@@ -141,7 +149,7 @@ namespace MediaBrowser.Dlna.ContentDirectory
             return builder.ToString();
         }
 
-        private IEnumerable<KeyValuePair<string, string>> HandleBrowse(Headers sparams, User user, string deviceId)
+        private async Task<IEnumerable<KeyValuePair<string, string>>> HandleBrowse(Headers sparams, User user, string deviceId)
         {
             var id = sparams["ObjectID"];
             var flag = sparams["BrowseFlag"];
@@ -149,16 +157,20 @@ namespace MediaBrowser.Dlna.ContentDirectory
             var sortCriteria = new SortCriteria(sparams.GetValueOrDefault("SortCriteria", ""));
 
             var provided = 0;
-            var requested = 0;
-            var start = 0;
 
-            if (sparams.ContainsKey("RequestedCount") && int.TryParse(sparams["RequestedCount"], out requested) && requested <= 0)
+            int? requested = 0;
+            int? start = 0;
+
+            int requestedVal;
+            if (sparams.ContainsKey("RequestedCount") && int.TryParse(sparams["RequestedCount"], out requestedVal) && requestedVal > 0)
             {
-                requested = 0;
+                requested = requestedVal;
             }
-            if (sparams.ContainsKey("StartingIndex") && int.TryParse(sparams["StartingIndex"], out start) && start <= 0)
+
+            int startVal;
+            if (sparams.ContainsKey("StartingIndex") && int.TryParse(sparams["StartingIndex"], out startVal) && startVal > 0)
             {
-                start = 0;
+                start = startVal;
             }
 
             //var root = GetItem(id) as IMediaFolder;
@@ -173,34 +185,26 @@ namespace MediaBrowser.Dlna.ContentDirectory
 
             var folder = (Folder)GetItemFromObjectId(id, user);
 
-            var children = GetChildrenSorted(folder, user, sortCriteria).ToList();
+            var childrenResult = (await GetChildrenSorted(folder, user, sortCriteria, start, requested).ConfigureAwait(false));
 
-            var totalCount = children.Count;
+            var totalCount = childrenResult.TotalRecordCount;
 
             if (string.Equals(flag, "BrowseMetadata"))
             {
-                result.DocumentElement.AppendChild(_didlBuilder.GetFolderElement(result, folder, children.Count, filter));
+                result.DocumentElement.AppendChild(_didlBuilder.GetFolderElement(result, folder, totalCount, filter));
                 provided++;
             }
             else
             {
-                if (start > 0)
-                {
-                    children = children.Skip(start).ToList();
-                }
-                if (requested > 0)
-                {
-                    children = children.Take(requested).ToList();
-                }
-
-                provided = children.Count;
+                provided = childrenResult.Items.Length;
 
-                foreach (var i in children)
+                foreach (var i in childrenResult.Items)
                 {
                     if (i.IsFolder)
                     {
                         var f = (Folder)i;
-                        var childCount = GetChildrenSorted(f, user, sortCriteria).Count();
+                        var childCount = (await GetChildrenSorted(f, user, sortCriteria, null, 0).ConfigureAwait(false))
+                            .TotalRecordCount;
 
                         result.DocumentElement.AppendChild(_didlBuilder.GetFolderElement(result, f, childCount, filter));
                     }
@@ -222,7 +226,7 @@ namespace MediaBrowser.Dlna.ContentDirectory
             };
         }
 
-        private IEnumerable<KeyValuePair<string, string>> HandleSearch(Headers sparams, User user, string deviceId)
+        private async Task<IEnumerable<KeyValuePair<string, string>>> HandleSearch(Headers sparams, User user, string deviceId)
         {
             var searchCriteria = new SearchCriteria(sparams.GetValueOrDefault("SearchCriteria", ""));
             var sortCriteria = new SortCriteria(sparams.GetValueOrDefault("SortCriteria", ""));
@@ -230,16 +234,19 @@ namespace MediaBrowser.Dlna.ContentDirectory
 
             // sort example: dc:title, dc:date
 
-            var requested = 0;
-            var start = 0;
+            int? requested = 0;
+            int? start = 0;
 
-            if (sparams.ContainsKey("RequestedCount") && int.TryParse(sparams["RequestedCount"], out requested) && requested <= 0)
+            int requestedVal;
+            if (sparams.ContainsKey("RequestedCount") && int.TryParse(sparams["RequestedCount"], out requestedVal) && requestedVal > 0)
             {
-                requested = 0;
+                requested = requestedVal;
             }
-            if (sparams.ContainsKey("StartingIndex") && int.TryParse(sparams["StartingIndex"], out start) && start <= 0)
+
+            int startVal;
+            if (sparams.ContainsKey("StartingIndex") && int.TryParse(sparams["StartingIndex"], out startVal) && startVal > 0)
             {
-                start = 0;
+                start = startVal;
             }
 
             //var root = GetItem(id) as IMediaFolder;
@@ -259,27 +266,19 @@ namespace MediaBrowser.Dlna.ContentDirectory
 
             var folder = (Folder)GetItemFromObjectId(sparams["ContainerID"], user);
 
-            var children = GetChildrenSorted(folder, user, searchCriteria, sortCriteria).ToList();
+            var childrenResult = (await GetChildrenSorted(folder, user, searchCriteria, sortCriteria, start, requested).ConfigureAwait(false));
 
-            var totalCount = children.Count;
+            var totalCount = childrenResult.TotalRecordCount;
 
-            if (start > 0)
-            {
-                children = children.Skip(start).ToList();
-            }
-            if (requested > 0)
-            {
-                children = children.Take(requested).ToList();
-            }
-
-            var provided = children.Count;
+            var provided = childrenResult.Items.Length;
 
-            foreach (var i in children)
+            foreach (var i in childrenResult.Items)
             {
                 if (i.IsFolder)
                 {
                     var f = (Folder)i;
-                    var childCount = GetChildrenSorted(f, user, searchCriteria, sortCriteria).Count();
+                    var childCount = (await GetChildrenSorted(f, user, searchCriteria, sortCriteria, null, 0).ConfigureAwait(false))
+                        .TotalRecordCount;
 
                     result.DocumentElement.AppendChild(_didlBuilder.GetFolderElement(result, f, childCount, filter));
                 }
@@ -300,15 +299,16 @@ namespace MediaBrowser.Dlna.ContentDirectory
             };
         }
 
-        private IEnumerable<BaseItem> GetChildrenSorted(Folder folder, User user, SearchCriteria search, SortCriteria sort)
+        private async Task<QueryResult<BaseItem>> GetChildrenSorted(Folder folder, User user, SearchCriteria search, SortCriteria sort, int? startIndex, int? limit)
         {
             if (search.SearchType == SearchType.Unknown)
             {
-                return GetChildrenSorted(folder, user, sort);
+                return await GetChildrenSorted(folder, user, sort, startIndex, limit).ConfigureAwait(false);
             }
 
-            var items = folder.GetRecursiveChildren(user);
-            items = FilterUnsupportedContent(items);
+            var result = await GetChildrenSorted(folder, user, sort, null, null).ConfigureAwait(false);
+
+            var items = FilterUnsupportedContent(result.Items);
 
             if (search.SearchType == SearchType.Audio)
             {
@@ -324,12 +324,123 @@ namespace MediaBrowser.Dlna.ContentDirectory
             }
             else if (search.SearchType == SearchType.Playlist)
             {
+
             }
 
-            return SortItems(items, user, sort);
+            items = SortItems(items, user, sort);
+
+            return ToResult(items, startIndex, limit);
+        }
+
+        private async Task<QueryResult<BaseItem>> GetChildrenSorted(Folder folder, User user, SortCriteria sort, int? startIndex, int? limit)
+        {
+            if (folder is UserRootFolder)
+            {
+                var result = await _userViewManager.GetUserViews(new UserViewQuery
+                {
+                    UserId = user.Id.ToString("N")
+
+                }, CancellationToken.None).ConfigureAwait(false);
+
+                return ToResult(result, startIndex, limit);
+            }
+
+            var view = folder as UserView;
+
+            if (view != null)
+            {
+                var result = await GetUserViewChildren(view, user, sort).ConfigureAwait(false);
+
+                return ToResult(result, startIndex, limit);
+            }
+
+            var channel = folder as Channel;
+
+            if (channel != null)
+            {
+                return await _channelManager.GetChannelItemsInternal(new ChannelItemQuery
+                {
+                    ChannelId = channel.Id.ToString("N"),
+                    Limit = limit,
+                    StartIndex = startIndex,
+                    UserId = user.Id.ToString("N")
+
+                }, CancellationToken.None);
+            }
+
+            var channelFolderItem = folder as ChannelFolderItem;
+
+            if (channelFolderItem != null)
+            {
+                return await _channelManager.GetChannelItemsInternal(new ChannelItemQuery
+                {
+                    ChannelId = channelFolderItem.ChannelId,
+                    FolderId = channelFolderItem.Id.ToString("N"),
+                    Limit = limit,
+                    StartIndex = startIndex,
+                    UserId = user.Id.ToString("N")
+
+                }, CancellationToken.None);
+            }
+
+            return ToResult(GetPlainFolderChildrenSorted(folder, user, sort), startIndex, limit);
+        }
+
+        private QueryResult<BaseItem> ToResult(IEnumerable<BaseItem> items, int? startIndex, int? limit)
+        {
+            var list = items.ToArray();
+            var totalCount = list.Length;
+
+            if (startIndex.HasValue)
+            {
+                list = list.Skip(startIndex.Value).ToArray();
+            }
+
+            if (limit.HasValue)
+            {
+                list = list.Take(limit.Value).ToArray();
+            }
+
+            return new QueryResult<BaseItem>
+            {
+                Items = list,
+                TotalRecordCount = totalCount
+            };
+        }
+
+        private async Task<IEnumerable<BaseItem>> GetUserViewChildren(UserView folder, User user, SortCriteria sort)
+        {
+            if (string.Equals(folder.ViewType, CollectionType.LiveTv, StringComparison.OrdinalIgnoreCase))
+            {
+                return new List<BaseItem>();
+            }
+            if (string.Equals(folder.ViewType, CollectionType.Channels, StringComparison.OrdinalIgnoreCase))
+            {
+                var result = await _channelManager.GetChannelsInternal(new ChannelQuery()
+                {
+                    UserId = user.Id.ToString("N")
+
+                }, CancellationToken.None).ConfigureAwait(false);
+
+                return result.Items;
+            }
+            if (string.Equals(folder.ViewType, CollectionType.TvShows, StringComparison.OrdinalIgnoreCase))
+            {
+                return SortItems(folder.GetChildren(user, true).OfType<Series>(), user, sort);
+            }
+            if (string.Equals(folder.ViewType, CollectionType.Movies, StringComparison.OrdinalIgnoreCase))
+            {
+                return GetPlainFolderChildrenSorted(folder, user, sort);
+            }
+            if (string.Equals(folder.ViewType, CollectionType.Music, StringComparison.OrdinalIgnoreCase))
+            {
+                return SortItems(folder.GetChildren(user, true).OfType<MusicArtist>(), user, sort);
+            }
+
+            return GetPlainFolderChildrenSorted(folder, user, sort);
         }
 
-        private IEnumerable<BaseItem> GetChildrenSorted(Folder folder, User user, SortCriteria sort)
+        private IEnumerable<BaseItem> GetPlainFolderChildrenSorted(Folder folder, User user, SortCriteria sort)
         {
             var items = folder.GetChildren(user, true);
 
@@ -345,7 +456,7 @@ namespace MediaBrowser.Dlna.ContentDirectory
 
         private IEnumerable<BaseItem> SortItems(IEnumerable<BaseItem> items, User user, SortCriteria sort)
         {
-            return _libraryManager.Sort(items, user, new[] { ItemSortBy.SortName }, SortOrder.Ascending);
+            return _libraryManager.Sort(items, user, new[] { ItemSortBy.SortName }, sort.SortOrder);
         }
 
         private IEnumerable<BaseItem> FilterUnsupportedContent(IEnumerable<BaseItem> items)
@@ -353,14 +464,12 @@ namespace MediaBrowser.Dlna.ContentDirectory
             return items.Where(i =>
             {
                 // Unplayable
-                // TODO: Display and prevent playback with restricted flag?
                 if (i.LocationType == LocationType.Virtual)
                 {
                     return false;
                 }
 
                 // Unplayable
-                // TODO: Display and prevent playback with restricted flag?
                 var supportsPlaceHolder = i as ISupportsPlaceHolders;
                 if (supportsPlaceHolder != null && supportsPlaceHolder.IsPlaceHolder)
                 {
@@ -368,7 +477,6 @@ namespace MediaBrowser.Dlna.ContentDirectory
                 }
 
                 // Upnp renderers won't understand these
-                // TODO: Display and prevent playback with restricted flag?
                 if (i is Game || i is Book)
                 {
                     return false;
diff --git a/MediaBrowser.Dlna/Didl/DidlBuilder.cs b/MediaBrowser.Dlna/Didl/DidlBuilder.cs
index 739793c032..649ba2c8ff 100644
--- a/MediaBrowser.Dlna/Didl/DidlBuilder.cs
+++ b/MediaBrowser.Dlna/Didl/DidlBuilder.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
@@ -612,6 +613,13 @@ namespace MediaBrowser.Dlna.Didl
             {
                 return GetImageInfo(item, ImageType.Thumb);
             }
+            if (item.HasImage(ImageType.Backdrop))
+            {
+                if (item is Channel)
+                {
+                    return GetImageInfo(item, ImageType.Backdrop);
+                }
+            }
 
             if (item is Audio || item is Episode)
             {
@@ -633,7 +641,7 @@ namespace MediaBrowser.Dlna.Didl
 
             try
             {
-                tag = _imageProcessor.GetImageCacheTag(item, ImageType.Primary);
+                tag = _imageProcessor.GetImageCacheTag(item, type);
             }
             catch
             {
diff --git a/MediaBrowser.Dlna/Images/logo120.jpg b/MediaBrowser.Dlna/Images/logo120.jpg
index 1de803c8fa..394c8e1376 100644
Binary files a/MediaBrowser.Dlna/Images/logo120.jpg and b/MediaBrowser.Dlna/Images/logo120.jpg differ
diff --git a/MediaBrowser.Dlna/Images/logo120.png b/MediaBrowser.Dlna/Images/logo120.png
index 2dd04d4681..97bdef818b 100644
Binary files a/MediaBrowser.Dlna/Images/logo120.png and b/MediaBrowser.Dlna/Images/logo120.png differ
diff --git a/MediaBrowser.Dlna/Images/logo240.jpg b/MediaBrowser.Dlna/Images/logo240.jpg
new file mode 100644
index 0000000000..c805523516
Binary files /dev/null and b/MediaBrowser.Dlna/Images/logo240.jpg differ
diff --git a/MediaBrowser.Dlna/Images/logo240.png b/MediaBrowser.Dlna/Images/logo240.png
new file mode 100644
index 0000000000..532f123178
Binary files /dev/null and b/MediaBrowser.Dlna/Images/logo240.png differ
diff --git a/MediaBrowser.Dlna/Images/logo48.jpg b/MediaBrowser.Dlna/Images/logo48.jpg
index f1e7302aae..52b9853541 100644
Binary files a/MediaBrowser.Dlna/Images/logo48.jpg and b/MediaBrowser.Dlna/Images/logo48.jpg differ
diff --git a/MediaBrowser.Dlna/Images/logo48.png b/MediaBrowser.Dlna/Images/logo48.png
index 3b13d141ce..29d4a05289 100644
Binary files a/MediaBrowser.Dlna/Images/logo48.png and b/MediaBrowser.Dlna/Images/logo48.png differ
diff --git a/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj b/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj
index 461470b7ac..962c2a211e 100644
--- a/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj
+++ b/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj
@@ -184,6 +184,10 @@
     <EmbeddedResource Include="Profiles\Xml\Windows 8 RT.xml" />
     <EmbeddedResource Include="Profiles\Xml\Windows Phone.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Images\logo240.jpg" />
+    <EmbeddedResource Include="Images\logo240.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/MediaBrowser.Dlna/PlayTo/Device.cs b/MediaBrowser.Dlna/PlayTo/Device.cs
index 85e18150ed..f67094554f 100644
--- a/MediaBrowser.Dlna/PlayTo/Device.cs
+++ b/MediaBrowser.Dlna/PlayTo/Device.cs
@@ -424,7 +424,7 @@ namespace MediaBrowser.Dlna.PlayTo
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error updating device info", ex);
+                _logger.ErrorException("Error updating device info for {0}", ex, Properties.Name);
 
                 _successiveStopCount++;
 
@@ -444,7 +444,7 @@ namespace MediaBrowser.Dlna.PlayTo
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error updating device info", ex);
+                _logger.ErrorException("Error updating device volume info for {0}", ex, Properties.Name);
             }
         }
 
diff --git a/MediaBrowser.Dlna/PlayTo/PlayToManager.cs b/MediaBrowser.Dlna/PlayTo/PlayToManager.cs
index a5b816919f..a52c38086d 100644
--- a/MediaBrowser.Dlna/PlayTo/PlayToManager.cs
+++ b/MediaBrowser.Dlna/PlayTo/PlayToManager.cs
@@ -77,42 +77,44 @@ namespace MediaBrowser.Dlna.PlayTo
                 return;
             }
 
-            var uri = new Uri(location);
-
-            var device = await Device.CreateuPnpDeviceAsync(uri, _httpClient, _config, _logger).ConfigureAwait(false);
-            
-            if (device.RendererCommands != null)
+            try
             {
-                var sessionInfo = await _sessionManager.LogSessionActivity(device.Properties.ClientType, _appHost.ApplicationVersion.ToString(), device.Properties.UUID, device.Properties.Name, uri.OriginalString, null)
-                    .ConfigureAwait(false);
+                var uri = new Uri(location);
 
-                var controller = sessionInfo.SessionController as PlayToController;
+                var device = await Device.CreateuPnpDeviceAsync(uri, _httpClient, _config, _logger).ConfigureAwait(false);
 
-                if (controller == null)
+                if (device.RendererCommands != null)
                 {
-                    var serverAddress = GetServerAddress(localIp);
+                    var sessionInfo = await _sessionManager.LogSessionActivity(device.Properties.ClientType, _appHost.ApplicationVersion.ToString(), device.Properties.UUID, device.Properties.Name, uri.OriginalString, null)
+                        .ConfigureAwait(false);
 
-                    sessionInfo.SessionController = controller = new PlayToController(sessionInfo,
-                        _sessionManager,
-                        _itemRepository,
-                        _libraryManager,
-                        _logger,
-                        _dlnaManager,
-                        _userManager,
-                        _imageProcessor,
-                        serverAddress,
-                        _deviceDiscovery);
+                    var controller = sessionInfo.SessionController as PlayToController;
 
-                    controller.Init(device);
+                    if (controller == null)
+                    {
+                        var serverAddress = GetServerAddress(localIp);
 
-                    var profile = _dlnaManager.GetProfile(device.Properties.ToDeviceIdentification()) ??
-                                  _dlnaManager.GetDefaultProfile();
+                        sessionInfo.SessionController = controller = new PlayToController(sessionInfo,
+                            _sessionManager,
+                            _itemRepository,
+                            _libraryManager,
+                            _logger,
+                            _dlnaManager,
+                            _userManager,
+                            _imageProcessor,
+                            serverAddress,
+                            _deviceDiscovery);
 
-                    _sessionManager.ReportCapabilities(sessionInfo.Id, new SessionCapabilities
-                    {
-                        PlayableMediaTypes = profile.GetSupportedMediaTypes(),
+                        controller.Init(device);
+
+                        var profile = _dlnaManager.GetProfile(device.Properties.ToDeviceIdentification()) ??
+                                      _dlnaManager.GetDefaultProfile();
 
-                        SupportedCommands = new List<string>
+                        _sessionManager.ReportCapabilities(sessionInfo.Id, new SessionCapabilities
+                        {
+                            PlayableMediaTypes = profile.GetSupportedMediaTypes(),
+
+                            SupportedCommands = new List<string>
                         {
                             GeneralCommandType.VolumeDown.ToString(),
                             GeneralCommandType.VolumeUp.ToString(),
@@ -124,12 +126,17 @@ namespace MediaBrowser.Dlna.PlayTo
                             GeneralCommandType.SetSubtitleStreamIndex.ToString()
                         },
 
-                        SupportsMediaControl = true
-                    });
+                            SupportsMediaControl = true
+                        });
 
-                    _logger.Info("DLNA Session created for {0} - {1}", device.Properties.Name, device.Properties.ModelName);
+                        _logger.Info("DLNA Session created for {0} - {1}", device.Properties.Name, device.Properties.ModelName);
+                    }
                 }
             }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error creating PlayTo device.", ex);
+            }
         }
 
         private string GetServerAddress(IPAddress localIp)
diff --git a/MediaBrowser.Dlna/Profiles/DefaultProfile.cs b/MediaBrowser.Dlna/Profiles/DefaultProfile.cs
index 0696b2691c..badb37cfc5 100644
--- a/MediaBrowser.Dlna/Profiles/DefaultProfile.cs
+++ b/MediaBrowser.Dlna/Profiles/DefaultProfile.cs
@@ -30,6 +30,8 @@ namespace MediaBrowser.Dlna.Profiles
             MaxStreamingBitrate = 8000000;
             MaxStaticBitrate = 8000000;
 
+            EnableAlbumArtInDidl = true;
+
             TranscodingProfiles = new[]
             {
                 new TranscodingProfile
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Android.xml b/MediaBrowser.Dlna/Profiles/Xml/Android.xml
index 8d7b5ea2a8..549bea59ed 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Android.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/Android.xml
@@ -9,7 +9,7 @@
   <ModelNumber>Media Browser</ModelNumber>
   <ModelUrl>http://mediabrowser.tv/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
   <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
   <AlbumArtPn>JPEG_SM</AlbumArtPn>
   <MaxAlbumArtWidth>512</MaxAlbumArtWidth>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Default.xml b/MediaBrowser.Dlna/Profiles/Xml/Default.xml
index 4cc1eca5d4..2ac840f445 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Default.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/Default.xml
@@ -9,7 +9,7 @@
   <ModelNumber>Media Browser</ModelNumber>
   <ModelUrl>http://mediabrowser.tv/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
   <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
   <AlbumArtPn>JPEG_SM</AlbumArtPn>
   <MaxAlbumArtWidth>512</MaxAlbumArtWidth>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml b/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml
index e25224727f..891353f321 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml	
@@ -14,7 +14,7 @@
   <ModelNumber>Media Browser</ModelNumber>
   <ModelUrl>http://mediabrowser.tv/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
   <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
   <AlbumArtPn>JPEG_SM</AlbumArtPn>
   <MaxAlbumArtWidth>512</MaxAlbumArtWidth>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml b/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml
index 26183da034..2acee1306f 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml	
@@ -15,7 +15,7 @@
   <ModelNumber>Media Browser</ModelNumber>
   <ModelUrl>http://mediabrowser.tv/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
   <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
   <AlbumArtPn>JPEG_SM</AlbumArtPn>
   <MaxAlbumArtWidth>512</MaxAlbumArtWidth>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml b/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml
index 0c736cbff8..e5e726cc69 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml	
@@ -13,7 +13,7 @@
   <ModelNumber>Media Browser</ModelNumber>
   <ModelUrl>http://mediabrowser.tv/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
   <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
   <AlbumArtPn>JPEG_SM</AlbumArtPn>
   <MaxAlbumArtWidth>512</MaxAlbumArtWidth>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml b/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml
index 39174d85a8..fe1a987ab8 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml
@@ -15,7 +15,7 @@
   <ModelNumber>Media Browser</ModelNumber>
   <ModelUrl>http://mediabrowser.tv/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
   <SupportedMediaTypes>Audio</SupportedMediaTypes>
   <AlbumArtPn>JPEG_SM</AlbumArtPn>
   <MaxAlbumArtWidth>512</MaxAlbumArtWidth>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml
index 0166160149..9b59393b4c 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml	
@@ -16,7 +16,7 @@
   <ModelNumber>Media Browser</ModelNumber>
   <ModelUrl>http://mediabrowser.tv/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
   <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
   <AlbumArtPn>JPEG_SM</AlbumArtPn>
   <MaxAlbumArtWidth>512</MaxAlbumArtWidth>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml
index 749b7a1339..f3ffd438c9 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml	
@@ -15,7 +15,7 @@
   <ModelNumber>3.0</ModelNumber>
   <ModelUrl>http://mediabrowser.tv/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
   <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
   <AlbumArtPn>JPEG_SM</AlbumArtPn>
   <MaxAlbumArtWidth>512</MaxAlbumArtWidth>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml
index aa73bc91d9..2ddb362ac5 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml	
@@ -17,7 +17,7 @@
   <ModelNumber>3.0</ModelNumber>
   <ModelUrl>http://mediabrowser.tv/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
   <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
   <AlbumArtPn>JPEG_SM</AlbumArtPn>
   <MaxAlbumArtWidth>512</MaxAlbumArtWidth>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml
index 1b133d8906..00f94455a1 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml	
@@ -16,7 +16,7 @@
   <ModelNumber>3.0</ModelNumber>
   <ModelUrl>http://www.microsoft.com/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
   <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
   <AlbumArtPn>JPEG_TN</AlbumArtPn>
   <MaxAlbumArtWidth>512</MaxAlbumArtWidth>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml
index 29e2a3d712..c985b041e8 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml	
@@ -16,7 +16,7 @@
   <ModelNumber>3.0</ModelNumber>
   <ModelUrl>http://www.microsoft.com/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
   <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
   <AlbumArtPn>JPEG_TN</AlbumArtPn>
   <MaxAlbumArtWidth>512</MaxAlbumArtWidth>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml
index 9805485a3d..8b44b67a66 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml	
@@ -16,7 +16,7 @@
   <ModelNumber>3.0</ModelNumber>
   <ModelUrl>http://www.microsoft.com/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
   <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
   <AlbumArtPn>JPEG_TN</AlbumArtPn>
   <MaxAlbumArtWidth>512</MaxAlbumArtWidth>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml
index e3068f23e8..843dc7819c 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml	
@@ -16,7 +16,7 @@
   <ModelNumber>3.0</ModelNumber>
   <ModelUrl>http://www.microsoft.com/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
   <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
   <AlbumArtPn>JPEG_TN</AlbumArtPn>
   <MaxAlbumArtWidth>512</MaxAlbumArtWidth>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml
index 98c781915d..b9e7c62a37 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml	
@@ -16,7 +16,7 @@
   <ModelNumber>Media Browser</ModelNumber>
   <ModelUrl>http://mediabrowser.tv/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
   <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
   <AlbumArtPn>JPEG_TN</AlbumArtPn>
   <MaxAlbumArtWidth>512</MaxAlbumArtWidth>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml b/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml
index fedc1db6a3..b2b4c31d39 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml	
@@ -16,7 +16,7 @@
   <ModelNumber>Media Browser</ModelNumber>
   <ModelUrl>http://mediabrowser.tv/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>true</IgnoreTranscodeByteRangeRequests>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
   <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
   <AlbumArtPn>JPEG_SM</AlbumArtPn>
   <MaxAlbumArtWidth>512</MaxAlbumArtWidth>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Windows 8 RT.xml b/MediaBrowser.Dlna/Profiles/Xml/Windows 8 RT.xml
index 384a27ca57..766bfdecd4 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Windows 8 RT.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Windows 8 RT.xml	
@@ -13,7 +13,7 @@
   <ModelNumber>Media Browser</ModelNumber>
   <ModelUrl>http://mediabrowser.tv/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
   <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
   <AlbumArtPn>JPEG_SM</AlbumArtPn>
   <MaxAlbumArtWidth>512</MaxAlbumArtWidth>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Windows Phone.xml b/MediaBrowser.Dlna/Profiles/Xml/Windows Phone.xml
index aec5b44cb7..3c9528dc20 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Windows Phone.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Windows Phone.xml	
@@ -9,7 +9,7 @@
   <ModelNumber>Media Browser</ModelNumber>
   <ModelUrl>http://mediabrowser.tv/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
   <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
   <AlbumArtPn>JPEG_SM</AlbumArtPn>
   <MaxAlbumArtWidth>512</MaxAlbumArtWidth>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml b/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml
index 17dd473be6..339b8debd7 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml	
@@ -16,7 +16,7 @@
   <ModelNumber>12.0</ModelNumber>
   <ModelUrl>http://www.microsoft.com/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
   <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
   <AlbumArtPn>JPEG_SM</AlbumArtPn>
   <MaxAlbumArtWidth>512</MaxAlbumArtWidth>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml
index e23ad92136..63223fea71 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml	
@@ -14,7 +14,7 @@
   <ModelNumber>Media Browser</ModelNumber>
   <ModelUrl>http://mediabrowser.tv/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
   <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
   <AlbumArtPn>JPEG_SM</AlbumArtPn>
   <MaxAlbumArtWidth>512</MaxAlbumArtWidth>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml b/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml
index 53d43a7e47..865d343b25 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml
@@ -15,7 +15,7 @@
   <ModelNumber>Media Browser</ModelNumber>
   <ModelUrl>http://mediabrowser.tv/</ModelUrl>
   <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
-  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <EnableAlbumArtInDidl>true</EnableAlbumArtInDidl>
   <SupportedMediaTypes>Audio</SupportedMediaTypes>
   <AlbumArtPn>JPEG_SM</AlbumArtPn>
   <MaxAlbumArtWidth>512</MaxAlbumArtWidth>
diff --git a/MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs b/MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs
index 9efce5bb3e..f4f724d07a 100644
--- a/MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs
+++ b/MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs
@@ -133,6 +133,24 @@ namespace MediaBrowser.Dlna.Server
         {
             var list = new List<DeviceIcon>();
 
+            list.Add(new DeviceIcon
+            {
+                MimeType = "image/png",
+                Depth = "24",
+                Width = 240,
+                Height = 240,
+                Url = "/mediabrowser/dlna/icons/logo240.png"
+            });
+
+            list.Add(new DeviceIcon
+            {
+                MimeType = "image/jpeg",
+                Depth = "24",
+                Width = 240,
+                Height = 240,
+                Url = "/mediabrowser/dlna/icons/logo240.jpg"
+            });
+
             list.Add(new DeviceIcon
             {
                 MimeType = "image/png",
diff --git a/MediaBrowser.Dlna/Ssdp/SsdpHandler.cs b/MediaBrowser.Dlna/Ssdp/SsdpHandler.cs
index 7002e566de..4c7c0d60c8 100644
--- a/MediaBrowser.Dlna/Ssdp/SsdpHandler.cs
+++ b/MediaBrowser.Dlna/Ssdp/SsdpHandler.cs
@@ -90,9 +90,14 @@ namespace MediaBrowser.Dlna.Ssdp
 
             values["HOST"] = "239.255.255.250:1900";
             values["USER-AGENT"] = "UPnP/1.0 DLNADOC/1.50 Platinum/1.0.4.2";
-            values["ST"] = "ssdp:all";
+
             values["MAN"] = "\"ssdp:discover\"";
-            values["MX"] = "10";
+
+            // Search target
+            values["ST"] = "ssdp:all";
+
+            // Seconds to delay response
+            values["MX"] = "3";
 
             SendDatagram("M-SEARCH * HTTP/1.1", values, localIp);
         }
diff --git a/MediaBrowser.Model/Dlna/SortCriteria.cs b/MediaBrowser.Model/Dlna/SortCriteria.cs
index 944d504866..600a2f58e9 100644
--- a/MediaBrowser.Model/Dlna/SortCriteria.cs
+++ b/MediaBrowser.Model/Dlna/SortCriteria.cs
@@ -1,8 +1,14 @@
-
+using MediaBrowser.Model.Entities;
+
 namespace MediaBrowser.Model.Dlna
 {
     public class SortCriteria
     {
+        public SortOrder SortOrder
+        {
+            get { return SortOrder.Ascending; }
+        }
+
         public SortCriteria(string value)
         {
             
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs b/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
index d219ab0276..af1bd94271 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
@@ -71,7 +71,7 @@ namespace MediaBrowser.Server.Implementations.Channels
                 var startingPercent = numComplete * percentPerUser * 100;
 
                 var innerProgress = new ActionableProgress<double>();
-                innerProgress.RegisterAction(p => progress.Report(startingPercent + (.8 * p)));
+                innerProgress.RegisterAction(p => progress.Report(startingPercent + (percentPerUser * p)));
 
                 await DownloadContent(user, cancellationToken, innerProgress).ConfigureAwait(false);
 
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
index 28cbd20e07..c7ca6bb30c 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
@@ -106,7 +106,7 @@ namespace MediaBrowser.Server.Implementations.Channels
                 .OrderBy(i => i.Name);
         }
 
-        public Task<QueryResult<BaseItemDto>> GetChannels(ChannelQuery query, CancellationToken cancellationToken)
+        public Task<QueryResult<Channel>> GetChannelsInternal(ChannelQuery query, CancellationToken cancellationToken)
         {
             var user = string.IsNullOrWhiteSpace(query.UserId)
                 ? null
@@ -148,21 +148,40 @@ namespace MediaBrowser.Server.Implementations.Channels
                 all = all.Take(query.Limit.Value).ToList();
             }
 
+            var returnItems = all.ToArray();
+
+            var result = new QueryResult<Channel>
+            {
+                Items = returnItems,
+                TotalRecordCount = totalCount
+            };
+
+            return Task.FromResult(result);
+        }
+
+        public async Task<QueryResult<BaseItemDto>> GetChannels(ChannelQuery query, CancellationToken cancellationToken)
+        {
+            var user = string.IsNullOrWhiteSpace(query.UserId)
+                ? null
+                : _userManager.GetUserById(new Guid(query.UserId));
+
+            var internalResult = await GetChannelsInternal(query, cancellationToken).ConfigureAwait(false);
+
             // Get everything
             var fields = Enum.GetNames(typeof(ItemFields))
                     .Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true))
                     .ToList();
 
-            var returnItems = all.Select(i => _dtoService.GetBaseItemDto(i, fields, user))
+            var returnItems = internalResult.Items.Select(i => _dtoService.GetBaseItemDto(i, fields, user))
                 .ToArray();
 
             var result = new QueryResult<BaseItemDto>
             {
                 Items = returnItems,
-                TotalRecordCount = totalCount
+                TotalRecordCount = internalResult.TotalRecordCount
             };
 
-            return Task.FromResult(result);
+            return result;
         }
 
         public async Task RefreshChannels(IProgress<double> progress, CancellationToken cancellationToken)
@@ -846,7 +865,7 @@ namespace MediaBrowser.Server.Implementations.Channels
             }
         }
 
-        public async Task<QueryResult<BaseItemDto>> GetChannelItems(ChannelItemQuery query, CancellationToken cancellationToken)
+        public async Task<QueryResult<BaseItem>> GetChannelItemsInternal(ChannelItemQuery query, CancellationToken cancellationToken)
         {
             // Get the internal channel entity
             var channel = GetChannel(query.ChannelId);
@@ -868,6 +887,12 @@ namespace MediaBrowser.Server.Implementations.Channels
                     throw new ArgumentException(string.Format("{0} channel only supports a maximum of {1} records at a time.", channel.Name, channelInfo.MaxPageSize.Value));
                 }
                 providerLimit = query.Limit;
+
+                // This will cause some providers to fail
+                if (providerLimit == 0)
+                {
+                    providerLimit = 1;
+                }
             }
 
             var user = string.IsNullOrWhiteSpace(query.UserId)
@@ -913,6 +938,31 @@ namespace MediaBrowser.Server.Implementations.Channels
             return await GetReturnItems(internalItems, providerTotalRecordCount, user, query, cancellationToken).ConfigureAwait(false);
         }
 
+        public async Task<QueryResult<BaseItemDto>> GetChannelItems(ChannelItemQuery query, CancellationToken cancellationToken)
+        {
+            var user = string.IsNullOrWhiteSpace(query.UserId)
+                ? null
+                : _userManager.GetUserById(new Guid(query.UserId));
+
+            var internalResult = await GetChannelItemsInternal(query, cancellationToken).ConfigureAwait(false);
+
+            // Get everything
+            var fields = Enum.GetNames(typeof(ItemFields))
+                    .Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true))
+                    .ToList();
+
+            var returnItems = internalResult.Items.Select(i => _dtoService.GetBaseItemDto(i, fields, user))
+                .ToArray();
+
+            var result = new QueryResult<BaseItemDto>
+            {
+                Items = returnItems,
+                TotalRecordCount = internalResult.TotalRecordCount
+            };
+
+            return result;
+        }
+
         private readonly SemaphoreSlim _resourcePool = new SemaphoreSlim(1, 1);
         private async Task<ChannelItemResult> GetChannelItems(IChannel channel,
             User user,
@@ -1054,7 +1104,7 @@ namespace MediaBrowser.Server.Implementations.Channels
                 filename + ".json");
         }
 
-        private async Task<QueryResult<BaseItemDto>> GetReturnItems(IEnumerable<BaseItem> items, int? totalCountFromProvider, User user, ChannelItemQuery query, CancellationToken cancellationToken)
+        private async Task<QueryResult<BaseItem>> GetReturnItems(IEnumerable<BaseItem> items, int? totalCountFromProvider, User user, ChannelItemQuery query, CancellationToken cancellationToken)
         {
             items = ApplyFilters(items, query.Filters, user);
 
@@ -1078,10 +1128,9 @@ namespace MediaBrowser.Server.Implementations.Channels
 
             await RefreshIfNeeded(all, cancellationToken).ConfigureAwait(false);
 
-            var returnItemArray = all.Select(i => _dtoService.GetBaseItemDto(i, query.Fields, user))
-                .ToArray();
+            var returnItemArray = all.ToArray();
 
-            return new QueryResult<BaseItemDto>
+            return new QueryResult<BaseItem>
             {
                 Items = returnItemArray,
                 TotalRecordCount = totalCount
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs b/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
index 04ddb4c4b1..a27755d758 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
@@ -97,11 +97,6 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             var info = _appHost.GetSystemInfo();
 
             CreatePortMap(device, info.HttpServerPortNumber);
-
-            if (info.WebSocketPortNumber != info.HttpServerPortNumber)
-            {
-                CreatePortMap(device, info.WebSocketPortNumber);
-            }
         }
 
         private void CreatePortMap(INatDevice device, int port)
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs b/MediaBrowser.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
index 9191e0bea3..3b4379e374 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
@@ -4,6 +4,7 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Serialization;
 using MediaBrowser.Server.Implementations.Udp;
 using System.Net.Sockets;
 
@@ -37,6 +38,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
         /// </summary>
         private readonly IHttpServer _httpServer;
         private readonly IServerApplicationHost _appHost;
+        private readonly IJsonSerializer _json;
 
         public const int PortNumber = 7359;
 
@@ -47,13 +49,14 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
         /// <param name="networkManager">The network manager.</param>
         /// <param name="serverConfigurationManager">The server configuration manager.</param>
         /// <param name="httpServer">The HTTP server.</param>
-        public UdpServerEntryPoint(ILogger logger, INetworkManager networkManager, IServerConfigurationManager serverConfigurationManager, IHttpServer httpServer, IServerApplicationHost appHost)
+        public UdpServerEntryPoint(ILogger logger, INetworkManager networkManager, IServerConfigurationManager serverConfigurationManager, IHttpServer httpServer, IServerApplicationHost appHost, IJsonSerializer json)
         {
             _logger = logger;
             _networkManager = networkManager;
             _serverConfigurationManager = serverConfigurationManager;
             _httpServer = httpServer;
             _appHost = appHost;
+            _json = json;
         }
 
         /// <summary>
@@ -61,7 +64,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
         /// </summary>
         public void Run()
         {
-            var udpServer = new UdpServer(_logger, _networkManager, _serverConfigurationManager, _httpServer, _appHost);
+            var udpServer = new UdpServer(_logger, _networkManager, _serverConfigurationManager, _httpServer, _appHost, _json);
 
             try
             {
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
index 2ee3d49a44..7f533d416f 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
@@ -59,14 +59,16 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
 
             var collectionType = args.GetCollectionType();
 
+            var isMusicMediaFolder = string.Equals(collectionType, CollectionType.Music,
+                StringComparison.OrdinalIgnoreCase);
+
             // If there's a collection type and it's not music, don't allow it.
-            if (!string.IsNullOrEmpty(collectionType) &&
-                !string.Equals(collectionType, CollectionType.Music, StringComparison.OrdinalIgnoreCase))
+            if (!isMusicMediaFolder)
             {
                 return null;
             }
 
-            return IsMusicAlbum(args) ? new MusicAlbum() : null;
+            return IsMusicAlbum(args, isMusicMediaFolder) ? new MusicAlbum() : null;
         }
 
 
@@ -74,27 +76,29 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
         /// Determine if the supplied file data points to a music album
         /// </summary>
         /// <param name="path">The path.</param>
+        /// <param name="isMusicMediaFolder">if set to <c>true</c> [is music media folder].</param>
         /// <param name="directoryService">The directory service.</param>
         /// <param name="logger">The logger.</param>
         /// <param name="fileSystem">The file system.</param>
         /// <returns><c>true</c> if [is music album] [the specified data]; otherwise, <c>false</c>.</returns>
-        public static bool IsMusicAlbum(string path, IDirectoryService directoryService, ILogger logger, IFileSystem fileSystem)
+        public static bool IsMusicAlbum(string path, bool isMusicMediaFolder, IDirectoryService directoryService, ILogger logger, IFileSystem fileSystem)
         {
-            return ContainsMusic(directoryService.GetFileSystemEntries(path), true, directoryService, logger, fileSystem);
+            return ContainsMusic(directoryService.GetFileSystemEntries(path), isMusicMediaFolder, true, directoryService, logger, fileSystem);
         }
 
         /// <summary>
         /// Determine if the supplied resolve args should be considered a music album
         /// </summary>
         /// <param name="args">The args.</param>
+        /// <param name="isMusicMediaFolder">if set to <c>true</c> [is music media folder].</param>
         /// <returns><c>true</c> if [is music album] [the specified args]; otherwise, <c>false</c>.</returns>
-        private bool IsMusicAlbum(ItemResolveArgs args)
+        private bool IsMusicAlbum(ItemResolveArgs args, bool isMusicMediaFolder)
         {
             // Args points to an album if parent is an Artist folder or it directly contains music
             if (args.IsDirectory)
             {
                 //if (args.Parent is MusicArtist) return true;  //saves us from testing children twice
-                if (ContainsMusic(args.FileSystemChildren, true, args.DirectoryService, _logger, _fileSystem)) return true;
+                if (ContainsMusic(args.FileSystemChildren, isMusicMediaFolder, true, args.DirectoryService, _logger, _fileSystem)) return true;
             }
 
             return false;
@@ -104,12 +108,18 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
         /// Determine if the supplied list contains what we should consider music
         /// </summary>
         /// <param name="list">The list.</param>
+        /// <param name="isMusicMediaFolder">if set to <c>true</c> [is music media folder].</param>
         /// <param name="allowSubfolders">if set to <c>true</c> [allow subfolders].</param>
         /// <param name="directoryService">The directory service.</param>
         /// <param name="logger">The logger.</param>
         /// <param name="fileSystem">The file system.</param>
         /// <returns><c>true</c> if the specified list contains music; otherwise, <c>false</c>.</returns>
-        private static bool ContainsMusic(IEnumerable<FileSystemInfo> list, bool allowSubfolders, IDirectoryService directoryService, ILogger logger, IFileSystem fileSystem)
+        private static bool ContainsMusic(IEnumerable<FileSystemInfo> list, 
+            bool isMusicMediaFolder,
+            bool allowSubfolders, 
+            IDirectoryService directoryService, 
+            ILogger logger, 
+            IFileSystem fileSystem)
         {
             // If list contains at least 2 audio files or at least one and no video files consider it to contain music
             var foundAudio = 0;
@@ -120,7 +130,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
             {
                 if ((fileSystemInfo.Attributes & FileAttributes.Directory) == FileAttributes.Directory)
                 {
-                    if (allowSubfolders && IsAlbumSubfolder(fileSystemInfo, directoryService, logger, fileSystem))
+                    if (isMusicMediaFolder && allowSubfolders && IsAlbumSubfolder(fileSystemInfo, true, directoryService, logger, fileSystem))
                     {
                         discSubfolderCount++;
                     }
@@ -135,27 +145,27 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
                 if (EntityResolutionHelper.IsAudioFile(fullName))
                 {
                     // Don't resolve these into audio files
-                    if (string.Equals(fileSystem.GetFileNameWithoutExtension(fullName), BaseItem.ThemeSongFilename) && EntityResolutionHelper.IsAudioFile(fullName))
+                    if (string.Equals(fileSystem.GetFileNameWithoutExtension(fullName), BaseItem.ThemeSongFilename))
                     {
                         continue;
                     }
 
                     foundAudio++;
                 }
+                else if (EntityResolutionHelper.IsVideoFile(fullName)) return false;
+                else if (EntityResolutionHelper.IsVideoPlaceHolder(fullName)) return false;
+                
                 if (foundAudio >= 2)
                 {
                     return true;
                 }
-
-                if (EntityResolutionHelper.IsVideoFile(fullName)) return false;
-                if (EntityResolutionHelper.IsVideoPlaceHolder(fullName)) return false;
             }
 
             //  or a single audio file and no video files
             return foundAudio > 0 || discSubfolderCount > 0;
         }
 
-        private static bool IsAlbumSubfolder(FileSystemInfo directory, IDirectoryService directoryService, ILogger logger, IFileSystem fileSystem)
+        private static bool IsAlbumSubfolder(FileSystemInfo directory, bool isMusicMediaFolder, IDirectoryService directoryService, ILogger logger, IFileSystem fileSystem)
         {
             var path = directory.FullName;
 
@@ -163,7 +173,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
             {
                 logger.Debug("Found multi-disc folder: " + path);
 
-                return ContainsMusic(directoryService.GetFileSystemEntries(path), false, directoryService, logger, fileSystem);
+                return ContainsMusic(directoryService.GetFileSystemEntries(path), isMusicMediaFolder, false, directoryService, logger, fileSystem);
             }
 
             return false;
@@ -171,7 +181,8 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
 
         private static bool IsMultiDiscFolder(string path)
         {
-            return EntityResolutionHelper.IsMultiPartFolder(path);
+            return false;
+            //return EntityResolutionHelper.IsMultiPartFolder(path);
         }
 
         private static bool IsAdditionalSubfolderAllowed(FileSystemInfo directory)
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
index 19a284d15c..2417d5dcb8 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs
@@ -62,9 +62,11 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
 
             var collectionType = args.GetCollectionType();
 
+            var isMusicMediaFolder = string.Equals(collectionType, CollectionType.Music,
+                StringComparison.OrdinalIgnoreCase);
+
             // If there's a collection type and it's not music, it can't be a series
-            if (!string.IsNullOrEmpty(collectionType) &&
-                !string.Equals(collectionType, CollectionType.Music, StringComparison.OrdinalIgnoreCase))
+            if (!isMusicMediaFolder)
             {
                 return null;
             }
@@ -72,7 +74,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
             var directoryService = args.DirectoryService;
             
             // If we contain an album assume we are an artist folder
-            return args.FileSystemChildren.Where(i => (i.Attributes & FileAttributes.Directory) == FileAttributes.Directory).Any(i => MusicAlbumResolver.IsMusicAlbum(i.FullName, directoryService, _logger, _fileSystem)) ? new MusicArtist() : null;
+            return args.FileSystemChildren.Where(i => (i.Attributes & FileAttributes.Directory) == FileAttributes.Directory).Any(i => MusicAlbumResolver.IsMusicAlbum(i.FullName, isMusicMediaFolder, directoryService, _logger, _fileSystem)) ? new MusicArtist() : null;
         }
 
     }
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
index 519d775ded..a17c33845f 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
@@ -5,6 +5,7 @@ using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Resolvers;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Logging;
 using System;
 using System.IO;
 
@@ -16,10 +17,12 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
     public class SeriesResolver : FolderResolver<Series>
     {
         private readonly IFileSystem _fileSystem;
+        private readonly ILogger _logger;
 
-        public SeriesResolver(IFileSystem fileSystem)
+        public SeriesResolver(IFileSystem fileSystem, ILogger logger)
         {
             _fileSystem = fileSystem;
+            _logger = logger;
         }
 
         /// <summary>
@@ -64,19 +67,8 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
                 {
                     return null;
                 }
-                
-                // It's a Series if any of the following conditions are met:
-                // series.xml exists
-                // [tvdbid= is present in the path
-                // TVUtils.IsSeriesFolder returns true
-                var filename = Path.GetFileName(args.Path);
-
-                if (string.IsNullOrEmpty(filename))
-                {
-                    return null;
-                }
 
-                if (TVUtils.IsSeriesFolder(args.Path, collectionType == CollectionType.TvShows, args.FileSystemChildren, args.DirectoryService, _fileSystem))
+                if (TVUtils.IsSeriesFolder(args.Path, string.Equals(collectionType, CollectionType.TvShows, StringComparison.OrdinalIgnoreCase), args.FileSystemChildren, args.DirectoryService, _fileSystem, _logger))
                 {
                     return new Series();
                 }
diff --git a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
index 73afa22e38..b8cb955fc9 100644
--- a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
@@ -1,4 +1,7 @@
-using MediaBrowser.Common.IO;
+using System.IO;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.IO;
+using MediaBrowser.Controller;
 using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
@@ -16,6 +19,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Server.Implementations.Configuration;
 
 namespace MediaBrowser.Server.Implementations.Library
 {
@@ -28,8 +32,9 @@ namespace MediaBrowser.Server.Implementations.Library
 
         private readonly IChannelManager _channelManager;
         private readonly ILiveTvManager _liveTvManager;
+        private readonly IServerApplicationPaths _appPaths;
 
-        public UserViewManager(ILibraryManager libraryManager, ILocalizationManager localizationManager, IFileSystem fileSystem, IUserManager userManager, IChannelManager channelManager, ILiveTvManager liveTvManager)
+        public UserViewManager(ILibraryManager libraryManager, ILocalizationManager localizationManager, IFileSystem fileSystem, IUserManager userManager, IChannelManager channelManager, ILiveTvManager liveTvManager, IServerApplicationPaths appPaths)
         {
             _libraryManager = libraryManager;
             _localizationManager = localizationManager;
@@ -37,6 +42,7 @@ namespace MediaBrowser.Server.Implementations.Library
             _userManager = userManager;
             _channelManager = channelManager;
             _liveTvManager = liveTvManager;
+            _appPaths = appPaths;
         }
 
         public async Task<IEnumerable<Folder>> GetUserViews(UserViewQuery query, CancellationToken cancellationToken)
@@ -124,5 +130,37 @@ namespace MediaBrowser.Server.Implementations.Library
 
             return _libraryManager.GetNamedView(name, type, sortName, cancellationToken);
         }
+
+        public async Task<SpecialFolder> GetSpecialFolder(string name, SpecialFolderType type, string itemType, CancellationToken cancellationToken)
+        {
+            var path = Path.Combine(_appPaths.ItemsByNamePath,
+                "specialfolders",
+                _fileSystem.GetValidFilename(name));
+
+            var id = (path + "_specialfolder_" + name).GetMBId(typeof(SpecialFolder));
+
+            var item = _libraryManager.GetItemById(id) as SpecialFolder;
+
+            if (item == null)
+            {
+                Directory.CreateDirectory(Path.GetDirectoryName(path));
+
+                item = new SpecialFolder
+                {
+                    Path = path,
+                    Id = id,
+                    DateCreated = DateTime.UtcNow,
+                    Name = name,
+                    SpecialFolderType = type,
+                    ItemTypeName = itemType
+                };
+
+                await _libraryManager.CreateItem(item, cancellationToken).ConfigureAwait(false);
+
+                await item.RefreshMetadata(cancellationToken).ConfigureAwait(false);
+            }
+
+            return item;
+        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/LiveTv/CleanDatabaseScheduledTask.cs b/MediaBrowser.Server.Implementations/LiveTv/CleanDatabaseScheduledTask.cs
index 56e92f82c4..bed9458ecf 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/CleanDatabaseScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/CleanDatabaseScheduledTask.cs
@@ -41,7 +41,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
         {
             return new ITaskTrigger[] 
             { 
-                new IntervalTrigger{ Interval = TimeSpan.FromHours(24)}
+                new IntervalTrigger{ Interval = TimeSpan.FromHours(12)}
             };
         }
 
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
index 4c17357ff2..3a5b91abd9 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "Video: {0}",
     "LabelRemoteAccessUrl": "Remote access: {0}",
     "LabelRunningOnPort": "Running on port {0}.",
-    "LabelRunningOnPorts": "Running on ports {0} and {1}.",
     "HeaderLatestFromChannel": "Latest from {0}",
     "ButtonDownload": "Download",
     "LabelUnknownLanaguage": "Unknown language",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
index 083f026652..a3f636e629 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
@@ -1,5 +1,5 @@
 {
-    "SettingsSaved": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440 \u0441\u0430\u049b\u0442\u0430\u043b\u0434\u044b.",
+    "SettingsSaved": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043b\u0435\u0440 \u0441\u0430\u049b\u0442\u0430\u043b\u0434\u044b.",
     "AddUser": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u043d\u044b \u04af\u0441\u0442\u0435\u0443",
     "Users": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u043b\u0430\u0440",
     "Delete": "\u0416\u043e\u044e",
@@ -46,9 +46,9 @@
     "HeaderTaskTriggers": "\u0422\u0430\u043f\u0441\u044b\u0440\u043c\u0430 \u0442\u0440\u0438\u0433\u0433\u0435\u0440\u043b\u0435\u0440\u0456",
     "MessageDeleteTaskTrigger": "\u0428\u044b\u043d\u044b\u043c\u0435\u043d \u043e\u0441\u044b \u0442\u0430\u043f\u0441\u044b\u0440\u043c\u0430 \u0442\u0440\u0438\u0433\u0433\u0435\u0440\u0456\u043d \u0436\u043e\u044e \u049b\u0430\u0436\u0435\u0442 \u043f\u0435?",
     "MessageNoPluginsInstalled": "\u041e\u0440\u043d\u0430\u0442\u044b\u043b\u0493\u0430\u043d \u043f\u043b\u0430\u0433\u0438\u043d\u0434\u0435\u0440 \u0436\u043e\u049b.",
-    "LabelVersionInstalled": "{0} \u043d\u04b1\u0441\u049b\u0430\u0441\u044b \u043e\u0440\u043d\u0430\u0442\u044b\u043b\u0493\u0430\u043d",
+    "LabelVersionInstalled": "{0} \u043e\u0440\u043d\u0430\u0442\u044b\u043b\u0493\u0430\u043d",
     "LabelNumberReviews": "{0} \u043f\u0456\u043a\u0456\u0440",
-    "LabelFree": "\u0410\u049b\u044b\u0441\u044b\u0437",
+    "LabelFree": "\u0422\u0435\u0433\u0456\u043d",
     "HeaderSelectAudio": "\u0414\u044b\u0431\u044b\u0441 \u0442\u0430\u04a3\u0434\u0430\u0443",
     "HeaderSelectSubtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440 \u0442\u0430\u04a3\u0434\u0430\u0443",
     "LabelDefaultStream": "(\u04d8\u0434\u0435\u043f\u043a\u0456)",
@@ -289,7 +289,7 @@
     "ButtonRestart": "\u049a\u0430\u0439\u0442\u0430 \u0456\u0441\u043a\u0435 \u049b\u043e\u0441\u0443",
     "MessagePleaseRefreshPage": "\u0416\u0430\u04a3\u0430 \u0436\u0430\u04a3\u0430\u0440\u0442\u0443\u043b\u0430\u0440\u0434\u044b \u0430\u043b\u0443 \u04af\u0448\u0456\u043d \u043e\u0441\u044b \u0431\u0435\u0442\u0442\u0456 \u049b\u0430\u0439\u0442\u0430 \u0436\u04af\u043a\u0442\u0435\u04a3\u0456\u0437.",
     "ButtonHide": "\u0416\u0430\u0441\u044b\u0440\u0443",
-    "MessageSettingsSaved": "\u0422\u0435\u04a3\u0448\u0435\u043b\u0456\u043c \u0441\u0430\u049b\u0442\u0430\u043b\u0434\u044b.",
+    "MessageSettingsSaved": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043b\u0435\u0440 \u0441\u0430\u049b\u0442\u0430\u043b\u0434\u044b.",
     "ButtonSignOut": "\u0428\u044b\u0493\u0443",
     "ButtonMyProfile": "\u041c\u0435\u043d\u0456\u04a3 \u043f\u0440\u043e\u0444\u0430\u0439\u043b\u044b\u043c",
     "ButtonMyPreferences": "\u041c\u0435\u043d\u0456\u04a3 \u0442\u0435\u04a3\u0448\u0435\u043b\u0456\u043c\u0434\u0435\u0440\u0456\u043c",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
index 473d75cb51..50391496b3 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
@@ -314,7 +314,7 @@
     "ButtonSubtitles": "Legendas",
     "ButtonScenes": "Cenas",
     "ButtonQuality": "Quality",
-    "HeaderNotifications": "Notifications",
+    "HeaderNotifications": "Notifica\u00e7\u00f5es",
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Selecionar",
     "ButtonNew": "Novo",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
index 80bdc43f7c..2fd2d8ae98 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
@@ -46,8 +46,8 @@
     "HeaderTaskTriggers": "\u0422\u0440\u0438\u0433\u0433\u0435\u0440\u044b \u0437\u0430\u0434\u0430\u043d\u0438\u044f",
     "MessageDeleteTaskTrigger": "\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0434\u0430\u043d\u043d\u044b\u0439 \u0442\u0440\u0438\u0433\u0433\u0435\u0440 \u0437\u0430\u0434\u0430\u043d\u0438\u044f?",
     "MessageNoPluginsInstalled": "\u041d\u0435 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e \u043d\u0438 \u043e\u0434\u043d\u043e\u0433\u043e \u043f\u043b\u0430\u0433\u0438\u043d\u0430.",
-    "LabelVersionInstalled": "\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043d\u0430\u044f \u0432\u0435\u0440\u0441\u0438\u044f: {0}",
-    "LabelNumberReviews": "\u041e\u0442\u0437\u044b\u0432\u043e\u0432: {0}",
+    "LabelVersionInstalled": "\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0430: {0}",
+    "LabelNumberReviews": "\u041e\u0442\u0437\u044b\u0432\u044b: {0}",
     "LabelFree": "\u0411\u0435\u0441\u043f\u043b\u0430\u0442\u043d\u043e",
     "HeaderSelectAudio": "\u0412\u044b\u0431\u043e\u0440 \u0430\u0443\u0434\u0438\u043e",
     "HeaderSelectSubtitles": "\u0412\u044b\u0431\u043e\u0440 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043e\u0432",
@@ -232,7 +232,7 @@
     "OptionBlockChannelContent": "\u0421\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442-\u043a\u0430\u043d\u0430\u043b\u043e\u0432",
     "ButtonRevoke": "\u041e\u0442\u043e\u0437\u0432\u0430\u0442\u044c",
     "MessageConfirmRevokeApiKey": "\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043e\u0442\u043e\u0437\u0432\u0430\u0442\u044c \u0434\u0430\u043d\u043d\u044b\u0439 \u043a\u043b\u044e\u0447 API?  \u0421\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0435\u0435 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u043a Media Browser \u0431\u0443\u0434\u0435\u0442 \u0440\u0435\u0437\u043a\u043e \u043e\u0431\u043e\u0440\u0432\u0430\u043d\u043e.",
-    "HeaderConfirmRevokeApiKey": "\u041e\u0442\u0437\u044b\u0432 \u043a\u043b\u044e\u0447\u0430 API",
+    "HeaderConfirmRevokeApiKey": "\u041e\u0442\u0437\u044b\u0432\u0430\u043d\u0438\u0435 \u043a\u043b\u044e\u0447\u0430 API",
     "ValueContainer": "\u041a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440: {0}",
     "ValueAudioCodec": "\u0410\u0443\u0434\u0438\u043e \u043a\u043e\u0434\u0435\u043a: {0}",
     "ValueVideoCodec": "\u0412\u0438\u0434\u0435\u043e \u043a\u043e\u0434\u0435\u043a: {0}",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ar.json b/MediaBrowser.Server.Implementations/Localization/Server/ar.json
index 667245839a..056b31c924 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ar.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ar.json
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "These values control how Media Browser will present itself to the device.",
     "LabelMaxBitrate": "Max bitrate:",
     "LabelMaxBitrateHelp": "Specify a max bitrate in bandwidth constrained environments, or if the device imposes it's own limit.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -890,5 +894,11 @@
     "HeaderChapters": "Chapters",
     "HeaderResumeSettings": "Resume Settings",
     "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TitleUsers": "Users",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ca.json b/MediaBrowser.Server.Implementations/Localization/Server/ca.json
index bcca3aeb9c..ac4c13b014 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ca.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ca.json
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "These values control how Media Browser will present itself to the device.",
     "LabelMaxBitrate": "Max bitrate:",
     "LabelMaxBitrateHelp": "Specify a max bitrate in bandwidth constrained environments, or if the device imposes it's own limit.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -890,5 +894,11 @@
     "HeaderChapters": "Chapters",
     "HeaderResumeSettings": "Resume Settings",
     "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TitleUsers": "Users",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/cs.json b/MediaBrowser.Server.Implementations/Localization/Server/cs.json
index 71ca6fc498..f591af7350 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/cs.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/cs.json
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "These values control how Media Browser will present itself to the device.",
     "LabelMaxBitrate": "Max bitrate:",
     "LabelMaxBitrateHelp": "Specify a max bitrate in bandwidth constrained environments, or if the device imposes it's own limit.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -890,5 +894,11 @@
     "HeaderChapters": "Chapters",
     "HeaderResumeSettings": "Resume Settings",
     "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TitleUsers": "Users",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/da.json b/MediaBrowser.Server.Implementations/Localization/Server/da.json
index 7a5bd76322..e32fb18f8e 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/da.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/da.json
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "These values control how Media Browser will present itself to the device.",
     "LabelMaxBitrate": "Max bitrate:",
     "LabelMaxBitrateHelp": "Specify a max bitrate in bandwidth constrained environments, or if the device imposes it's own limit.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "System venligt navn",
@@ -890,5 +894,11 @@
     "HeaderChapters": "Chapters",
     "HeaderResumeSettings": "Resume Settings",
     "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TitleUsers": "Users",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/de.json b/MediaBrowser.Server.Implementations/Localization/Server/de.json
index ea1b4a1bc5..ef7b00c35b 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/de.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/de.json
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "These values control how Media Browser will present itself to the device.",
     "LabelMaxBitrate": "Maximale Bitrate:",
     "LabelMaxBitrateHelp": "Specify a max bitrate in bandwidth constrained environments, or if the device imposes it's own limit.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Freundlicher Name",
@@ -890,5 +894,11 @@
     "HeaderChapters": "Chapters",
     "HeaderResumeSettings": "Resume Settings",
     "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TitleUsers": "Users",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/el.json b/MediaBrowser.Server.Implementations/Localization/Server/el.json
index 2edf373264..eb0cd1b87a 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/el.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/el.json
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "These values control how Media Browser will present itself to the device.",
     "LabelMaxBitrate": "Max bitrate:",
     "LabelMaxBitrateHelp": "Specify a max bitrate in bandwidth constrained environments, or if the device imposes it's own limit.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -890,5 +894,11 @@
     "HeaderChapters": "Chapters",
     "HeaderResumeSettings": "Resume Settings",
     "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TitleUsers": "Users",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json b/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
index 7ff88733ae..43c9bd211f 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "These values control how Media Browser will present itself to the device.",
     "LabelMaxBitrate": "Max bitrate:",
     "LabelMaxBitrateHelp": "Specify a max bitrate in bandwidth constrained environments, or if the device imposes it's own limit.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -890,5 +894,11 @@
     "HeaderChapters": "Chapters",
     "HeaderResumeSettings": "Resume Settings",
     "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TitleUsers": "Users",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/en_US.json b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
index 930401e5cb..a0238b0201 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "These values control how Media Browser will present itself to the device.",
     "LabelMaxBitrate": "Max bitrate:",
     "LabelMaxBitrateHelp": "Specify a max bitrate in bandwidth constrained environments, or if the device imposes it's own limit.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -890,5 +894,11 @@
     "HeaderChapters": "Chapters",
     "HeaderResumeSettings": "Resume Settings",
     "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TitleUsers": "Users",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/es.json b/MediaBrowser.Server.Implementations/Localization/Server/es.json
index 94c6c9ec47..e4d0086317 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/es.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es.json
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "Estos valores controlan el modo en que Media Browser se presentar\u00e1 en el dispositivo.",
     "LabelMaxBitrate": "Bitrate m\u00e1ximo:",
     "LabelMaxBitrateHelp": "Especificar una tasa de bits m\u00e1xima en entornos de ancho de banda limitado, o si el dispositivo impone su propio l\u00edmite.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignorar las solicitudes de intervalo de bytes de transcodificaci\u00f3n",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "Si est\u00e1 activado, estas solicitudes ser\u00e1n atendidas pero ignorar\u00e1n el encabezado de intervalo de bytes.",
     "LabelFriendlyName": "Nombre amigable",
@@ -890,5 +894,11 @@
     "HeaderChapters": "Chapters",
     "HeaderResumeSettings": "Resume Settings",
     "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TitleUsers": "Users",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json b/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
index f1a323e6d1..d6e96d1ed7 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "Estos valores controlan la manera en que Media Browser se presentar\u00e1 a s\u00ed mismo ante el dispositivo.",
     "LabelMaxBitrate": "Tasa de bits m\u00e1xima:",
     "LabelMaxBitrateHelp": "Especifique la tasa de bits m\u00e1xima para ambientes con un ancho de banda limitado, o si el dispositivo impone sus propios l\u00edmites.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignorar solicitudes de transcodificaci\u00f3n de rango de byte.",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "Si se habilita, estas solicitudes seran honradas pero se ignorar\u00e1 el encabezado de rango de byte.",
     "LabelFriendlyName": "Nombre amistoso:",
@@ -888,5 +892,13 @@
     "ButtonSync": "Sincronizar",
     "TabScheduledTasks": "Tareas Programadas",
     "HeaderChapters": "Cap\u00edtulos",
-    "HeaderResumeSettings": "Configuraci\u00f3n para Continuar"
+    "HeaderResumeSettings": "Configuraci\u00f3n para Continuar",
+    "TabSync": "Sync",
+    "TitleUsers": "Users",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/fr.json b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
index 275cd20c33..4626f659bf 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/fr.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "Ces valeurs contr\u00f4lent comment Media Browser sera pr\u00e9sent\u00e9 \u00e0 l'appareil.",
     "LabelMaxBitrate": "D\u00e9bit maximum:",
     "LabelMaxBitrateHelp": "Sp\u00e9cifiez un d\u00e9bit maximum dans les environnements avec bande passante limit\u00e9e ou si l'appareil impose sa propre limite.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore le transcodage des demandes de plage d'octets",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "Si activ\u00e9, ces requ\u00eates\/demandes seront honor\u00e9es mais l'ent\u00eate de plage d'octets sera ignor\u00e9. ",
     "LabelFriendlyName": "Surnom d'affichage",
@@ -890,5 +894,11 @@
     "HeaderChapters": "Chapitres",
     "HeaderResumeSettings": "Reprendre les param\u00e8tres",
     "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TitleUsers": "Users",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/he.json b/MediaBrowser.Server.Implementations/Localization/Server/he.json
index 51a27549e7..a44b45ae0a 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/he.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/he.json
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "These values control how Media Browser will present itself to the device.",
     "LabelMaxBitrate": "Max bitrate:",
     "LabelMaxBitrateHelp": "Specify a max bitrate in bandwidth constrained environments, or if the device imposes it's own limit.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -890,5 +894,11 @@
     "HeaderChapters": "Chapters",
     "HeaderResumeSettings": "Resume Settings",
     "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TitleUsers": "Users",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/it.json b/MediaBrowser.Server.Implementations/Localization/Server/it.json
index dba80e2b4f..2101e854a1 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/it.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/it.json
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "Controllano questi valori come Media Browser si presenter\u00e0 al dispositivo.",
     "LabelMaxBitrate": "Max bitrate:",
     "LabelMaxBitrateHelp": "Specificare un bitrate massimo in ambienti larghezza di banda limitata, o se il dispositivo impone il suo limite proprio.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignorare le richieste di intervallo di byte di trascodifica",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "Se abilitata, queste richieste saranno onorati, ma ignorano l'intestazione intervallo di byte.",
     "LabelFriendlyName": "Nome Condiviso",
@@ -890,5 +894,11 @@
     "HeaderChapters": "Chapters",
     "HeaderResumeSettings": "Resume Settings",
     "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TitleUsers": "Users",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/kk.json b/MediaBrowser.Server.Implementations/Localization/Server/kk.json
index a3120ffe4b..aabaffb518 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/kk.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/kk.json
@@ -16,11 +16,11 @@
     "LabelYoureDone": "\u0411\u04d9\u0440\u0456 \u0434\u0430\u0439\u044b\u043d!",
     "WelcomeToMediaBrowser": "Media Browser-\u0433\u0435 \u049b\u043e\u0448 \u043a\u0435\u043b\u0434\u0456\u04a3\u0456\u0437!",
     "TitleMediaBrowser": "Media Browser",
-    "ThisWizardWillGuideYou": "\u0411\u04b1\u043b \u043a\u043e\u043c\u0435\u043a\u0448\u0456 \u0431\u0430\u0441\u0442\u0430\u043f\u049b\u044b \u043e\u0440\u043d\u0430\u0442\u0443 \u043f\u0440\u043e\u0446\u0435\u0441\u0456 \u0441\u0430\u0442\u044b\u043b\u0430\u0440\u044b\u043c\u0435\u043d \u04e9\u0442\u043a\u0456\u0437\u0435\u0434\u0456. \u0411\u0430\u0441\u0442\u0430\u0443 \u04af\u0448\u0456\u043d \u0442\u0456\u043b\u0434\u0456 \u0442\u0430\u04a3\u0434\u0430\u04a3\u044b\u0437.",
+    "ThisWizardWillGuideYou": "\u0411\u04b1\u043b \u043a\u043e\u043c\u0435\u043a\u0448\u0456 \u0431\u0430\u0441\u0442\u0430\u043f\u049b\u044b \u043e\u0440\u043d\u0430\u0442\u0443 \u043f\u0440\u043e\u0446\u0435\u0441\u0456 \u0441\u0430\u0442\u044b\u043b\u0430\u0440\u044b\u043c\u0435\u043d \u04e9\u0442\u043a\u0456\u0437\u0435\u0434\u0456. \u0411\u0430\u0441\u0442\u0430\u0443 \u04af\u0448\u0456\u043d \u04e9\u0437\u0456\u04a3\u0456\u0437\u0433\u0435 \u0442\u0456\u043b \u0442\u0435\u04a3\u0448\u0435\u043b\u0456\u043c\u0456\u043d \u0442\u0430\u04a3\u0434\u0430\u04a3\u044b\u0437.",
     "TellUsAboutYourself": "\u04e8\u0437\u0456\u04a3\u0456\u0437 \u0442\u0443\u0440\u0430\u043b\u044b \u0430\u0439\u0442\u044b\u04a3\u044b\u0437",
     "LabelYourFirstName": "\u0410\u0442\u044b\u04a3\u044b\u0437:",
     "MoreUsersCanBeAddedLater": "\u041a\u04e9\u0431\u0456\u0440\u0435\u043a \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u043b\u0430\u0440\u0434\u044b \u043a\u0435\u0439\u0456\u043d \u0411\u0430\u049b\u044b\u043b\u0430\u0443 \u0442\u0430\u049b\u0442\u0430\u0441\u044b \u0430\u0440\u049b\u044b\u043b\u044b \u04af\u0441\u0442\u0435\u0443\u0456\u04a3\u0456\u0437 \u043c\u04af\u043c\u043a\u0456\u043d.",
-    "UserProfilesIntro": "Media Browser \u0431\u0435\u043a\u0456\u0442\u0456\u043b\u0433\u0435\u043d \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b \u043f\u0440\u043e\u0444\u0438\u043b\u044c\u0434\u0435\u0440\u0456\u043d \u049b\u0430\u043c\u0442\u0438\u0434\u044b, \u04d9\u0440 \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u0493\u0430 \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0443, \u043e\u0439\u043d\u0430\u0442\u0443 \u043a\u04af\u0439\u0456 \u0436\u04d9\u043d\u0435 \u0436\u0430\u0441\u0442\u0430\u0441 \u0441\u0430\u043d\u0430\u0442\u044b\u043d \u0431\u0430\u0441\u049b\u0430\u0440\u0443 \u04af\u0448\u0456\u043d \u04e9\u0437 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043b\u0435\u0440\u0456 \u049b\u043e\u0441\u044b\u043b\u0430\u0434\u044b.",
+    "UserProfilesIntro": "Media Browser \u0431\u0435\u043a\u0456\u0442\u0456\u043b\u0433\u0435\u043d \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b \u043f\u0440\u043e\u0444\u0438\u043b\u044c\u0434\u0435\u0440\u0456\u043d \u049b\u0430\u043c\u0442\u0438\u0434\u044b, \u04d9\u0440 \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u0493\u0430 \u04e9\u0437\u0456\u043d\u0456\u04a3 \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0443 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043b\u0435\u0440\u0456, \u043e\u0439\u043d\u0430\u0442\u0443 \u043a\u04af\u0439\u0456 \u0436\u04d9\u043d\u0435 \u0436\u0430\u0441\u0442\u0430\u0441 \u0441\u0430\u043d\u0430\u0442\u044b \u049b\u043e\u0441\u044b\u043b\u0430\u0434\u044b.",
     "LabelWindowsService": "Windows \u049b\u044b\u0437\u043c\u0435\u0442\u0456",
     "AWindowsServiceHasBeenInstalled": "Windows \u049b\u044b\u0437\u043c\u0435\u0442\u0456 \u043e\u0440\u043d\u0430\u0442\u044b\u043b\u0434\u044b.",
     "WindowsServiceIntro1": "Media Browser Server \u0436\u04af\u0439\u0435\u043b\u0456\u043a \u0442\u0430\u049b\u0442\u0430\u0434\u0430\u0493\u044b \u0431\u0435\u043b\u0433\u0456\u0448\u0435\u0441\u0456 \u0431\u0430\u0440 \u0436\u04b1\u043c\u044b\u0441 \u04af\u0441\u0442\u0435\u043b\u0456\u043d\u0456\u04a3 \u049b\u043e\u043b\u0434\u0430\u043d\u0431\u0430\u0441\u044b \u0440\u0435\u0442\u0456\u043d\u0434\u0435 \u04d9\u0434\u0435\u043f\u043a\u0456 \u043e\u0440\u044b\u043d\u0434\u0430\u043b\u0430\u0434\u044b, \u0431\u0456\u0440\u0430\u049b \u0435\u0433\u0435\u0440 \u0431\u04b1\u043d\u044b \u04e9\u04a3\u0434\u0456\u043a \u049b\u044b\u0437\u043c\u0435\u0442\u0456 \u0440\u0435\u0442\u0456\u043d\u0434\u0435 \u0442\u0435\u04a3\u0448\u0435\u0443\u0434\u0456 \u049b\u0430\u043b\u0430\u0441\u0430\u04a3\u044b\u0437, \u043e\u0440\u043d\u044b\u043d\u0430 \u0431\u04b1\u043b Windows \u049b\u044b\u0437\u043c\u0435\u0442\u0442\u0435\u0440 \u0434\u0438\u0441\u043f\u0435\u0442\u0447\u0435\u0440\u0456 \u0430\u0440\u049b\u044b\u043b\u044b \u0456\u0441\u043a\u0435 \u049b\u043e\u0441\u044b\u043b\u0443\u044b \u043c\u04af\u043c\u043a\u0456\u043d.",
@@ -43,7 +43,7 @@
     "ReferToMediaLibraryWiki": "\u0422\u0430\u0441\u0443\u0448\u044b\u0445\u0430\u043d\u0430 \u0442\u0443\u0440\u0430\u043b\u044b \u0443\u0438\u043a\u0438 \u0456\u0448\u0456\u043d\u0435\u043d \u049b\u0430\u0440\u0430\u04a3\u044b\u0437.",
     "LabelCountry": "\u0415\u043b:",
     "LabelLanguage": "\u0422\u0456\u043b:",
-    "HeaderPreferredMetadataLanguage": "\u041c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a \u0442\u0456\u043b\u0456\u043d\u0456\u04a3 \u0442\u0435\u04a3\u0448\u0435\u043b\u0456\u043c\u0456:",
+    "HeaderPreferredMetadataLanguage": "\u041c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440 \u0442\u0456\u043b\u0456\u043d\u0456\u04a3 \u0442\u0435\u04a3\u0448\u0435\u043b\u0456\u043c\u0456:",
     "LabelSaveLocalMetadata": "\u0421\u0443\u0440\u0435\u0442\u0442\u0435\u043c\u0435 v\u0435\u043d \u043c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a\u0442\u0456 \u0442\u0430\u0441\u0443\u0448\u044b \u049b\u0430\u043b\u0442\u0430\u043b\u0430\u0440\u044b \u0456\u0448\u0456\u043d\u0434\u0435  \u0441\u0430\u049b\u0442\u0430\u0443",
     "LabelSaveLocalMetadataHelp": "\u0421\u0443\u0440\u0435\u0442\u0442\u0435\u043c\u0435 \u043c\u0435\u043d \u043c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a\u0442\u0456 \u0442\u0456\u043a\u0435\u043b\u0435\u0439 \u0442\u0430\u0441\u0443\u0448\u044b \u049b\u0430\u043b\u0442\u0430\u043b\u0430\u0440\u044b \u0456\u0448\u0456\u043d\u0434\u0435 \u0441\u0430\u049b\u0442\u0430\u043b\u0443\u044b \u043e\u043b\u0430\u0440\u0434\u044b \u0436\u0435\u04a3\u0456\u043b \u04e9\u04a3\u0434\u0435\u0439 \u0430\u043b\u0430\u0442\u044b\u043d \u043e\u0440\u044b\u043d\u0493\u0430 \u049b\u043e\u044f\u0434\u044b.",
     "LabelDownloadInternetMetadata": "\u0421\u0443\u0440\u0435\u0442\u0442\u0435\u043c\u0435 \u043c\u0435\u043d \u043c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a\u0442\u0456 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u0442\u0435\u043d \u0436\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u0443",
@@ -281,7 +281,7 @@
     "LabelAutomaticUpdatesTmdbHelp": "\u049a\u043e\u0441\u044b\u043b\u0493\u0430\u043d\u0434\u0430,  \u0436\u0430\u04a3\u0430 \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440 TheMovieDB.org \u0434\u0435\u0440\u0435\u049b\u043e\u0440\u044b\u043d\u0430 \u04af\u0441\u0442\u0435\u043b\u0433\u0435\u043d \u0431\u043e\u0439\u0434\u0430 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0442\u044b \u0442\u04af\u0440\u0434\u0435 \u0436\u04af\u043a\u0442\u0435\u043b\u0456\u043f \u0430\u043b\u044b\u043d\u0430\u0434\u044b. \u0411\u0430\u0440 \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440 \u0430\u0443\u044b\u0441\u0442\u044b\u0440\u044b\u043b\u043c\u0430\u0439\u0434\u044b.",
     "LabelAutomaticUpdatesTvdbHelp": "\u049a\u043e\u0441\u044b\u043b\u0493\u0430\u043d\u0434\u0430, \u0436\u0430\u04a3\u0430 \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440 TheTVDB.com \u0434\u0435\u0440\u0435\u049b\u043e\u0440\u044b\u043d\u0430 \u04af\u0441\u0442\u0435\u043b\u0433\u0435\u043d \u0431\u043e\u0439\u0434\u0430 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0442\u044b \u0442\u04af\u0440\u0434\u0435 \u0436\u04af\u043a\u0442\u0435\u043b\u0456\u043f \u0430\u043b\u044b\u043d\u0430\u0434\u044b. \u0411\u0430\u0440 \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440 \u0430\u0443\u044b\u0441\u0442\u044b\u0440\u044b\u043b\u043c\u0430\u0439\u0434\u044b.",
     "ExtractChapterImagesHelp": "\u0421\u0430\u0445\u043d\u0430 \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440\u0456\u043d \u0448\u044b\u0493\u0430\u0440\u044b\u043f \u0430\u043b\u0443 \u043a\u043b\u0438\u0435\u043d\u0442\u0442\u0435\u0440\u0433\u0435 \u0441\u0430\u0445\u043d\u0430 \u0431\u04e9\u043b\u0435\u043a\u0442\u0435\u0443\u0433\u0435 \u0430\u0440\u043d\u0430\u043b\u0493\u0430\u043d \u0441\u044b\u0437\u0431\u0430\u043b\u044b\u049b \u043c\u04d9\u0437\u0456\u0440\u043b\u0435\u0440\u0434\u0456 \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0443 \u04af\u0448\u0456\u043d \u0440\u04b1\u049b\u0441\u0430\u0442 \u0435\u0442\u0435\u0434\u0456. \u0411\u04b1\u043b \u043f\u0440\u043e\u0446\u0435\u0441 \u0431\u0430\u044f\u0443, \u043f\u0440\u043e\u0446\u0435\u0441\u0441\u043e\u0440\u0434\u044b \u0442\u043e\u0437\u0434\u044b\u0440\u0430\u0442\u044b\u043d \u0436\u04d9\u043d\u0435 \u0431\u0456\u0440\u0430\u0437 \u0433\u0438\u0433\u0430\u0431\u0430\u0439\u0442 \u043a\u0435\u04a3\u0456\u0441\u0442\u0456\u043a\u0442\u0456 \u049b\u0430\u0436\u0435\u0442 \u0435\u0442\u0435\u0442\u0456\u043d \u0431\u043e\u043b\u0443\u044b \u043c\u04af\u043c\u043a\u0456\u043d. \u041e\u043b \u0431\u0435\u0439\u043d\u0435\u0444\u0430\u0439\u043b\u0434\u0430\u0440\u044b \u0442\u0430\u0431\u044b\u043b\u0493\u0430\u043d\u0434\u0430, \u0436\u04d9\u043d\u0435 \u0442\u0430\u04a3\u0493\u044b 4:00 \u0441\u0430\u0493\u0430\u0442\u044b\u043d\u0430 \u0436\u043e\u0441\u043f\u0430\u0440\u043b\u0430\u0493\u0430\u043d \u0442\u0430\u043f\u0441\u044b\u0440\u043c\u0430 \u0440\u0435\u0442\u0456\u043d\u0434\u0435 \u0436\u04b1\u043c\u044b\u0441 \u0456\u0441\u0442\u0435\u0439\u0434\u0456. \u041e\u0440\u044b\u043d\u0434\u0430\u0443 \u043a\u0435\u0441\u0442\u0435\u0441\u0456 \u0416\u043e\u0441\u043f\u0430\u0440\u043b\u0430\u0443\u0448\u044b \u0430\u0439\u043c\u0430\u0493\u044b\u043d\u0434\u0430 \u0442\u0435\u04a3\u0448\u0435\u043b\u0435\u0434\u0456. \u0411\u04b1\u043b \u0442\u0430\u043f\u0441\u044b\u0440\u043c\u0430\u043d\u044b \u049b\u0430\u0440\u0431\u0430\u043b\u0430\u0441 \u0441\u0430\u0493\u0430\u0442\u0442\u0430\u0440\u044b\u043d\u0434\u0430 \u0436\u04b1\u043c\u044b\u0441 \u0456\u0441\u0442\u0435\u0442\u043a\u0456\u0437\u0443 \u04b1\u0441\u044b\u043d\u044b\u043b\u043c\u0430\u0439\u0434\u044b.",
-    "LabelMetadataDownloadLanguage": "\u041c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a \u0442\u0456\u043b\u0456\u043d\u0456\u04a3 \u0442\u0435\u04a3\u0448\u0435\u043b\u0456\u043c\u0456:",
+    "LabelMetadataDownloadLanguage": "\u0416\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u0443 \u0442\u0456\u043b\u0456\u043d\u0456\u04a3 \u0442\u0435\u04a3\u0448\u0435\u043b\u0456\u043c\u0456:",
     "ButtonAutoScroll": "\u0410\u0432\u0442\u043e\u0430\u0439\u043d\u0430\u043b\u0434\u044b\u0440\u0443",
     "LabelImageSavingConvention": "\u0421\u0443\u0440\u0435\u0442 \u0441\u0430\u049b\u0442\u0430\u0443 \u043a\u0435\u043b\u0456\u0441\u0456\u043c\u0456:",
     "LabelImageSavingConventionHelp": "Media Browser \u043a\u0435\u04a3 \u0442\u0430\u0440\u0430\u0493\u0430\u043d \u043c\u0443\u043b\u044c\u0442\u0438\u043c\u0435\u0434\u0438\u0430 \u049b\u043e\u043b\u0434\u0430\u043d\u0431\u0430\u043b\u0430\u0440\u044b\u043d\u0430\u043d \u0430\u043b\u044b\u043d\u0493\u0430\u043d \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440\u0434\u0456 \u0442\u0430\u043d\u0438\u0434\u044b. \u0421\u043e\u043d\u044b\u043c\u0435\u043d \u049b\u0430\u0442\u0430\u0440 \u0431\u0430\u0441\u049b\u0430 \u04e9\u043d\u0456\u043c\u0434\u0435\u0440 \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0434\u0430 \u0431\u043e\u043b\u0441\u0430, \u0436\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u0443 \u043a\u0435\u043b\u0456\u0441\u0456\u043c\u0456\u043d \u0442\u0430\u04a3\u0434\u0430\u0443 \u043f\u0430\u0439\u0434\u0430\u043b\u044b.",
@@ -676,7 +676,7 @@
     "TabResponses": "\u04ae\u043d \u049b\u0430\u0442\u0443\u043b\u0430\u0440",
     "HeaderProfileInformation": "\u041f\u0440\u043e\u0444\u0430\u0439\u043b \u0430\u049b\u043f\u0430\u0440\u0430\u0442\u044b",
     "LabelEmbedAlbumArtDidl": "Didl \u0456\u0448\u0456\u043d\u0435 \u0430\u043b\u044c\u0431\u043e\u043c \u0441\u0443\u0440\u0435\u0442\u0456\u043d \u0435\u043d\u0434\u0456\u0440\u0443",
-    "LabelEmbedAlbumArtDidlHelp": "\u041a\u0435\u0439\u0431\u0456\u0440 \u0436\u0430\u0431\u0434\u044b\u049b\u0442\u0430\u0440\u0493\u0430 \u0430\u043b\u044c\u0431\u043e\u043c \u0441\u0443\u0440\u0435\u0442\u0456\u043d \u0430\u043b\u0443 \u04af\u0448\u0456\u043d \u043e\u0441\u044b \u04d9\u0434\u0456\u0441 \u049b\u0430\u0436\u0435\u0442. \u0411\u0430\u0441\u049b\u0430\u043b\u0430\u0440 \u0430\u0440\u049b\u044b\u043b\u044b, \u043e\u0441\u044b \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440 \u049b\u043e\u0441\u044b\u043b\u0493\u0430\u043d\u0434\u0430, \u043e\u0439\u043d\u0430\u0442\u0443 \u0441\u04d9\u0442\u0441\u0456\u0437 \u0431\u043e\u043b\u0443\u044b \u043c\u04af\u043c\u043a\u0456\u043d.",
+    "LabelEmbedAlbumArtDidlHelp": "\u041a\u0435\u0439\u0431\u0456\u0440 \u0436\u0430\u0431\u0434\u044b\u049b\u0442\u0430\u0440\u0493\u0430 \u0430\u043b\u044c\u0431\u043e\u043c \u0441\u0443\u0440\u0435\u0442\u0456\u043d \u0430\u043b\u0443 \u04af\u0448\u0456\u043d \u043e\u0441\u044b \u04d9\u0434\u0456\u0441 \u049b\u0430\u0436\u0435\u0442. \u0411\u0430\u0441\u049b\u0430\u043b\u0430\u0440 \u04af\u0448\u0456\u043d, \u043e\u0441\u044b \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440 \u049b\u043e\u0441\u044b\u043b\u0493\u0430\u043d\u0434\u0430, \u043e\u0439\u043d\u0430\u0442\u0443 \u0441\u04d9\u0442\u0441\u0456\u0437 \u0431\u043e\u043b\u0443\u044b \u043c\u04af\u043c\u043a\u0456\u043d.",
     "LabelAlbumArtPN": "\u0410\u043b\u044c\u0431\u043e\u043c \u0441\u0443\u0440\u0435\u0442\u0456 PN:",
     "LabelAlbumArtHelp": "PN \u0430\u043b\u044c\u0431\u043e\u043c \u0441\u0443\u0440\u0435\u0442\u0456 \u04af\u0448\u0456\u043d upnp:albumArtURI \u0456\u0448\u0456\u043d\u0434\u0435\u0433\u0456 dlna:profileID \u0442\u04e9\u043b\u0441\u0438\u043f\u0430\u0442\u044b\u043c\u0435\u043d \u0431\u0456\u0440\u0433\u0435 \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u044b\u043b\u0430\u0434\u044b. \u041a\u0435\u0439\u0431\u0456\u0440 \u043a\u043b\u0438\u0435\u043d\u0442\u0442\u0435\u0440 \u04af\u0448\u0456\u043d \u0441\u0443\u0440\u0435\u0442\u0442\u0456\u04a3 \u04e9\u043b\u0448\u0435\u043c\u0456\u043d\u0435 \u0430\u04a3\u0493\u0430\u0440\u0443\u0441\u044b\u0437 \u043d\u0430\u049b\u0442\u044b \u043c\u04d9\u043d \u049b\u0430\u0436\u0435\u0442.",
     "LabelAlbumArtMaxWidth": "\u0410\u043b\u044c\u0431\u043e\u043c \u0441\u0443\u0440\u0435\u0442\u0456\u043d\u0456\u04a3 \u0435\u04a3 \u0436\u043e\u0493\u0430\u0440\u044b \u0435\u043d\u0456:",
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "\u0411\u04b1\u043b \u043c\u04d9\u043d\u0434\u0435\u0440 Media Browser \u049b\u0430\u043b\u0430\u0439 \u04e9\u0437\u0456\u043d \u0436\u0430\u0431\u0434\u044b\u049b\u0442\u0430 \u043a\u04e9\u0440\u0441\u0435\u0442\u0435\u0442\u0456\u043d\u0456\u04a3 \u0431\u0430\u0441\u049b\u0430\u0440\u0430\u0434\u044b.",
     "LabelMaxBitrate": "\u0415\u04a3 \u0436\u043e\u0493\u0430\u0440\u044b \u049b\u0430\u0440\u049b\u044b\u043d:",
     "LabelMaxBitrateHelp": "\u04e8\u0442\u043a\u0456\u0437\u0443 \u043c\u04af\u043c\u043a\u0456\u043d\u0434\u0456\u0433\u0456 \u0448\u0435\u043a\u0442\u0435\u043b\u0433\u0435\u043d \u043e\u0440\u0442\u0430\u043b\u0430\u0440\u0434\u0430\u0493\u044b \u0435\u04a3 \u0436\u043e\u0493\u0430\u0440\u044b \u049b\u0430\u0440\u049b\u044b\u043d\u0434\u044b \u0430\u043d\u044b\u049b\u0442\u0430\u04a3\u044b\u0437.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "\u049a\u0430\u0439\u0442\u0430 \u043a\u043e\u0434\u0442\u0430\u0443 \u0431\u0430\u0439\u0442 \u0430\u0443\u049b\u044b\u043c\u044b \u0441\u04b1\u0440\u0430\u043d\u044b\u0441\u0442\u0430\u0440\u044b\u043d \u0435\u043b\u0435\u043c\u0435\u0443",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "\u049a\u043e\u0441\u044b\u043b\u0493\u0430\u043d\u0434\u0430, \u043e\u0441\u044b \u0441\u04b1\u0440\u0430\u043d\u044b\u0441\u0442\u0430\u0440\u043c\u0435\u043d \u0441\u0430\u043d\u0430\u0441\u0443 \u0431\u043e\u043b\u0430\u0434\u044b, \u0431\u0456\u0440\u0430\u049b \u0431\u0430\u0439\u0442 \u0430\u0443\u049b\u044b\u043c\u044b\u043d\u044b\u04a3 \u0431\u0430\u0441 \u0434\u0435\u0440\u0435\u043a\u0442\u0435\u043c\u0435\u0441\u0456 \u0435\u043b\u0435\u043f \u0435\u0441\u043a\u0435\u0440\u0456\u043b\u043c\u0435\u0439\u0434\u0456.",
     "LabelFriendlyName": "\u0422\u04af\u0441\u0456\u043d\u0456\u043a\u0442\u0456 \u0430\u0442\u044b",
@@ -885,10 +889,16 @@
     "TabUsers": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u043b\u0430\u0440",
     "HeaderFeatures": "\u041c\u04d9\u043b\u0456\u043c\u0435\u0442\u0442\u0435\u0440",
     "HeaderAdvanced": "\u049a\u043e\u0441\u044b\u043c\u0448\u0430",
-    "ButtonSync": "\u0421\u0438\u043d\u0445\u0440\u043e\u043d\u0434\u0430\u0443",
+    "ButtonSync": "\u0421\u0438\u043d\u0445\u0440\u043e",
     "TabScheduledTasks": "\u0416\u043e\u0441\u043f\u0430\u0440\u043b\u0430\u0443\u0448\u044b",
     "HeaderChapters": "\u0421\u0430\u0445\u043d\u0430\u043b\u0430\u0440",
     "HeaderResumeSettings": "\u0416\u0430\u043b\u0493\u0430\u0441\u0442\u044b\u0440\u0443 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043b\u0435\u0440\u0456",
-    "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TabSync": "\u0421\u0438\u043d\u0445\u0440\u043e\u043d\u0434\u0430\u0443",
+    "TitleUsers": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u043b\u0430\u0440",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ko.json b/MediaBrowser.Server.Implementations/Localization/Server/ko.json
index c558cbe8dc..19b5c8b1d8 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ko.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ko.json
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "These values control how Media Browser will present itself to the device.",
     "LabelMaxBitrate": "Max bitrate:",
     "LabelMaxBitrateHelp": "Specify a max bitrate in bandwidth constrained environments, or if the device imposes it's own limit.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -890,5 +894,11 @@
     "HeaderChapters": "Chapters",
     "HeaderResumeSettings": "Resume Settings",
     "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TitleUsers": "Users",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ms.json b/MediaBrowser.Server.Implementations/Localization/Server/ms.json
index 134ff44d8e..6cfd966a48 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ms.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ms.json
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "These values control how Media Browser will present itself to the device.",
     "LabelMaxBitrate": "Max bitrate:",
     "LabelMaxBitrateHelp": "Specify a max bitrate in bandwidth constrained environments, or if the device imposes it's own limit.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -890,5 +894,11 @@
     "HeaderChapters": "Chapters",
     "HeaderResumeSettings": "Resume Settings",
     "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TitleUsers": "Users",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/nb.json b/MediaBrowser.Server.Implementations/Localization/Server/nb.json
index 165bf3f66d..733c92f7b6 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/nb.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/nb.json
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "These values control how Media Browser will present itself to the device.",
     "LabelMaxBitrate": "Max bitrate:",
     "LabelMaxBitrateHelp": "Specify a max bitrate in bandwidth constrained environments, or if the device imposes it's own limit.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -890,5 +894,11 @@
     "HeaderChapters": "Chapters",
     "HeaderResumeSettings": "Resume Settings",
     "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TitleUsers": "Users",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/nl.json b/MediaBrowser.Server.Implementations/Localization/Server/nl.json
index 5862688a60..bb014d6c13 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/nl.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/nl.json
@@ -65,12 +65,12 @@
     "LabelSubtitleLanguagePreference": "Voorkeurs taal ondertiteling:",
     "OptionDefaultSubtitles": "Standaard",
     "OptionOnlyForcedSubtitles": "Alleen 'geforceerde' ondertiteling",
-    "OptionAlwaysPlaySubtitles": "Altijd ondertiteling weergeven",
+    "OptionAlwaysPlaySubtitles": "Ondertiteling altijd weergeven",
     "OptionNoSubtitles": "Geen ondertitels",
-    "OptionDefaultSubtitlesHelp": "Ondertiteling wordt weergegeven in de voorkeurstaal als de audio in een buitenlandse taal is.",
-    "OptionOnlyForcedSubtitlesHelp": "Alleen ondertiteling die als 'forced' gemarkeerd zijn worden geladen.",
+    "OptionDefaultSubtitlesHelp": "Ondertiteling wordt weergegeven in de voorkeurstaal als de audio in een andere taal is.",
+    "OptionOnlyForcedSubtitlesHelp": "Alleen ondertitels gemarkeerd als \"gedwongen\" zullen worden geladen.",
     "OptionAlwaysPlaySubtitlesHelp": "Ondertiteling wordt weergegeveen in de voorkeurstaal ongeacht de taal van de audio.",
-    "OptionNoSubtitlesHelp": "Ondertiteling wordt niet standaard weergegeven.",
+    "OptionNoSubtitlesHelp": "Ondertiteling wordt standaard niet weergegeven.",
     "TabProfiles": "Profielen",
     "TabSecurity": "Beveiliging",
     "ButtonAddUser": "Gebruiker toevoegen",
@@ -136,7 +136,7 @@
     "OptionAlbumArtist": "Albumartiest",
     "OptionArtist": "Artiest",
     "OptionAlbum": "Album",
-    "OptionTrackName": "Track Naam",
+    "OptionTrackName": "Naam van Nummer",
     "OptionCommunityRating": "Gemeenschaps Waardering",
     "OptionNameSort": "Naam",
     "OptionFolderSort": "Mappen",
@@ -237,7 +237,7 @@
     "ButtonGroupVersions": "Groepeer Versies",
     "ButtonAddToCollection": "Toevoegen aan verzameling",
     "PismoMessage": "Pismo File Mount (met een geschonken licentie).",
-    "TangibleSoftwareMessage": "Tangible Solution Java\/C# converters worden onder een gedoneerde licentie gebruikt.",
+    "TangibleSoftwareMessage": "Gebruik makend van concrete oplossingen als Java \/ C converters door een geschonken licentie.",
     "HeaderCredits": "Credits",
     "PleaseSupportOtherProduces": "Steun A.U.B. ook de andere gratis producten die wij gebruiken:",
     "VersionNumber": "Versie {0}",
@@ -296,7 +296,7 @@
     "PasswordLocalhostMessage": "Wachtwoorden zijn niet vereist bij het aanmelden van localhost.",
     "TabGuide": "Gids",
     "TabChannels": "Kanalen",
-    "TabCollections": "Verzameling",
+    "TabCollections": "Verzamelingen",
     "HeaderChannels": "Kanalen",
     "TabRecordings": "Opnamen",
     "TabScheduled": "Gepland",
@@ -613,7 +613,7 @@
     "ButtonArrowRight": "Rechts",
     "ButtonBack": "Terug",
     "ButtonInfo": "Info",
-    "ButtonOsd": "On Screen Display",
+    "ButtonOsd": "Weergave op het scherm",
     "ButtonPageUp": "Page Up",
     "ButtonPageDown": "Page Down",
     "PageAbbreviation": "PG",
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "Deze waarden bepalen hoe Media Browser zichzelf zal presenteren aan het apparaat.",
     "LabelMaxBitrate": "Max. bitrate:",
     "LabelMaxBitrateHelp": "Geef een max. bitrate in bandbreedte beperkte omgevingen, of als het apparaat zijn eigen limiet heeft.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Transcodeer byte range-aanvragen negeren",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "Indien ingeschakeld, zal deze verzoeken worden gehonoreerd, maar zal de byte bereik header worden genegerd.",
     "LabelFriendlyName": "Aangepaste naam",
@@ -745,14 +749,14 @@
     "LabelDisplayPluginsFor": "Toon Plug-ins voor:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Naam aflevering",
-    "LabelSeriesName": "Naam serie",
-    "ValueSeriesNamePeriod": "Naam.Serie",
-    "ValueSeriesNameUnderscore": "Naam_Serie",
-    "ValueEpisodeNamePeriod": "Naam.Aflevering",
-    "ValueEpisodeNameUnderscore": "Naam_Aflevering",
+    "LabelEpisodeName": "Aflevering naam",
+    "LabelSeriesName": "Serie naam",
+    "ValueSeriesNamePeriod": "Serie.Naam",
+    "ValueSeriesNameUnderscore": "Serie_naam",
+    "ValueEpisodeNamePeriod": "Aflevering.naam",
+    "ValueEpisodeNameUnderscore": "Aflevering_naam",
     "HeaderTypeText": "Voer tekst in",
-    "LabelTypeText": "tekst",
+    "LabelTypeText": "Tekst",
     "HeaderSearchForSubtitles": "Zoeken naar Ondertitels",
     "MessageNoSubtitleSearchResultsFound": "Geen zoekresultaten gevonden.",
     "TabDisplay": "Weergave",
@@ -800,7 +804,7 @@
     "LabelEnableChannelContentDownloadingFor": "Schakel kanaalinhoud downloaden in voor:",
     "LabelEnableChannelContentDownloadingForHelp": "Sommige kanalen ondersteunen downloaden en later kijken. Schakel deze optie in als er weinig bandbreedte beschikbaar is. Inhoud zal dan tijdens de kanaal download taak uitgevoerd worden.",
     "LabelChannelDownloadPath": "Kanaal inhoud download pad:",
-    "LabelChannelDownloadPathHelp": "Geef een eigen download pad op als dit gewenst is, leeglaten voor dowloaden naar de interne program data map.",
+    "LabelChannelDownloadPathHelp": "Geef een eigen download pad op als dit gewenst is, leeglaten voor dowloaden naar de interne programa data map.",
     "LabelChannelDownloadAge": "Verwijder inhoud na: (dagen)",
     "LabelChannelDownloadAgeHelp": "Gedownloade inhoud die ouder is zal worden verwijderd. Afspelen via internet streaming blijft mogelijk.",
     "ChannelSettingsFormHelp": "Installeer kanalen zoals Trailers en Vimeo in de Plug-in catalogus.",
@@ -836,7 +840,7 @@
     "LabelGroupChannelsIntoViews": "Toon de volgende kanalen binnen mijn overzichten:",
     "LabelGroupChannelsIntoViewsHelp": "Indien ingeschakeld, zullen deze kanalen direct naast andere overzichten worden weergegeven. Indien uitgeschakeld, zullen ze worden weergegeven in een aparte kanalen overzicht.",
     "LabelDisplayCollectionsView": "Toon Collecties in Mijn Overzichten om film collecties te tonen",
-    "LabelXbmcMetadataEnableExtraThumbs": "Kopieer extrafanart naar extrathunms",
+    "LabelXbmcMetadataEnableExtraThumbs": "Kopieer extrafanart naar extrathumbs",
     "LabelXbmcMetadataEnableExtraThumbsHelp": "Als er afbeeldingen gedownload worden kunnen deze in extrafanart en extrathumbs worden opgeslagen voor maximale compatibiliteit met XBMC skins",
     "TabServices": "Meta Diensten",
     "TabLogs": "Logboeken",
@@ -890,5 +894,11 @@
     "HeaderChapters": "Hoofdstukken",
     "HeaderResumeSettings": "Instellingen voor Hervatten",
     "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TitleUsers": "Gebruikers",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pl.json b/MediaBrowser.Server.Implementations/Localization/Server/pl.json
index 135b640f28..8e07ffe222 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pl.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pl.json
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "These values control how Media Browser will present itself to the device.",
     "LabelMaxBitrate": "Max bitrate:",
     "LabelMaxBitrateHelp": "Specify a max bitrate in bandwidth constrained environments, or if the device imposes it's own limit.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -890,5 +894,11 @@
     "HeaderChapters": "Chapters",
     "HeaderResumeSettings": "Resume Settings",
     "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TitleUsers": "Users",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json b/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
index 55d76aa8b6..dec101dfd3 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "Estes valores controlam como o Media Browser ser\u00e1 exibido no dispositivo.",
     "LabelMaxBitrate": "Taxa de bits m\u00e1xima:",
     "LabelMaxBitrateHelp": "Especifique uma taxa de bits m\u00e1xima para ambientes com restri\u00e7\u00e3o de tamanho de banda, ou se o dispositivo  imp\u00f5e esse limite.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignorar requisi\u00e7\u00f5es de extens\u00e3o do byte de transcodifica\u00e7\u00e3o",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "Se ativadas, estas requisi\u00e7\u00f5es ser\u00e3o honradas mas ir\u00e3o ignorar o cabe\u00e7alho da extens\u00e3o do byte.",
     "LabelFriendlyName": "Nome amig\u00e1vel",
@@ -767,10 +771,10 @@
     "OptionAuto": "Auto",
     "OptionYes": "Sim",
     "OptionNo": "N\u00e3o",
-    "LabelHomePageSection1": "Se\u00e7\u00e3o um da tela de in\u00edcio:",
-    "LabelHomePageSection2": "Se\u00e7\u00e3o dois da tela de in\u00edcio:",
-    "LabelHomePageSection3": "Se\u00e7\u00e3o tr\u00eas da tela de in\u00edcio:",
-    "LabelHomePageSection4": "Se\u00e7\u00e3o quatro da tela de in\u00edcio",
+    "LabelHomePageSection1": "Tela de in\u00edcio se\u00e7\u00e3o 1:",
+    "LabelHomePageSection2": "Tela de in\u00edcio se\u00e7\u00e3o 2:",
+    "LabelHomePageSection3": "Tela de in\u00edcio se\u00e7\u00e3o 3:",
+    "LabelHomePageSection4": "Tela de in\u00edcio se\u00e7\u00e3o 4:",
     "OptionMyViewsButtons": "Minhas visualiza\u00e7\u00f5es (bot\u00f5es)",
     "OptionMyViews": "Minhas visualiza\u00e7\u00f5es",
     "OptionMyViewsSmall": "Minhas visualiza\u00e7\u00f5es (pequeno)",
@@ -889,6 +893,12 @@
     "TabScheduledTasks": "Tarefas Agendadas",
     "HeaderChapters": "Cap\u00edtulos",
     "HeaderResumeSettings": "Ajustes para Retomar",
-    "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TabSync": "Sincroniza\u00e7\u00e3o",
+    "TitleUsers": "Usu\u00e1rios",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
index 966365f7c0..01e446591b 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
@@ -190,7 +190,7 @@
     "HeaderStatus": "Estado",
     "OptionContinuing": "A Continuar",
     "OptionEnded": "Terminado",
-    "HeaderAirDays": "Dias de Exibi\u00e7\u00e3o:",
+    "HeaderAirDays": "Dias de Exibi\u00e7\u00e3o",
     "OptionSunday": "Domingo",
     "OptionMonday": "Segunda",
     "OptionTuesday": "Ter\u00e7a",
@@ -198,8 +198,8 @@
     "OptionThursday": "Quinta",
     "OptionFriday": "Sexta",
     "OptionSaturday": "S\u00e1bado",
-    "HeaderManagement": "Gest\u00e3o:",
-    "LabelManagement": "Management:",
+    "HeaderManagement": "Gest\u00e3o",
+    "LabelManagement": "Administra\u00e7\u00e3o:",
     "OptionMissingImdbId": "Id do IMDb em falta",
     "OptionMissingTvdbId": "iD do TheTVDB em falta",
     "OptionMissingOverview": "Descri\u00e7\u00e3o em falta",
@@ -257,11 +257,11 @@
     "ButtonSelectDirectory": "Selecione a diretoria",
     "LabelCustomPaths": "Defina localiza\u00e7\u00f5es personalizadas. Deixe os campos em branco para usar os valores padr\u00e3o.",
     "LabelCachePath": "Localiza\u00e7\u00e3o da cache:",
-    "LabelCachePathHelp": "Esta pasta cont\u00e9m ficheiros de cacha do servidor, como por exemplo, imagens.",
+    "LabelCachePathHelp": "Defina uma localiza\u00e7\u00e3o para ficheiros de cache do servidor, como por exemplo, imagens.",
     "LabelImagesByNamePath": "Localiza\u00e7\u00e3o das imagens por nome:",
-    "LabelImagesByNamePathHelp": "Esta pasta cont\u00e9m imagens de atores, artistas, g\u00e9neros e est\u00fadios.",
+    "LabelImagesByNamePathHelp": "Defina uma localiza\u00e7\u00e3o para imagens de atores, artistas, g\u00e9neros e est\u00fadios.",
     "LabelMetadataPath": "Localiza\u00e7\u00e3o dos metadados:",
-    "LabelMetadataPathHelp": "Esta localiza\u00e7\u00e3o cont\u00e9m imagens e metadados transferidos que n\u00e3o foram configurados para serem armazenados nas pastas multim\u00e9dia.",
+    "LabelMetadataPathHelp": "Defina uma localiza\u00e7\u00e3o para imagens e metadados transferidos que n\u00e3o foram configurados para serem armazenados nas pastas multim\u00e9dia.",
     "LabelTranscodingTempPath": "Localiza\u00e7\u00e3o tempor\u00e1ria das transcodifica\u00e7\u00f5es:",
     "LabelTranscodingTempPathHelp": "Esta pasta cont\u00e9m ficheiros de trabalho usados pelo transcodificador.",
     "TabBasics": "B\u00e1sico",
@@ -630,7 +630,7 @@
     "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Cenas",
     "ButtonSubtitles": "Legendas",
-    "ButtonAudioTracks": "Audio tracks",
+    "ButtonAudioTracks": "Faixas de \u00e1udio",
     "ButtonPreviousTrack": "Previous track",
     "ButtonNextTrack": "Next track",
     "ButtonStop": "Parar",
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "Estes valores controlam como o Media Browser ser\u00e1 exibido no dispositivo.",
     "LabelMaxBitrate": "Taxa de bits m\u00e1xima:",
     "LabelMaxBitrateHelp": "Specify a max bitrate in bandwidth constrained environments, or if the device imposes it's own limit.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Nome amig\u00e1vel",
@@ -871,24 +875,30 @@
     "HeaderNewApiKeyHelp": "Grant an application permission to communicate with Media Browser.",
     "HeaderHttpHeaders": "Http Headers",
     "HeaderIdentificationHeader": "Identification Header",
-    "LabelValue": "Value:",
+    "LabelValue": "Valor:",
     "LabelMatchType": "Match type:",
-    "OptionEquals": "Equals",
+    "OptionEquals": "Iguais",
     "OptionRegex": "Regex",
     "OptionSubstring": "Substring",
     "TabView": "View",
-    "TabSort": "Sort",
-    "TabFilter": "Filter",
-    "ButtonView": "View",
+    "TabSort": "Ordenar",
+    "TabFilter": "Filtro",
+    "ButtonView": "Visualizar",
     "LabelPageSize": "Item limit:",
-    "LabelView": "View:",
+    "LabelView": "Visualizar:",
     "TabUsers": "Users",
     "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced",
-    "ButtonSync": "Sync",
+    "HeaderAdvanced": "Avan\u00e7ado",
+    "ButtonSync": "Sincronizar",
     "TabScheduledTasks": "Scheduled Tasks",
-    "HeaderChapters": "Chapters",
+    "HeaderChapters": "Cap\u00edtulos",
     "HeaderResumeSettings": "Resume Settings",
     "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TitleUsers": "Users",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ru.json b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
index c5ea589e86..aa6dd94f31 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ru.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
@@ -47,7 +47,7 @@
     "LabelSaveLocalMetadata": "\u0421\u043e\u0445\u0440\u0430\u043d\u044f\u0442\u044c \u0438\u043b\u043b\u044e\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u0438 \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0435 \u0432\u043d\u0443\u0442\u0440\u0438 \u043c\u0435\u0434\u0438\u0430\u043f\u0430\u043f\u043e\u043a",
     "LabelSaveLocalMetadataHelp": "\u0418\u043b\u043b\u044e\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u0438 \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0435 \u0431\u0443\u0434\u0443\u0442 \u0445\u0440\u0430\u043d\u0438\u0442\u044c\u0441\u044f \u043d\u0435\u043f\u043e\u0441\u0440\u0435\u0434\u0441\u0442\u0432\u0435\u043d\u043d\u043e \u0432\u043d\u0443\u0442\u0440\u0438 \u043c\u0435\u0434\u0438\u0430\u043f\u0430\u043f\u043e\u043a, \u043f\u0440\u0438 \u0442\u0430\u043a\u043e\u043c \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0438 \u0438\u0445 \u043c\u043e\u0436\u043d\u043e \u043b\u0435\u0433\u043a\u043e \u043f\u0440\u0430\u0432\u0438\u0442\u044c.",
     "LabelDownloadInternetMetadata": "\u0417\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044c \u0438\u043b\u043b\u044e\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u0438 \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0435 \u0438\u0437 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u0430",
-    "LabelDownloadInternetMetadataHelp": "\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e \u043d\u043e\u0441\u0438\u0442\u0435\u043b\u0435 \u043c\u043e\u0436\u0435\u0442 \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044c\u0441\u044f Media Browser, \u0447\u0442\u043e\u0431\u044b \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u044b\u0435 \u0441\u043f\u043e\u0441\u043e\u0431\u044b \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0434\u0430\u043d\u043d\u044b\u0445.",
+    "LabelDownloadInternetMetadataHelp": "\u0414\u043b\u044f \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u044b\u0445 \u0441\u043f\u043e\u0441\u043e\u0431\u043e\u0432 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f, \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u0430 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0441\u0432\u0435\u0434\u0435\u043d\u0438\u0439 \u043e \u043d\u043e\u0441\u0438\u0442\u0435\u043b\u0435 \u0432 Media Browser.",
     "TabPreferences": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438",
     "TabPassword": "\u041f\u0430\u0440\u043e\u043b\u044c",
     "TabLibraryAccess": "\u0414\u043e\u0441\u0442\u0443\u043f \u043a \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0435",
@@ -337,7 +337,7 @@
     "OptionAutomatic": "\u0410\u0432\u0442\u043e",
     "LiveTvPluginRequired": "\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u043f\u043b\u0430\u0433\u0438\u043d-\u043f\u043e\u0441\u0442\u0430\u0432\u0449\u0438\u043a \u0443\u0441\u043b\u0443\u0433 \u044d\u0444\u0438\u0440\u043d\u043e\u0433\u043e \u0422\u0412 \u0434\u043b\u044f \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0435\u043d\u0438\u044f.",
     "LiveTvPluginRequiredHelp": "\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u0435 \u043e\u0434\u0438\u043d \u0438\u0437 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0445 \u043f\u043b\u0430\u0433\u0438\u043d\u043e\u0432, \u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, NextPVR \u0438\u043b\u0438 ServerWMC.",
-    "LabelCustomizeOptionsPerMediaType": "\u041f\u043e\u0434\u0433\u043e\u043d\u043a\u0430 \u043f\u043e \u0442\u0438\u043f\u0443 \u043d\u043e\u0441\u0438\u0442\u0435\u043b\u044f:",
+    "LabelCustomizeOptionsPerMediaType": "\u041f\u043e\u0434\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043f\u043e \u0442\u0438\u043f\u0443 \u043d\u043e\u0441\u0438\u0442\u0435\u043b\u044f:",
     "OptionDownloadThumbImage": "\u0411\u0435\u0433\u0443\u043d\u043e\u043a",
     "OptionDownloadMenuImage": "\u041c\u0435\u043d\u044e",
     "OptionDownloadLogoImage": "\u041b\u043e\u0433\u043e\u0442\u0438\u043f",
@@ -590,7 +590,7 @@
     "NotificationOptionInstallationFailed": "\u0421\u0431\u043e\u0439 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438",
     "NotificationOptionNewLibraryContent": "\u041d\u043e\u0432\u043e\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e",
     "NotificationOptionNewLibraryContentMultiple": "\u041d\u043e\u0432\u043e\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e (\u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e)",
-    "SendNotificationHelp": "\u041f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f \u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u044e\u0442\u0441\u044f \u0432 \u044f\u0449\u0438\u043a \u0432\u0445\u043e\u0434\u044f\u0449\u0438\u0445 \u0418\u043d\u0444\u043e\u043f\u0430\u043d\u0435\u043b\u0438. \u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0438\u0442\u0435 \u043a\u0430\u0442\u0430\u043b\u043e\u0433 \u043f\u043b\u0430\u0433\u0438\u043d\u043e\u0432, \u0447\u0442\u043e\u0431\u044b \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u0441\u0440\u0435\u0434\u0441\u0442\u0432\u0430 \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0439.",
+    "SendNotificationHelp": "\u041f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e, \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f \u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u044e\u0442\u0441\u044f \u0432 \u044f\u0449\u0438\u043a \u0432\u0445\u043e\u0434\u044f\u0449\u0438\u0445 \u0432 \u0418\u043d\u0444\u043e\u043f\u0430\u043d\u0435\u043b\u0438. \u041f\u0435\u0440\u0435\u0439\u0434\u0438\u0442\u0435 \u0432 \u043a\u0430\u0442\u0430\u043b\u043e\u0433 \u043f\u043b\u0430\u0433\u0438\u043d\u043e\u0432, \u0447\u0442\u043e\u0431\u044b \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0439.",
     "NotificationOptionServerRestartRequired": "\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u043f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0430",
     "LabelNotificationEnabled": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0434\u0430\u043d\u043d\u043e\u0435 \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435",
     "LabelMonitorUsers": "\u041e\u0442\u0441\u043b\u0435\u0436\u0438\u0432\u0430\u043d\u0438\u0435 \u0434\u0435\u044f\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u0438 \u043e\u0442:",
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "\u042d\u0442\u0438 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f \u0443\u043f\u0440\u0430\u0432\u043b\u044f\u044e\u0442, \u043a\u0430\u043a Media Browser \u0431\u0443\u0434\u0435\u0442 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u044f\u0442\u044c\u0441\u044f \u043d\u0430 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0435.",
     "LabelMaxBitrate": "\u041c\u0430\u043a\u0441. \u043f\u043e\u0442\u043e\u043a\u043e\u0432\u0430\u044f \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c:",
     "LabelMaxBitrateHelp": "\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u0443\u044e \u043f\u043e\u0442\u043e\u043a\u043e\u0432\u0443\u044e \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c \u0432 \u0441\u0440\u0435\u0434\u0430\u0445 \u0441 \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u043d\u043e\u0439 \u043f\u0440\u043e\u043f\u0443\u0441\u043a\u043d\u043e\u0439 \u0441\u043f\u043e\u0441\u043e\u0431\u043d\u043e\u0441\u0442\u044c\u044e, \u043b\u0438\u0431\u043e \u0435\u0441\u043b\u0438 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043d\u0430\u043a\u043b\u0430\u0434\u044b\u0432\u0430\u0435\u0442 \u0441\u0432\u043e\u0451 \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u0435 \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u0435.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0437\u0430\u043f\u0440\u043e\u0441\u044b \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d\u0430 \u0431\u0430\u0439\u0442\u043e\u0432 \u043f\u0435\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u043e\u0432\u043a\u0438",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "\u041f\u0440\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438, \u044d\u0442\u0438 \u0437\u0430\u043f\u0440\u043e\u0441\u044b \u0431\u0443\u0434\u0443\u0442 \u0443\u0447\u0442\u0435\u043d\u044b, \u043d\u043e \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d\u0430 \u0431\u0430\u0439\u0442\u043e\u0432 \u0431\u0443\u0434\u0435\u0442 \u043f\u0440\u043e\u0438\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u043d.",
     "LabelFriendlyName": "\u041f\u043e\u043d\u044f\u0442\u043d\u043e\u0435 \u0438\u043c\u044f",
@@ -705,7 +709,7 @@
     "HeaderIdentificationCriteriaHelp": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435, \u043f\u043e \u043a\u0440\u0430\u0439\u043d\u0435\u0439 \u043c\u0435\u0440\u0435, \u043e\u0434\u0438\u043d \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u043e\u043d\u043d\u044b\u0439 \u043a\u0440\u0438\u0442\u0435\u0440\u0438\u0439.",
     "HeaderDirectPlayProfileHelp": "\u0414\u043e\u0431\u0430\u0432\u044c\u0442\u0435 \u043f\u0440\u043e\u0444\u0438\u043b\u0438 \u043f\u0440\u044f\u043c\u043e\u0433\u043e \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f, \u0447\u0442\u043e\u0431\u044b \u0443\u043a\u0430\u0437\u0430\u0442\u044c, \u043a\u0430\u043a\u0438\u0435 \u0444\u043e\u0440\u043c\u0430\u0442\u044b \u043c\u043e\u0433\u0443\u0442 \u043e\u0431\u0440\u0430\u0431\u0430\u0442\u044b\u0432\u0430\u0442\u044c\u0441\u044f \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e\u043c \u0438\u0437\u043d\u0430\u0447\u0430\u043b\u044c\u043d\u043e.",
     "HeaderTranscodingProfileHelp": "\u0414\u043e\u0431\u0430\u0432\u044c\u0442\u0435 \u043f\u0440\u043e\u0444\u0438\u043b\u0438 \u043f\u0435\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u043e\u0432\u043a\u0438, \u0447\u0442\u043e\u0431\u044b \u0443\u043a\u0430\u0437\u0430\u0442\u044c, \u043a\u0430\u043a\u0438\u0435 \u0444\u043e\u0440\u043c\u0430\u0442\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f, \u043a\u043e\u0433\u0434\u0430 \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u043f\u0435\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u043e\u0432\u043a\u0430.",
-    "HeaderResponseProfileHelp": "\u041f\u0440\u043e\u0444\u0438\u043b\u0438 \u043e\u0442\u043a\u043b\u0438\u043a\u043e\u0432 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u044e\u0442 \u0441\u043f\u043e\u0441\u043e\u0431 \u043f\u043e\u0434\u043e\u0433\u043d\u0430\u0442\u044c \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e, \u043f\u043e\u0441\u044b\u043b\u0430\u0435\u043c\u0443\u044e \u043d\u0430 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u0440\u0438 \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u0438 \u043d\u0435\u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u0432\u0438\u0434\u043e\u0432 \u043d\u043e\u0441\u0438\u0442\u0435\u043b\u0435\u0439.",
+    "HeaderResponseProfileHelp": "\u041f\u0440\u043e\u0444\u0438\u043b\u0438 \u043e\u0442\u043a\u043b\u0438\u043a\u043e\u0432 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u044e\u0442 \u0441\u043f\u043e\u0441\u043e\u0431 \u0434\u043b\u044f \u043f\u043e\u0434\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438, \u043f\u043e\u0441\u044b\u043b\u0430\u0435\u043c\u043e\u0439 \u043d\u0430 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u0440\u0438 \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u0438 \u043d\u0435\u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u0432\u0438\u0434\u043e\u0432 \u043d\u043e\u0441\u0438\u0442\u0435\u043b\u0435\u0439.",
     "LabelXDlnaCap": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 X-Dlna:",
     "LabelXDlnaCapHelp": "\u041e\u043f\u0440\u0435\u0434\u0435\u043b\u044f\u0435\u0442 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430 X_DLNACAP \u0432 \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u0435 \u0438\u043c\u0451\u043d urn:schemas-dlna-org:device-1-0",
     "LabelXDlnaDoc": "\u0421\u0445\u0435\u043c\u0430 X-Dlna:",
@@ -792,7 +796,7 @@
     "MessageNoCollectionsAvailable": "\u041a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u0438 \u043f\u043e\u0437\u0432\u043e\u043b\u044f\u044e\u0442 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u043d\u0430\u0441\u0442\u0440\u0430\u0438\u0432\u0430\u0435\u043c\u044b\u043c \u0433\u0440\u0443\u043f\u043f\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435\u043c \u0438\u0437 \u0444\u0438\u043b\u044c\u043c\u043e\u0432, \u0441\u0435\u0440\u0438\u0430\u043b\u043e\u0432, \u0430\u043b\u044c\u0431\u043e\u043c\u043e\u0432 \u0438 \u0438\u0433\u0440. \u041d\u0430\u0436\u043c\u0438\u0442\u0435 \u043a\u043d\u043e\u043f\u043a\u0443 \"\u0421\u043e\u0437\u0434\u0430\u0442\u044c\", \u0447\u0442\u043e\u0431\u044b \u043d\u0430\u0447\u0430\u0442\u044c \u043d\u043e\u0432\u0443\u044e \u043a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u044e.",
     "HeaderWelcomeToMediaBrowserWebClient": "\u0412\u0435\u0431-\u043a\u043b\u0438\u0435\u043d\u0442 Media Browser \u043f\u0440\u0438\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u0432\u0430\u0441!",
     "ButtonDismiss": "\u0421\u043a\u0440\u044b\u0442\u044c",
-    "MessageLearnHowToCustomize": "\u0418\u0437\u0443\u0447\u0438\u0442\u0435, \u043a\u0430\u043a \u043f\u043e\u0434\u043e\u0433\u043d\u0430\u0442\u044c \u0434\u0430\u043d\u043d\u0443\u044e \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443 \u043f\u043e \u0441\u0432\u043e\u0435\u043c\u0443 \u0432\u043a\u0443\u0441\u0443. \u041d\u0430\u0436\u043c\u0438\u0442\u0435 \u0430\u0432\u0430\u0442\u0430\u0440\u0443 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0432 \u043f\u0440\u0430\u0432\u043e\u043c \u0432\u0435\u0440\u0445\u043d\u0435\u043c \u0443\u0433\u043b\u0443 \u044d\u043a\u0440\u0430\u043d\u0430, \u0447\u0442\u043e\u0431\u044b \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0438 \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0441\u0432\u043e\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438.",
+    "MessageLearnHowToCustomize": "\u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c, \u043a\u0430\u043a \u043f\u043e\u0434\u0441\u0442\u0440\u0430\u0438\u0432\u0430\u0442\u044c \u0434\u0430\u043d\u043d\u0443\u044e \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443 \u043f\u043e \u0441\u0432\u043e\u0435\u043c\u0443 \u043b\u0438\u0447\u043d\u043e\u043c\u0443 \u0432\u043a\u0443\u0441\u0443. \u041d\u0430\u0436\u043c\u0438\u0442\u0435 \u0430\u0432\u0430\u0442\u0430\u0440\u0443 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0432 \u043f\u0440\u0430\u0432\u043e\u043c \u0432\u0435\u0440\u0445\u043d\u0435\u043c \u0443\u0433\u043b\u0443 \u044d\u043a\u0440\u0430\u043d\u0430, \u0447\u0442\u043e\u0431\u044b \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0438 \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0441\u0432\u043e\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438.",
     "ButtonEditOtherUserPreferences": "\u041f\u0440\u0430\u0432\u0438\u0442\u044c \u043b\u0438\u0447\u043d\u044b\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u044d\u0442\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f.",
     "LabelChannelStreamQuality": "\u041a\u0430\u0447\u0435\u0441\u0442\u0432\u043e \u043f\u043e\u0442\u043e\u043a\u043e\u0432\u043e\u0439 \u043f\u0435\u0440\u0435\u0434\u0430\u0447\u0438 \u0447\u0435\u0440\u0435\u0437 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442:",
     "LabelChannelStreamQualityHelp": "\u0412 \u0441\u0440\u0435\u0434\u0435 \u0441 \u043d\u0438\u0437\u043a\u043e\u0439 \u043f\u0440\u043e\u043f\u0443\u0441\u043a\u043d\u043e\u0439 \u0441\u043f\u043e\u0441\u043e\u0431\u043d\u043e\u0441\u0442\u044c\u044e, \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u0435 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u0430 \u043c\u043e\u0436\u0435\u0442 \u043f\u043e\u043c\u043e\u0447\u044c \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0438\u0442\u044c \u0432\u043f\u0435\u0447\u0430\u0442\u043b\u0435\u043d\u0438\u0435 \u0431\u043e\u043b\u0435\u0435 \u043f\u043b\u0430\u0432\u043d\u043e\u0433\u043e \u043f\u043e\u0442\u043e\u043a\u043e\u0432\u043e\u0433\u043e \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f.",
@@ -842,7 +846,7 @@
     "TabLogs": "\u0416\u0443\u0440\u043d\u0430\u043b\u044b",
     "HeaderServerLogFiles": "\u0424\u0430\u0439\u043b\u044b \u0436\u0443\u0440\u043d\u0430\u043b\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0430:",
     "TabBranding": "\u0411\u0440\u0435\u043d\u0434\u0438\u043d\u0433",
-    "HeaderBrandingHelp": "\u041f\u043e\u0434\u0433\u043e\u043d\u043a\u0430 \u0432\u043d\u0435\u0448\u043d\u0435\u0433\u043e \u0432\u0438\u0434\u0430 Media Browser \u0432 \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0438 \u0441 \u043f\u043e\u0442\u0440\u0435\u0431\u043d\u043e\u0441\u0442\u044f\u043c\u0438 \u0432\u0430\u0448\u0435\u0439 \u0433\u0440\u0443\u043f\u043f\u044b \u0438\u043b\u0438 \u043e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u0438.",
+    "HeaderBrandingHelp": "\u041f\u043e\u0434\u0441\u0442\u0440\u043e\u0439\u0442\u0435 \u0432\u043d\u0435\u0448\u043d\u0438\u0439 \u0432\u0438\u0434 Media Browser \u0432 \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0438 \u0441 \u043f\u043e\u0442\u0440\u0435\u0431\u043d\u043e\u0441\u0442\u044f\u043c\u0438 \u0432\u0430\u0448\u0435\u0439 \u0433\u0440\u0443\u043f\u043f\u044b \u0438\u043b\u0438 \u043e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u0438.",
     "LabelLoginDisclaimer": "\u041e\u0433\u043e\u0432\u043e\u0440\u043a\u0430 \u043d\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0435 \u0432\u0445\u043e\u0434\u0430:",
     "LabelLoginDisclaimerHelp": "\u042d\u0442\u043e \u0431\u0443\u0434\u0435\u0442 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c\u0441\u044f \u0432 \u043d\u0438\u0436\u043d\u0435\u0439 \u0447\u0430\u0441\u0442\u0438 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b \u0432\u0445\u043e\u0434\u0430 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0443.",
     "LabelAutomaticallyDonate": "\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438 \u0436\u0435\u0440\u0442\u0432\u043e\u0432\u0430\u0442\u044c \u0434\u0430\u043d\u043d\u0443\u044e \u0441\u0443\u043c\u043c\u0443 \u043a\u0430\u0436\u0434\u044b\u0435 \u0448\u0435\u0441\u0442\u044c \u043c\u0435\u0441\u044f\u0446\u0435\u0432",
@@ -858,7 +862,7 @@
     "HeaderLatestMusic": "\u041d\u043e\u0432\u0438\u043d\u043a\u0438 \u043c\u0443\u0437\u044b\u043a\u0438",
     "HeaderBranding": "\u0411\u0440\u0435\u043d\u0434\u0438\u043d\u0433",
     "HeaderApiKeys": "\u041a\u043b\u044e\u0447\u0438 API",
-    "HeaderApiKeysHelp": "\u0412\u043d\u0435\u0448\u043d\u0438\u043c \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f\u043c \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u043a\u043b\u044e\u0447 API, \u0434\u043b\u044f \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f \u043a Media Browser. \u041a\u043b\u044e\u0447\u0438 \u0432\u044b\u0434\u0430\u044e\u0442\u0441\u044f \u043f\u0440\u0438 \u0432\u0445\u043e\u0434\u0435 \u0441 \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u044c\u044e Media Browser, \u0438\u043b\u0438 \u043a\u043b\u044e\u0447 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044e \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0432\u0440\u0443\u0447\u043d\u0443\u044e.",
+    "HeaderApiKeysHelp": "\u0412\u043d\u0435\u0448\u043d\u0438\u043c \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f\u043c \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u043a\u043b\u044e\u0447 API, \u0434\u043b\u044f \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f \u043a Media Browser. \u041a\u043b\u044e\u0447\u0438 \u0432\u044b\u0434\u0430\u044e\u0442\u0441\u044f \u043f\u0440\u0438 \u0432\u0445\u043e\u0434\u0435 \u0441 \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u044c\u044e Media Browser, \u0438\u043b\u0438 \u043a\u043b\u044e\u0447 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044e \u0432\u0440\u0443\u0447\u043d\u0443\u044e.",
     "HeaderApiKey": "\u041a\u043b\u044e\u0447 API",
     "HeaderApp": "\u041f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435",
     "HeaderDevice": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e",
@@ -889,6 +893,12 @@
     "TabScheduledTasks": "\u041f\u043b\u0430\u043d\u0438\u0440\u043e\u0432\u0449\u0438\u043a",
     "HeaderChapters": "\u0421\u0446\u0435\u043d\u044b",
     "HeaderResumeSettings": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0432\u043e\u0437\u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f",
-    "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TabSync": "\u0421\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u044f",
+    "TitleUsers": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/sv.json b/MediaBrowser.Server.Implementations/Localization/Server/sv.json
index c6c0426408..5e76f85c91 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/sv.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/sv.json
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "Dessa v\u00e4rden styr hur Media Browser presenterar sig f\u00f6r enheten.",
     "LabelMaxBitrate": "H\u00f6gsta bithastighet:",
     "LabelMaxBitrateHelp": "Ange en h\u00f6gsta bithastighet i bandbreddsbegr\u00e4nsade milj\u00f6er, eller i fall d\u00e4r enheten har sina egna begr\u00e4nsningar.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignorera beg\u00e4ran om \"byte range\" vid omkodning",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "Om aktiverad kommer beg\u00e4ran att uppfyllas, men \"byte range\"-rubriken ignoreras.",
     "LabelFriendlyName": "\u00d6nskat namn",
@@ -890,5 +894,11 @@
     "HeaderChapters": "Chapters",
     "HeaderResumeSettings": "Resume Settings",
     "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TitleUsers": "Users",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/vi.json b/MediaBrowser.Server.Implementations/Localization/Server/vi.json
index 17748ecc7f..4ddd7a7d12 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/vi.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/vi.json
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "These values control how Media Browser will present itself to the device.",
     "LabelMaxBitrate": "Max bitrate:",
     "LabelMaxBitrateHelp": "Specify a max bitrate in bandwidth constrained environments, or if the device imposes it's own limit.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -890,5 +894,11 @@
     "HeaderChapters": "Chapters",
     "HeaderResumeSettings": "Resume Settings",
     "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TitleUsers": "Users",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json b/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
index 352a031e1b..d79d48099b 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
@@ -691,6 +691,10 @@
     "HeaderProfileServerSettingsHelp": "These values control how Media Browser will present itself to the device.",
     "LabelMaxBitrate": "Max bitrate:",
     "LabelMaxBitrateHelp": "Specify a max bitrate in bandwidth constrained environments, or if the device imposes it's own limit.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -890,5 +894,11 @@
     "HeaderChapters": "Chapters",
     "HeaderResumeSettings": "Resume Settings",
     "TabSync": "Sync",
-    "TitleUsers": "Users"
+    "TitleUsers": "Users",
+    "LabelProtocol": "Protocol:",
+    "OptionProtocolHttp": "Http",
+    "OptionProtocolHls": "Http Live Streaming",
+    "LabelContext": "Context:",
+    "OptionContextStreaming": "Streaming",
+    "OptionContextStatic": "Sync"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs b/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
index a65184f615..3d0781e914 100644
--- a/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
+++ b/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
@@ -61,15 +61,6 @@ namespace MediaBrowser.Server.Implementations.ServerManager
         /// <value>The configuration manager.</value>
         private IServerConfigurationManager ConfigurationManager { get; set; }
 
-        /// <summary>
-        /// Gets the web socket port number.
-        /// </summary>
-        /// <value>The web socket port number.</value>
-        public int WebSocketPortNumber
-        {
-            get { return ConfigurationManager.Configuration.HttpServerPortNumber; }
-        }
-
         /// <summary>
         /// Gets the web socket listeners.
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/Session/WebSocketController.cs b/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
index e1d77c2682..2d5a30f3d4 100644
--- a/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
+++ b/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
@@ -234,6 +234,8 @@ namespace MediaBrowser.Server.Implementations.Session
 
         private Task SendMessage<T>(WebSocketMessage<T> message, CancellationToken cancellationToken)
         {
+            if (SkipSending()) return Task.FromResult(true);
+
             var socket = GetActiveSocket();
 
             return socket.SendAsync(message, cancellationToken);
@@ -241,6 +243,8 @@ namespace MediaBrowser.Server.Implementations.Session
 
         private Task SendMessages<T>(WebSocketMessage<T> message, CancellationToken cancellationToken)
         {
+            if (SkipSending()) return Task.FromResult(true);
+
             var tasks = GetActiveSockets().Select(i => Task.Run(async () =>
             {
                 try
@@ -257,6 +261,27 @@ namespace MediaBrowser.Server.Implementations.Session
             return Task.WhenAll(tasks);
         }
 
+        private bool SkipSending()
+        {
+            if (Session != null)
+            {
+                if (string.Equals(Session.Client, "mb-classic", StringComparison.OrdinalIgnoreCase))
+                {
+                    Version version;
+
+                    if (!string.IsNullOrWhiteSpace(Session.ApplicationVersion) && Version.TryParse(Session.ApplicationVersion, out version))
+                    {
+                        if (version < new Version(3, 0, 196))
+                        {
+                            _logger.Debug("Skipping web socket message to MBC version {0}.", version);
+                            return true;
+                        }
+                    }
+                }
+            }
+            return false;
+        }
+
         public void Dispose()
         {
             foreach (var socket in Sockets.ToList())
diff --git a/MediaBrowser.Server.Implementations/Udp/UdpServer.cs b/MediaBrowser.Server.Implementations/Udp/UdpServer.cs
index f78f983dce..e4626bec6c 100644
--- a/MediaBrowser.Server.Implementations/Udp/UdpServer.cs
+++ b/MediaBrowser.Server.Implementations/Udp/UdpServer.cs
@@ -54,13 +54,14 @@ namespace MediaBrowser.Server.Implementations.Udp
         /// <param name="serverConfigurationManager">The server configuration manager.</param>
         /// <param name="httpServer">The HTTP server.</param>
         /// <param name="appHost">The application host.</param>
-        public UdpServer(ILogger logger, INetworkManager networkManager, IServerConfigurationManager serverConfigurationManager, IHttpServer httpServer, IServerApplicationHost appHost)
+        public UdpServer(ILogger logger, INetworkManager networkManager, IServerConfigurationManager serverConfigurationManager, IHttpServer httpServer, IServerApplicationHost appHost, IJsonSerializer json)
         {
             _logger = logger;
             _networkManager = networkManager;
             _serverConfigurationManager = serverConfigurationManager;
             _httpServer = httpServer;
             _appHost = appHost;
+            _json = json;
 
             AddMessageResponder("who is MediaBrowserServer?", RespondToV1Message);
             AddMessageResponder("who is MediaBrowserServer_v2?", RespondToV2Message);
@@ -77,13 +78,20 @@ namespace MediaBrowser.Server.Implementations.Udp
         /// Raises the <see cref="E:MessageReceived" /> event.
         /// </summary>
         /// <param name="e">The <see cref="UdpMessageReceivedEventArgs"/> instance containing the event data.</param>
-        private async void OnMessageReceived(UdpMessageReceivedEventArgs e)
+        private void OnMessageReceived(UdpMessageReceivedEventArgs e)
         {
             var responder = _responders.FirstOrDefault(i => i.Item1.SequenceEqual(e.Bytes));
 
             if (responder != null)
             {
-                responder.Item2(e.RemoteEndPoint);
+                try
+                {
+                    responder.Item2(e.RemoteEndPoint);
+                }
+                catch (Exception ex)
+                {
+                    _logger.ErrorException("Error in OnMessageReceived", ex);
+                }
             }
         }
 
diff --git a/MediaBrowser.Server.Mono/Native/ServerAuthorization.cs b/MediaBrowser.Server.Mono/Native/ServerAuthorization.cs
index 6f43a12c09..bd456c88bf 100644
--- a/MediaBrowser.Server.Mono/Native/ServerAuthorization.cs
+++ b/MediaBrowser.Server.Mono/Native/ServerAuthorization.cs
@@ -18,7 +18,7 @@ namespace MediaBrowser.ServerApplication.Native
         /// <param name="webSocketPort">The web socket port.</param>
         /// <param name="udpPort">The UDP port.</param>
         /// <param name="tempDirectory">The temp directory.</param>
-        public static void AuthorizeServer(int httpServerPort, string httpServerUrlPrefix, int webSocketPort, int udpPort, string tempDirectory)
+        public static void AuthorizeServer(int httpServerPort, string httpServerUrlPrefix, int udpPort, string tempDirectory)
         {
 
         }
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 5c3c3e9077..e584a950cd 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -533,8 +533,8 @@ namespace MediaBrowser.ServerApplication
             AuthenticationRepository = await GetAuthenticationRepository().ConfigureAwait(false);
             RegisterSingleInstance(AuthenticationRepository);
 
-            SyncRepository = await GetSyncRepository().ConfigureAwait(false);
-            RegisterSingleInstance(SyncRepository);
+            //SyncRepository = await GetSyncRepository().ConfigureAwait(false);
+            //RegisterSingleInstance(SyncRepository);
 
             UserManager = new UserManager(LogManager.GetLogger("UserManager"), ServerConfigurationManager, UserRepository, XmlSerializer);
             RegisterSingleInstance(UserManager);
@@ -598,9 +598,6 @@ namespace MediaBrowser.ServerApplication
             var dlnaManager = new DlnaManager(XmlSerializer, FileSystemManager, ApplicationPaths, LogManager.GetLogger("Dlna"), JsonSerializer);
             RegisterSingleInstance<IDlnaManager>(dlnaManager);
 
-            var contentDirectory = new ContentDirectory(dlnaManager, UserDataManager, ImageProcessor, LibraryManager, ServerConfigurationManager, UserManager, LogManager.GetLogger("UpnpContentDirectory"), HttpClient);
-            RegisterSingleInstance<IContentDirectory>(contentDirectory);
-
             var connectionManager = new ConnectionManager(dlnaManager, ServerConfigurationManager, LogManager.GetLogger("UpnpConnectionManager"), HttpClient);
             RegisterSingleInstance<IConnectionManager>(connectionManager);
 
@@ -610,9 +607,12 @@ namespace MediaBrowser.ServerApplication
             LiveTvManager = new LiveTvManager(ServerConfigurationManager, FileSystemManager, Logger, ItemRepository, ImageProcessor, UserDataManager, DtoService, UserManager, LibraryManager, TaskManager, LocalizationManager);
             RegisterSingleInstance(LiveTvManager);
 
-            UserViewManager = new UserViewManager(LibraryManager, LocalizationManager, FileSystemManager, UserManager, ChannelManager, LiveTvManager);
+            UserViewManager = new UserViewManager(LibraryManager, LocalizationManager, FileSystemManager, UserManager, ChannelManager, LiveTvManager, ApplicationPaths);
             RegisterSingleInstance(UserViewManager);
 
+            var contentDirectory = new ContentDirectory(dlnaManager, UserDataManager, ImageProcessor, LibraryManager, ServerConfigurationManager, UserManager, LogManager.GetLogger("UpnpContentDirectory"), HttpClient, UserViewManager, ChannelManager);
+            RegisterSingleInstance<IContentDirectory>(contentDirectory);
+
             NotificationManager = new NotificationManager(LogManager, UserManager, ServerConfigurationManager);
             RegisterSingleInstance(NotificationManager);
 
@@ -1024,7 +1024,7 @@ namespace MediaBrowser.ServerApplication
                 HasPendingRestart = HasPendingRestart,
                 Version = ApplicationVersion.ToString(),
                 IsNetworkDeployed = CanSelfUpdate,
-                WebSocketPortNumber = ServerManager.WebSocketPortNumber,
+                WebSocketPortNumber = HttpServerPort,
                 SupportsNativeWebSocket = true,
                 FailedPluginAssemblies = FailedAssemblies.ToList(),
                 InProgressInstallations = InstallationManager.CurrentInstallations.Select(i => i.Item1).ToList(),
diff --git a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs
index eb73966ce4..97a3ee190b 100644
--- a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs
+++ b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs
@@ -35,7 +35,7 @@ namespace MediaBrowser.ServerApplication.FFMpeg
                     switch (arg)
                     {
                         case "Version":
-                            return "20140721";
+                            return "20140612";
                         case "FFMpegFilename":
                             return "ffmpeg.exe";
                         case "FFProbeFilename":
@@ -113,8 +113,8 @@ namespace MediaBrowser.ServerApplication.FFMpeg
                 case PlatformID.Win32NT:
                     return new[]
                     {
-                        "http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-20140721-git-ce385c8-win32-static.7z",
-                        "https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/ffmpeg/windows/ffmpeg-20140721-git-ce385c8-win32-static.7z"
+                        "http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-20140612-git-3a1c895-win32-static.7z",
+                        "https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/ffmpeg/windows/ffmpeg-20140612-git-3a1c895-win32-static.7z"
                     };
 
                 case PlatformID.Unix:
@@ -222,4 +222,4 @@ namespace MediaBrowser.ServerApplication.FFMpeg
         public string sysname = string.Empty;
         public string machine = string.Empty;
     }
-}
+}
\ No newline at end of file
diff --git a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs
index 2642ffde73..4f94ebd67c 100644
--- a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs
+++ b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs
@@ -1,12 +1,10 @@
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Common.Net;
-using MediaBrowser.Common.Progress;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Net;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -140,13 +138,9 @@ namespace MediaBrowser.ServerApplication.FFMpeg
                     ExtractFFMpeg(tempFile, directory);
                     return;
                 }
-                catch (HttpException ex)
-                {
-                    _logger.ErrorException("Error downloading {0}", ex, url);
-                }
                 catch (Exception ex)
                 {
-                    _logger.ErrorException("Error unpacking {0}", ex, url);
+                    _logger.ErrorException("Error downloading {0}", ex, url);
                 }
             }
 
diff --git a/MediaBrowser.Tests/Resolvers/TvUtilTests.cs b/MediaBrowser.Tests/Resolvers/TvUtilTests.cs
index 104e634472..5e6add5284 100644
--- a/MediaBrowser.Tests/Resolvers/TvUtilTests.cs
+++ b/MediaBrowser.Tests/Resolvers/TvUtilTests.cs
@@ -166,6 +166,8 @@ namespace MediaBrowser.Tests.Resolvers
             Assert.AreEqual(1, TVUtils.GetSeasonNumberFromPath(@"\Drive\Season 1"));
             Assert.AreEqual(1, TVUtils.GetSeasonNumberFromPath(@"\Drive\Season 1"));
 
+            Assert.AreEqual(2, TVUtils.GetSeasonNumberFromPath(@"\Drive\Seinfeld\S02"));
+            
             Assert.AreEqual(2, TVUtils.GetSeasonNumberFromPath(@"\Drive\Seinfeld\2"));
             
             //Four Digits seasons
-- 
cgit v1.2.3


From a37a11c486350a35cbc9f8763c477dd189e35501 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 30 Jul 2014 22:09:23 -0400
Subject: 3.0.5324.37963

---
 MediaBrowser.Api/Playback/BaseStreamingService.cs  |  3 +-
 MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs | 30 ++++++------
 MediaBrowser.Controller/Library/TVUtils.cs         | 22 +++++----
 MediaBrowser.Dlna/Didl/DidlBuilder.cs              | 55 +++++++++++++---------
 MediaBrowser.Dlna/PlayTo/PlayToController.cs       |  8 ++--
 .../MediaBrowser.Model.Portable.csproj             | 15 +++---
 .../MediaBrowser.Model.net35.csproj                | 15 +++---
 MediaBrowser.Model/Configuration/LiveTvOptions.cs  |  8 ----
 .../Configuration/ServerConfiguration.cs           | 22 +--------
 .../Configuration/TvFileOrganizationOptions.cs     | 40 ----------------
 MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs   | 38 ++++++++++-----
 .../FileOrganization/AutoOrganizeOptions.cs        | 17 +++++++
 .../FileOrganization/TvFileOrganizationOptions.cs  | 40 ++++++++++++++++
 MediaBrowser.Model/LiveTv/LiveTvOptions.cs         |  8 ++++
 MediaBrowser.Model/MediaBrowser.Model.csproj       |  5 +-
 .../FileOrganization/EpisodeFileOrganizer.cs       |  2 +-
 .../FileOrganization/Extensions.cs                 | 29 ++++++++++++
 .../FileOrganization/FileOrganizationService.cs    |  9 +++-
 .../FileOrganization/OrganizerScheduledTask.cs     | 12 +++--
 .../Library/Resolvers/TV/SeriesResolver.cs         |  7 ++-
 .../LiveTv/LiveTvConfigurationFactory.cs           |  2 +-
 .../MediaBrowser.Server.Implementations.csproj     |  1 +
 MediaBrowser.ServerApplication/ApplicationHost.cs  |  8 ++++
 23 files changed, 242 insertions(+), 154 deletions(-)
 delete mode 100644 MediaBrowser.Model/Configuration/LiveTvOptions.cs
 delete mode 100644 MediaBrowser.Model/Configuration/TvFileOrganizationOptions.cs
 create mode 100644 MediaBrowser.Model/FileOrganization/AutoOrganizeOptions.cs
 create mode 100644 MediaBrowser.Model/FileOrganization/TvFileOrganizationOptions.cs
 create mode 100644 MediaBrowser.Model/LiveTv/LiveTvOptions.cs
 create mode 100644 MediaBrowser.Server.Implementations/FileOrganization/Extensions.cs

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index df85ca3cbc..1963ad10a5 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -1917,7 +1917,8 @@ namespace MediaBrowser.Api.Playback
                     state.TargetPacketLength,
                     state.TranscodeSeekInfo,
                     state.IsTargetAnamorphic
-                    );
+
+                    ).FirstOrDefault() ?? string.Empty;
             }
 
             foreach (var item in responseHeaders)
diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
index ccaa918ec7..c00e0c18b5 100644
--- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
@@ -55,21 +55,6 @@ namespace MediaBrowser.Api.Playback.Hls
 
         public object Get(GetMasterHlsVideoStream request)
         {
-            if (string.Equals(request.AudioCodec, "copy", StringComparison.OrdinalIgnoreCase))
-            {
-                throw new ArgumentException("Audio codec copy is not allowed here.");
-            }
-
-            if (string.Equals(request.VideoCodec, "copy", StringComparison.OrdinalIgnoreCase))
-            {
-                throw new ArgumentException("Video codec copy is not allowed here.");
-            }
-
-            if (string.IsNullOrEmpty(request.MediaSourceId))
-            {
-                throw new ArgumentException("MediaSourceId is required");
-            }
-
             var result = GetAsync(request).Result;
 
             return result;
@@ -332,6 +317,21 @@ namespace MediaBrowser.Api.Playback.Hls
         {
             var state = await GetState(request, CancellationToken.None).ConfigureAwait(false);
 
+            if (string.Equals(request.AudioCodec, "copy", StringComparison.OrdinalIgnoreCase))
+            {
+                throw new ArgumentException("Audio codec copy is not allowed here.");
+            }
+
+            if (string.Equals(request.VideoCodec, "copy", StringComparison.OrdinalIgnoreCase))
+            {
+                throw new ArgumentException("Video codec copy is not allowed here.");
+            }
+
+            if (string.IsNullOrEmpty(request.MediaSourceId))
+            {
+                throw new ArgumentException("MediaSourceId is required");
+            }
+
             var audioBitrate = state.OutputAudioBitrate ?? 0;
             var videoBitrate = state.OutputVideoBitrate ?? 0;
 
diff --git a/MediaBrowser.Controller/Library/TVUtils.cs b/MediaBrowser.Controller/Library/TVUtils.cs
index 6ef1fb6f72..5e43eb6441 100644
--- a/MediaBrowser.Controller/Library/TVUtils.cs
+++ b/MediaBrowser.Controller/Library/TVUtils.cs
@@ -223,10 +223,11 @@ namespace MediaBrowser.Controller.Library
                     continue;
                 }
 
-                if ((attributes & FileAttributes.System) == FileAttributes.System)
-                {
-                    continue;
-                }
+                // Can't enforce this because files saved by Bitcasa are always marked System
+                //if ((attributes & FileAttributes.System) == FileAttributes.System)
+                //{
+                //    continue;
+                //}
 
                 if ((attributes & FileAttributes.Directory) == FileAttributes.Directory)
                 {
@@ -268,13 +269,16 @@ namespace MediaBrowser.Controller.Library
 
                 if ((attributes & FileAttributes.Hidden) == FileAttributes.Hidden)
                 {
+                    logger.Debug("Igoring series file or folder marked hidden: {0}", child.FullName);
                     continue;
                 }
 
-                if ((attributes & FileAttributes.System) == FileAttributes.System)
-                {
-                    continue;
-                }
+                // Can't enforce this because files saved by Bitcasa are always marked System
+                //if ((attributes & FileAttributes.System) == FileAttributes.System)
+                //{
+                //    logger.Debug("Igoring series subfolder marked system: {0}", child.FullName);
+                //    continue;
+                //}
 
                 if ((attributes & FileAttributes.Directory) == FileAttributes.Directory)
                 {
@@ -299,6 +303,8 @@ namespace MediaBrowser.Controller.Library
                 }
                 else
                 {
+                    logger.Debug("Evaluating series file: {0}", child.FullName);
+                    
                     var fullName = child.FullName;
 
                     if (EntityResolutionHelper.IsVideoFile(fullName) || EntityResolutionHelper.IsVideoPlaceHolder(fullName))
diff --git a/MediaBrowser.Dlna/Didl/DidlBuilder.cs b/MediaBrowser.Dlna/Didl/DidlBuilder.cs
index 649ba2c8ff..f1377727bb 100644
--- a/MediaBrowser.Dlna/Didl/DidlBuilder.cs
+++ b/MediaBrowser.Dlna/Didl/DidlBuilder.cs
@@ -97,8 +97,6 @@ namespace MediaBrowser.Dlna.Didl
 
         private void AddVideoResource(XmlElement container, Video video, string deviceId, Filter filter, StreamInfo streamInfo = null)
         {
-            var res = container.OwnerDocument.CreateElement(string.Empty, "res", NS_DIDL);
-
             if (streamInfo == null)
             {
                 var sources = _user == null ? video.GetMediaSources(true).ToList() : video.GetMediaSources(true, _user).ToList();
@@ -113,6 +111,38 @@ namespace MediaBrowser.Dlna.Didl
                });
             }
 
+            var targetWidth = streamInfo.TargetWidth;
+            var targetHeight = streamInfo.TargetHeight;
+
+            var contentFeatureList = new ContentFeatureBuilder(_profile).BuildVideoHeader(streamInfo.Container,
+                streamInfo.VideoCodec,
+                streamInfo.AudioCodec,
+                targetWidth,
+                targetHeight,
+                streamInfo.TargetVideoBitDepth,
+                streamInfo.TargetVideoBitrate,
+                streamInfo.TargetAudioChannels,
+                streamInfo.TargetAudioBitrate,
+                streamInfo.TargetTimestamp,
+                streamInfo.IsDirectStream,
+                streamInfo.RunTimeTicks,
+                streamInfo.TargetVideoProfile,
+                streamInfo.TargetVideoLevel,
+                streamInfo.TargetFramerate,
+                streamInfo.TargetPacketLength,
+                streamInfo.TranscodeSeekInfo,
+                streamInfo.IsTargetAnamorphic);
+
+            foreach (var contentFeature in contentFeatureList)
+            {
+                AddVideoResource(container, video, deviceId, filter, contentFeature, streamInfo);
+            }
+        }
+
+        private void AddVideoResource(XmlElement container, Video video, string deviceId, Filter filter, string contentFeatures, StreamInfo streamInfo)
+        {
+            var res = container.OwnerDocument.CreateElement(string.Empty, "res", NS_DIDL);
+
             var url = streamInfo.ToDlnaUrl(_serverAddress);
 
             res.InnerText = url;
@@ -189,25 +219,6 @@ namespace MediaBrowser.Dlna.Didl
                ? MimeTypes.GetMimeType(filename)
                : mediaProfile.MimeType;
 
-            var contentFeatures = new ContentFeatureBuilder(_profile).BuildVideoHeader(streamInfo.Container,
-                streamInfo.VideoCodec,
-                streamInfo.AudioCodec,
-                targetWidth,
-                targetHeight,
-                streamInfo.TargetVideoBitDepth,
-                streamInfo.TargetVideoBitrate,
-                streamInfo.TargetAudioChannels,
-                streamInfo.TargetAudioBitrate,
-                streamInfo.TargetTimestamp,
-                streamInfo.IsDirectStream,
-                streamInfo.RunTimeTicks,
-                streamInfo.TargetVideoProfile,
-                streamInfo.TargetVideoLevel,
-                streamInfo.TargetFramerate,
-                streamInfo.TargetPacketLength,
-                streamInfo.TranscodeSeekInfo,
-                streamInfo.IsTargetAnamorphic);
-
             res.SetAttribute("protocolInfo", String.Format(
                 "http-get:*:{0}:{1}",
                 mimeType,
@@ -216,7 +227,7 @@ namespace MediaBrowser.Dlna.Didl
 
             container.AppendChild(res);
         }
-
+        
         private void AddAudioResource(XmlElement container, Audio audio, string deviceId, Filter filter, StreamInfo streamInfo = null)
         {
             var res = container.OwnerDocument.CreateElement(string.Empty, "res", NS_DIDL);
diff --git a/MediaBrowser.Dlna/PlayTo/PlayToController.cs b/MediaBrowser.Dlna/PlayTo/PlayToController.cs
index d81e460492..9e8d8213fd 100644
--- a/MediaBrowser.Dlna/PlayTo/PlayToController.cs
+++ b/MediaBrowser.Dlna/PlayTo/PlayToController.cs
@@ -501,7 +501,7 @@ namespace MediaBrowser.Dlna.PlayTo
 
             if (streamInfo.MediaType == DlnaProfileType.Video)
             {
-                return new ContentFeatureBuilder(profile)
+                var list = new ContentFeatureBuilder(profile)
                     .BuildVideoHeader(streamInfo.Container,
                     streamInfo.VideoCodec,
                     streamInfo.AudioCodec,
@@ -520,6 +520,8 @@ namespace MediaBrowser.Dlna.PlayTo
                     streamInfo.TargetPacketLength,
                     streamInfo.TranscodeSeekInfo,
                     streamInfo.IsTargetAnamorphic);
+
+                return list.FirstOrDefault();
             }
 
             return null;
@@ -600,9 +602,7 @@ namespace MediaBrowser.Dlna.PlayTo
             _currentPlaylistIndex = index;
             var currentitem = Playlist[index];
 
-            var dlnaheaders = GetDlnaHeaders(currentitem);
-
-            await _device.SetAvTransport(currentitem.StreamUrl, dlnaheaders, currentitem.Didl);
+            await _device.SetAvTransport(currentitem.StreamUrl, GetDlnaHeaders(currentitem), currentitem.Didl);
 
             var streamInfo = currentitem.StreamInfo;
             if (streamInfo.StartPositionTicks > 0 && streamInfo.IsDirectStream)
diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
index e55d3eec9b..f374ed5297 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -152,9 +152,6 @@
     <Compile Include="..\MediaBrowser.Model\Configuration\ImageSavingConvention.cs">
       <Link>Configuration\ImageSavingConvention.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Configuration\LiveTvOptions.cs">
-      <Link>Configuration\LiveTvOptions.cs</Link>
-    </Compile>
     <Compile Include="..\MediaBrowser.Model\Configuration\MetadataOptions.cs">
       <Link>Configuration\MetadataOptions.cs</Link>
     </Compile>
@@ -179,9 +176,6 @@
     <Compile Include="..\MediaBrowser.Model\Configuration\SubtitlePlaybackMode.cs">
       <Link>Configuration\SubtitlePlaybackMode.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Configuration\TvFileOrganizationOptions.cs">
-      <Link>Configuration\TvFileOrganizationOptions.cs</Link>
-    </Compile>
     <Compile Include="..\MediaBrowser.Model\Configuration\UnratedItem.cs">
       <Link>Configuration\UnratedItem.cs</Link>
     </Compile>
@@ -473,6 +467,9 @@
     <Compile Include="..\MediaBrowser.Model\Extensions\StringHelper.cs">
       <Link>Extensions\StringHelper.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\FileOrganization\AutoOrganizeOptions.cs">
+      <Link>FileOrganization\AutoOrganizeOptions.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\FileOrganization\EpisodeFileOrganizationRequest.cs">
       <Link>FileOrganization\EpisodeFileOrganizationRequest.cs</Link>
     </Compile>
@@ -488,6 +485,9 @@
     <Compile Include="..\MediaBrowser.Model\FileOrganization\FileSortingStatus.cs">
       <Link>FileOrganization\FileSortingStatus.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\FileOrganization\TvFileOrganizationOptions.cs">
+      <Link>FileOrganization\TvFileOrganizationOptions.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Games\GameSystem.cs">
       <Link>Games\GameSystem.cs</Link>
     </Compile>
@@ -542,6 +542,9 @@
     <Compile Include="..\MediaBrowser.Model\LiveTv\LiveTvInfo.cs">
       <Link>LiveTv\LiveTvInfo.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\LiveTv\LiveTvOptions.cs">
+      <Link>LiveTv\LiveTvOptions.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\LiveTv\LiveTvServiceInfo.cs">
       <Link>LiveTv\LiveTvServiceInfo.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
index 603eecbaed..5385ee036c 100644
--- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
+++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
@@ -115,9 +115,6 @@
     <Compile Include="..\MediaBrowser.Model\Configuration\ImageSavingConvention.cs">
       <Link>Configuration\ImageSavingConvention.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Configuration\LiveTvOptions.cs">
-      <Link>Configuration\LiveTvOptions.cs</Link>
-    </Compile>
     <Compile Include="..\MediaBrowser.Model\Configuration\MetadataOptions.cs">
       <Link>Configuration\MetadataOptions.cs</Link>
     </Compile>
@@ -142,9 +139,6 @@
     <Compile Include="..\MediaBrowser.Model\Configuration\SubtitlePlaybackMode.cs">
       <Link>Configuration\SubtitlePlaybackMode.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Configuration\TvFileOrganizationOptions.cs">
-      <Link>Configuration\TvFileOrganizationOptions.cs</Link>
-    </Compile>
     <Compile Include="..\MediaBrowser.Model\Configuration\UnratedItem.cs">
       <Link>Configuration\UnratedItem.cs</Link>
     </Compile>
@@ -436,6 +430,9 @@
     <Compile Include="..\MediaBrowser.Model\Extensions\StringHelper.cs">
       <Link>Extensions\StringHelper.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\FileOrganization\AutoOrganizeOptions.cs">
+      <Link>FileOrganization\AutoOrganizeOptions.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\FileOrganization\EpisodeFileOrganizationRequest.cs">
       <Link>FileOrganization\EpisodeFileOrganizationRequest.cs</Link>
     </Compile>
@@ -451,6 +448,9 @@
     <Compile Include="..\MediaBrowser.Model\FileOrganization\FileSortingStatus.cs">
       <Link>FileOrganization\FileSortingStatus.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\FileOrganization\TvFileOrganizationOptions.cs">
+      <Link>FileOrganization\TvFileOrganizationOptions.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Games\GameSystem.cs">
       <Link>Games\GameSystem.cs</Link>
     </Compile>
@@ -499,6 +499,9 @@
     <Compile Include="..\MediaBrowser.Model\LiveTv\LiveTvInfo.cs">
       <Link>LiveTv\LiveTvInfo.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\LiveTv\LiveTvOptions.cs">
+      <Link>LiveTv\LiveTvOptions.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\LiveTv\LiveTvServiceInfo.cs">
       <Link>LiveTv\LiveTvServiceInfo.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model/Configuration/LiveTvOptions.cs b/MediaBrowser.Model/Configuration/LiveTvOptions.cs
deleted file mode 100644
index 575f0b8637..0000000000
--- a/MediaBrowser.Model/Configuration/LiveTvOptions.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace MediaBrowser.Model.Configuration
-{
-    public class LiveTvOptions
-    {
-        public int? GuideDays { get; set; }
-        public string ActiveService { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 00f7add14c..4734e2af7d 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.FileOrganization;
+using MediaBrowser.Model.LiveTv;
 using MediaBrowser.Model.Notifications;
-using MediaBrowser.Model.Weather;
-using System;
 
 namespace MediaBrowser.Model.Configuration
 {
@@ -10,18 +10,6 @@ namespace MediaBrowser.Model.Configuration
     /// </summary>
     public class ServerConfiguration : BaseApplicationConfiguration
     {
-        /// <summary>
-        /// Gets or sets the zip code to use when displaying weather
-        /// </summary>
-        /// <value>The weather location.</value>
-        public string WeatherLocation { get; set; }
-
-        /// <summary>
-        /// Gets or sets the weather unit to use when displaying weather
-        /// </summary>
-        /// <value>The weather unit.</value>
-        public WeatherUnits WeatherUnit { get; set; }
-
         /// <summary>
         /// Gets or sets a value indicating whether [enable u pn p].
         /// </summary>
@@ -191,9 +179,6 @@ namespace MediaBrowser.Model.Configuration
 
         public SubtitleOptions SubtitleOptions { get; set; }
 
-        [Obsolete]
-        public string[] ManualLoginClients { get; set; }
-
         public ChannelOptions ChannelOptions { get; set; }
         public ChapterOptions ChapterOptions { get; set; }
 
@@ -237,8 +222,6 @@ namespace MediaBrowser.Model.Configuration
             SortRemoveCharacters = new[] { ",", "&", "-", "{", "}", "'" };
             SortRemoveWords = new[] { "the", "a", "an" };
 
-            ManualLoginClients = new string[] { };
-
             SeasonZeroDisplayName = "Specials";
 
             EnableRealtimeMonitor = true;
@@ -304,7 +287,6 @@ namespace MediaBrowser.Model.Configuration
             };
 
             SubtitleOptions = new SubtitleOptions();
-            TvFileOrganizationOptions = new TvFileOrganizationOptions();
         }
     }
 }
diff --git a/MediaBrowser.Model/Configuration/TvFileOrganizationOptions.cs b/MediaBrowser.Model/Configuration/TvFileOrganizationOptions.cs
deleted file mode 100644
index fe32d4a80a..0000000000
--- a/MediaBrowser.Model/Configuration/TvFileOrganizationOptions.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-
-namespace MediaBrowser.Model.Configuration
-{
-    public class TvFileOrganizationOptions
-    {
-        public bool IsEnabled { get; set; }
-        public int MinFileSizeMb { get; set; }
-        public string[] LeftOverFileExtensionsToDelete { get; set; }
-        public string[] WatchLocations { get; set; }
-
-        public string SeasonFolderPattern { get; set; }
-
-        public string SeasonZeroFolderName { get; set; }
-
-        public string EpisodeNamePattern { get; set; }
-        public string MultiEpisodeNamePattern { get; set; }
-
-        public bool OverwriteExistingEpisodes { get; set; }
-
-        public bool DeleteEmptyFolders { get; set; }
-
-        public bool CopyOriginalFile { get; set; }
-
-        public TvFileOrganizationOptions()
-        {
-            MinFileSizeMb = 50;
-
-            LeftOverFileExtensionsToDelete = new string[] { };
-
-            WatchLocations = new string[] { };
-
-            EpisodeNamePattern = "%sn - %sx%0e - %en.%ext";
-            MultiEpisodeNamePattern = "%sn - %sx%0e-x%0ed - %en.%ext";
-            SeasonFolderPattern = "Season %s";
-            SeasonZeroFolderName = "Season 0";
-
-            CopyOriginalFile = false;
-        }
-    }
-}
diff --git a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
index b6d9d9f77d..5417c5b82c 100644
--- a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
+++ b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
@@ -92,7 +92,7 @@ namespace MediaBrowser.Model.Dlna
             return (contentFeatures + orgOp + orgCi + dlnaflags).Trim(';');
         }
 
-        public string BuildVideoHeader(string container,
+        public List<string> BuildVideoHeader(string container,
             string videoCodec,
             string audioCodec,
             int? width,
@@ -149,30 +149,42 @@ namespace MediaBrowser.Model.Dlna
                 timestamp,
                 isAnamorphic);
 
-            string orgPn = mediaProfile == null ? null : mediaProfile.OrgPn;
+            List<string> orgPnValues = new List<string>();
 
-            if (string.IsNullOrEmpty(orgPn))
+            if (mediaProfile != null && !string.IsNullOrEmpty(mediaProfile.OrgPn))
+            {
+                orgPnValues.Add(mediaProfile.OrgPn);
+            }
+            else
             {
                 foreach (string s in GetVideoOrgPnValue(container, videoCodec, audioCodec, width, height, timestamp))
                 {
-                    orgPn = s;
+                    orgPnValues.Add(s);
                     break;
                 }
             }
 
-            if (string.IsNullOrEmpty(orgPn))
+            List<string> contentFeatureList = new List<string>();
+
+            foreach (string orgPn in orgPnValues)
             {
-                // TODO: Support multiple values and return multiple headers?
-                foreach (string s in (orgPn ?? string.Empty).Split(','))
-                {
-                    orgPn = s;
-                    break;
-                }
+                string contentFeatures = string.IsNullOrEmpty(orgPn) ? string.Empty : "DLNA.ORG_PN=" + orgPn;
+
+                var value = (contentFeatures + orgOp + orgCi + dlnaflags).Trim(';');
+
+                contentFeatureList.Add(value);
             }
 
-            string contentFeatures = string.IsNullOrEmpty(orgPn) ? string.Empty : "DLNA.ORG_PN=" + orgPn;
+            if (orgPnValues.Count == 0)
+            {
+                string contentFeatures = string.Empty;
 
-            return (contentFeatures + orgOp + orgCi + dlnaflags).Trim(';');
+                var value = (contentFeatures + orgOp + orgCi + dlnaflags).Trim(';');
+
+                contentFeatureList.Add(value);
+            }
+
+            return contentFeatureList;
         }
 
         private string GetImageOrgPnValue(string container, int? width, int? height)
diff --git a/MediaBrowser.Model/FileOrganization/AutoOrganizeOptions.cs b/MediaBrowser.Model/FileOrganization/AutoOrganizeOptions.cs
new file mode 100644
index 0000000000..ae701ea68d
--- /dev/null
+++ b/MediaBrowser.Model/FileOrganization/AutoOrganizeOptions.cs
@@ -0,0 +1,17 @@
+
+namespace MediaBrowser.Model.FileOrganization
+{
+    public class AutoOrganizeOptions
+    {
+        /// <summary>
+        /// Gets or sets the tv options.
+        /// </summary>
+        /// <value>The tv options.</value>
+        public TvFileOrganizationOptions TvOptions { get; set; }
+
+        public AutoOrganizeOptions()
+        {
+            TvOptions = new TvFileOrganizationOptions();
+        }
+    }
+}
diff --git a/MediaBrowser.Model/FileOrganization/TvFileOrganizationOptions.cs b/MediaBrowser.Model/FileOrganization/TvFileOrganizationOptions.cs
new file mode 100644
index 0000000000..973ecf6e71
--- /dev/null
+++ b/MediaBrowser.Model/FileOrganization/TvFileOrganizationOptions.cs
@@ -0,0 +1,40 @@
+
+namespace MediaBrowser.Model.FileOrganization
+{
+    public class TvFileOrganizationOptions
+    {
+        public bool IsEnabled { get; set; }
+        public int MinFileSizeMb { get; set; }
+        public string[] LeftOverFileExtensionsToDelete { get; set; }
+        public string[] WatchLocations { get; set; }
+
+        public string SeasonFolderPattern { get; set; }
+
+        public string SeasonZeroFolderName { get; set; }
+
+        public string EpisodeNamePattern { get; set; }
+        public string MultiEpisodeNamePattern { get; set; }
+
+        public bool OverwriteExistingEpisodes { get; set; }
+
+        public bool DeleteEmptyFolders { get; set; }
+
+        public bool CopyOriginalFile { get; set; }
+
+        public TvFileOrganizationOptions()
+        {
+            MinFileSizeMb = 50;
+
+            LeftOverFileExtensionsToDelete = new string[] { };
+
+            WatchLocations = new string[] { };
+
+            EpisodeNamePattern = "%sn - %sx%0e - %en.%ext";
+            MultiEpisodeNamePattern = "%sn - %sx%0e-x%0ed - %en.%ext";
+            SeasonFolderPattern = "Season %s";
+            SeasonZeroFolderName = "Season 0";
+
+            CopyOriginalFile = false;
+        }
+    }
+}
diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
new file mode 100644
index 0000000000..05fdc00b12
--- /dev/null
+++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
@@ -0,0 +1,8 @@
+namespace MediaBrowser.Model.LiveTv
+{
+    public class LiveTvOptions
+    {
+        public int? GuideDays { get; set; }
+        public string ActiveService { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index f57c3b95db..efd8c2a0a2 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -79,13 +79,14 @@
     <Compile Include="Configuration\ChapterOptions.cs" />
     <Compile Include="Configuration\XbmcMetadataOptions.cs" />
     <Compile Include="Configuration\SubtitlePlaybackMode.cs" />
-    <Compile Include="Configuration\TvFileOrganizationOptions.cs" />
+    <Compile Include="FileOrganization\AutoOrganizeOptions.cs" />
+    <Compile Include="FileOrganization\TvFileOrganizationOptions.cs" />
     <Compile Include="Configuration\BaseApplicationConfiguration.cs" />
     <Compile Include="Configuration\DlnaOptions.cs" />
     <Compile Include="Configuration\EncodingQuality.cs" />
     <Compile Include="Configuration\ImageOption.cs" />
     <Compile Include="Configuration\ImageSavingConvention.cs" />
-    <Compile Include="Configuration\LiveTvOptions.cs" />
+    <Compile Include="LiveTv\LiveTvOptions.cs" />
     <Compile Include="Configuration\MetadataPlugin.cs" />
     <Compile Include="Configuration\MetadataOptions.cs" />
     <Compile Include="Configuration\MetadataPluginSummary.cs" />
diff --git a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
index 594ba9d235..cf9571824c 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
@@ -126,7 +126,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
 
             var series = (Series)_libraryManager.GetItemById(new Guid(request.SeriesId));
 
-            await OrganizeEpisode(result.OriginalPath, series, request.SeasonNumber, request.EpisodeNumber, request.EndingEpisodeNumber, _config.Configuration.TvFileOrganizationOptions, true, result, cancellationToken).ConfigureAwait(false);
+            await OrganizeEpisode(result.OriginalPath, series, request.SeasonNumber, request.EpisodeNumber, request.EndingEpisodeNumber, options, true, result, cancellationToken).ConfigureAwait(false);
 
             await _organizationService.SaveResult(result, CancellationToken.None).ConfigureAwait(false);
 
diff --git a/MediaBrowser.Server.Implementations/FileOrganization/Extensions.cs b/MediaBrowser.Server.Implementations/FileOrganization/Extensions.cs
new file mode 100644
index 0000000000..e43ab3665e
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/FileOrganization/Extensions.cs
@@ -0,0 +1,29 @@
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Model.FileOrganization;
+using System.Collections.Generic;
+
+namespace MediaBrowser.Server.Implementations.FileOrganization
+{
+    public static class ConfigurationExtension
+    {
+        public static AutoOrganizeOptions GetAutoOrganizeOptions(this IConfigurationManager manager)
+        {
+            return manager.GetConfiguration<AutoOrganizeOptions>("autoorganize");
+        }
+    }
+
+    public class AutoOrganizeOptionsFactory : IConfigurationFactory
+    {
+        public IEnumerable<ConfigurationStore> GetConfigurations()
+        {
+            return new List<ConfigurationStore>
+            {
+                new ConfigurationStore
+                {
+                    Key = "autoorganize",
+                    ConfigurationType = typeof (AutoOrganizeOptions)
+                }
+            };
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/FileOrganization/FileOrganizationService.cs b/MediaBrowser.Server.Implementations/FileOrganization/FileOrganizationService.cs
index 7cf38b0a0e..7c52696787 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/FileOrganizationService.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/FileOrganizationService.cs
@@ -95,6 +95,11 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
             return _repo.Delete(resultId);
         }
 
+        private TvFileOrganizationOptions GetTvOptions()
+        {
+            return _config.GetAutoOrganizeOptions().TvOptions;
+        }
+
         public async Task PerformOrganization(string resultId)
         {
             var result = _repo.GetResult(resultId);
@@ -107,7 +112,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
             var organizer = new EpisodeFileOrganizer(this, _config, _fileSystem, _logger, _libraryManager,
                 _libraryMonitor, _providerManager);
 
-            await organizer.OrganizeEpisodeFile(result.OriginalPath, _config.Configuration.TvFileOrganizationOptions, true, CancellationToken.None)
+            await organizer.OrganizeEpisodeFile(result.OriginalPath, GetTvOptions(), true, CancellationToken.None)
                     .ConfigureAwait(false);
         }
 
@@ -121,7 +126,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
             var organizer = new EpisodeFileOrganizer(this, _config, _fileSystem, _logger, _libraryManager,
                 _libraryMonitor, _providerManager);
 
-            await organizer.OrganizeWithCorrection(request, _config.Configuration.TvFileOrganizationOptions, CancellationToken.None).ConfigureAwait(false);
+            await organizer.OrganizeWithCorrection(request, GetTvOptions(), CancellationToken.None).ConfigureAwait(false);
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs b/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
index fbb743f943..4e182ea88f 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
@@ -4,6 +4,7 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.FileOrganization;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.FileOrganization;
 using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Generic;
@@ -48,10 +49,15 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
             get { return "Library"; }
         }
 
+        private TvFileOrganizationOptions GetTvOptions()
+        {
+            return _config.GetAutoOrganizeOptions().TvOptions;
+        }
+
         public Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
         {
             return new TvFolderOrganizer(_libraryManager, _logger, _fileSystem, _libraryMonitor, _organizationService, _config, _providerManager)
-                .Organize(_config.Configuration.TvFileOrganizationOptions, cancellationToken, progress);
+                .Organize(GetTvOptions(), cancellationToken, progress);
         }
 
         public IEnumerable<ITaskTrigger> GetDefaultTriggers()
@@ -64,12 +70,12 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
 
         public bool IsHidden
         {
-            get { return !_config.Configuration.TvFileOrganizationOptions.IsEnabled; }
+            get { return !GetTvOptions().IsEnabled; }
         }
 
         public bool IsEnabled
         {
-            get { return _config.Configuration.TvFileOrganizationOptions.IsEnabled; }
+            get { return !GetTvOptions().IsEnabled; }
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
index a17c33845f..d3aad582a3 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
@@ -60,15 +60,18 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
 
                 var collectionType = args.GetCollectionType();
 
+                var isTvShowsFolder = string.Equals(collectionType, CollectionType.TvShows,
+                    StringComparison.OrdinalIgnoreCase);
+
                 // If there's a collection type and it's not tv, it can't be a series
                 if (!string.IsNullOrEmpty(collectionType) &&
-                    !string.Equals(collectionType, CollectionType.TvShows, StringComparison.OrdinalIgnoreCase) &&
+                    !isTvShowsFolder &&
                     !string.Equals(collectionType, CollectionType.BoxSets, StringComparison.OrdinalIgnoreCase))
                 {
                     return null;
                 }
 
-                if (TVUtils.IsSeriesFolder(args.Path, string.Equals(collectionType, CollectionType.TvShows, StringComparison.OrdinalIgnoreCase), args.FileSystemChildren, args.DirectoryService, _fileSystem, _logger))
+                if (TVUtils.IsSeriesFolder(args.Path, isTvShowsFolder, args.FileSystemChildren, args.DirectoryService, _fileSystem, _logger))
                 {
                     return new Series();
                 }
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvConfigurationFactory.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvConfigurationFactory.cs
index fefe6401db..57d1d79e16 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvConfigurationFactory.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvConfigurationFactory.cs
@@ -1,5 +1,5 @@
 using MediaBrowser.Common.Configuration;
-using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.LiveTv;
 using System.Collections.Generic;
 
 namespace MediaBrowser.Server.Implementations.LiveTv
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 79d15039b2..5cc22ac64c 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -127,6 +127,7 @@
     <Compile Include="EntryPoints\RefreshUsersMetadata.cs" />
     <Compile Include="EntryPoints\UsageEntryPoint.cs" />
     <Compile Include="FileOrganization\EpisodeFileOrganizer.cs" />
+    <Compile Include="FileOrganization\Extensions.cs" />
     <Compile Include="FileOrganization\FileOrganizationService.cs" />
     <Compile Include="FileOrganization\NameUtils.cs" />
     <Compile Include="FileOrganization\TvFolderOrganizer.cs" />
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index e584a950cd..7dc70627bd 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -43,6 +43,7 @@ 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;
@@ -333,6 +334,13 @@ namespace MediaBrowser.ServerApplication
                 saveConfig = true;
             }
 
+            if (ServerConfigurationManager.Configuration.TvFileOrganizationOptions != null)
+            {
+                ServerConfigurationManager.SaveConfiguration("autoorganize", new AutoOrganizeOptions { TvOptions = ServerConfigurationManager.Configuration.TvFileOrganizationOptions });
+                ServerConfigurationManager.Configuration.TvFileOrganizationOptions = null;
+                saveConfig = true;
+            }
+
             if (saveConfig)
             {
                 ServerConfigurationManager.SaveConfiguration();
-- 
cgit v1.2.3


From c5319bb4ae9606e07d62525a022e5a67f85a7d43 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 4 Aug 2014 23:41:56 -0400
Subject: update playlist xml saving

---
 .../DefaultTheme/DefaultThemeService.cs            | 673 ---------------------
 MediaBrowser.Api/DefaultTheme/Models.cs            |  83 ---
 MediaBrowser.Api/Library/LibraryService.cs         |   5 +
 MediaBrowser.Api/MediaBrowser.Api.csproj           |   2 -
 .../Serialization/JsonSerializer.cs                |  20 -
 .../Serialization/XmlSerializer.cs                 |  15 -
 .../Configuration/ConfigurationHelper.cs           |  28 +-
 MediaBrowser.Controller/Entities/BaseItem.cs       |   7 -
 MediaBrowser.Controller/Entities/LinkedChild.cs    |   8 +-
 MediaBrowser.Controller/Library/TVUtils.cs         |   2 -
 .../Providers/BaseItemXmlParser.cs                 |  23 +-
 MediaBrowser.Dlna/Didl/DidlBuilder.cs              |   2 +-
 .../MediaBrowser.LocalMetadata.csproj              |   2 +
 .../Parsers/BoxSetXmlParser.cs                     |   9 +-
 .../Parsers/PlaylistXmlParser.cs                   |  72 +++
 .../Providers/BoxSetXmlProvider.cs                 |   6 +-
 .../Providers/PlaylistXmlProvider.cs               |  31 +
 .../Providers/TrailerXmlProvider.cs                |   8 +-
 .../Savers/PlaylistXmlSaver.cs                     |   6 +-
 .../Savers/XmlSaverHelpers.cs                      |   6 +-
 .../Serialization/IJsonSerializer.cs               |   8 -
 MediaBrowser.Model/Serialization/IXmlSerializer.cs |   7 -
 .../HttpServer/HttpListenerHost.cs                 |   2 +-
 .../Localization/JavaScript/ar.json                |  15 +-
 .../Localization/JavaScript/ca.json                |  15 +-
 .../Localization/JavaScript/cs.json                |  15 +-
 .../Localization/JavaScript/da.json                |  15 +-
 .../Localization/JavaScript/de.json                |  15 +-
 .../Localization/JavaScript/el.json                |  15 +-
 .../Localization/JavaScript/en_GB.json             |  15 +-
 .../Localization/JavaScript/en_US.json             |  15 +-
 .../Localization/JavaScript/es.json                |  15 +-
 .../Localization/JavaScript/es_MX.json             |  13 +-
 .../Localization/JavaScript/fr.json                |  13 +-
 .../Localization/JavaScript/he.json                |  15 +-
 .../Localization/JavaScript/it.json                |  13 +-
 .../Localization/JavaScript/javascript.json        |   7 +-
 .../Localization/JavaScript/kk.json                |  15 +-
 .../Localization/JavaScript/ms.json                |  15 +-
 .../Localization/JavaScript/nb.json                |  15 +-
 .../Localization/JavaScript/nl.json                |  13 +-
 .../Localization/JavaScript/pl.json                |  15 +-
 .../Localization/JavaScript/pt_BR.json             |  15 +-
 .../Localization/JavaScript/pt_PT.json             |  15 +-
 .../Localization/JavaScript/ru.json                |  19 +-
 .../Localization/JavaScript/sv.json                |  13 +-
 .../Localization/JavaScript/tr.json                |  19 +-
 .../Localization/JavaScript/vi.json                |  15 +-
 .../Localization/JavaScript/zh_TW.json             |  15 +-
 .../Localization/Server/ar.json                    |  48 +-
 .../Localization/Server/ca.json                    |  50 +-
 .../Localization/Server/cs.json                    |  48 +-
 .../Localization/Server/da.json                    |  48 +-
 .../Localization/Server/de.json                    |  48 +-
 .../Localization/Server/el.json                    |  48 +-
 .../Localization/Server/en_GB.json                 |  50 +-
 .../Localization/Server/en_US.json                 |  50 +-
 .../Localization/Server/es.json                    |  48 +-
 .../Localization/Server/es_MX.json                 |  48 +-
 .../Localization/Server/fr.json                    |  48 +-
 .../Localization/Server/he.json                    |  48 +-
 .../Localization/Server/it.json                    |  50 +-
 .../Localization/Server/kk.json                    |  52 +-
 .../Localization/Server/ko.json                    |  50 +-
 .../Localization/Server/ms.json                    |  50 +-
 .../Localization/Server/nb.json                    |  48 +-
 .../Localization/Server/nl.json                    |  50 +-
 .../Localization/Server/pl.json                    |  48 +-
 .../Localization/Server/pt_BR.json                 |  50 +-
 .../Localization/Server/pt_PT.json                 |  48 +-
 .../Localization/Server/ru.json                    |  58 +-
 .../Localization/Server/server.json                |  47 +-
 .../Localization/Server/sv.json                    |  48 +-
 .../Localization/Server/tr.json                    |  66 +-
 .../Localization/Server/vi.json                    |  48 +-
 .../Localization/Server/zh_TW.json                 |  48 +-
 .../Persistence/SqliteExtensions.cs                |  22 +
 77 files changed, 1768 insertions(+), 1002 deletions(-)
 delete mode 100644 MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs
 delete mode 100644 MediaBrowser.Api/DefaultTheme/Models.cs
 create mode 100644 MediaBrowser.LocalMetadata/Parsers/PlaylistXmlParser.cs
 create mode 100644 MediaBrowser.LocalMetadata/Providers/PlaylistXmlProvider.cs

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs b/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs
deleted file mode 100644
index 21ba47bd4d..0000000000
--- a/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs
+++ /dev/null
@@ -1,673 +0,0 @@
-using MediaBrowser.Controller.Drawing;
-using MediaBrowser.Controller.Dto;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.Entities.Movies;
-using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Controller.Persistence;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Querying;
-using ServiceStack;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace MediaBrowser.Api.DefaultTheme
-{
-    [Route("/MBT/DefaultTheme/Games", "GET")]
-    public class GetGamesView : IReturn<GamesView>
-    {
-        [ApiMember(Name = "UserId", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")]
-        public Guid UserId { get; set; }
-
-        [ApiMember(Name = "RecentlyPlayedGamesLimit", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
-        public int RecentlyPlayedGamesLimit { get; set; }
-
-        public string ParentId { get; set; }
-    }
-
-    [Route("/MBT/DefaultTheme/TV", "GET")]
-    public class GetTvView : IReturn<TvView>
-    {
-        [ApiMember(Name = "UserId", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")]
-        public Guid UserId { get; set; }
-
-        [ApiMember(Name = "ComedyGenre", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
-        public string ComedyGenre { get; set; }
-
-        [ApiMember(Name = "RomanceGenre", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
-        public string RomanceGenre { get; set; }
-
-        [ApiMember(Name = "TopCommunityRating", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
-        public double TopCommunityRating { get; set; }
-
-        [ApiMember(Name = "NextUpEpisodeLimit", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
-        public int NextUpEpisodeLimit { get; set; }
-
-        [ApiMember(Name = "ResumableEpisodeLimit", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
-        public int ResumableEpisodeLimit { get; set; }
-
-        [ApiMember(Name = "LatestEpisodeLimit", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
-        public int LatestEpisodeLimit { get; set; }
-
-        public string ParentId { get; set; }
-    }
-
-    [Route("/MBT/DefaultTheme/Movies", "GET")]
-    public class GetMovieView : IReturn<MoviesView>
-    {
-        [ApiMember(Name = "UserId", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")]
-        public Guid UserId { get; set; }
-
-        [ApiMember(Name = "FamilyGenre", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
-        public string FamilyGenre { get; set; }
-
-        [ApiMember(Name = "ComedyGenre", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
-        public string ComedyGenre { get; set; }
-
-        [ApiMember(Name = "RomanceGenre", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
-        public string RomanceGenre { get; set; }
-
-        [ApiMember(Name = "LatestMoviesLimit", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
-        public int LatestMoviesLimit { get; set; }
-
-        [ApiMember(Name = "LatestTrailersLimit", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
-        public int LatestTrailersLimit { get; set; }
-
-        public string ParentId { get; set; }
-    }
-
-    [Route("/MBT/DefaultTheme/Favorites", "GET")]
-    public class GetFavoritesView : IReturn<FavoritesView>
-    {
-        [ApiMember(Name = "UserId", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")]
-        public Guid UserId { get; set; }
-    }
-
-    [Authenticated]
-    public class DefaultThemeService : BaseApiService
-    {
-        private readonly IUserManager _userManager;
-        private readonly IDtoService _dtoService;
-        private readonly ILogger _logger;
-        private readonly ILibraryManager _libraryManager;
-        private readonly IUserDataManager _userDataManager;
-
-        private readonly IImageProcessor _imageProcessor;
-        private readonly IItemRepository _itemRepo;
-
-        public DefaultThemeService(IUserManager userManager, IDtoService dtoService, ILogger logger, ILibraryManager libraryManager, IImageProcessor imageProcessor, IUserDataManager userDataManager, IItemRepository itemRepo)
-        {
-            _userManager = userManager;
-            _dtoService = dtoService;
-            _logger = logger;
-            _libraryManager = libraryManager;
-            _imageProcessor = imageProcessor;
-            _userDataManager = userDataManager;
-            _itemRepo = itemRepo;
-        }
-
-        public object Get(GetFavoritesView request)
-        {
-            var user = _userManager.GetUserById(request.UserId);
-
-            var allItems = user.RootFolder.GetRecursiveChildren(user)
-                .ToList();
-
-            var allFavoriteItems = allItems.Where(i => _userDataManager.GetUserData(user.Id, i.GetUserDataKey()).IsFavorite)
-                .ToList();
-
-            var itemsWithImages = allFavoriteItems.Where(i => !string.IsNullOrEmpty(i.PrimaryImagePath))
-                .ToList();
-
-            var itemsWithBackdrops = allFavoriteItems.Where(i => i.GetImages(ImageType.Backdrop).Any())
-                .ToList();
-
-            var view = new FavoritesView();
-
-            var fields = new List<ItemFields>();
-
-            view.BackdropItems = FilterItemsForBackdropDisplay(itemsWithBackdrops)
-                .Randomize("backdrop")
-                .Take(10)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            var spotlightItems = itemsWithBackdrops.Randomize("spotlight")
-                                                   .Take(10)
-                                                   .ToList();
-
-            view.SpotlightItems = spotlightItems
-              .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-              .ToList();
-
-            fields.Add(ItemFields.PrimaryImageAspectRatio);
-
-            view.Albums = itemsWithImages
-                .OfType<MusicAlbum>()
-                .Randomize()
-                .Take(4)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.Books = itemsWithImages
-                .OfType<Book>()
-                .Randomize()
-                .Take(6)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.Episodes = itemsWithImages
-                .OfType<Episode>()
-                .Randomize()
-                .Take(6)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.Games = itemsWithImages
-                .OfType<Game>()
-                .Randomize()
-                .Take(6)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.Movies = itemsWithImages
-                .OfType<Movie>()
-                .Randomize()
-                .Take(6)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.Series = itemsWithImages
-                .OfType<Series>()
-                .Randomize()
-                .Take(6)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.Songs = itemsWithImages
-                .OfType<Audio>()
-                .Randomize()
-                .Take(4)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.MiniSpotlights = itemsWithBackdrops
-                .Except(spotlightItems)
-                .Randomize()
-                .Take(5)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            var artists = allItems.OfType<Audio>()
-                .SelectMany(i => i.AllArtists)
-                .Distinct(StringComparer.OrdinalIgnoreCase)
-                .Randomize()
-            .Select(i =>
-            {
-                try
-                {
-                    return _libraryManager.GetArtist(i);
-                }
-                catch
-                {
-                    return null;
-                }
-            })
-                .Where(i => i != null && _userDataManager.GetUserData(user.Id, i.GetUserDataKey()).IsFavorite)
-                .Take(4)
-                .ToList();
-
-            view.Artists = artists
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            return ToOptimizedSerializedResultUsingCache(view);
-        }
-
-        public object Get(GetGamesView request)
-        {
-            var user = _userManager.GetUserById(request.UserId);
-
-            var items = GetAllLibraryItems(user.Id, _userManager, _libraryManager, request.ParentId).Where(i => i is Game || i is GameSystem)
-                .ToList();
-
-            var gamesWithImages = items.OfType<Game>().Where(i => !string.IsNullOrEmpty(i.PrimaryImagePath)).ToList();
-
-            var itemsWithBackdrops = FilterItemsForBackdropDisplay(items.Where(i => i.GetImages(ImageType.Backdrop).Any())).ToList();
-
-            var gamesWithBackdrops = itemsWithBackdrops.OfType<Game>().ToList();
-
-            var view = new GamesView();
-
-            var fields = new List<ItemFields>();
-
-            view.GameSystems = items
-                .OfType<GameSystem>()
-                .OrderBy(i => i.SortName)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            var currentUserId = user.Id;
-            view.RecentlyPlayedGames = gamesWithImages
-                .OrderByDescending(i => _userDataManager.GetUserData(currentUserId, i.GetUserDataKey()).LastPlayedDate ?? DateTime.MinValue)
-                .Take(request.RecentlyPlayedGamesLimit)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.BackdropItems = gamesWithBackdrops
-                .OrderBy(i => Guid.NewGuid())
-                .Take(10)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.SpotlightItems = gamesWithBackdrops
-                .OrderBy(i => Guid.NewGuid())
-                .Take(10)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.MultiPlayerItems = gamesWithImages
-            .Where(i => i.PlayersSupported.HasValue && i.PlayersSupported.Value > 1)
-            .Randomize()
-            .Select(i => GetItemStub(i, ImageType.Primary))
-            .Where(i => i != null)
-            .Take(1)
-            .ToList();
-
-            return ToOptimizedSerializedResultUsingCache(view);
-        }
-
-        public object Get(GetTvView request)
-        {
-            var romanceGenres = request.RomanceGenre.Split(',').ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
-            var comedyGenres = request.ComedyGenre.Split(',').ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
-
-            var user = _userManager.GetUserById(request.UserId);
-
-            var series = GetAllLibraryItems(user.Id, _userManager, _libraryManager, request.ParentId)
-                .OfType<Series>()
-                .ToList();
-
-            var seriesWithBackdrops = series.Where(i => i.GetImages(ImageType.Backdrop).Any()).ToList();
-
-            var view = new TvView();
-
-            var fields = new List<ItemFields>();
-
-            var seriesWithBestBackdrops = FilterItemsForBackdropDisplay(seriesWithBackdrops).ToList();
-
-            view.BackdropItems = seriesWithBestBackdrops
-                .OrderBy(i => Guid.NewGuid())
-                .Take(10)
-                .AsParallel()
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.ShowsItems = series
-               .Where(i => i.GetImages(ImageType.Backdrop).Any())
-               .Randomize("all")
-               .Select(i => GetItemStub(i, ImageType.Backdrop))
-               .Where(i => i != null)
-               .Take(1)
-               .ToList();
-
-            view.RomanceItems = seriesWithBackdrops
-             .Where(i => i.Genres.Any(romanceGenres.ContainsKey))
-             .Randomize("romance")
-             .Select(i => GetItemStub(i, ImageType.Backdrop))
-             .Where(i => i != null)
-             .Take(1)
-             .ToList();
-
-            view.ComedyItems = seriesWithBackdrops
-             .Where(i => i.Genres.Any(comedyGenres.ContainsKey))
-             .Randomize("comedy")
-             .Select(i => GetItemStub(i, ImageType.Backdrop))
-             .Where(i => i != null)
-             .Take(1)
-             .ToList();
-
-            var spotlightSeries = seriesWithBestBackdrops
-                .Where(i => i.CommunityRating.HasValue && i.CommunityRating >= 8.5)
-                .ToList();
-
-            if (spotlightSeries.Count < 20)
-            {
-                spotlightSeries = seriesWithBestBackdrops;
-            }
-
-            spotlightSeries = spotlightSeries
-                .OrderBy(i => Guid.NewGuid())
-                .Take(10)
-                .ToList();
-
-            view.SpotlightItems = spotlightSeries
-                .AsParallel()
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            var miniSpotlightItems = seriesWithBackdrops
-                .Except(spotlightSeries.OfType<Series>())
-                .Where(i => i.CommunityRating.HasValue && i.CommunityRating >= 8)
-                .ToList();
-
-            if (miniSpotlightItems.Count < 15)
-            {
-                miniSpotlightItems = seriesWithBackdrops;
-            }
-
-            view.MiniSpotlights = miniSpotlightItems
-              .Randomize("minispotlight")
-              .Take(5)
-              .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-              .ToList();
-
-            var nextUpEpisodes = new TvShowsService(_userManager, _userDataManager, _libraryManager, _itemRepo, _dtoService)
-                .GetNextUpEpisodes(new GetNextUpEpisodes { UserId = user.Id }, series)
-                .ToList();
-
-            fields.Add(ItemFields.PrimaryImageAspectRatio);
-
-            view.NextUpEpisodes = nextUpEpisodes
-                .Take(request.NextUpEpisodeLimit)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.SeriesIdsInProgress = nextUpEpisodes.Select(i => i.Series.Id.ToString("N")).ToList();
-
-            // Avoid implicitly captured closure
-            var currentUser1 = user;
-
-            var ownedEpisodes = series
-                .SelectMany(i => i.GetRecursiveChildren(currentUser1).Where(j => j.LocationType != LocationType.Virtual))
-                .OfType<Episode>()
-                .ToList();
-
-            // Avoid implicitly captured closure
-            var currentUser = user;
-
-            view.LatestEpisodes = ownedEpisodes
-                .OrderByDescending(i => i.DateCreated)
-                .Where(i => !_userDataManager.GetUserData(currentUser.Id, i.GetUserDataKey()).Played)
-                .Take(request.LatestEpisodeLimit)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.ResumableEpisodes = ownedEpisodes
-                .Where(i => _userDataManager.GetUserData(currentUser.Id, i.GetUserDataKey()).PlaybackPositionTicks > 0)
-                .OrderByDescending(i => _userDataManager.GetUserData(currentUser.Id, i.GetUserDataKey()).LastPlayedDate ?? DateTime.MinValue)
-                .Take(request.ResumableEpisodeLimit)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            return ToOptimizedSerializedResultUsingCache(view);
-        }
-
-        public object Get(GetMovieView request)
-        {
-            var user = _userManager.GetUserById(request.UserId);
-
-            var items = GetAllLibraryItems(user.Id, _userManager, _libraryManager, request.ParentId)
-                .Where(i => i is Movie || i is Trailer || i is BoxSet)
-                .ToList();
-
-            var view = new MoviesView();
-
-            var movies = items.OfType<Movie>()
-                .ToList();
-
-            var trailers = items.OfType<Trailer>()
-               .ToList();
-
-            var hdMovies = movies.Where(i => i.IsHD).ToList();
-
-            var familyGenres = request.FamilyGenre.Split(',').ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
-
-            var familyMovies = movies.Where(i => i.Genres.Any(familyGenres.ContainsKey)).ToList();
-
-            view.HDMoviePercentage = 100 * hdMovies.Count;
-            view.HDMoviePercentage /= movies.Count;
-
-            view.FamilyMoviePercentage = 100 * familyMovies.Count;
-            view.FamilyMoviePercentage /= movies.Count;
-
-            var moviesWithBackdrops = movies
-               .Where(i => i.GetImages(ImageType.Backdrop).Any())
-               .ToList();
-
-            var fields = new List<ItemFields>();
-
-            var itemsWithTopBackdrops = FilterItemsForBackdropDisplay(moviesWithBackdrops).ToList();
-
-            view.BackdropItems = itemsWithTopBackdrops
-                .OrderBy(i => Guid.NewGuid())
-                .Take(10)
-                .AsParallel()
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.MovieItems = moviesWithBackdrops
-               .Randomize("all")
-               .Select(i => GetItemStub(i, ImageType.Backdrop))
-               .Where(i => i != null)
-               .Take(1)
-               .ToList();
-
-            view.TrailerItems = trailers
-             .Where(i => !string.IsNullOrEmpty(i.PrimaryImagePath))
-             .Randomize()
-             .Select(i => GetItemStub(i, ImageType.Primary))
-             .Where(i => i != null)
-             .Take(1)
-             .ToList();
-
-            view.BoxSetItems = items
-             .OfType<BoxSet>()
-             .Where(i => i.GetImages(ImageType.Backdrop).Any())
-             .Randomize()
-             .Select(i => GetItemStub(i, ImageType.Backdrop))
-             .Where(i => i != null)
-             .Take(1)
-             .ToList();
-
-            view.ThreeDItems = moviesWithBackdrops
-             .Where(i => i.Is3D)
-             .Randomize("3d")
-             .Select(i => GetItemStub(i, ImageType.Backdrop))
-             .Where(i => i != null)
-             .Take(1)
-             .ToList();
-
-            var romanceGenres = request.RomanceGenre.Split(',').ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
-            var comedyGenres = request.ComedyGenre.Split(',').ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
-
-            view.RomanceItems = moviesWithBackdrops
-             .Where(i => i.Genres.Any(romanceGenres.ContainsKey))
-             .Randomize("romance")
-             .Select(i => GetItemStub(i, ImageType.Backdrop))
-             .Where(i => i != null)
-             .Take(1)
-             .ToList();
-
-            view.ComedyItems = moviesWithBackdrops
-             .Where(i => i.Genres.Any(comedyGenres.ContainsKey))
-             .Randomize("comedy")
-             .Select(i => GetItemStub(i, ImageType.Backdrop))
-             .Where(i => i != null)
-             .Take(1)
-             .ToList();
-
-            view.HDItems = hdMovies
-             .Where(i => i.GetImages(ImageType.Backdrop).Any())
-             .Randomize("hd")
-             .Select(i => GetItemStub(i, ImageType.Backdrop))
-             .Where(i => i != null)
-             .Take(1)
-             .ToList();
-
-            view.FamilyMovies = familyMovies
-             .Where(i => i.GetImages(ImageType.Backdrop).Any())
-             .Randomize("family")
-             .Select(i => GetItemStub(i, ImageType.Backdrop))
-             .Where(i => i != null)
-             .Take(1)
-             .ToList();
-
-            var currentUserId = user.Id;
-            var spotlightItems = itemsWithTopBackdrops
-                .Where(i => i.CommunityRating.HasValue && i.CommunityRating >= 8)
-                .Where(i => !_userDataManager.GetUserData(currentUserId, i.GetUserDataKey()).Played)
-                .ToList();
-
-            if (spotlightItems.Count < 20)
-            {
-                spotlightItems = itemsWithTopBackdrops;
-            }
-
-            spotlightItems = spotlightItems
-                .OrderBy(i => Guid.NewGuid())
-                .Take(10)
-                .ToList();
-
-            view.SpotlightItems = spotlightItems
-                .AsParallel()
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            var miniSpotlightItems = moviesWithBackdrops
-                .Except(spotlightItems)
-                .Where(i => i.CommunityRating.HasValue && i.CommunityRating >= 7.5)
-                .ToList();
-
-            if (miniSpotlightItems.Count < 15)
-            {
-                miniSpotlightItems = itemsWithTopBackdrops;
-            }
-
-            miniSpotlightItems = miniSpotlightItems
-              .Randomize("minispotlight")
-              .ToList();
-
-            // Avoid implicitly captured closure
-            miniSpotlightItems.InsertRange(0, moviesWithBackdrops
-                .Where(i => _userDataManager.GetUserData(currentUserId, i.GetUserDataKey()).PlaybackPositionTicks > 0)
-                .OrderByDescending(i => _userDataManager.GetUserData(currentUserId, i.GetUserDataKey()).LastPlayedDate ?? DateTime.MaxValue)
-                .Take(3));
-
-            view.MiniSpotlights = miniSpotlightItems
-              .Take(3)
-              .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-              .ToList();
-
-            // Avoid implicitly captured closure
-            var currentUserId1 = user.Id;
-
-            view.LatestMovies = movies
-                .OrderByDescending(i => i.DateCreated)
-                .Where(i => !_userDataManager.GetUserData(currentUserId1, i.GetUserDataKey()).Played)
-                .Take(request.LatestMoviesLimit)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            view.LatestTrailers = trailers
-                .OrderByDescending(i => i.DateCreated)
-                .Where(i => !_userDataManager.GetUserData(currentUserId1, i.GetUserDataKey()).Played)
-                .Take(request.LatestTrailersLimit)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
-                .ToList();
-
-            return ToOptimizedSerializedResultUsingCache(view);
-        }
-
-        private IEnumerable<BaseItem> FilterItemsForBackdropDisplay(IEnumerable<BaseItem> items)
-        {
-            var tuples = items
-                .Select(i => new Tuple<BaseItem, double>(i, GetResolution(i, ImageType.Backdrop, 0)))
-                .Where(i => i.Item2 > 0)
-                .ToList();
-
-            var topItems = tuples
-                .Where(i => i.Item2 >= 1920)
-                .ToList();
-
-            if (topItems.Count >= 10)
-            {
-                return topItems.Select(i => i.Item1);
-            }
-
-            return tuples.Select(i => i.Item1);
-        }
-
-        private double GetResolution(BaseItem item, ImageType type, int index)
-        {
-            try
-            {
-                var info = item.GetImageInfo(type, index);
-
-                var size = _imageProcessor.GetImageSize(info.Path, info.DateModified);
-
-                return size.Width;
-            }
-            catch
-            {
-                return 0;
-            }
-        }
-
-        private ItemStub GetItemStub(BaseItem item, ImageType imageType)
-        {
-            var stub = new ItemStub
-            {
-                Id = _dtoService.GetDtoId(item),
-                Name = item.Name,
-                ImageType = imageType
-            };
-
-            try
-            {
-                var tag = _imageProcessor.GetImageCacheTag(item, imageType);
-
-                if (tag != null)
-                {
-                    stub.ImageTag = tag;
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.ErrorException("Error getting image tag for {0}", ex, item.Path);
-                return null;
-            }
-
-            return stub;
-        }
-    }
-
-    static class RandomExtension
-    {
-        public static IEnumerable<T> Randomize<T>(this IEnumerable<T> sequence, string type = "none")
-            where T : BaseItem
-        {
-            var hour = DateTime.Now.Hour + DateTime.Now.Day + 2;
-
-            var typeCode = type.GetHashCode();
-
-            return sequence.OrderBy(i =>
-            {
-                var val = i.Id.GetHashCode() + i.Genres.Count + i.People.Count + (i.ProductionYear ?? 0) + i.DateCreated.Minute + i.DateModified.Minute + typeCode;
-
-                return val % hour;
-            });
-        }
-
-        public static IEnumerable<string> Randomize(this IEnumerable<string> sequence)
-        {
-            var hour = DateTime.Now.Hour + 2;
-
-            return sequence.OrderBy(i => i.GetHashCode() % hour);
-        }
-    }
-}
diff --git a/MediaBrowser.Api/DefaultTheme/Models.cs b/MediaBrowser.Api/DefaultTheme/Models.cs
deleted file mode 100644
index 6cc7af4993..0000000000
--- a/MediaBrowser.Api/DefaultTheme/Models.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
-using System;
-using System.Collections.Generic;
-
-namespace MediaBrowser.Api.DefaultTheme
-{
-    public class ItemStub
-    {
-        public string Name { get; set; }
-        public string Id { get; set; }
-        public string ImageTag { get; set; }
-        public ImageType ImageType { get; set; }
-    }
-
-    public class MoviesView : BaseView
-    {
-        public List<ItemStub> MovieItems { get; set; }
-
-        public List<ItemStub> BoxSetItems { get; set; }
-        public List<ItemStub> TrailerItems { get; set; }
-        public List<ItemStub> HDItems { get; set; }
-        public List<ItemStub> ThreeDItems { get; set; }
-
-        public List<ItemStub> FamilyMovies { get; set; }
-
-        public List<ItemStub> RomanceItems { get; set; }
-        public List<ItemStub> ComedyItems { get; set; }
-
-        public double FamilyMoviePercentage { get; set; }
-
-        public double HDMoviePercentage { get; set; }
-
-        public List<BaseItemDto> LatestTrailers { get; set; }
-        public List<BaseItemDto> LatestMovies { get; set; }
-    }
-
-    public class TvView : BaseView
-    {
-        public List<ItemStub> ShowsItems { get; set; }
-
-        public List<ItemStub> RomanceItems { get; set; }
-        public List<ItemStub> ComedyItems { get; set; }
-
-        public List<string> SeriesIdsInProgress { get; set; }
-
-        public List<BaseItemDto> LatestEpisodes { get; set; }
-        public List<BaseItemDto> NextUpEpisodes { get; set; }
-        public List<BaseItemDto> ResumableEpisodes { get; set; }
-    }
-
-    public class ItemByNameInfo
-    {
-        public string Name { get; set; }
-        public int ItemCount { get; set; }
-    }
-
-    public class GamesView : BaseView
-    {
-        public List<ItemStub> MultiPlayerItems { get; set; }
-        public List<BaseItemDto> GameSystems { get; set; }
-        public List<BaseItemDto> RecentlyPlayedGames { get; set; }
-    }
-
-    public class BaseView
-    {
-        public List<BaseItemDto> BackdropItems { get; set; }
-        public List<BaseItemDto> SpotlightItems { get; set; }
-        public List<BaseItemDto> MiniSpotlights { get; set; }
-    }
-
-    public class FavoritesView : BaseView
-    {
-        public List<BaseItemDto> Movies { get; set; }
-        public List<BaseItemDto> Series { get; set; }
-        public List<BaseItemDto> Episodes { get; set; }
-        public List<BaseItemDto> Games { get; set; }
-        public List<BaseItemDto> Books { get; set; }
-        public List<BaseItemDto> Albums { get; set; }
-        public List<BaseItemDto> Songs { get; set; }
-        public List<BaseItemDto> Artists { get; set; }
-    }
-}
diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs
index f6588714e0..56f66bd6b0 100644
--- a/MediaBrowser.Api/Library/LibraryService.cs
+++ b/MediaBrowser.Api/Library/LibraryService.cs
@@ -284,6 +284,11 @@ namespace MediaBrowser.Api.Library
             return ToOptimizedResult(result);
         }
 
+        public void Post(PostUpdatedSeries request)
+        {
+            
+        }
+
         public object Get(GetFile request)
         {
             var item = _libraryManager.GetItemById(request.Id);
diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index f2f0ec790c..7b6f9ee46f 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -77,8 +77,6 @@
     <Compile Include="AppThemeService.cs" />
     <Compile Include="BaseApiService.cs" />
     <Compile Include="ConfigurationService.cs" />
-    <Compile Include="DefaultTheme\DefaultThemeService.cs" />
-    <Compile Include="DefaultTheme\Models.cs" />
     <Compile Include="DisplayPreferencesService.cs" />
     <Compile Include="EnvironmentService.cs" />
     <Compile Include="GamesService.cs" />
diff --git a/MediaBrowser.Common.Implementations/Serialization/JsonSerializer.cs b/MediaBrowser.Common.Implementations/Serialization/JsonSerializer.cs
index 130e21b6ef..e7fd121788 100644
--- a/MediaBrowser.Common.Implementations/Serialization/JsonSerializer.cs
+++ b/MediaBrowser.Common.Implementations/Serialization/JsonSerializer.cs
@@ -210,25 +210,5 @@ namespace MediaBrowser.Common.Implementations.Serialization
 
             return ServiceStack.Text.JsonSerializer.SerializeToString(obj, obj.GetType());
         }
-
-        /// <summary>
-        /// Serializes to bytes.
-        /// </summary>
-        /// <param name="obj">The obj.</param>
-        /// <returns>System.Byte[][].</returns>
-        /// <exception cref="System.ArgumentNullException">obj</exception>
-        public byte[] SerializeToBytes(object obj)
-        {
-            if (obj == null)
-            {
-                throw new ArgumentNullException("obj");
-            }
-
-            using (var stream = new MemoryStream())
-            {
-                SerializeToStream(obj, stream);
-                return stream.ToArray();
-            }
-        }
     }
 }
diff --git a/MediaBrowser.Common.Implementations/Serialization/XmlSerializer.cs b/MediaBrowser.Common.Implementations/Serialization/XmlSerializer.cs
index 06c60dacda..cef744753a 100644
--- a/MediaBrowser.Common.Implementations/Serialization/XmlSerializer.cs
+++ b/MediaBrowser.Common.Implementations/Serialization/XmlSerializer.cs
@@ -91,20 +91,5 @@ namespace MediaBrowser.Common.Implementations.Serialization
                 return DeserializeFromStream(type, stream);
             }
         }
-
-        /// <summary>
-        /// Serializes to bytes.
-        /// </summary>
-        /// <param name="obj">The obj.</param>
-        /// <returns>System.Byte[][].</returns>
-        public byte[] SerializeToBytes(object obj)
-        {
-            using (var stream = new MemoryStream())
-            {
-                SerializeToStream(obj, stream);
-
-                return stream.ToArray();
-            }
-        }
     }
 }
diff --git a/MediaBrowser.Common/Configuration/ConfigurationHelper.cs b/MediaBrowser.Common/Configuration/ConfigurationHelper.cs
index 64c2e87de1..8c904b0dbf 100644
--- a/MediaBrowser.Common/Configuration/ConfigurationHelper.cs
+++ b/MediaBrowser.Common/Configuration/ConfigurationHelper.cs
@@ -36,21 +36,25 @@ namespace MediaBrowser.Common.Configuration
                 configuration = Activator.CreateInstance(type);
             }
 
-            // Take the object we just got and serialize it back to bytes
-            var newBytes = xmlSerializer.SerializeToBytes(configuration);
-
-            // If the file didn't exist before, or if something has changed, re-save
-            if (buffer == null || !buffer.SequenceEqual(newBytes))
+            using (var stream = new MemoryStream())
             {
-                Directory.CreateDirectory(Path.GetDirectoryName(path));
-                
-                // Save it after load in case we got new items
-                File.WriteAllBytes(path, newBytes);
-            }
+                xmlSerializer.SerializeToStream(configuration, stream);
 
-            return configuration;
-        }
+                // Take the object we just got and serialize it back to bytes
+                var newBytes = stream.ToArray();
+
+                // If the file didn't exist before, or if something has changed, re-save
+                if (buffer == null || !buffer.SequenceEqual(newBytes))
+                {
+                    Directory.CreateDirectory(Path.GetDirectoryName(path));
 
+                    // Save it after load in case we got new items
+                    File.WriteAllBytes(path, newBytes);
+                }
+
+                return configuration;
+            }
+        }
 
         /// <summary>
         /// Reads an xml configuration file from the file system
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 36e65f5f53..a476f555fb 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1045,13 +1045,6 @@ namespace MediaBrowser.Controller.Entities
                                     return false;
                                 }
                             }
-                            if (info.ItemIndexNumber.HasValue)
-                            {
-                                if (info.ItemIndexNumber.Value != (i.IndexNumber ?? -1))
-                                {
-                                    return false;
-                                }
-                            }
                             return true;
                         }
                     }
diff --git a/MediaBrowser.Controller/Entities/LinkedChild.cs b/MediaBrowser.Controller/Entities/LinkedChild.cs
index 3fc0ab716e..c77fe18c45 100644
--- a/MediaBrowser.Controller/Entities/LinkedChild.cs
+++ b/MediaBrowser.Controller/Entities/LinkedChild.cs
@@ -12,7 +12,6 @@ namespace MediaBrowser.Controller.Entities
         public string ItemName { get; set; }
         public string ItemType { get; set; }
         public int? ItemYear { get; set; }
-        public int? ItemIndexNumber { get; set; }
 
         /// <summary>
         /// Serves as a cache
@@ -24,11 +23,8 @@ namespace MediaBrowser.Controller.Entities
         {
             return new LinkedChild
             {
-                ItemName = item.Name,
-                ItemYear = item.ProductionYear,
-                ItemType = item.GetType().Name,
-                Type = LinkedChildType.Manual,
-                ItemIndexNumber = item.IndexNumber
+                Path = item.Path,
+                Type = LinkedChildType.Manual
             };
         }
     }
diff --git a/MediaBrowser.Controller/Library/TVUtils.cs b/MediaBrowser.Controller/Library/TVUtils.cs
index 5e43eb6441..541dfd2268 100644
--- a/MediaBrowser.Controller/Library/TVUtils.cs
+++ b/MediaBrowser.Controller/Library/TVUtils.cs
@@ -303,8 +303,6 @@ namespace MediaBrowser.Controller.Library
                 }
                 else
                 {
-                    logger.Debug("Evaluating series file: {0}", child.FullName);
-                    
                     var fullName = child.FullName;
 
                     if (EntityResolutionHelper.IsVideoFile(fullName) || EntityResolutionHelper.IsVideoPlaceHolder(fullName))
diff --git a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
index 7e6895ec5f..06d7382972 100644
--- a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
+++ b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
@@ -1304,30 +1304,19 @@ namespace MediaBrowser.Controller.Providers
                                 break;
                             }
 
-                        case "Type":
+                        case "Path":
                             {
-                                linkedItem.ItemType = reader.ReadElementContentAsString();
+                                linkedItem.Path = reader.ReadElementContentAsString();
                                 break;
                             }
 
-                        case "Year":
+                        case "Type":
                             {
-                                var val = reader.ReadElementContentAsString();
-
-                                if (!string.IsNullOrWhiteSpace(val))
-                                {
-                                    int rval;
-
-                                    if (int.TryParse(val, NumberStyles.Integer, _usCulture, out rval))
-                                    {
-                                        linkedItem.ItemYear = rval;
-                                    }
-                                }
-
+                                linkedItem.ItemType = reader.ReadElementContentAsString();
                                 break;
                             }
 
-                        case "IndexNumber":
+                        case "Year":
                             {
                                 var val = reader.ReadElementContentAsString();
 
@@ -1337,7 +1326,7 @@ namespace MediaBrowser.Controller.Providers
 
                                     if (int.TryParse(val, NumberStyles.Integer, _usCulture, out rval))
                                     {
-                                        linkedItem.ItemIndexNumber = rval;
+                                        linkedItem.ItemYear = rval;
                                     }
                                 }
 
diff --git a/MediaBrowser.Dlna/Didl/DidlBuilder.cs b/MediaBrowser.Dlna/Didl/DidlBuilder.cs
index 8ad2257705..ec86f69e79 100644
--- a/MediaBrowser.Dlna/Didl/DidlBuilder.cs
+++ b/MediaBrowser.Dlna/Didl/DidlBuilder.cs
@@ -592,7 +592,7 @@ namespace MediaBrowser.Dlna.Didl
             icon.InnerText = iconUrlInfo.Url;
             element.AppendChild(icon);
 
-            if (!_profile.EnableAlbumArtInDidl)
+            if (!_profile.EnableAlbumArtInDidl && !(item is Photo))
             {
                 return;
             }
diff --git a/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj b/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj
index b103d9f5a0..6f8cf31d1e 100644
--- a/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj
+++ b/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj
@@ -54,6 +54,7 @@
     <Compile Include="Parsers\GameXmlParser.cs" />
     <Compile Include="Parsers\MovieXmlParser.cs" />
     <Compile Include="Parsers\MusicVideoXmlParser.cs" />
+    <Compile Include="Parsers\PlaylistXmlParser.cs" />
     <Compile Include="Parsers\SeasonXmlParser.cs" />
     <Compile Include="Parsers\SeriesXmlParser.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -69,6 +70,7 @@
     <Compile Include="Providers\MovieXmlProvider.cs" />
     <Compile Include="Providers\MusicVideoXmlProvider.cs" />
     <Compile Include="Providers\PersonXmlProvider.cs" />
+    <Compile Include="Providers\PlaylistXmlProvider.cs" />
     <Compile Include="Providers\SeasonXmlProvider.cs" />
     <Compile Include="Providers\SeriesXmlProvider.cs" />
     <Compile Include="Providers\TrailerXmlProvider.cs" />
diff --git a/MediaBrowser.LocalMetadata/Parsers/BoxSetXmlParser.cs b/MediaBrowser.LocalMetadata/Parsers/BoxSetXmlParser.cs
index 85a72cf281..f89e29d54b 100644
--- a/MediaBrowser.LocalMetadata/Parsers/BoxSetXmlParser.cs
+++ b/MediaBrowser.LocalMetadata/Parsers/BoxSetXmlParser.cs
@@ -1,17 +1,14 @@
-using System.Collections.Generic;
-using System.Globalization;
-using System.Xml;
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Logging;
+using System.Collections.Generic;
+using System.Xml;
 
 namespace MediaBrowser.LocalMetadata.Parsers
 {
     public class BoxSetXmlParser : BaseItemXmlParser<BoxSet>
     {
-        private readonly CultureInfo UsCulture = new CultureInfo("en-US");
-
         public BoxSetXmlParser(ILogger logger)
             : base(logger)
         {
diff --git a/MediaBrowser.LocalMetadata/Parsers/PlaylistXmlParser.cs b/MediaBrowser.LocalMetadata/Parsers/PlaylistXmlParser.cs
new file mode 100644
index 0000000000..83bc6a49ee
--- /dev/null
+++ b/MediaBrowser.LocalMetadata/Parsers/PlaylistXmlParser.cs
@@ -0,0 +1,72 @@
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Playlists;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Logging;
+using System.Collections.Generic;
+using System.Xml;
+
+namespace MediaBrowser.LocalMetadata.Parsers
+{
+    public class PlaylistXmlParser : BaseItemXmlParser<Playlist>
+    {
+        public PlaylistXmlParser(ILogger logger)
+            : base(logger)
+        {
+        }
+
+        protected override void FetchDataFromXmlNode(XmlReader reader, Playlist item)
+        {
+            switch (reader.Name)
+            {
+                case "PlaylistItems":
+
+                    using (var subReader = reader.ReadSubtree())
+                    {
+                        FetchFromCollectionItemsNode(subReader, item);
+                    }
+                    break;
+
+                default:
+                    base.FetchDataFromXmlNode(reader, item);
+                    break;
+            }
+        }
+
+        private void FetchFromCollectionItemsNode(XmlReader reader, Playlist item)
+        {
+            reader.MoveToContent();
+
+            var list = new List<LinkedChild>();
+
+            while (reader.Read())
+            {
+                if (reader.NodeType == XmlNodeType.Element)
+                {
+                    switch (reader.Name)
+                    {
+                        case "PlaylistItem":
+                            {
+                                using (var subReader = reader.ReadSubtree())
+                                {
+                                    var child = GetLinkedChild(subReader);
+
+                                    if (child != null)
+                                    {
+                                        list.Add(child);
+                                    }
+                                }
+
+                                break;
+                            }
+
+                        default:
+                            reader.Skip();
+                            break;
+                    }
+                }
+            }
+
+            item.LinkedChildren = list;
+        }
+    }
+}
diff --git a/MediaBrowser.LocalMetadata/Providers/BoxSetXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/BoxSetXmlProvider.cs
index 871c2bd926..6e40c35947 100644
--- a/MediaBrowser.LocalMetadata/Providers/BoxSetXmlProvider.cs
+++ b/MediaBrowser.LocalMetadata/Providers/BoxSetXmlProvider.cs
@@ -1,10 +1,10 @@
-using System.IO;
-using System.Threading;
-using MediaBrowser.Common.IO;
+using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.LocalMetadata.Parsers;
 using MediaBrowser.Model.Logging;
+using System.IO;
+using System.Threading;
 
 namespace MediaBrowser.LocalMetadata.Providers
 {
diff --git a/MediaBrowser.LocalMetadata/Providers/PlaylistXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/PlaylistXmlProvider.cs
new file mode 100644
index 0000000000..2279ae0521
--- /dev/null
+++ b/MediaBrowser.LocalMetadata/Providers/PlaylistXmlProvider.cs
@@ -0,0 +1,31 @@
+using MediaBrowser.Common.IO;
+using MediaBrowser.Controller.Playlists;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.LocalMetadata.Parsers;
+using MediaBrowser.Model.Logging;
+using System.IO;
+using System.Threading;
+
+namespace MediaBrowser.LocalMetadata.Providers
+{
+    class PlaylistXmlProvider : BaseXmlProvider<Playlist>
+    {
+        private readonly ILogger _logger;
+
+        public PlaylistXmlProvider(IFileSystem fileSystem, ILogger logger)
+            : base(fileSystem)
+        {
+            _logger = logger;
+        }
+
+        protected override void Fetch(LocalMetadataResult<Playlist> result, string path, CancellationToken cancellationToken)
+        {
+            new PlaylistXmlParser(_logger).Fetch(result.Item, path, cancellationToken);
+        }
+
+        protected override FileSystemInfo GetXmlFile(ItemInfo info, IDirectoryService directoryService)
+        {
+            return directoryService.GetFile(Path.Combine(info.Path, "playlist.xml"));
+        }
+    }
+}
diff --git a/MediaBrowser.LocalMetadata/Providers/TrailerXmlProvider.cs b/MediaBrowser.LocalMetadata/Providers/TrailerXmlProvider.cs
index db3b2fcf00..7f96f7d961 100644
--- a/MediaBrowser.LocalMetadata/Providers/TrailerXmlProvider.cs
+++ b/MediaBrowser.LocalMetadata/Providers/TrailerXmlProvider.cs
@@ -1,12 +1,12 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using MediaBrowser.Common.IO;
+using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.LocalMetadata.Parsers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
 
 namespace MediaBrowser.LocalMetadata.Providers
 {
diff --git a/MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs
index cdb3a2500f..abc7e3b3fa 100644
--- a/MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs
@@ -1,6 +1,6 @@
 using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Playlists;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
@@ -31,7 +31,7 @@ namespace MediaBrowser.LocalMetadata.Savers
                 return false;
             }
 
-            return item is BoxSet && updateType >= ItemUpdateType.MetadataDownload;
+            return item is Playlist && updateType >= ItemUpdateType.MetadataImport;
         }
 
         /// <summary>
@@ -46,7 +46,7 @@ namespace MediaBrowser.LocalMetadata.Savers
 
             builder.Append("<Item>");
 
-            XmlSaverHelpers.AddCommonNodes((BoxSet)item, builder);
+            XmlSaverHelpers.AddCommonNodes((Playlist)item, builder);
 
             builder.Append("</Item>");
 
diff --git a/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs b/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs
index 491592989c..a007a95cf0 100644
--- a/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs
+++ b/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs
@@ -717,7 +717,6 @@ namespace MediaBrowser.LocalMetadata.Savers
             {
                 builder.Append("<" + singularNodeName + ">");
 
-                builder.Append("<Name>" + SecurityElement.Escape(link.ItemName) + "</Name>");
                 builder.Append("<Type>" + SecurityElement.Escape(link.ItemType) + "</Type>");
 
                 if (link.ItemYear.HasValue)
@@ -725,10 +724,7 @@ namespace MediaBrowser.LocalMetadata.Savers
                     builder.Append("<Year>" + SecurityElement.Escape(link.ItemYear.Value.ToString(UsCulture)) + "</Year>");
                 }
 
-                if (link.ItemIndexNumber.HasValue)
-                {
-                    builder.Append("<IndexNumber>" + SecurityElement.Escape(link.ItemIndexNumber.Value.ToString(UsCulture)) + "</IndexNumber>");
-                }
+                builder.Append("<Path>" + SecurityElement.Escape((link.Path ?? string.Empty)) + "</Path>");
 
                 builder.Append("</" + singularNodeName + ">");
             }
diff --git a/MediaBrowser.Model/Serialization/IJsonSerializer.cs b/MediaBrowser.Model/Serialization/IJsonSerializer.cs
index 77a14c1e5d..cd1e550e50 100644
--- a/MediaBrowser.Model/Serialization/IJsonSerializer.cs
+++ b/MediaBrowser.Model/Serialization/IJsonSerializer.cs
@@ -83,13 +83,5 @@ namespace MediaBrowser.Model.Serialization
         /// <returns>System.String.</returns>
         /// <exception cref="System.ArgumentNullException">obj</exception>
         string SerializeToString(object obj);
-
-        /// <summary>
-        /// Serializes to bytes.
-        /// </summary>
-        /// <param name="obj">The obj.</param>
-        /// <returns>System.Byte[][].</returns>
-        /// <exception cref="System.ArgumentNullException">obj</exception>
-        byte[] SerializeToBytes(object obj);
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/Serialization/IXmlSerializer.cs b/MediaBrowser.Model/Serialization/IXmlSerializer.cs
index 1773773502..eb23d784fe 100644
--- a/MediaBrowser.Model/Serialization/IXmlSerializer.cs
+++ b/MediaBrowser.Model/Serialization/IXmlSerializer.cs
@@ -42,12 +42,5 @@ namespace MediaBrowser.Model.Serialization
         /// <param name="buffer">The buffer.</param>
         /// <returns>System.Object.</returns>
         object DeserializeFromBytes(Type type, byte[] buffer);
-
-        /// <summary>
-        /// Serializes to bytes.
-        /// </summary>
-        /// <param name="obj">The obj.</param>
-        /// <returns>System.Byte[][].</returns>
-        byte[] SerializeToBytes(object obj);
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index 6e0b654fd9..90b77828bb 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -152,7 +152,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             HostContext.Config.HandlerFactoryPath = ListenerRequest.GetHandlerPathIfAny(UrlPrefixes.First());
 
             _listener = NativeWebSocket.IsSupported
-                ? _listener = new HttpListenerServer(_logger)
+                ? _listener = new WebSocketSharpListener(_logger)
                 : _listener = new WebSocketSharpListener(_logger);
 
             _listener.WebSocketHandler = WebSocketHandler;
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json
index 4b2e7ba1d8..c99a00ef0f 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "Video: {0}",
     "LabelRemoteAccessUrl": "Remote access: {0}",
     "LabelRunningOnPort": "Running on port {0}.",
-    "LabelRunningOnPorts": "Running on ports {0} and {1}.",
     "HeaderLatestFromChannel": "Latest from {0}",
     "ButtonDownload": "Download",
     "LabelUnknownLanaguage": "Unknown language",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "LIVE",
     "LabelNewProgram": "NEW",
     "LabelPremiereProgram": "PREMIERE",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Change Folder Type",
     "HeaderChangeFolderTypeHelp": "To change the folder type, please remove and rebuild the collection with the new type.",
     "HeaderAlert": "Alert",
@@ -318,6 +318,15 @@
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Select",
     "ButtonNew": "New",
-    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
-    "HeaderVideoError": "Video Error"
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM playback plugin.",
+    "HeaderVideoError": "Video Error",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "LabelName": "Name:",
+    "ButtonSubmit": "Submit",
+    "LabelSelectPlaylist": "Playlist:",
+    "OptionNewPlaylist": "New playlist...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 d3bdf0bbb6..e696238eb4 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ca.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ca.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "Video: {0}",
     "LabelRemoteAccessUrl": "Remote access: {0}",
     "LabelRunningOnPort": "Running on port {0}.",
-    "LabelRunningOnPorts": "Running on ports {0} and {1}.",
     "HeaderLatestFromChannel": "Latest from {0}",
     "ButtonDownload": "Download",
     "LabelUnknownLanaguage": "Unknown language",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "LIVE",
     "LabelNewProgram": "NEW",
     "LabelPremiereProgram": "PREMIERE",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Change Folder Type",
     "HeaderChangeFolderTypeHelp": "To change the folder type, please remove and rebuild the collection with the new type.",
     "HeaderAlert": "Alert",
@@ -318,6 +318,15 @@
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Select",
     "ButtonNew": "New",
-    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
-    "HeaderVideoError": "Video Error"
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM playback plugin.",
+    "HeaderVideoError": "Video Error",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "LabelName": "Name:",
+    "ButtonSubmit": "Submit",
+    "LabelSelectPlaylist": "Playlist:",
+    "OptionNewPlaylist": "New playlist...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 a853a39eb2..38fc9135f6 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/cs.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/cs.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "Video: {0}",
     "LabelRemoteAccessUrl": "Remote access: {0}",
     "LabelRunningOnPort": "Running on port {0}.",
-    "LabelRunningOnPorts": "Running on ports {0} and {1}.",
     "HeaderLatestFromChannel": "Latest from {0}",
     "ButtonDownload": "St\u00e1hnout",
     "LabelUnknownLanaguage": "Unknown language",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "LIVE",
     "LabelNewProgram": "NEW",
     "LabelPremiereProgram": "PREMIERE",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Change Folder Type",
     "HeaderChangeFolderTypeHelp": "To change the folder type, please remove and rebuild the collection with the new type.",
     "HeaderAlert": "Alert",
@@ -318,6 +318,15 @@
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Vybrat",
     "ButtonNew": "Nov\u00e9",
-    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
-    "HeaderVideoError": "Video Error"
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM playback plugin.",
+    "HeaderVideoError": "Video Error",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "LabelName": "Jm\u00e9no:",
+    "ButtonSubmit": "Submit",
+    "LabelSelectPlaylist": "Playlist:",
+    "OptionNewPlaylist": "New playlist...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 8c13b22b74..32b83f77e4 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/da.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/da.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "Video: {0}",
     "LabelRemoteAccessUrl": "Remote access: {0}",
     "LabelRunningOnPort": "Running on port {0}.",
-    "LabelRunningOnPorts": "Running on ports {0} and {1}.",
     "HeaderLatestFromChannel": "Latest from {0}",
     "ButtonDownload": "Download",
     "LabelUnknownLanaguage": "Unknown language",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "LIVE",
     "LabelNewProgram": "NEW",
     "LabelPremiereProgram": "PREMIERE",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Change Folder Type",
     "HeaderChangeFolderTypeHelp": "To change the folder type, please remove and rebuild the collection with the new type.",
     "HeaderAlert": "Alert",
@@ -318,6 +318,15 @@
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "V\u00e6lg",
     "ButtonNew": "Ny",
-    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
-    "HeaderVideoError": "Video Error"
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM playback plugin.",
+    "HeaderVideoError": "Video Error",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "LabelName": "Navn:",
+    "ButtonSubmit": "Submit",
+    "LabelSelectPlaylist": "Playlist:",
+    "OptionNewPlaylist": "New playlist...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 c871cae0a2..6c97357041 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "Video: {0}",
     "LabelRemoteAccessUrl": "Remote access: {0}",
     "LabelRunningOnPort": "Running on port {0}.",
-    "LabelRunningOnPorts": "Running on ports {0} and {1}.",
     "HeaderLatestFromChannel": "Latest from {0}",
     "ButtonDownload": "Download",
     "LabelUnknownLanaguage": "Unknown language",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "LIVE",
     "LabelNewProgram": "NEW",
     "LabelPremiereProgram": "PREMIERE",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Change Folder Type",
     "HeaderChangeFolderTypeHelp": "To change the folder type, please remove and rebuild the collection with the new type.",
     "HeaderAlert": "Alert",
@@ -318,6 +318,15 @@
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Ausw\u00e4hlen",
     "ButtonNew": "Neu",
-    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
-    "HeaderVideoError": "Video Error"
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM playback plugin.",
+    "HeaderVideoError": "Video Error",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "LabelName": "Name:",
+    "ButtonSubmit": "Submit",
+    "LabelSelectPlaylist": "Playlist:",
+    "OptionNewPlaylist": "New playlist...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 3514a060ad..a3e4cc1ee8 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/el.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/el.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "Video: {0}",
     "LabelRemoteAccessUrl": "Remote access: {0}",
     "LabelRunningOnPort": "Running on port {0}.",
-    "LabelRunningOnPorts": "Running on ports {0} and {1}.",
     "HeaderLatestFromChannel": "Latest from {0}",
     "ButtonDownload": "Download",
     "LabelUnknownLanaguage": "Unknown language",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "LIVE",
     "LabelNewProgram": "NEW",
     "LabelPremiereProgram": "PREMIERE",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Change Folder Type",
     "HeaderChangeFolderTypeHelp": "To change the folder type, please remove and rebuild the collection with the new type.",
     "HeaderAlert": "Alert",
@@ -318,6 +318,15 @@
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Select",
     "ButtonNew": "New",
-    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
-    "HeaderVideoError": "Video Error"
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM playback plugin.",
+    "HeaderVideoError": "Video Error",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "LabelName": "Name:",
+    "ButtonSubmit": "Submit",
+    "LabelSelectPlaylist": "Playlist:",
+    "OptionNewPlaylist": "New playlist...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 da4787718a..d6911ac4df 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_GB.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_GB.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "Video: {0}",
     "LabelRemoteAccessUrl": "Remote access: {0}",
     "LabelRunningOnPort": "Running on port {0}.",
-    "LabelRunningOnPorts": "Running on ports {0} and {1}.",
     "HeaderLatestFromChannel": "Latest from {0}",
     "ButtonDownload": "Download",
     "LabelUnknownLanaguage": "Unknown language",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "LIVE",
     "LabelNewProgram": "NEW",
     "LabelPremiereProgram": "PREMIERE",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Change Folder Type",
     "HeaderChangeFolderTypeHelp": "To change the folder type, please remove and rebuild the collection with the new type.",
     "HeaderAlert": "Alert",
@@ -318,6 +318,15 @@
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Select",
     "ButtonNew": "New",
-    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
-    "HeaderVideoError": "Video Error"
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM playback plugin.",
+    "HeaderVideoError": "Video Error",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "LabelName": "Name:",
+    "ButtonSubmit": "Submit",
+    "LabelSelectPlaylist": "Playlist:",
+    "OptionNewPlaylist": "New playlist...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 ff77db14b3..98efe6cefc 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "Video: {0}",
     "LabelRemoteAccessUrl": "Remote access: {0}",
     "LabelRunningOnPort": "Running on port {0}.",
-    "LabelRunningOnPorts": "Running on ports {0} and {1}.",
     "HeaderLatestFromChannel": "Latest from {0}",
     "ButtonDownload": "Download",
     "LabelUnknownLanaguage": "Unknown language",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "LIVE",
     "LabelNewProgram": "NEW",
     "LabelPremiereProgram": "PREMIERE",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Change Folder Type",
     "HeaderChangeFolderTypeHelp": "To change the folder type, please remove and rebuild the collection with the new type.",
     "HeaderAlert": "Alert",
@@ -318,6 +318,15 @@
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Select",
     "ButtonNew": "New",
-    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
-    "HeaderVideoError": "Video Error"
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM playback plugin.",
+    "HeaderVideoError": "Video Error",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "LabelName": "Name:",
+    "ButtonSubmit": "Submit",
+    "LabelSelectPlaylist": "Playlist:",
+    "OptionNewPlaylist": "New playlist...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 f5f30360df..b540e2b3c9 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "Video: {0}",
     "LabelRemoteAccessUrl": "Acceso remoto: {0}",
     "LabelRunningOnPort": "Ejecut\u00e1ndose en el puerto {0}.",
-    "LabelRunningOnPorts": "Ejecut\u00e1ndose en los puertos {0} y {1}.",
     "HeaderLatestFromChannel": "Lo \u00faltimo de {0}",
     "ButtonDownload": "Descargar",
     "LabelUnknownLanaguage": "Idioma desconocido",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "LIVE",
     "LabelNewProgram": "NEW",
     "LabelPremiereProgram": "PREMIERE",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Change Folder Type",
     "HeaderChangeFolderTypeHelp": "To change the folder type, please remove and rebuild the collection with the new type.",
     "HeaderAlert": "Alert",
@@ -318,6 +318,15 @@
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Seleccionar",
     "ButtonNew": "Nuevo",
-    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
-    "HeaderVideoError": "Video Error"
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM playback plugin.",
+    "HeaderVideoError": "Video Error",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "LabelName": "Nombre:",
+    "ButtonSubmit": "Enviar",
+    "LabelSelectPlaylist": "Playlist:",
+    "OptionNewPlaylist": "New playlist...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 d9855c52ff..3bf3f48e29 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "Video: {0}",
     "LabelRemoteAccessUrl": "Acceso remoto: {0}",
     "LabelRunningOnPort": "Ejecutando en el puerto: {0}.",
-    "LabelRunningOnPorts": "Ejecutando en los puertos {0} y {1}.",
     "HeaderLatestFromChannel": "M\u00e1s Recientes de {0}",
     "ButtonDownload": "Descargar",
     "LabelUnknownLanaguage": "Idioma desconocido",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "EN VIVO",
     "LabelNewProgram": "NUEVO",
     "LabelPremiereProgram": "ESTRENO",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Cambiar tipo de carpeta",
     "HeaderChangeFolderTypeHelp": "Para cambiar el tipo de carpeta, por favor elimine y reconstruya la colecci\u00f3n con el nuevo tipo.",
     "HeaderAlert": "Alerta",
@@ -319,5 +319,14 @@
     "ButtonSelect": "Seleccionar",
     "ButtonNew": "Nuevo",
     "MessageInternetExplorerWebm": "Para mejores resultados con Internet Explorer por favor instale el complemento WebM para IE.",
-    "HeaderVideoError": "Error de Video"
+    "HeaderVideoError": "Error de Video",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "LabelName": "Nombre:",
+    "ButtonSubmit": "Enviar",
+    "LabelSelectPlaylist": "Playlist:",
+    "OptionNewPlaylist": "New playlist...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 5086dcfacf..002390edc2 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "Vid\u00e9o: {0}",
     "LabelRemoteAccessUrl": "Acc\u00e8s distant: {0}",
     "LabelRunningOnPort": "En ex\u00e9cution sur le port: {0}.",
-    "LabelRunningOnPorts": "En ex\u00e9cution sur le port: {0} et {1}.",
     "HeaderLatestFromChannel": "Les plus r\u00e9cents de {0}",
     "ButtonDownload": "T\u00e9l\u00e9chargement",
     "LabelUnknownLanaguage": "Langue inconnue",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "DIRECT",
     "LabelNewProgram": "NOUVEAUTE",
     "LabelPremiereProgram": "PREMIERE",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Modifier le type de dossier",
     "HeaderChangeFolderTypeHelp": "Pour modifier le type de dossier, merci de supprimer et reconstruire la collection avec le nouveau type.",
     "HeaderAlert": "Alerte",
@@ -319,5 +319,14 @@
     "ButtonSelect": "S\u00e9lectionner",
     "ButtonNew": "Nouveau",
     "MessageInternetExplorerWebm": "Pour de meilleurs r\u00e9sultats avec Internet Explorer, merci d'installer le plugin WebM pour IE.",
-    "HeaderVideoError": "Erreur vid\u00e9o"
+    "HeaderVideoError": "Erreur vid\u00e9o",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "LabelName": "Nom:",
+    "ButtonSubmit": "Soumettre",
+    "LabelSelectPlaylist": "Playlist:",
+    "OptionNewPlaylist": "New playlist...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 d5202486f4..09445ed64e 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/he.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/he.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "Video: {0}",
     "LabelRemoteAccessUrl": "Remote access: {0}",
     "LabelRunningOnPort": "Running on port {0}.",
-    "LabelRunningOnPorts": "Running on ports {0} and {1}.",
     "HeaderLatestFromChannel": "Latest from {0}",
     "ButtonDownload": "Download",
     "LabelUnknownLanaguage": "Unknown language",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "LIVE",
     "LabelNewProgram": "NEW",
     "LabelPremiereProgram": "PREMIERE",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Change Folder Type",
     "HeaderChangeFolderTypeHelp": "To change the folder type, please remove and rebuild the collection with the new type.",
     "HeaderAlert": "Alert",
@@ -318,6 +318,15 @@
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "\u05d1\u05d7\u05e8",
     "ButtonNew": "\u05d7\u05d3\u05e9",
-    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
-    "HeaderVideoError": "Video Error"
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM playback plugin.",
+    "HeaderVideoError": "Video Error",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "LabelName": "\u05e9\u05dd:",
+    "ButtonSubmit": "Submit",
+    "LabelSelectPlaylist": "Playlist:",
+    "OptionNewPlaylist": "New playlist...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 463b079e99..32df58847b 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/it.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/it.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "Video: {0}",
     "LabelRemoteAccessUrl": "Accesso remoto: {0}",
     "LabelRunningOnPort": "Avviato su porta {0}",
-    "LabelRunningOnPorts": "Avviato su porte {0} e {1}.",
     "HeaderLatestFromChannel": "Ultime da {0}",
     "ButtonDownload": "Download",
     "LabelUnknownLanaguage": "lingua sconosciuta",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "LIVE",
     "LabelNewProgram": "Nuovo",
     "LabelPremiereProgram": "PREMIERE",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Cambia il tipo di cartella",
     "HeaderChangeFolderTypeHelp": "Per cambiare il tipo di cartella, rimuovere e ricostruire la collezione con il nuovo tipo.",
     "HeaderAlert": "Avviso",
@@ -319,5 +319,14 @@
     "ButtonSelect": "Seleziona",
     "ButtonNew": "Nuovo",
     "MessageInternetExplorerWebm": "Se utilizzi internet explorer installa WebM plugin",
-    "HeaderVideoError": "Video Error"
+    "HeaderVideoError": "Video Error",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "LabelName": "Nome:",
+    "ButtonSubmit": "Invia",
+    "LabelSelectPlaylist": "Playlist:",
+    "OptionNewPlaylist": "New playlist...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 3c1748ef1b..ad4ba7dc0f 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -284,6 +284,7 @@
     "LabelLiveProgram": "LIVE",
     "LabelNewProgram": "NEW",
     "LabelPremiereProgram": "PREMIERE",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Change Folder Type",
     "HeaderChangeFolderTypeHelp": "To change the folder type, please remove and rebuild the collection with the new type.",
     "HeaderAlert": "Alert",
@@ -323,7 +324,7 @@
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Select",
     "ButtonNew": "New",
-    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM playback plugin.",
     "HeaderVideoError": "Video Error",
     "ButtonAddToPlaylist": "Add to playlist",
     "HeaderAddToPlaylist": "Add to Playlist",
@@ -331,5 +332,7 @@
     "ButtonSubmit": "Submit",
     "LabelSelectPlaylist":  "Playlist:",
     "OptionNewPlaylist":  "New playlist...",
-    "MessageAddedToPlaylistSuccess":  "Ok"
+    "MessageAddedToPlaylistSuccess":  "Ok",
+	"ButtonViewSeriesRecording": "View series recording",
+	"ValueOriginalAirDate": "Original air date: {0}"
 }
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
index a2d2849380..2127151792 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "\u0411\u0435\u0439\u043d\u0435: {0}",
     "LabelRemoteAccessUrl": "\u049a\u0430\u0448\u044b\u049b\u0442\u0430\u043d \u049b\u0430\u0442\u044b\u043d\u0430\u0441\u0443: {0}",
     "LabelRunningOnPort": "{0} \u043f\u043e\u0440\u0442\u044b\u043d\u0434\u0430 \u0436\u04b1\u043c\u044b\u0441 \u0456\u0441\u0442\u0435\u0439\u0434\u0456.",
-    "LabelRunningOnPorts": "{0} \u0436\u04d9\u043d\u0435 {1} \u043f\u043e\u0440\u0442\u0442\u0430\u0440\u044b\u043d\u0434\u0430 \u0436\u04b1\u043c\u044b\u0441 \u0456\u0441\u0442\u0435\u0439\u0434\u0456.",
     "HeaderLatestFromChannel": "\u0415\u04a3 \u043a\u0435\u0439\u0456\u043d\u0433\u0456 {0}",
     "ButtonDownload": "\u0416\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u0443",
     "LabelUnknownLanaguage": "\u0411\u0435\u043b\u0433\u0456\u0441\u0456\u0437 \u0442\u0456\u043b",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "\u0422\u0406\u041a\u0415\u041b\u0415\u0419 \u042d\u0424\u0418\u0420",
     "LabelNewProgram": "\u0416\u0410\u04a2\u0410",
     "LabelPremiereProgram": "\u0422\u04b0\u0421\u0410\u0423\u041a\u0415\u0421\u0415\u0420\u0406",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "\u049a\u0430\u043b\u0442\u0430 \u0442\u04af\u0440\u0456\u043d \u04e9\u0437\u0433\u0435\u0440\u0442\u0443",
     "HeaderChangeFolderTypeHelp": "\u049a\u0430\u043b\u0442\u0430 \u0442\u04af\u0440\u0456\u043d \u04e9\u0437\u0433\u0435\u0440\u0442\u0443 \u04af\u0448\u0456\u043d, \u0430\u043b\u0430\u0441\u0442\u0430\u04a3\u044b\u0437 \u0436\u04d9\u043d\u0435 \u0436\u0438\u043d\u0430\u049b\u0442\u044b \u0436\u0430\u04a3\u0430 \u0442\u04af\u0440\u0456\u043c\u0435\u043d \u049b\u0430\u0439\u0442\u0430 \u049b\u04b1\u0440\u044b\u04a3\u044b\u0437.",
     "HeaderAlert": "\u0415\u0441\u043a\u0435\u0440\u0442\u0443",
@@ -318,6 +318,15 @@
     "HeaderSelectPlayer": "\u041e\u0439\u043d\u0430\u0442\u049b\u044b\u0448\u0442\u044b \u0442\u0430\u04a3\u0434\u0430\u0443:",
     "ButtonSelect": "\u0411\u04e9\u043b\u0435\u043a\u0442\u0435\u0443",
     "ButtonNew": "\u0416\u0430\u0441\u0430\u0443",
-    "MessageInternetExplorerWebm": "Internet Explorer \u0430\u0440\u049b\u044b\u043b\u044b \u0435\u04a3 \u0436\u0430\u049b\u0441\u044b \u043d\u04d9\u0442\u0438\u0436\u0435\u043b\u0435\u0440 \u04af\u0448\u0456\u043d IE \u0448\u043e\u043b\u0493\u044b\u0448\u044b\u043d\u0430 \u0430\u0440\u043d\u0430\u043b\u0493\u0430\u043d WebM \u043f\u043b\u0430\u0433\u0438\u043d\u0456\u043d \u043e\u0440\u043d\u0430\u0442\u044b\u04a3\u044b\u0437.",
-    "HeaderVideoError": "\u0411\u0435\u0439\u043d\u0435 \u049b\u0430\u0442\u0435\u0441\u0456"
+    "MessageInternetExplorerWebm": "Internet Explorer \u0430\u0440\u049b\u044b\u043b\u044b \u0435\u04a3 \u0436\u0430\u049b\u0441\u044b \u043d\u04d9\u0442\u0438\u0436\u0435\u043b\u0435\u0440\u0433\u0435 \u0438\u0435 \u0431\u043e\u043b\u0443 \u04af\u0448\u0456\u043d WebM \u043e\u0439\u043d\u0430\u0442\u0443 \u043f\u043b\u0430\u0433\u0438\u043d\u0456\u043d \u043e\u0440\u043d\u0430\u0442\u044b\u04a3\u044b\u0437.",
+    "HeaderVideoError": "\u0411\u0435\u0439\u043d\u0435 \u049b\u0430\u0442\u0435\u0441\u0456",
+    "ButtonAddToPlaylist": "\u041e\u0439\u043d\u0430\u0442\u0443 \u0442\u0456\u0437\u0456\u043c\u0456\u043d\u0435 \u04af\u0441\u0442\u0435\u0443",
+    "HeaderAddToPlaylist": "\u041e\u0439\u043d\u0430\u0442\u0443 \u0442\u0456\u0437\u0456\u043c\u0456\u043d\u0435 \u04af\u0441\u0442\u0435\u0443",
+    "LabelName": "\u0410\u0442\u044b:",
+    "ButtonSubmit": "\u0416\u0456\u0431\u0435\u0440\u0443",
+    "LabelSelectPlaylist": "\u041e\u0439\u043d\u0430\u0442\u0443 \u0442\u0456\u0437\u0456\u043c\u0456:",
+    "OptionNewPlaylist": "\u0416\u0430\u04a3\u0430 \u043e\u0439\u043d\u0430\u0442\u0443 \u0442\u0456\u0437\u0456\u043c\u0456...",
+    "MessageAddedToPlaylistSuccess": "\u0416\u0430\u0440\u0430\u0439\u0434\u044b",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 9c7d900928..b9ac54e51c 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ms.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ms.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "Video: {0}",
     "LabelRemoteAccessUrl": "Remote access: {0}",
     "LabelRunningOnPort": "Running on port {0}.",
-    "LabelRunningOnPorts": "Running on ports {0} and {1}.",
     "HeaderLatestFromChannel": "Latest from {0}",
     "ButtonDownload": "Download",
     "LabelUnknownLanaguage": "Unknown language",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "LIVE",
     "LabelNewProgram": "NEW",
     "LabelPremiereProgram": "PREMIERE",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Change Folder Type",
     "HeaderChangeFolderTypeHelp": "To change the folder type, please remove and rebuild the collection with the new type.",
     "HeaderAlert": "Alert",
@@ -318,6 +318,15 @@
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Select",
     "ButtonNew": "New",
-    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
-    "HeaderVideoError": "Video Error"
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM playback plugin.",
+    "HeaderVideoError": "Video Error",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "LabelName": "Name:",
+    "ButtonSubmit": "Submit",
+    "LabelSelectPlaylist": "Playlist:",
+    "OptionNewPlaylist": "New playlist...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 b16e5e101e..02d0820c29 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/nb.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/nb.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "Video: {0}",
     "LabelRemoteAccessUrl": "Remote access: {0}",
     "LabelRunningOnPort": "Running on port {0}.",
-    "LabelRunningOnPorts": "Running on ports {0} and {1}.",
     "HeaderLatestFromChannel": "Latest from {0}",
     "ButtonDownload": "Download",
     "LabelUnknownLanaguage": "Unknown language",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "LIVE",
     "LabelNewProgram": "NEW",
     "LabelPremiereProgram": "PREMIERE",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Change Folder Type",
     "HeaderChangeFolderTypeHelp": "To change the folder type, please remove and rebuild the collection with the new type.",
     "HeaderAlert": "Alert",
@@ -318,6 +318,15 @@
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Select",
     "ButtonNew": "New",
-    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
-    "HeaderVideoError": "Video Error"
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM playback plugin.",
+    "HeaderVideoError": "Video Error",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "LabelName": "Navn",
+    "ButtonSubmit": "Submit",
+    "LabelSelectPlaylist": "Playlist:",
+    "OptionNewPlaylist": "New playlist...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 37cff9888e..7a28e58e7f 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "Video: {0}",
     "LabelRemoteAccessUrl": "Toegang op afstand: {0}",
     "LabelRunningOnPort": "Draait op poort {0}.",
-    "LabelRunningOnPorts": "Draait op poort {0} en {1}.",
     "HeaderLatestFromChannel": "Laatste van {0}",
     "ButtonDownload": "Download",
     "LabelUnknownLanaguage": "Onbekende taal",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "LIVE",
     "LabelNewProgram": "NIEUW",
     "LabelPremiereProgram": "PREMIERE",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Verander Maptype",
     "HeaderChangeFolderTypeHelp": "Als u het type map wilt wijzigen, verwijder het dan en maak dan een nieuwe collectie met het nieuwe type.",
     "HeaderAlert": "Waarschuwing",
@@ -319,5 +319,14 @@
     "ButtonSelect": "Selecteer",
     "ButtonNew": "Nieuw",
     "MessageInternetExplorerWebm": "Voor het beste resultaat met Internet Explorer installeert u de WebM plugin voor IE.",
-    "HeaderVideoError": "Video Fout"
+    "HeaderVideoError": "Video Fout",
+    "ButtonAddToPlaylist": "Toevoegen aan afspeellijst",
+    "HeaderAddToPlaylist": "Toevoegen aan afspeellijst",
+    "LabelName": "Naam:",
+    "ButtonSubmit": "Uitvoeren",
+    "LabelSelectPlaylist": "Afspeellijst:",
+    "OptionNewPlaylist": "Nieuwe afspeellijst...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 44ac4c93f5..3952295b77 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pl.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pl.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "Video: {0}",
     "LabelRemoteAccessUrl": "Remote access: {0}",
     "LabelRunningOnPort": "Running on port {0}.",
-    "LabelRunningOnPorts": "Running on ports {0} and {1}.",
     "HeaderLatestFromChannel": "Latest from {0}",
     "ButtonDownload": "Download",
     "LabelUnknownLanaguage": "Unknown language",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "LIVE",
     "LabelNewProgram": "NEW",
     "LabelPremiereProgram": "PREMIERE",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Change Folder Type",
     "HeaderChangeFolderTypeHelp": "To change the folder type, please remove and rebuild the collection with the new type.",
     "HeaderAlert": "Alert",
@@ -318,6 +318,15 @@
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Select",
     "ButtonNew": "New",
-    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
-    "HeaderVideoError": "Video Error"
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM playback plugin.",
+    "HeaderVideoError": "Video Error",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "LabelName": "Name:",
+    "ButtonSubmit": "Submit",
+    "LabelSelectPlaylist": "Playlist:",
+    "OptionNewPlaylist": "New playlist...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 5e667f3d07..7da7aa2f5f 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "V\u00eddeo: {0}",
     "LabelRemoteAccessUrl": "Acesso Remoto: {0}",
     "LabelRunningOnPort": "Executando na porta {0}.",
-    "LabelRunningOnPorts": "Dispon\u00edvel nas portas {0} e {1}.",
     "HeaderLatestFromChannel": "Mais recentes de {0}",
     "ButtonDownload": "Download",
     "LabelUnknownLanaguage": "Idioma desconhecido",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "AO VIVO",
     "LabelNewProgram": "NOVO",
     "LabelPremiereProgram": "ESTR\u00c9IA",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Alterar Tipo de Pasta",
     "HeaderChangeFolderTypeHelp": "Para alterar o tipo de pasta, por favor remova e reconstrua a cole\u00e7\u00e3o com o novo tipo.",
     "HeaderAlert": "Alerta",
@@ -318,6 +318,15 @@
     "HeaderSelectPlayer": "Selecione onde reproduzir:",
     "ButtonSelect": "Selecionar",
     "ButtonNew": "Nova",
-    "MessageInternetExplorerWebm": "Para melhores resultados com o Internet Explorer, por favor instale o plugin WebM para IE.",
-    "HeaderVideoError": "Erro de V\u00eddeo"
+    "MessageInternetExplorerWebm": "Para melhores resultados com o Internet Explorer, por favor instale o plugin de reprodu\u00e7\u00e3o WebM.",
+    "HeaderVideoError": "Erro de V\u00eddeo",
+    "ButtonAddToPlaylist": "Adicionar \u00e0 lista de reprodu\u00e7\u00e3o",
+    "HeaderAddToPlaylist": "Adicionar \u00e0 Lista de Reprodu\u00e7\u00e3o",
+    "LabelName": "Nome:",
+    "ButtonSubmit": "Enviar",
+    "LabelSelectPlaylist": "Lista de Reprodu\u00e7\u00e3o:",
+    "OptionNewPlaylist": "Nova lista de reprodu\u00e7\u00e3o...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 50391496b3..6d29ffa050 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "Video: {0}",
     "LabelRemoteAccessUrl": "Remote access: {0}",
     "LabelRunningOnPort": "Running on port {0}.",
-    "LabelRunningOnPorts": "Running on ports {0} and {1}.",
     "HeaderLatestFromChannel": "Latest from {0}",
     "ButtonDownload": "Download",
     "LabelUnknownLanaguage": "Unknown language",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "LIVE",
     "LabelNewProgram": "NEW",
     "LabelPremiereProgram": "PREMIERE",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Change Folder Type",
     "HeaderChangeFolderTypeHelp": "To change the folder type, please remove and rebuild the collection with the new type.",
     "HeaderAlert": "Alert",
@@ -318,6 +318,15 @@
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Selecionar",
     "ButtonNew": "Novo",
-    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
-    "HeaderVideoError": "Video Error"
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM playback plugin.",
+    "HeaderVideoError": "Video Error",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "LabelName": "Nome:",
+    "ButtonSubmit": "Submit",
+    "LabelSelectPlaylist": "Playlist:",
+    "OptionNewPlaylist": "New playlist...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 3fd62bed50..1bd96aff19 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "\u0412\u0438\u0434\u0435\u043e: {0}",
     "LabelRemoteAccessUrl": "\u0414\u043b\u044f \u0443\u0434\u0430\u043b\u0451\u043d\u043d\u043e\u0433\u043e \u0434\u043e\u0441\u0442\u0443\u043f\u0430: {0}",
     "LabelRunningOnPort": "\u0420\u0430\u0431\u043e\u0442\u0430\u0435\u0442 \u043d\u0430 \u043f\u043e\u0440\u0442\u0443 {0}.",
-    "LabelRunningOnPorts": "\u0420\u0430\u0431\u043e\u0442\u0430\u0435\u0442 \u043d\u0430 \u043f\u043e\u0440\u0442\u0430\u0445 {0} \u0438 {1}.",
     "HeaderLatestFromChannel": "\u041d\u043e\u0432\u0438\u043d\u043a\u0438 \u0438\u0437 {0}",
     "ButtonDownload": "\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c",
     "LabelUnknownLanaguage": "\u041d\u0435\u043e\u043f\u043e\u0437\u043d\u0430\u043d\u043d\u044b\u0439 \u044f\u0437\u044b\u043a",
@@ -193,7 +192,7 @@
     "LabelCurrentPath": "\u0422\u0435\u043a\u0443\u0449\u0438\u0439 \u043f\u0443\u0442\u044c:",
     "HeaderSelectMediaPath": "\u0412\u044b\u0431\u043e\u0440 \u043f\u0443\u0442\u0438 \u043d\u043e\u0441\u0438\u0442\u0435\u043b\u044f",
     "ButtonNetwork": "\u0421\u0435\u0442\u044c",
-    "MessageDirectoryPickerInstruction": "\u0421\u0435\u0442\u0435\u0432\u044b\u0435 \u043f\u0443\u0442\u0438 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0432\u0432\u043e\u0434\u0438\u0442\u044c \u0432\u0440\u0443\u0447\u043d\u0443\u044e, \u0432 \u0441\u043b\u0443\u0447\u0430\u0435, \u0435\u0441\u043b\u0438 \u043f\u0440\u0438 \u043d\u0430\u0436\u0430\u0442\u0438\u0438 \u043a\u043d\u043e\u043f\u043a\u0438 \u0421\u0435\u0442\u044c \u043f\u0440\u043e\u0438\u0441\u0445\u043e\u0434\u0438\u0442 \u0441\u0431\u043e\u0439 \u043e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u0438\u044f \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432. \u041d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, {0} \u0438\u043b\u0438 {1}.",
+    "MessageDirectoryPickerInstruction": "\u0421\u0435\u0442\u0435\u0432\u044b\u0435 \u043f\u0443\u0442\u0438 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0432\u0432\u043e\u0434\u0438\u0442\u044c \u0432\u0440\u0443\u0447\u043d\u0443\u044e, \u0432 \u0441\u043b\u0443\u0447\u0430\u0435, \u0435\u0441\u043b\u0438 \u043f\u0440\u0438 \u043d\u0430\u0436\u0430\u0442\u0438\u0438 \u043a\u043d\u043e\u043f\u043a\u0438 \u0421\u0435\u0442\u044c \u043f\u0440\u043e\u0438\u0441\u0445\u043e\u0434\u0438\u0442 \u0441\u0431\u043e\u0439 \u043e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u0438\u044f \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432. \u041d\u0430\u043f\u0440\u0438\u043c\u0435\u0440: {0} \u0438\u043b\u0438 {1}.",
     "HeaderMenu": "\u041c\u0435\u043d\u044e",
     "ButtonOpen": "\u041e\u0442\u043a\u0440\u044b\u0442\u044c",
     "ButtonOpenInNewTab": "\u0412 \u043d\u043e\u0432\u043e\u0439 \u0432\u043a\u043b\u0430\u0434\u043a\u0435",
@@ -246,7 +245,7 @@
     "ButtonPreviousPage": "\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0430\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430",
     "ButtonMoveLeft": "\u0414\u0432\u0438\u0433\u0430\u0442\u044c \u0432\u043b\u0435\u0432\u043e",
     "ButtonMoveRight": "\u0414\u0432\u0438\u0433\u0430\u0442\u044c \u0432\u043f\u0440\u0430\u0432\u043e",
-    "ButtonBrowseOnlineImages": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u043e\u043d\u043b\u0430\u0439\u043d \u0440\u0438\u0441\u0443\u043d\u043a\u0438",
+    "ButtonBrowseOnlineImages": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0440\u0438\u0441\u0443\u043d\u043a\u0438 \u0432 \u0441\u0435\u0442\u0438",
     "HeaderDeleteItem": "\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430",
     "ConfirmDeleteItem": "\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0434\u0430\u043d\u043d\u044b\u0439 \u044d\u043b\u0435\u043c\u0435\u043d\u0442 \u0438\u0437 \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438?",
     "MessagePleaseEnterNameOrId": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u0438\u043b\u0438 \u0432\u043d\u0435\u0448\u043d\u0438\u0439 ID.",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "\u041f\u0420\u042f\u041c\u041e\u0419 \u042d\u0424\u0418\u0420",
     "LabelNewProgram": "\u041d\u041e\u0412\u041e\u0415",
     "LabelPremiereProgram": "\u041f\u0420\u0415\u041c\u042c\u0415\u0420\u0410",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "\u0418\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0435 \u0442\u0438\u043f\u0430 \u043f\u0430\u043f\u043a\u0438",
     "HeaderChangeFolderTypeHelp": "\u0427\u0442\u043e\u0431\u044b \u0438\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0442\u0438\u043f \u043f\u0430\u043f\u043a\u0438, \u0443\u0434\u0430\u043b\u0438\u0442\u0435 \u0438 \u043f\u0435\u0440\u0435\u0441\u0442\u0440\u043e\u0439\u0442\u0435 \u043a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u044e \u0441 \u043d\u043e\u0432\u044b\u043c \u0442\u0438\u043f\u043e\u043c.",
     "HeaderAlert": "\u041e\u043f\u043e\u0432\u0435\u0449\u0435\u043d\u0438\u0435",
@@ -318,6 +318,15 @@
     "HeaderSelectPlayer": "\u0412\u044b\u0431\u043e\u0440 \u043f\u043b\u0435\u0439\u0435\u0440\u0430:",
     "ButtonSelect": "\u0412\u044b\u0431\u0440\u0430\u0442\u044c",
     "ButtonNew": "\u0421\u043e\u0437\u0434\u0430\u0442\u044c",
-    "MessageInternetExplorerWebm": "\u0414\u043b\u044f \u043d\u0430\u0438\u043b\u0443\u0447\u0448\u0438\u0445 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u0432 \u043f\u043e\u0441\u0440\u0435\u0434\u0441\u0442\u0432\u043e\u043c Internet Explorer, \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u0435 \u043f\u043b\u0430\u0433\u0438\u043d WebM \u0434\u043b\u044f IE.",
-    "HeaderVideoError": "\u041e\u0448\u0438\u0431\u043a\u0430 \u0432\u0438\u0434\u0435\u043e"
+    "MessageInternetExplorerWebm": "\u0414\u043b\u044f \u0434\u043e\u0441\u0442\u0438\u0436\u0435\u043d\u0438\u044f \u043d\u0430\u0438\u043b\u0443\u0447\u0448\u0438\u0445 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u0432 \u0432 Internet Explorer, \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u0435 \u043f\u043b\u0430\u0433\u0438\u043d \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f WebM.",
+    "HeaderVideoError": "\u041e\u0448\u0438\u0431\u043a\u0430 \u0432\u0438\u0434\u0435\u043e",
+    "ButtonAddToPlaylist": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432 \u0441\u043f\u0438\u0441\u043e\u043a \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f",
+    "HeaderAddToPlaylist": "\u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0432 \u0441\u043f\u0438\u0441\u043e\u043a \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f",
+    "LabelName": "\u0418\u043c\u044f:",
+    "ButtonSubmit": "\u041e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u044c",
+    "LabelSelectPlaylist": "\u0421\u043f\u0438\u0441\u043e\u043a \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f:",
+    "OptionNewPlaylist": "\u041d\u043e\u0432\u044b\u0439 \u0441\u043f\u0438\u0441\u043e\u043a \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f...",
+    "MessageAddedToPlaylistSuccess": "\u041e\u041a",
+    "ButtonViewSeriesRecording": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0437\u0430\u043f\u0438\u0441\u044c \u0441\u0435\u0440\u0438\u0430\u043b\u0430",
+    "ValueOriginalAirDate": "\u0414\u0430\u0442\u0430 \u043f\u0435\u0440\u0432\u043e\u043d\u0430\u0447\u0430\u043b\u044c\u043d\u043e\u0433\u043e \u044d\u0444\u0438\u0440\u0430: {0}"
 }
\ 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 4af6f92725..43a8afcdc3 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/sv.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/sv.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "Video: {0}",
     "LabelRemoteAccessUrl": "Fj\u00e4rranslutning: {0}",
     "LabelRunningOnPort": "Anv\u00e4nder port {0}.",
-    "LabelRunningOnPorts": "Anv\u00e4nder port {0} och {1}.",
     "HeaderLatestFromChannel": "Senaste fr\u00e5n {0}",
     "ButtonDownload": "Ladda ned",
     "LabelUnknownLanaguage": "Ok\u00e4nt spr\u00e5k",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "LIVE",
     "LabelNewProgram": "NY",
     "LabelPremiereProgram": "PREMI\u00c4R",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "\u00c4ndra mapptyp",
     "HeaderChangeFolderTypeHelp": "F\u00f6r att \u00e4ndra mapptyp, ta bort den existerande och skapa en ny av den \u00f6nskade typen.",
     "HeaderAlert": "Varning",
@@ -319,5 +319,14 @@
     "ButtonSelect": "V\u00e4lj",
     "ButtonNew": "Nytillkommet",
     "MessageInternetExplorerWebm": "F\u00f6r b\u00e4sta resultat med Internet Explorer, installera WebM-till\u00e4gget f\u00f6r IE.",
-    "HeaderVideoError": "Videofel"
+    "HeaderVideoError": "Videofel",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "LabelName": "Namn:",
+    "ButtonSubmit": "Bekr\u00e4fta",
+    "LabelSelectPlaylist": "Playlist:",
+    "OptionNewPlaylist": "New playlist...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 b65d112e10..40af8daf78 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/tr.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/tr.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "Video: {0}",
     "LabelRemoteAccessUrl": "Remote access: {0}",
     "LabelRunningOnPort": "Running on port {0}.",
-    "LabelRunningOnPorts": "Running on ports {0} and {1}.",
     "HeaderLatestFromChannel": "Latest from {0}",
     "ButtonDownload": "Download",
     "LabelUnknownLanaguage": "Unknown language",
@@ -253,7 +252,7 @@
     "MessageValueNotCorrect": "The value entered is not correct. Please try again.",
     "MessageItemSaved": "Item saved.",
     "OptionEnded": "Bitmi\u015f",
-    "OptionContinuing": "Continuing",
+    "OptionContinuing": "Topluluk",
     "OptionOff": "Off",
     "OptionOn": "On",
     "HeaderFields": "Fields",
@@ -268,7 +267,7 @@
     "OptionBackdrops": "Backdrops",
     "OptionImages": "Images",
     "OptionKeywords": "Keywords",
-    "OptionTags": "Tags",
+    "OptionTags": "Etiketler",
     "OptionStudios": "Studios",
     "OptionName": "Name",
     "OptionOverview": "Overview",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "LIVE",
     "LabelNewProgram": "NEW",
     "LabelPremiereProgram": "PREMIERE",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Change Folder Type",
     "HeaderChangeFolderTypeHelp": "To change the folder type, please remove and rebuild the collection with the new type.",
     "HeaderAlert": "Alert",
@@ -318,6 +318,15 @@
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Se\u00e7im",
     "ButtonNew": "Yeni",
-    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
-    "HeaderVideoError": "Video Error"
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM playback plugin.",
+    "HeaderVideoError": "Video Error",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "LabelName": "\u0130sim",
+    "ButtonSubmit": "Submit",
+    "LabelSelectPlaylist": "Playlist:",
+    "OptionNewPlaylist": "New playlist...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 3440a8ab0d..ce80778b72 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/vi.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/vi.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "Video: {0}",
     "LabelRemoteAccessUrl": "Remote access: {0}",
     "LabelRunningOnPort": "Running on port {0}.",
-    "LabelRunningOnPorts": "Running on ports {0} and {1}.",
     "HeaderLatestFromChannel": "Latest from {0}",
     "ButtonDownload": "Download",
     "LabelUnknownLanaguage": "Unknown language",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "LIVE",
     "LabelNewProgram": "NEW",
     "LabelPremiereProgram": "PREMIERE",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Change Folder Type",
     "HeaderChangeFolderTypeHelp": "To change the folder type, please remove and rebuild the collection with the new type.",
     "HeaderAlert": "Alert",
@@ -318,6 +318,15 @@
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "L\u1ef1a ch\u1ecdn",
     "ButtonNew": "M\u1edbi",
-    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
-    "HeaderVideoError": "Video Error"
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM playback plugin.",
+    "HeaderVideoError": "Video Error",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "LabelName": "T\u00ean:",
+    "ButtonSubmit": "Submit",
+    "LabelSelectPlaylist": "Playlist:",
+    "OptionNewPlaylist": "New playlist...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 763337f43d..35db67ea24 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json
@@ -178,7 +178,6 @@
     "LabelVideoCodec": "Video: {0}",
     "LabelRemoteAccessUrl": "Remote access: {0}",
     "LabelRunningOnPort": "Running on port {0}.",
-    "LabelRunningOnPorts": "Running on ports {0} and {1}.",
     "HeaderLatestFromChannel": "Latest from {0}",
     "ButtonDownload": "Download",
     "LabelUnknownLanaguage": "Unknown language",
@@ -282,6 +281,7 @@
     "LabelLiveProgram": "LIVE",
     "LabelNewProgram": "NEW",
     "LabelPremiereProgram": "PREMIERE",
+    "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Change Folder Type",
     "HeaderChangeFolderTypeHelp": "To change the folder type, please remove and rebuild the collection with the new type.",
     "HeaderAlert": "Alert",
@@ -318,6 +318,15 @@
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "\u9078\u64c7",
     "ButtonNew": "\u5275\u5efa",
-    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
-    "HeaderVideoError": "Video Error"
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM playback plugin.",
+    "HeaderVideoError": "Video Error",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "LabelName": "\u540d\u5b57\uff1a",
+    "ButtonSubmit": "Submit",
+    "LabelSelectPlaylist": "Playlist:",
+    "OptionNewPlaylist": "New playlist...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}"
 }
\ 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 056b31c924..b37c576701 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ar.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ar.json
@@ -794,6 +794,8 @@
     "TabNextUp": "Next Up",
     "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
     "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the New button to start creating Collections.",
+    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",
     "ButtonDismiss": "Dismiss",
     "MessageLearnHowToCustomize": "Learn how to customize this page to your own personal tastes. Click your user icon in the top right corner of the screen to view and update your preferences.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sync"
+    "OptionContextStatic": "Sync",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "TabPlaylists": "Playlists",
+    "ButtonClose": "Close",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ca.json b/MediaBrowser.Server.Implementations/Localization/Server/ca.json
index ac4c13b014..dcd6122fe6 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ca.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ca.json
@@ -88,7 +88,7 @@
     "LabelSelectUsers": "Select users:",
     "ButtonUpload": "Upload",
     "HeaderUploadNewImage": "Upload New Image",
-    "LabelDropImageHere": "Drop Image Here",
+    "LabelDropImageHere": "Drop image here",
     "ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG\/PNG only.",
     "MessageNothingHere": "Nothing here.",
     "MessagePleaseEnsureInternetMetadata": "Please ensure downloading of internet metadata is enabled.",
@@ -794,6 +794,8 @@
     "TabNextUp": "Next Up",
     "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
     "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the New button to start creating Collections.",
+    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",
     "ButtonDismiss": "Dismiss",
     "MessageLearnHowToCustomize": "Learn how to customize this page to your own personal tastes. Click your user icon in the top right corner of the screen to view and update your preferences.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sync"
+    "OptionContextStatic": "Sync",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "TabPlaylists": "Playlists",
+    "ButtonClose": "Close",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/cs.json b/MediaBrowser.Server.Implementations/Localization/Server/cs.json
index f591af7350..181c941fe8 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/cs.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/cs.json
@@ -794,6 +794,8 @@
     "TabNextUp": "Next Up",
     "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
     "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the New button to start creating Collections.",
+    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",
     "ButtonDismiss": "Zam\u00edtnout",
     "MessageLearnHowToCustomize": "Learn how to customize this page to your own personal tastes. Click your user icon in the top right corner of the screen to view and update your preferences.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sync"
+    "OptionContextStatic": "Sync",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "TabPlaylists": "Playlists",
+    "ButtonClose": "Zav\u0159\u00edt",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/da.json b/MediaBrowser.Server.Implementations/Localization/Server/da.json
index e32fb18f8e..86ad2e9ee0 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/da.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/da.json
@@ -794,6 +794,8 @@
     "TabNextUp": "Next Up",
     "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
     "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the New button to start creating Collections.",
+    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",
     "ButtonDismiss": "Dismiss",
     "MessageLearnHowToCustomize": "Learn how to customize this page to your own personal tastes. Click your user icon in the top right corner of the screen to view and update your preferences.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sync"
+    "OptionContextStatic": "Sync",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "TabPlaylists": "Playlists",
+    "ButtonClose": "Close",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/de.json b/MediaBrowser.Server.Implementations/Localization/Server/de.json
index ef7b00c35b..af7ef85fed 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/de.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/de.json
@@ -794,6 +794,8 @@
     "TabNextUp": "Als N\u00e4chstes",
     "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
     "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the New button to start creating Collections.",
+    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "Willkommen zum Media Browser Web Client",
     "ButtonDismiss": "Verwerfen",
     "MessageLearnHowToCustomize": "Learn how to customize this page to your own personal tastes. Click your user icon in the top right corner of the screen to view and update your preferences.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sync"
+    "OptionContextStatic": "Sync",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "TabPlaylists": "Playlists",
+    "ButtonClose": "Close",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/el.json b/MediaBrowser.Server.Implementations/Localization/Server/el.json
index eb0cd1b87a..c45308d036 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/el.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/el.json
@@ -794,6 +794,8 @@
     "TabNextUp": "Next Up",
     "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
     "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the New button to start creating Collections.",
+    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",
     "ButtonDismiss": "Dismiss",
     "MessageLearnHowToCustomize": "Learn how to customize this page to your own personal tastes. Click your user icon in the top right corner of the screen to view and update your preferences.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sync"
+    "OptionContextStatic": "Sync",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "TabPlaylists": "Playlists",
+    "ButtonClose": "Close",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json b/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
index 43c9bd211f..8d1fc6a592 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
@@ -88,7 +88,7 @@
     "LabelSelectUsers": "Select users:",
     "ButtonUpload": "Upload",
     "HeaderUploadNewImage": "Upload New Image",
-    "LabelDropImageHere": "Drop Image Here",
+    "LabelDropImageHere": "Drop image here",
     "ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG\/PNG only.",
     "MessageNothingHere": "Nothing here.",
     "MessagePleaseEnsureInternetMetadata": "Please ensure downloading of internet metadata is enabled.",
@@ -794,6 +794,8 @@
     "TabNextUp": "Next Up",
     "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
     "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the New button to start creating Collections.",
+    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",
     "ButtonDismiss": "Dismiss",
     "MessageLearnHowToCustomize": "Learn how to customize this page to your own personal tastes. Click your user icon in the top right corner of the screen to view and update your preferences.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sync"
+    "OptionContextStatic": "Sync",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "TabPlaylists": "Playlists",
+    "ButtonClose": "Close",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/en_US.json b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
index a0238b0201..8c931ea3b1 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
@@ -88,7 +88,7 @@
     "LabelSelectUsers": "Select users:",
     "ButtonUpload": "Upload",
     "HeaderUploadNewImage": "Upload New Image",
-    "LabelDropImageHere": "Drop Image Here",
+    "LabelDropImageHere": "Drop image here",
     "ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG\/PNG only.",
     "MessageNothingHere": "Nothing here.",
     "MessagePleaseEnsureInternetMetadata": "Please ensure downloading of internet metadata is enabled.",
@@ -794,6 +794,8 @@
     "TabNextUp": "Next Up",
     "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
     "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the New button to start creating Collections.",
+    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",
     "ButtonDismiss": "Dismiss",
     "MessageLearnHowToCustomize": "Learn how to customize this page to your own personal tastes. Click your user icon in the top right corner of the screen to view and update your preferences.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sync"
+    "OptionContextStatic": "Sync",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "TabPlaylists": "Playlists",
+    "ButtonClose": "Close",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/es.json b/MediaBrowser.Server.Implementations/Localization/Server/es.json
index e4d0086317..31565de40b 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/es.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es.json
@@ -794,6 +794,8 @@
     "TabNextUp": "Siguiendo",
     "MessageNoMovieSuggestionsAvailable": "No hay sugerencias de pel\u00edculas disponibles. Comience ver y calificar sus pel\u00edculas y vuelva para ver las recomendaciones.",
     "MessageNoCollectionsAvailable": "Colecciones le permitir\u00e1 disfrutar de grupos personalizados de Pel\u00edculas, Series, Discos, Libros y Juegos. Haga click en el bot\u00f3n nuevo para empezar a crear Colecciones.",
+    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "Vienvenido al Cliente Web de Media Browser",
     "ButtonDismiss": "Descartar",
     "MessageLearnHowToCustomize": "Aprenda c\u00f3mo personalizar esta p\u00e1gina a sus propios gustos personales. Haga clic en su icono de usuario en la esquina superior derecha de la pantalla para ver y actualizar sus preferencias.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sync"
+    "OptionContextStatic": "Sync",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "TabPlaylists": "Playlists",
+    "ButtonClose": "Cerrar",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json b/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
index bec77ac61f..2f5219316f 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
@@ -794,6 +794,8 @@
     "TabNextUp": "A Continuaci\u00f3n",
     "MessageNoMovieSuggestionsAvailable": "No hay sugerencias de pel\u00edculas disponibles en este momento. Comienza a ver y a calificar tus pel\u00edculas, y regresa para ver tus recomendaciones.",
     "MessageNoCollectionsAvailable": "Las Colecciones te permiten disfrutar de grupos personalizados de Pel\u00edculas, Series, \u00c1lbumes, Libros y Juegos. Da clic en el bot\u00f3n \"Nuevo\" para empezar a crear colecciones.",
+    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "Bienvenido al Cliente Web de Media Browser",
     "ButtonDismiss": "Descartar",
     "MessageLearnHowToCustomize": "Aprenda c\u00f3mo personalizar esta p\u00e1gina a sus gustos personales. Haga clic en su icono de usuario en la esquina superior derecha de la pantalla para ver y actualizar sus preferencias.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Transmisi\u00f3n en vivo por Http",
     "LabelContext": "Contexto:",
     "OptionContextStreaming": "Transmisi\u00f3n",
-    "OptionContextStatic": "Sinc."
+    "OptionContextStatic": "Sinc.",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "TabPlaylists": "Playlists",
+    "ButtonClose": "Cerrar",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/fr.json b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
index 4626f659bf..914dc58588 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/fr.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
@@ -794,6 +794,8 @@
     "TabNextUp": "Prochains \u00e0 voir",
     "MessageNoMovieSuggestionsAvailable": "Aucune suggestion de film n'est actuellement disponible. Commencez \u00e0 regarder et noter vos films pour avoir des suggestions.",
     "MessageNoCollectionsAvailable": "Les Collections permettent le groupement de films, S\u00e9ries, Albums, Livres et Jeux. Cliquer sur \"Nouveau\" pour commencer la cr\u00e9ation des Collections.",
+    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "Bienvenue au client Web Media Browser",
     "ButtonDismiss": "Annuler",
     "MessageLearnHowToCustomize": "Apprenez comment personnaliser cette page selon vos propres go\u00fbts. S\u00e9lectionnez votre ic\u00f4ne d'utilisateur dans le coin en haut, \u00e0 droite de l'\u00e9cran pour visionner et mettre \u00e0 jour vos pr\u00e9f\u00e9rences. ",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sync"
+    "OptionContextStatic": "Sync",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "TabPlaylists": "Playlists",
+    "ButtonClose": "Fermer",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/he.json b/MediaBrowser.Server.Implementations/Localization/Server/he.json
index a44b45ae0a..6491891e05 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/he.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/he.json
@@ -794,6 +794,8 @@
     "TabNextUp": "Next Up",
     "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
     "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the New button to start creating Collections.",
+    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",
     "ButtonDismiss": "Dismiss",
     "MessageLearnHowToCustomize": "Learn how to customize this page to your own personal tastes. Click your user icon in the top right corner of the screen to view and update your preferences.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sync"
+    "OptionContextStatic": "Sync",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "TabPlaylists": "Playlists",
+    "ButtonClose": "Close",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/it.json b/MediaBrowser.Server.Implementations/Localization/Server/it.json
index 0aa4a27310..f3351b33cb 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/it.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/it.json
@@ -339,7 +339,7 @@
     "LiveTvPluginRequiredHelp": "Installa un servizio disponibile, come Next Pvr or ServerWMC.",
     "LabelCustomizeOptionsPerMediaType": "Personalizza per il tipo di supporto:",
     "OptionDownloadThumbImage": "Foto",
-    "OptionDownloadMenuImage": "Menu",
+    "OptionDownloadMenuImage": "Men\u00f9",
     "OptionDownloadLogoImage": "Logo",
     "OptionDownloadBoxImage": "Box",
     "OptionDownloadDiscImage": "Disco",
@@ -794,6 +794,8 @@
     "TabNextUp": "Da vedere",
     "MessageNoMovieSuggestionsAvailable": "Nessun suggerimento di film sono attualmente disponibili. Iniziare a guardare e valutare i vostri film, e poi tornare per visualizzare le tue segnalazioni.",
     "MessageNoCollectionsAvailable": "Collezioni permettono di godere di raggruppamenti personalizzati di film, serie, album, libri e giochi. Fare clic sul pulsante Nuovo per avviare la creazione di collezioni.",
+    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "Benvenuti nel Media Browser Web client",
     "ButtonDismiss": "Dismetti",
     "MessageLearnHowToCustomize": "Ulteriori informazioni su come personalizzare questa pagina ai tuoi gusti personali. Fare clic sull'icona utente in alto a destra dello schermo per visualizzare e aggiornare le vostre preferenze.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Contenuto:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sinc"
+    "OptionContextStatic": "Sinc",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "TabPlaylists": "Playlists",
+    "ButtonClose": "Chiudi",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/kk.json b/MediaBrowser.Server.Implementations/Localization/Server/kk.json
index 718c5b96e9..4e8d46ba29 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/kk.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/kk.json
@@ -589,7 +589,7 @@
     "NotificationOptionTaskFailed": "\u0416\u043e\u0441\u043f\u0430\u0440\u043b\u0430\u0493\u0430\u043d \u0442\u0430\u043f\u0441\u044b\u0440\u043c\u0430 \u0441\u04d9\u0442\u0441\u0456\u0437\u0434\u0456\u0433\u0456",
     "NotificationOptionInstallationFailed": "\u041e\u0440\u043d\u0430\u0442\u0443 \u0441\u04d9\u0442\u0441\u0456\u0437\u0434\u0456\u0433\u0456",
     "NotificationOptionNewLibraryContent": "\u0416\u0430\u04a3\u0430 \u043c\u0430\u0437\u043c\u04b1\u043d \u04af\u0441\u0442\u0435\u043b\u0433\u0435\u043d",
-    "NotificationOptionNewLibraryContentMultiple": "\u0416\u0430\u04a3\u0430 \u043c\u0430\u0437\u043c\u04b1\u043d \u049b\u043e\u0441\u044b\u043b\u0434\u044b (\u0431\u0456\u0440\u043d\u0435\u0448\u0435)",
+    "NotificationOptionNewLibraryContentMultiple": "\u0416\u0430\u04a3\u0430 \u043c\u0430\u0437\u043c\u04b1\u043d \u049b\u043e\u0441\u044b\u043b\u0434\u044b (\u043a\u04e9\u043f\u0442\u0435\u0433\u0435\u043d)",
     "SendNotificationHelp": "\u0425\u0430\u0431\u0430\u0440\u043b\u0430\u043d\u0434\u044b\u0440\u0443\u043b\u0430\u0440 \u0431\u0430\u049b\u044b\u043b\u0430\u0443 \u0442\u0430\u049b\u0442\u0430\u0441\u044b\u043d\u0434\u0430\u0493\u044b \u04d9\u0434\u0435\u043f\u043a\u0456 \u043a\u0456\u0440\u0456\u0441 \u0436\u04d9\u0448\u0456\u0433\u0456\u043d\u0435 \u0436\u0435\u0442\u043a\u0456\u0437\u0456\u043b\u0435\u0434\u0456. \u049a\u043e\u0441\u044b\u043c\u0448\u0430 \u0445\u0430\u0431\u0430\u0440\u043b\u0430\u043d\u0434\u044b\u0440\u0443 \u049b\u04b1\u0440\u0430\u043b\u0434\u0430\u0440\u044b\u043d \u043e\u0440\u043d\u0430\u0442\u0443 \u04af\u0448\u0456\u043d \u043f\u043b\u0430\u0433\u0438\u043d\u0434\u0435\u0440 \u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0456\u043d \u0448\u0430\u0440\u043b\u0430\u04a3\u044b\u0437.",
     "NotificationOptionServerRestartRequired": "\u0421\u0435\u0440\u0432\u0435\u0440\u0434\u0456 \u049b\u0430\u0439\u0442\u0430 \u0456\u0441\u043a\u0435 \u049b\u043e\u0441\u0443 \u049b\u0430\u0436\u0435\u0442",
     "LabelNotificationEnabled": "\u0411\u04b1\u043b \u0445\u0430\u0431\u0430\u0440\u043b\u0430\u043d\u0434\u044b\u0440\u043c\u0430\u043d\u044b \u049b\u043e\u0441\u0443",
@@ -777,7 +777,7 @@
     "LabelHomePageSection4": "\u0411\u0430\u0441\u0442\u044b \u0431\u0435\u0442 4-\u0431\u04e9\u043b\u0456\u043c:",
     "OptionMyViewsButtons": "\u041c\u0435\u043d\u0456\u04a3 \u043a\u04e9\u0440\u0456\u043d\u0456\u0441\u0442\u0435\u0440\u0456\u043c (\u0442\u04af\u0439\u043c\u0435\u0448\u0456\u043a\u0442\u0435\u0440)",
     "OptionMyViews": "\u041c\u0435\u043d\u0456\u04a3 \u043a\u04e9\u0440\u0456\u043d\u0456\u0441\u0442\u0435\u0440\u0456\u043c",
-    "OptionMyViewsSmall": "\u041c\u0435\u043d\u0456\u04a3 \u043a\u04e9\u0440\u0456\u043d\u0456\u0441\u0442\u0435\u0440\u0456\u043c (\u043a\u0456\u0448\u0456)",
+    "OptionMyViewsSmall": "\u041c\u0435\u043d\u0456\u04a3 \u043a\u04e9\u0440\u0456\u043d\u0456\u0441\u0442\u0435\u0440\u0456\u043c (\u044b\u049b\u0448\u0430\u043c)",
     "OptionResumablemedia": "\u0416\u0430\u043b\u0493\u0430\u0441\u0442\u044b\u0440\u0443",
     "OptionLatestMedia": "\u0415\u04a3 \u0441\u043e\u04a3\u0493\u044b \u0442\u0430\u0441\u0443\u0448\u044b\u043b\u0430\u0440",
     "OptionLatestChannelMedia": "\u0410\u0440\u043d\u0430\u043b\u0430\u0440\u0434\u044b\u04a3 \u0435\u04a3 \u043a\u0435\u0439\u0456\u043d\u0433\u0456 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0442\u0435\u0440\u0456",
@@ -794,6 +794,8 @@
     "TabNextUp": "\u0410\u043b\u0434\u0430\u0493\u044b",
     "MessageNoMovieSuggestionsAvailable": "\u0415\u0448\u049b\u0430\u043d\u0434\u0430\u0439 \u0444\u0438\u043b\u044c\u043c \u04b1\u0441\u044b\u043d\u044b\u0441\u0442\u0430\u0440\u044b \u0430\u0493\u044b\u043c\u0434\u0430 \u049b\u043e\u043b \u0436\u0435\u0442\u0456\u043c\u0434\u0456 \u0435\u043c\u0435\u0441. \u0424\u0438\u043b\u044c\u043c\u0434\u0435\u0440\u0434\u0456 \u049b\u0430\u0440\u0430\u0443\u0434\u044b \u0436\u04d9\u043d\u0435 \u0431\u0430\u0493\u0430\u043b\u0430\u0443\u0434\u044b \u0431\u0430\u0441\u0442\u0430\u04a3\u044b\u0437, \u0441\u043e\u043d\u0434\u0430 \u0430\u0440\u043d\u0430\u043b\u0493\u0430\u043d \u04b1\u0441\u044b\u043d\u044b\u0442\u0430\u0440\u044b\u04a3\u044b\u0437\u0434\u044b \u043a\u04e9\u0440\u0443 \u04af\u0448\u0456\u043d \u049b\u0430\u0439\u0442\u0430 \u043a\u0435\u043b\u0456\u04a3\u0456\u0437.",
     "MessageNoCollectionsAvailable": "\u0424\u0438\u043b\u044c\u043c\u0434\u0435\u0440\u0434\u0456, \u0441\u0435\u0440\u0438\u0430\u043b\u0434\u0430\u0440\u0434\u044b, \u0430\u043b\u044c\u0431\u043e\u043c\u0434\u0430\u0440\u0434\u044b, \u043a\u0456\u0442\u0430\u043f\u0442\u0430\u0440\u0434\u044b \u0436\u04d9\u043d\u0435 \u043e\u0439\u044b\u043d\u0434\u0430\u0440\u0434\u044b \u0436\u0435\u043a\u0435\u043b\u0435\u043d\u0433\u0435\u043d \u0442\u043e\u043f\u0442\u0430\u0441\u0442\u044b\u0440\u0443 \u04af\u0448\u0456\u043d \u0442\u043e\u043f\u0442\u0430\u043c\u0430\u043b\u0430\u0440 \u043c\u04af\u043c\u043a\u0456\u043d\u0434\u0456\u043a \u0431\u0435\u0440\u0435\u0434\u0456. \u0422\u043e\u043f\u0442\u0430\u043c\u0430\u043b\u0430\u0440\u0434\u044b \u0436\u0430\u0441\u0430\u0439 \u0431\u0430\u0441\u0442\u0430\u0443 \u04af\u0448\u0456\u043d \"\u0416\u0430\u0441\u0430\u0443\" \u0442\u04af\u0439\u043c\u0435\u0448\u0456\u0433\u0456\u043d \u0431\u0430\u0441\u044b\u04a3\u044b\u0437.",
+    "MessageNoPlaylistsAvailable": "\u041e\u0439\u043d\u0430\u0442\u0443 \u0442\u0456\u0437\u0456\u043c\u0434\u0435\u0440\u0456 \u0431\u0456\u0440 \u043a\u0435\u0437\u0434\u0435 \u043e\u0439\u043d\u0430\u0442\u0443 \u04af\u0448\u0456\u043d \u043c\u0430\u0437\u043c\u04b1\u043d \u0442\u0456\u0437\u0456\u043c\u0456\u043d \u0436\u0430\u0441\u0430\u0443\u0493\u0430  \u0440\u04b1\u049b\u0441\u0430\u0442 \u0435\u0442\u0435\u0434\u0456. \u041e\u0439\u043d\u0430\u0442\u0443 \u0442\u0456\u0437\u0456\u043c\u0434\u0435\u0440\u0433\u0435 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0442\u0435\u0440\u0434\u0456 \u04af\u0441\u0442\u0435\u0443 \u04af\u0448\u0456\u043d, \u0442\u0456\u043d\u0442\u0443\u0456\u0440\u0434\u0456\u04a3 \u043e\u04a3 \u0436\u0430\u049b \u0442\u04af\u0439\u043c\u0435\u0448\u0456\u0433\u0456\u043d \u0431\u0430\u0441\u044b\u04a3\u044b\u0437 \u043d\u0435\u043c\u0435\u0441\u0435 \u0442\u04af\u0440\u0442\u0456\u043f \u0436\u04d9\u043d\u0435 \u04b1\u0441\u0442\u0430\u043f \u0442\u04b1\u0440\u044b\u04a3\u044b\u0437, \u0441\u043e\u043d\u0434\u0430 \u041e\u0439\u043d\u0430\u0442\u0443 \u0442\u0456\u0437\u0456\u043c\u0456\u043d\u0435 \u04af\u0441\u0442\u0435\u0443 \u0434\u0435\u0433\u0435\u043d\u0434\u0456 \u0442\u0430\u04a3\u0434\u0430\u04a3\u044b\u0437.",
+    "MessageNoPlaylistItemsAvailable": "\u041e\u0441\u044b \u043e\u0439\u043d\u0430\u0442\u0443 \u0442\u0456\u0437\u0456\u043c \u0430\u0493\u044b\u043c\u0434\u0430\u0493\u044b \u0443\u0430\u049b\u044b\u0442\u0442\u0430 \u0431\u043e\u0441.",
     "HeaderWelcomeToMediaBrowserWebClient": "Media Browser \u0432\u0435\u0431-\u043a\u043b\u0438\u0435\u043d\u0442 \u0431\u0430\u0493\u0434\u0430\u0440\u043b\u0430\u043c\u0430\u0441\u044b\u043d\u0430 \u0445\u043e\u0448 \u043a\u0435\u043b\u0434\u0456\u04a3\u0456\u0437!",
     "ButtonDismiss": "\u0416\u0430\u0441\u044b\u0440\u0443",
     "MessageLearnHowToCustomize": "\u041e\u0441\u044b \u0431\u0435\u0442\u0442\u0456 \u0436\u0435\u043a\u0435 \u043a\u04e9\u04a3\u0456\u043b\u0433\u0435 \u04b1\u043d\u0430\u0442\u0443 \u0431\u043e\u0439\u044b\u043d\u0448\u0430 \u049b\u0430\u043b\u0430\u0439 \u0442\u0435\u04a3\u0448\u0435\u0443\u0456\u043d \u04af\u0439\u0440\u0435\u043d\u0456\u04a3\u0456\u0437. \u0422\u0435\u04a3\u0448\u0435\u043b\u0456\u043c\u0434\u0435\u0440\u0456\u04a3\u0456\u0437\u0434\u0456 \u049b\u0430\u0440\u0430\u0443 \u0436\u04d9\u043d\u0435 \u0436\u0430\u04a3\u0430\u0440\u0442\u0443 \u04af\u0448\u0456\u043d \u044d\u043a\u0440\u0430\u043d\u0434\u0430\u0493\u044b \u0436\u043e\u0493\u0430\u0440\u0493\u044b \u043e\u04a3 \u0431\u04b1\u0440\u044b\u0448\u044b\u043d\u0434\u0430\u0493\u044b \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u043b\u044b\u049b \u0431\u0435\u043b\u0433\u0456\u0448\u0435\u04a3\u0456\u0437\u0434\u0456 \u0431\u0430\u0441\u044b\u04a3\u044b\u0437.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http \u0422\u0456\u043a\u0435\u043b\u0435\u0439 \u0410\u0493\u044b\u043d (HLS)",
     "LabelContext": "\u041c\u04d9\u0442\u0456\u043d\u043c\u04d9\u043d:",
     "OptionContextStreaming": "\u0410\u0493\u044b\u043d\u043c\u0435\u043d \u0442\u0430\u0441\u044b\u043c\u0430\u043b\u0434\u0430\u0443",
-    "OptionContextStatic": "\u0421\u0438\u043d\u0445\u0440\u043e\u043d\u0434\u0430\u0443"
+    "OptionContextStatic": "\u0421\u0438\u043d\u0445\u0440\u043e\u043d\u0434\u0430\u0443",
+    "ButtonAddToPlaylist": "\u041e\u0439\u043d\u0430\u0442\u0443 \u0442\u0456\u0437\u0456\u043c\u0456\u043d\u0435 \u04af\u0441\u0442\u0435\u0443",
+    "TabPlaylists": "\u041e\u0439\u043d\u0430\u0442\u0443 \u0442\u0456\u0437\u0456\u043c\u0434\u0435\u0440\u0456",
+    "ButtonClose": "\u0416\u0430\u0431\u0443",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ko.json b/MediaBrowser.Server.Implementations/Localization/Server/ko.json
index 19b5c8b1d8..fe12bcb3dd 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ko.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ko.json
@@ -88,7 +88,7 @@
     "LabelSelectUsers": "Select users:",
     "ButtonUpload": "Upload",
     "HeaderUploadNewImage": "Upload New Image",
-    "LabelDropImageHere": "Drop Image Here",
+    "LabelDropImageHere": "Drop image here",
     "ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG\/PNG only.",
     "MessageNothingHere": "Nothing here.",
     "MessagePleaseEnsureInternetMetadata": "Please ensure downloading of internet metadata is enabled.",
@@ -794,6 +794,8 @@
     "TabNextUp": "Next Up",
     "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
     "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the New button to start creating Collections.",
+    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",
     "ButtonDismiss": "Dismiss",
     "MessageLearnHowToCustomize": "Learn how to customize this page to your own personal tastes. Click your user icon in the top right corner of the screen to view and update your preferences.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sync"
+    "OptionContextStatic": "Sync",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "TabPlaylists": "Playlists",
+    "ButtonClose": "Close",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ms.json b/MediaBrowser.Server.Implementations/Localization/Server/ms.json
index 6cfd966a48..4344dfbc6a 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ms.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ms.json
@@ -88,7 +88,7 @@
     "LabelSelectUsers": "Select users:",
     "ButtonUpload": "Upload",
     "HeaderUploadNewImage": "Upload New Image",
-    "LabelDropImageHere": "Drop Image Here",
+    "LabelDropImageHere": "Drop image here",
     "ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG\/PNG only.",
     "MessageNothingHere": "Nothing here.",
     "MessagePleaseEnsureInternetMetadata": "Please ensure downloading of internet metadata is enabled.",
@@ -794,6 +794,8 @@
     "TabNextUp": "Next Up",
     "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
     "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the New button to start creating Collections.",
+    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",
     "ButtonDismiss": "Dismiss",
     "MessageLearnHowToCustomize": "Learn how to customize this page to your own personal tastes. Click your user icon in the top right corner of the screen to view and update your preferences.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sync"
+    "OptionContextStatic": "Sync",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "TabPlaylists": "Playlists",
+    "ButtonClose": "Close",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/nb.json b/MediaBrowser.Server.Implementations/Localization/Server/nb.json
index 733c92f7b6..1c2ad5f293 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/nb.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/nb.json
@@ -794,6 +794,8 @@
     "TabNextUp": "Next Up",
     "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
     "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the New button to start creating Collections.",
+    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",
     "ButtonDismiss": "Dismiss",
     "MessageLearnHowToCustomize": "Learn how to customize this page to your own personal tastes. Click your user icon in the top right corner of the screen to view and update your preferences.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sync"
+    "OptionContextStatic": "Sync",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "TabPlaylists": "Playlists",
+    "ButtonClose": "Close",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/nl.json b/MediaBrowser.Server.Implementations/Localization/Server/nl.json
index 24eacd739a..7945a87344 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/nl.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/nl.json
@@ -263,7 +263,7 @@
     "LabelMetadataPath": "metagegevens pad:",
     "LabelMetadataPathHelp": "Deze locatie bevat gedownloade afbeeldingen en metagegevens die niet zijn geconfigureerd om te worden opgeslagen in mediamappen .",
     "LabelTranscodingTempPath": "Tijdelijk Transcodeer pad:",
-    "LabelTranscodingTempPathHelp": "Deze map bevat werkbestanden die worden gebruikt door de transcoder.",
+    "LabelTranscodingTempPathHelp": "Deze map bevat werkbestanden die worden gebruikt door de transcoder. Geef een eigen locatie op of laat leeg om de standaardlocatie te gebruiken.",
     "TabBasics": "Basis",
     "TabTV": "TV",
     "TabGames": "Games",
@@ -794,6 +794,8 @@
     "TabNextUp": "Eerstvolgende",
     "MessageNoMovieSuggestionsAvailable": "Er zijn momenteel geen film suggesties beschikbaar. Begin met het bekijken en waardeer uw films, kom daarna terug om uw aanbevelingen te bekijken.",
     "MessageNoCollectionsAvailable": "Met Verzamelingen kunt u genieten van gepersonaliseerde groeperingen van films, series, Albums, Boeken en games. Klik op de knop Nieuw om te beginnen met het maken van verzamelingen.",
+    "MessageNoPlaylistsAvailable": "Met afspeellijsten kan je een lijst maken waarvan de items achter elkaar afgespeeld worden. Om een item toe te voegen klik je met rechts of tik en hou je het vast om het te selecteren, klik vervolgens op Toevoegen aan afspeellijst.",
+    "MessageNoPlaylistItemsAvailable": "De afspeellijst is momenteel leeg.",
     "HeaderWelcomeToMediaBrowserWebClient": "Welkom op de Media Browser Web Client",
     "ButtonDismiss": "Afwijzen",
     "MessageLearnHowToCustomize": "Leer hoe u deze pagina aan kunt passen aan uw persoonlijke smaak. Klik op uw gebruikersnaam pictogram in de rechterbovenhoek van het scherm om uw voorkeuren te bekijken en bij te werken.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sync"
+    "OptionContextStatic": "Sync",
+    "ButtonAddToPlaylist": "Toevoegen aan afspeellijst",
+    "TabPlaylists": "Afspeellijst",
+    "ButtonClose": "Sluiten",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pl.json b/MediaBrowser.Server.Implementations/Localization/Server/pl.json
index 8e07ffe222..927eee68d0 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pl.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pl.json
@@ -794,6 +794,8 @@
     "TabNextUp": "Next Up",
     "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
     "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the New button to start creating Collections.",
+    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",
     "ButtonDismiss": "Dismiss",
     "MessageLearnHowToCustomize": "Learn how to customize this page to your own personal tastes. Click your user icon in the top right corner of the screen to view and update your preferences.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sync"
+    "OptionContextStatic": "Sync",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "TabPlaylists": "Playlists",
+    "ButtonClose": "Close",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json b/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
index beaf8aba90..356a646fe2 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
@@ -11,7 +11,7 @@
     "LabelRestartServer": "Reiniciar Servidor",
     "LabelShowLogWindow": "Exibir Janela de Log",
     "LabelPrevious": "Anterior",
-    "LabelFinish": "Terminar",
+    "LabelFinish": "Finalizar",
     "LabelNext": "Pr\u00f3ximo",
     "LabelYoureDone": "Pronto!",
     "WelcomeToMediaBrowser": "Bem Vindo ao Media Browser!",
@@ -794,6 +794,8 @@
     "TabNextUp": "Pr\u00f3ximos",
     "MessageNoMovieSuggestionsAvailable": "N\u00e3o existem sugest\u00f5es de filmes dispon\u00edveis atualmente. Comece por assistir e classificar seus filmes e, ent\u00e3o, volte para verificar suas recomenda\u00e7\u00f5es.",
     "MessageNoCollectionsAvailable": "Cole\u00e7\u00f5es permitem que voc\u00ea agrupe os Filmes, S\u00e9ries, Livros e Jogos de forma personalizada. Clique no bot\u00e3o Nova para iniciar a cria\u00e7\u00e3o de Cole\u00e7\u00f5es.",
+    "MessageNoPlaylistsAvailable": "Listas de reprodu\u00e7\u00e3o permitem criar listas com conte\u00fado para reproduzir consecutivamente, de uma s\u00f3 vez. Para adicionar itens \u00e0s listas de reprodu\u00e7\u00e3o, clique com o bot\u00e3o direito ou toque a tela por alguns segundos, depois selecione Adicionar \u00e0 Lista de Reprodu\u00e7\u00e3o.",
+    "MessageNoPlaylistItemsAvailable": "Esta lista de reprodu\u00e7\u00e3o est\u00e1 vazia.",
     "HeaderWelcomeToMediaBrowserWebClient": "Bem-vindo ao Cliente Web do Media Browser",
     "ButtonDismiss": "Descartar",
     "MessageLearnHowToCustomize": "Aprenda como personalizar esta p\u00e1gina com seu estilo pessoal. Clique no \u00edcone do usu\u00e1rio no canto superior direito da tela para ver e atualizar suas prefer\u00eancias.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Contexto:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sinc"
+    "OptionContextStatic": "Sinc",
+    "ButtonAddToPlaylist": "Adicionar \u00e0 lista de reprodu\u00e7\u00e3o",
+    "TabPlaylists": "Listas de Reprodu\u00e7\u00e3o",
+    "ButtonClose": "Fechar",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
index 01e446591b..c4e11e4280 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
@@ -794,6 +794,8 @@
     "TabNextUp": "Next Up",
     "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
     "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the New button to start creating Collections.",
+    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",
     "ButtonDismiss": "Dismiss",
     "MessageLearnHowToCustomize": "Learn how to customize this page to your own personal tastes. Click your user icon in the top right corner of the screen to view and update your preferences.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sync"
+    "OptionContextStatic": "Sync",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "TabPlaylists": "Playlists",
+    "ButtonClose": "Close",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ru.json b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
index 87f31d415b..e64b0659d6 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ru.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
@@ -589,7 +589,7 @@
     "NotificationOptionTaskFailed": "\u0421\u0431\u043e\u0439 \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u043e\u0433\u043e \u0437\u0430\u0434\u0430\u043d\u0438\u044f",
     "NotificationOptionInstallationFailed": "\u0421\u0431\u043e\u0439 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438",
     "NotificationOptionNewLibraryContent": "\u041d\u043e\u0432\u043e\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e",
-    "NotificationOptionNewLibraryContentMultiple": "\u041d\u043e\u0432\u043e\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e (\u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e)",
+    "NotificationOptionNewLibraryContentMultiple": "\u041d\u043e\u0432\u043e\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e (\u043c\u043d\u043e\u0436\u0435\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u0435)",
     "SendNotificationHelp": "\u041f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e, \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f \u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u044e\u0442\u0441\u044f \u0432 \u044f\u0449\u0438\u043a \u0432\u0445\u043e\u0434\u044f\u0449\u0438\u0445 \u0432 \u0418\u043d\u0444\u043e\u043f\u0430\u043d\u0435\u043b\u0438. \u041f\u0435\u0440\u0435\u0439\u0434\u0438\u0442\u0435 \u0432 \u043a\u0430\u0442\u0430\u043b\u043e\u0433 \u043f\u043b\u0430\u0433\u0438\u043d\u043e\u0432, \u0447\u0442\u043e\u0431\u044b \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0439.",
     "NotificationOptionServerRestartRequired": "\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u043f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0430",
     "LabelNotificationEnabled": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0434\u0430\u043d\u043d\u043e\u0435 \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435",
@@ -727,7 +727,7 @@
     "OptionReportByteRangeSeekingWhenTranscodingHelp": "\u042d\u0442\u043e \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0434\u043b\u044f \u043d\u0435\u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u043d\u0435 \u0434\u0435\u043b\u0430\u044e\u0442 \u043f\u043e\u0432\u0440\u0435\u043c\u0435\u043d\u043d\u0443\u044e \u043f\u0435\u0440\u0435\u043c\u043e\u0442\u043a\u0443 \u0434\u043e\u0441\u0442\u0430\u0442\u043e\u0447\u043d\u043e \u0445\u043e\u0440\u043e\u0448\u043e.",
     "HeaderSubtitleDownloadingHelp": "\u041f\u0440\u0438 \u0441\u043a\u0430\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0438 \u0432\u0438\u0434\u0435\u043e\u0444\u0430\u0439\u043b\u043e\u0432, Media Browser \u043c\u043e\u0436\u0435\u0442 \u0438\u0441\u043a\u0430\u0442\u044c \u043d\u0435\u0434\u043e\u0441\u0442\u0430\u044e\u0449\u0438\u0435 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u044b \u0438 \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044c \u0438\u0445 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u043f\u043e\u0441\u0442\u0430\u0432\u0449\u0438\u043a\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043e\u0432, \u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, OpenSubtitles.org.",
     "HeaderDownloadSubtitlesFor": "\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043e\u0432 \u0434\u043b\u044f:",
-    "MessageNoChapterProviders": "\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u0435 \u043f\u043b\u0430\u0433\u0438\u043d-\u043f\u043e\u0441\u0442\u0430\u0432\u0449\u0438\u043a \u0441\u0446\u0435\u043d (\u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, ChapterDb) \u0434\u043b\u044f \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0445 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432 \u0441\u0446\u0435\u043d.",
+    "MessageNoChapterProviders": "\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u0435 \u043f\u043b\u0430\u0433\u0438\u043d-\u043f\u043e\u0441\u0442\u0430\u0432\u0449\u0438\u043a \u0441\u0446\u0435\u043d (\u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440: ChapterDb) \u0434\u043b\u044f \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0445 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432 \u0441\u0446\u0435\u043d.",
     "LabelSkipIfGraphicalSubsPresent": "\u041e\u043f\u0443\u0441\u0442\u0438\u0442\u044c, \u0435\u0441\u043b\u0438 \u0432 \u0432\u0438\u0434\u0435\u043e\u0444\u0430\u0439\u043b\u0435 \u0443\u0436\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0442\u0441\u044f \u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u0438\u0435 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u044b",
     "LabelSkipIfGraphicalSubsPresentHelp": "\u0422\u0435\u043a\u0441\u0442\u043e\u0432\u044b\u0435 \u0432\u0435\u0440\u0441\u0438\u0438 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043e\u0432 \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0438\u0432\u0430\u044e\u0442 \u0431\u043e\u043b\u0435\u0435 \u044d\u0444\u0444\u0435\u043a\u0442\u0438\u0432\u043d\u0443\u044e \u0434\u043e\u0441\u0442\u0430\u0432\u043a\u0443 \u0434\u043b\u044f \u043c\u043e\u0431\u0438\u043b\u044c\u043d\u044b\u0445 \u043a\u043b\u0438\u0435\u043d\u0442\u043e\u0432.",
     "TabSubtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044b",
@@ -777,7 +777,7 @@
     "LabelHomePageSection4": "\u0413\u043b\u0430\u0432\u043d\u0430\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 - \u0440\u0430\u0437\u0434\u0435\u043b 4:",
     "OptionMyViewsButtons": "\u041c\u043e\u0438 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f (\u043a\u043d\u043e\u043f\u043a\u0438)",
     "OptionMyViews": "\u041c\u043e\u0438 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f",
-    "OptionMyViewsSmall": "\u041c\u043e\u0438 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f (\u043c\u0430\u043b\u044b\u0435)",
+    "OptionMyViewsSmall": "\u041c\u043e\u0438 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f (\u043a\u043e\u043c\u043f\u0430\u043a\u0442\u043d\u044b\u0435)",
     "OptionResumablemedia": "\u0412\u043e\u0437\u043e\u0431\u043d\u043e\u0432\u0438\u043c\u044b\u0435",
     "OptionLatestMedia": "\u041d\u043e\u0432\u0438\u043d\u043a\u0438 \u043d\u043e\u0441\u0438\u0442\u0435\u043b\u0435\u0439",
     "OptionLatestChannelMedia": "\u041d\u043e\u0432\u0438\u043d\u043a\u0438 \u043a\u0430\u043d\u0430\u043b\u043e\u0432",
@@ -794,6 +794,8 @@
     "TabNextUp": "\u041f\u0440\u043e\u0434\u043e\u043b\u0436\u0435\u043d\u0438\u044f",
     "MessageNoMovieSuggestionsAvailable": "\u0421\u0435\u0439\u0447\u0430\u0441 \u043d\u0435\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0445 \u043f\u0440\u0435\u0434\u043b\u043e\u0436\u0435\u043d\u0438\u0439 \u0444\u0438\u043b\u044c\u043c\u043e\u0432. \u041d\u0430\u0447\u043d\u0438\u0442\u0435 \u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0438 \u043e\u0446\u0435\u043d\u0438\u0432\u0430\u0442\u044c \u0444\u0438\u043b\u044c\u043c\u044b, \u0438 \u0442\u043e\u0433\u0434\u0430 \u0432\u0435\u0440\u043d\u0438\u0442\u0435\u0441\u044c \u043d\u0430\u0437\u0430\u0434, \u0447\u0442\u043e\u0431\u044b \u0443\u0432\u0438\u0434\u0435\u0442\u044c \u0432\u0430\u0448\u0438 \u0440\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u0430\u0446\u0438\u0438.",
     "MessageNoCollectionsAvailable": "\u041a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u0438 \u043f\u043e\u0437\u0432\u043e\u043b\u044f\u044e\u0442 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u043d\u0430\u0441\u0442\u0440\u0430\u0438\u0432\u0430\u0435\u043c\u044b\u043c \u0433\u0440\u0443\u043f\u043f\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435\u043c \u0438\u0437 \u0444\u0438\u043b\u044c\u043c\u043e\u0432, \u0441\u0435\u0440\u0438\u0430\u043b\u043e\u0432, \u0430\u043b\u044c\u0431\u043e\u043c\u043e\u0432 \u0438 \u0438\u0433\u0440. \u041d\u0430\u0436\u043c\u0438\u0442\u0435 \u043a\u043d\u043e\u043f\u043a\u0443 \"\u0421\u043e\u0437\u0434\u0430\u0442\u044c\", \u0447\u0442\u043e\u0431\u044b \u043d\u0430\u0447\u0430\u0442\u044c \u043d\u043e\u0432\u0443\u044e \u043a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u044e.",
+    "MessageNoPlaylistsAvailable": "\u0421\u043f\u0438\u0441\u043a\u0438 \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043f\u043e\u0437\u0432\u043e\u043b\u044f\u044e\u0442 \u0441\u043e\u0437\u0434\u0430\u0432\u0430\u0442\u044c \u0441\u043f\u0438\u0441\u043a\u0438 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u044f \u0434\u043b\u044f \u043f\u043e\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0433\u043e \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u0437\u0430 \u0440\u0430\u0437. \u0427\u0442\u043e\u0431\u044b \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u044b \u0432 \u0441\u043f\u0438\u0441\u043a\u0438 \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f, \u0449\u0435\u043b\u043a\u043d\u0438\u0442\u0435 \u043f\u0440\u0430\u0432\u043e\u0439 \u043a\u043d\u043e\u043f\u043a\u043e\u0439 \u043c\u044b\u0448\u0438 \u0438\u043b\u0438 \u043a\u043e\u0441\u043d\u0438\u0442\u0435\u0441\u044c \u0438 \u0434\u0435\u0440\u0436\u0438\u0442\u0435, \u0437\u0430\u0442\u0435\u043c \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432 \u0441\u043f\u0438\u0441\u043e\u043a \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f.",
+    "MessageNoPlaylistItemsAvailable": "\u0414\u0430\u043d\u043d\u044b\u0439 \u0441\u043f\u0438\u0441\u043e\u043a \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u0432 \u043d\u0430\u0441\u0442\u043e\u044f\u0449\u0435\u0435 \u0432\u0440\u0435\u043c\u044f \u043f\u0443\u0441\u0442.",
     "HeaderWelcomeToMediaBrowserWebClient": "\u0412\u0435\u0431-\u043a\u043b\u0438\u0435\u043d\u0442 Media Browser \u043f\u0440\u0438\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u0432\u0430\u0441!",
     "ButtonDismiss": "\u0421\u043a\u0440\u044b\u0442\u044c",
     "MessageLearnHowToCustomize": "\u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c, \u043a\u0430\u043a \u043f\u043e\u0434\u0441\u0442\u0440\u0430\u0438\u0432\u0430\u0442\u044c \u0434\u0430\u043d\u043d\u0443\u044e \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443 \u043f\u043e \u0441\u0432\u043e\u0435\u043c\u0443 \u043b\u0438\u0447\u043d\u043e\u043c\u0443 \u0432\u043a\u0443\u0441\u0443. \u041d\u0430\u0436\u043c\u0438\u0442\u0435 \u0430\u0432\u0430\u0442\u0430\u0440\u0443 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0432 \u043f\u0440\u0430\u0432\u043e\u043c \u0432\u0435\u0440\u0445\u043d\u0435\u043c \u0443\u0433\u043b\u0443 \u044d\u043a\u0440\u0430\u043d\u0430, \u0447\u0442\u043e\u0431\u044b \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0438 \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0441\u0432\u043e\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438.",
@@ -807,7 +809,7 @@
     "LabelChannelDownloadPathHelp": "\u0423\u043a\u0430\u0436\u0438\u0442\u0435, \u043f\u043e \u0436\u0435\u043b\u0430\u043d\u0438\u044e, \u043f\u0440\u043e\u0438\u0437\u0432\u043e\u043b\u044c\u043d\u044b\u0439 \u043f\u0443\u0442\u044c \u0434\u043b\u044f \u0437\u0430\u0433\u0440\u0443\u0437\u043e\u043a. \u041e\u0441\u0442\u0430\u0432\u044c\u0442\u0435 \u043f\u0443\u0441\u0442\u044b\u043c, \u0447\u0442\u043e\u0431\u044b \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044c \u0432\u043e \u0432\u043d\u0443\u0442\u0440\u0435\u043d\u043d\u044e\u044e \u043f\u0430\u043f\u043a\u0443 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u043d\u044b\u0445 \u0434\u0430\u043d\u043d\u044b\u0445.",
     "LabelChannelDownloadAge": "\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u044f \u0447\u0435\u0440\u0435\u0437, \u0434\u043d\u0438:",
     "LabelChannelDownloadAgeHelp": "\u0411\u0443\u0434\u0435\u0442 \u0443\u0434\u0430\u043b\u0435\u043d\u043e \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043d\u043d\u043e\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u0441\u0442\u0430\u0440\u0435\u0435, \u0447\u0435\u043c \u0434\u0430\u043d\u043d\u043e\u0435. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u0435\u0433\u043e \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043f\u043e\u0441\u0440\u0435\u0434\u0441\u0442\u0432\u043e\u043c \u043f\u043e\u0442\u043e\u043a\u043e\u0432\u043e\u0439 \u043f\u0435\u0440\u0435\u0434\u0430\u0447\u0438 \u0447\u0435\u0440\u0435\u0437 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442 \u0441\u043e\u0445\u0440\u0430\u043d\u044f\u0435\u0442\u0441\u044f.",
-    "ChannelSettingsFormHelp": "\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u0435 \u043a\u0430\u043d\u0430\u043b\u044b (\u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, Trailers \u0438 Vimeo) \u0438\u0437 \u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0430 \u043f\u043b\u0430\u0433\u0438\u043d\u043e\u0432.",
+    "ChannelSettingsFormHelp": "\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u0435 \u043a\u0430\u043d\u0430\u043b\u044b (\u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440: Trailers \u0438\u043b\u0438 Vimeo) \u0438\u0437 \u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0430 \u043f\u043b\u0430\u0433\u0438\u043d\u043e\u0432.",
     "LabelSelectCollection": "\u0412\u044b\u0431\u043e\u0440 \u043a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u0438:",
     "ViewTypeMovies": "\u041a\u0438\u043d\u043e",
     "ViewTypeTvShows": "\u0422\u0412",
@@ -818,7 +820,7 @@
     "ViewTypeLiveTV": "\u0422\u0412 \u044d\u0444\u0438\u0440",
     "HeaderOtherDisplaySettings": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f",
     "HeaderMyViews": "\u041c\u043e\u0438 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f",
-    "LabelSelectFolderGroups": "\u0410\u0432\u0442\u043e\u0433\u0440\u0443\u043f\u043f\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u0432 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f (\u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, \u041a\u0438\u043d\u043e, \u041c\u0443\u0437\u044b\u043a\u0430 \u0438 \u0422\u0412) \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u044f \u0438\u0437 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0445 \u043f\u0430\u043f\u043e\u043a:",
+    "LabelSelectFolderGroups": "\u0410\u0432\u0442\u043e\u0433\u0440\u0443\u043f\u043f\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u0432 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f (\u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440: \u041a\u0438\u043d\u043e, \u041c\u0443\u0437\u044b\u043a\u0430 \u0438\u043b\u0438 \u0422\u0412) \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u044f \u0438\u0437 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0445 \u043f\u0430\u043f\u043e\u043a:",
     "LabelSelectFolderGroupsHelp": "\u041f\u0430\u043f\u043a\u0438, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u043d\u0435 \u043e\u0442\u043c\u0435\u0447\u0435\u043d\u044b, \u0431\u0443\u0434\u0443\u0442 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c\u0441\u044f \u043f\u043e \u043f\u0440\u0438\u0441\u0443\u0449\u0438\u043c \u0438\u043c \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f\u043c.",
     "OptionDisplayAdultContent": "\u041e\u0442\u043e\u0431\u0440\u0430\u0437\u0438\u0442\u044c \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \"\u0434\u043b\u044f \u0432\u0437\u0440\u043e\u0441\u043b\u044b\u0445\"",
     "OptionLibraryFolders": "\u041c\u0435\u0434\u0438\u0430\u043f\u0430\u043f\u043a\u0438",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http \u041f\u0440\u044f\u043c\u043e\u0439 \u041f\u043e\u0442\u043e\u043a (HLS)",
     "LabelContext": "\u041a\u043e\u043d\u0442\u0435\u043a\u0441\u0442",
     "OptionContextStreaming": "\u041f\u043e\u0442\u043e\u043a\u043e\u0432\u0430\u044f \u043f\u0435\u0440\u0435\u0434\u0430\u0447\u0430",
-    "OptionContextStatic": "\u0421\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u044f"
+    "OptionContextStatic": "\u0421\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u044f",
+    "ButtonAddToPlaylist": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432 \u0441\u043f\u0438\u0441\u043e\u043a \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f",
+    "TabPlaylists": "\u0421\u043f\u0438\u0441\u043a\u0438 \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f",
+    "ButtonClose": "\u0417\u0430\u043a\u0440\u044b\u0442\u044c",
+    "LabelAllLanguages": "\u0412\u0441\u0435 \u044f\u0437\u044b\u043a\u0438",
+    "HeaderBrowseOnlineImages": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u0440\u0438\u0441\u0443\u043d\u043a\u043e\u0432 \u0432 \u0441\u0435\u0442\u0438",
+    "LabelSource": "\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a:",
+    "OptionAll": "\u0412\u0441\u0435",
+    "LabelImage": "\u0420\u0438\u0441\u0443\u043d\u043e\u043a:",
+    "ButtonBrowseImages": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0440\u0438\u0441\u0443\u043d\u043a\u0438",
+    "HeaderImages": "\u0420\u0438\u0441\u0443\u043d\u043a\u0438",
+    "HeaderBackdrops": "\u0417\u0430\u0434\u043d\u0438\u043a\u0438",
+    "HeaderScreenshots": "\u0421\u043d\u0438\u043c\u043a\u0438 \u044d\u043a\u0440\u0430\u043d\u0430",
+    "HeaderAddUpdateImage": "\u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u0435\/\u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u0440\u0438\u0441\u0443\u043d\u043a\u0430",
+    "LabelJpgPngOnly": "\u0422\u043e\u043b\u044c\u043a\u043e JPG\/PNG",
+    "LabelImageType": "\u0422\u0438\u043f \u0440\u0438\u0441\u0443\u043d\u043a\u0430:",
+    "OptionPrimary": "\u041f\u0435\u0440\u0432\u0438\u0447\u043d\u044b\u0439",
+    "OptionArt": "\u0412\u0438\u043d\u044c\u0435\u0442\u043a\u0430",
+    "OptionBox": "\u041a\u043e\u0440\u043e\u0431\u043a\u0430",
+    "OptionBoxRear": "\u041a\u043e\u0440\u043e\u0431\u043a\u0430 \u0441\u0437\u0430\u0434\u0438",
+    "OptionDisc": "\u0414\u0438\u0441\u043a",
+    "OptionLogo": "\u041b\u043e\u0433\u043e\u0442\u0438\u043f",
+    "OptionMenu": "\u041c\u0435\u043d\u044e",
+    "OptionScreenshot": "\u0421\u043d\u0438\u043c\u043e\u043a \u044d\u043a\u0440\u0430\u043d\u0430",
+    "OptionLocked": "\u0417\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u043e",
+    "OptionUnidentified": "\u041d\u0435 \u043e\u043f\u043e\u0437\u043d\u0430\u043d\u043e",
+    "OptionMissingParentalRating": "\u041f\u0440\u043e\u043f\u0443\u0449\u0435\u043d\u0430 \u0432\u043e\u0437\u0440\u0430\u0441\u0442\u043d\u0430\u044f \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f",
+    "OptionStub": "\u0417\u0430\u0433\u043b\u0443\u0448\u043a\u0430",
+    "HeaderEpisodes": "\u042d\u043f\u0438\u0437\u043e\u0434\u044b:",
+    "OptionSeason0": "\u0421\u0435\u0437\u043e\u043d 0",
+    "LabelReport": "\u041e\u0442\u0447\u0451\u0442",
+    "OptionReportSongs": "\u041c\u0435\u043b\u043e\u0434\u0438\u0438",
+    "OptionReportSeries": "\u0421\u0435\u0440\u0438\u0430\u043b",
+    "OptionReportSeasons": "\u0421\u0435\u0437\u043e\u043d\u044b",
+    "OptionReportTrailers": "\u0422\u0440\u0435\u0439\u043b\u0435\u0440\u044b",
+    "OptionReportMusicVideos": "\u041a\u043b\u0438\u043f\u044b",
+    "OptionReportMovies": "\u0424\u0438\u043b\u044c\u043c\u044b",
+    "OptionReportHomeVideos": "\u0414\u043e\u043c\u0430\u0448\u043d\u0435\u0435 \u0432\u0438\u0434\u0435\u043e",
+    "OptionReportGames": "\u0418\u0433\u0440\u044b",
+    "OptionReportEpisodes": "\u042d\u043f\u0438\u0437\u043e\u0434\u044b",
+    "OptionReportCollections": "\u041a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u0438",
+    "OptionReportBooks": "\u041a\u043d\u0438\u0433\u0438",
+    "OptionReportArtists": "\u0418\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u0438",
+    "OptionReportAlbums": "\u0410\u043b\u044c\u0431\u043e\u043c\u044b",
+    "OptionReportAdultVideos": "\u0412\u0437\u0440\u043e\u0441\u043b\u043e\u0435 \u0432\u0438\u0434\u0435\u043e"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 4716209481..a88ba85922 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -919,5 +919,50 @@
     "OptionContextStreaming": "Streaming",
     "OptionContextStatic": "Sync",
     "ButtonAddToPlaylist":  "Add to playlist",
-    "TabPlaylists":  "Playlists"
+    "TabPlaylists":  "Playlists",
+	"ButtonClose": "Close",
+	"LabelAllLanguages": "All languages",
+	"HeaderBrowseOnlineImages": "Browse Online Images",
+	"LabelSource": "Source:",
+	"OptionAll": "All",
+	"LabelImage": "Image:",
+	"ButtonUpload": "Upload",
+	"ButtonBrowseImages": "Browse Images",
+	"HeaderImages": "Images",
+	"HeaderBackdrops": "Backdrops",
+	"HeaderScreenshots": "Screenshots",
+	"HeaderAddUpdateImage": "Add/Update Image",
+	"LabelDropImageHere": "Drop image here",
+	"LabelJpgPngOnly": "JPG/PNG only",
+	"LabelImageType": "Image type:",
+	"OptionPrimary": "Primary",
+	"OptionArt": "Art",
+	"OptionBackdrop": "Backdrop",
+	"OptionBox": "Box",
+	"OptionBoxRear": "Box rear",
+	"OptionDisc": "Disc",
+	"OptionLogo": "Logo",
+	"OptionMenu": "Menu",
+	"OptionScreenshot": "Screenshot",
+	"OptionLocked": "Locked",
+	"OptionUnidentified": "Unidentified",
+	"OptionMissingParentalRating": "Missing parental rating",
+	"OptionStub": "Stub",
+	"HeaderEpisodes": "Episodes:",
+	"OptionSeason0": "Season 0",
+	"LabelReport": "Report:",
+	"OptionReportSongs": "Songs",
+	"OptionReportSeries": "Series",
+	"OptionReportSeasons": "Seasons",
+	"OptionReportTrailers": "Trailers",
+	"OptionReportMusicVideos": "Music videos",
+	"OptionReportMovies": "Movies",
+	"OptionReportHomeVideos": "Home videos",
+	"OptionReportGames": "Games",
+	"OptionReportEpisodes": "Episodes",
+	"OptionReportCollections": "Collections",
+	"OptionReportBooks": "Books",
+	"OptionReportArtists": "Artists",
+	"OptionReportAlbums": "Albums",
+	"OptionReportAdultVideos": "Adult videos"
 }
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/sv.json b/MediaBrowser.Server.Implementations/Localization/Server/sv.json
index 4a7e529f07..5e95737333 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/sv.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/sv.json
@@ -794,6 +794,8 @@
     "TabNextUp": "N\u00e4stkommande",
     "MessageNoMovieSuggestionsAvailable": "Det finns inga filmf\u00f6rslag f\u00f6r tillf\u00e4llet. Efter att ha sett ett antal filmer kan du \u00e5terkomma hit f\u00f6r att se dina f\u00f6rslag.",
     "MessageNoCollectionsAvailable": "Samlingar g\u00f6r det m\u00f6jligt att skapa skr\u00e4ddarsydda grupper av filmer, serier, album, b\u00f6cker och spel. Klicka p\u00e5 \"Ny\" f\u00f6r att b\u00f6rja med samlingar.",
+    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "V\u00e4lkommen till Media Browsers webbklient",
     "ButtonDismiss": "Avvisa",
     "MessageLearnHowToCustomize": "L\u00e4r dig hur du anpassar den h\u00e4r sidan till din personliga smak. Klicka p\u00e5 anv\u00e4ndarikonen uppe till h\u00f6ger f\u00f6r att visa och \u00e4ndra dina inst\u00e4llningar.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Live-str\u00f6mning via Http",
     "LabelContext": "Metod:",
     "OptionContextStreaming": "Str\u00f6mning",
-    "OptionContextStatic": "Synk"
+    "OptionContextStatic": "Synk",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "TabPlaylists": "Playlists",
+    "ButtonClose": "St\u00e4ng",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/tr.json b/MediaBrowser.Server.Implementations/Localization/Server/tr.json
index c2498b5750..3bbb22109f 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/tr.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/tr.json
@@ -178,9 +178,9 @@
     "OptionHasThemeVideo": "Tema Videosu",
     "TabMovies": "Filmler",
     "TabStudios": "St\u00fcdyo",
-    "TabTrailers": "Trailers",
-    "HeaderLatestMovies": "Latest Movies",
-    "HeaderLatestTrailers": "Latest Trailers",
+    "TabTrailers": "Fragmanlar",
+    "HeaderLatestMovies": "Son filmler",
+    "HeaderLatestTrailers": "Son fragmanlar",
     "OptionHasSpecialFeatures": "Special Features",
     "OptionImdbRating": "\u0130MDb Reyting",
     "OptionParentalRating": "Parental Rating",
@@ -188,7 +188,7 @@
     "TabBasic": "Basit",
     "TabAdvanced": "Geli\u015fmi\u015f",
     "HeaderStatus": "Durum",
-    "OptionContinuing": "Continuing",
+    "OptionContinuing": "Topluluk",
     "OptionEnded": "Bitmi\u015f",
     "HeaderAirDays": "Air Days",
     "OptionSunday": "Pazar",
@@ -208,8 +208,8 @@
     "TitleSupport": "Destek",
     "TabLog": "Kay\u0131t",
     "TabAbout": "Hakk\u0131nda",
-    "TabSupporterKey": "Supporter Key",
-    "TabBecomeSupporter": "Become a Supporter",
+    "TabSupporterKey": "Destek\u00e7i kodu",
+    "TabBecomeSupporter": "Destek\u00e7i ol",
     "MediaBrowserHasCommunity": "Media Browser has a thriving community of users and contributors.",
     "CheckoutKnowledgeBase": "Check out our knowledge base to help you get the most out of Media Browser.",
     "SearchKnowledgeBase": "Search the Knowledge Base",
@@ -328,7 +328,7 @@
     "ButtonDelete": "Sil",
     "ButtonRemove": "Sil",
     "OptionRecordSeries": "Kay\u0131t Serisi",
-    "HeaderDetails": "Detay",
+    "HeaderDetails": "Detaylar",
     "TitleLiveTV": "Canl\u0131 TV",
     "LabelNumberOfGuideDays": "Number of days of guide data to download:",
     "LabelNumberOfGuideDaysHelp": "Downloading more days worth of guide data provides the ability to schedule out further in advance and view more listings, but it will also take longer to download. Auto will choose based on the number of channels.",
@@ -440,7 +440,7 @@
     "SystemDlnaProfilesHelp": "System profiles are read-only. Changes to a system profile will be saved to a new custom profile.",
     "TitleDashboard": "Dashboard",
     "TabHome": "Anasayfa",
-    "TabInfo": "Info",
+    "TabInfo": "Bilgi",
     "HeaderLinks": "Links",
     "HeaderSystemPaths": "System Paths",
     "LinkCommunity": "Community",
@@ -524,7 +524,7 @@
     "HeaderRunningTasks": "Running Tasks",
     "HeaderActiveDevices": "Active Devices",
     "HeaderPendingInstallations": "Pending Installations",
-    "HeaerServerInformation": "Server Information",
+    "HeaerServerInformation": "Sunucu bilgisi",
     "ButtonRestartNow": "Restart Now",
     "ButtonRestart": "Restart",
     "ButtonShutdown": "Shutdown",
@@ -794,6 +794,8 @@
     "TabNextUp": "Sonraki hafta",
     "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
     "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the New button to start creating Collections.",
+    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",
     "ButtonDismiss": "Dismiss",
     "MessageLearnHowToCustomize": "Learn how to customize this page to your own personal tastes. Click your user icon in the top right corner of the screen to view and update your preferences.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sync"
+    "OptionContextStatic": "Sync",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "TabPlaylists": "Playlists",
+    "ButtonClose": "Close",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/vi.json b/MediaBrowser.Server.Implementations/Localization/Server/vi.json
index 4ddd7a7d12..aefae379f7 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/vi.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/vi.json
@@ -794,6 +794,8 @@
     "TabNextUp": "Next Up",
     "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
     "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the New button to start creating Collections.",
+    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",
     "ButtonDismiss": "Dismiss",
     "MessageLearnHowToCustomize": "Learn how to customize this page to your own personal tastes. Click your user icon in the top right corner of the screen to view and update your preferences.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sync"
+    "OptionContextStatic": "Sync",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "TabPlaylists": "Playlists",
+    "ButtonClose": "Close",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json b/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
index d79d48099b..9c42fef3f5 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
@@ -794,6 +794,8 @@
     "TabNextUp": "Next Up",
     "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
     "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the New button to start creating Collections.",
+    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",
     "ButtonDismiss": "Dismiss",
     "MessageLearnHowToCustomize": "Learn how to customize this page to your own personal tastes. Click your user icon in the top right corner of the screen to view and update your preferences.",
@@ -900,5 +902,49 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sync"
+    "OptionContextStatic": "Sync",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "TabPlaylists": "Playlists",
+    "ButtonClose": "Close",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add\/Update Image",
+    "LabelJpgPngOnly": "JPG\/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
+    "OptionReportAdultVideos": "Adult videos"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs
index 0b3d5f7847..6e484413a1 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs
@@ -4,6 +4,7 @@ using System.Data;
 using System.Data.SQLite;
 using System.IO;
 using System.Threading.Tasks;
+using MediaBrowser.Model.Serialization;
 
 namespace MediaBrowser.Server.Implementations.Persistence
 {
@@ -151,5 +152,26 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             return connection;
         }
+
+        /// <summary>
+        /// Serializes to bytes.
+        /// </summary>
+        /// <param name="json">The json.</param>
+        /// <param name="obj">The obj.</param>
+        /// <returns>System.Byte[][].</returns>
+        /// <exception cref="System.ArgumentNullException">obj</exception>
+        public static byte[] SerializeToBytes(this IJsonSerializer json, object obj)
+        {
+            if (obj == null)
+            {
+                throw new ArgumentNullException("obj");
+            }
+
+            using (var stream = new MemoryStream())
+            {
+                json.SerializeToStream(obj, stream);
+                return stream.ToArray();
+            }
+        }
     }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 3ba6364f259ea43979a88b2a83d64292119057dc Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 5 Aug 2014 19:59:24 -0400
Subject: fixes #887 - Support ttml subtitle output

---
 MediaBrowser.Api/Subtitles/SubtitleService.cs      | 10 ++--
 MediaBrowser.Api/SystemService.cs                  |  2 +
 MediaBrowser.Controller/Entities/Audio/Audio.cs    |  5 ++
 .../Entities/Audio/MusicAlbum.cs                   |  5 ++
 .../Entities/Audio/MusicArtist.cs                  |  5 ++
 .../Entities/Audio/MusicGenre.cs                   |  5 ++
 MediaBrowser.Controller/Entities/BaseItem.cs       |  8 +++
 MediaBrowser.Controller/Entities/TV/Season.cs      |  5 ++
 MediaBrowser.Controller/Entities/TV/Series.cs      |  5 ++
 MediaBrowser.Controller/Entities/Video.cs          |  5 ++
 MediaBrowser.Controller/IServerApplicationHost.cs  |  6 +++
 MediaBrowser.Controller/Library/TVUtils.cs         |  2 +-
 .../MediaEncoding/ISubtitleEncoder.cs              |  4 ++
 MediaBrowser.Dlna/PlayTo/PlaylistItemFactory.cs    |  5 +-
 MediaBrowser.Dlna/Profiles/Windows81Profile.cs     |  7 +++
 MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml |  4 +-
 .../Profiles/Xml/Samsung Smart TV.xml              |  4 +-
 MediaBrowser.Dlna/Profiles/Xml/Windows 8 RT.xml    |  4 +-
 .../Parsers/PlaylistXmlParser.cs                   | 14 +++++
 .../Savers/PlaylistXmlSaver.cs                     | 24 +++++++--
 .../Savers/XmlSaverHelpers.cs                      | 12 +++--
 .../MediaBrowser.MediaEncoding.csproj              |  1 +
 .../Subtitles/SubtitleEncoder.cs                   | 38 ++++++++++----
 MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs | 59 ++++++++++++++++++++++
 MediaBrowser.Model/Dlna/StreamBuilder.cs           | 48 ++++--------------
 MediaBrowser.Model/Dlna/StreamInfo.cs              | 43 +++++++++++++---
 MediaBrowser.Model/Dlna/SubtitleProfile.cs         |  9 +++-
 MediaBrowser.Model/Dto/BaseItemDto.cs              | 12 ++---
 MediaBrowser.Model/MediaInfo/SubtitleFormat.cs     |  1 +
 .../MediaBrowser.Providers.csproj                  |  1 +
 .../Playlists/PlaylistMetadataService.cs           | 47 +++++++++++++++++
 .../Dto/DtoService.cs                              | 14 ++---
 .../LiveTv/LiveTvManager.cs                        |  1 -
 .../Udp/UdpServer.cs                               |  2 +-
 MediaBrowser.ServerApplication/ApplicationHost.cs  | 12 ++++-
 35 files changed, 333 insertions(+), 96 deletions(-)
 create mode 100644 MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs
 create mode 100644 MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Api/Subtitles/SubtitleService.cs b/MediaBrowser.Api/Subtitles/SubtitleService.cs
index 3e692cb22f..f7696e9639 100644
--- a/MediaBrowser.Api/Subtitles/SubtitleService.cs
+++ b/MediaBrowser.Api/Subtitles/SubtitleService.cs
@@ -1,6 +1,4 @@
-using System.IO;
-using System.Linq;
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Net;
@@ -11,6 +9,8 @@ using MediaBrowser.Model.Providers;
 using ServiceStack;
 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -69,7 +69,8 @@ namespace MediaBrowser.Api.Subtitles
         public string Id { get; set; }
     }
 
-    [Route("/Videos/{Id}/{MediaSourceId}/Subtitles/{Index}/Stream.{Format}", "GET", Summary = "Gets subtitles in a specified format (vtt).")]
+    [Route("/Videos/{Id}/{MediaSourceId}/Subtitles/{Index}/Stream.{Format}", "GET", Summary = "Gets subtitles in a specified format.")]
+    [Route("/Videos/{Id}/{MediaSourceId}/Subtitles/{Index}/{StartPositionTicks}/Stream.{Format}", "GET", Summary = "Gets subtitles in a specified format.")]
     public class GetSubtitle
     {
         /// <summary>
@@ -132,6 +133,7 @@ namespace MediaBrowser.Api.Subtitles
                 request.Index,
                 request.Format,
                 request.StartPositionTicks,
+                null,
                 CancellationToken.None).ConfigureAwait(false);
         }
 
diff --git a/MediaBrowser.Api/SystemService.cs b/MediaBrowser.Api/SystemService.cs
index e31e66d19d..259b1d8921 100644
--- a/MediaBrowser.Api/SystemService.cs
+++ b/MediaBrowser.Api/SystemService.cs
@@ -71,6 +71,8 @@ namespace MediaBrowser.Api
         /// Initializes a new instance of the <see cref="SystemService" /> class.
         /// </summary>
         /// <param name="appHost">The app host.</param>
+        /// <param name="appPaths">The application paths.</param>
+        /// <param name="fileSystem">The file system.</param>
         /// <exception cref="System.ArgumentNullException">jsonSerializer</exception>
         public SystemService(IServerApplicationHost appHost, IApplicationPaths appPaths, IFileSystem fileSystem)
         {
diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs
index 32d3dd5c8c..d3085cb680 100644
--- a/MediaBrowser.Controller/Entities/Audio/Audio.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs
@@ -34,6 +34,11 @@ namespace MediaBrowser.Controller.Entities.Audio
             Tags = new List<string>();
         }
 
+        public override bool SupportsAddingToPlaylist
+        {
+            get { return LocationType == LocationType.FileSystem && RunTimeTicks.HasValue; }
+        }
+
         /// <summary>
         /// Gets or sets a value indicating whether this instance has embedded image.
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
index 695b1fd570..152d767823 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -21,6 +21,11 @@ namespace MediaBrowser.Controller.Entities.Audio
             SoundtrackIds = new List<Guid>();
         }
 
+        public override bool SupportsAddingToPlaylist
+        {
+            get { return true; }
+        }
+
         [IgnoreDataMember]
         public MusicArtist MusicArtist
         {
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
index 1544da7bc9..de527b68b3 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
@@ -26,6 +26,11 @@ namespace MediaBrowser.Controller.Entities.Audio
             }
         }
 
+        public override bool SupportsAddingToPlaylist
+        {
+            get { return true; }
+        }
+
         protected override IEnumerable<BaseItem> ActualChildren
         {
             get
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs b/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs
index bce9da4d15..f1dc56ac68 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs
@@ -18,6 +18,11 @@ namespace MediaBrowser.Controller.Entities.Audio
             return "MusicGenre-" + Name;
         }
 
+        public override bool SupportsAddingToPlaylist
+        {
+            get { return true; }
+        }
+
         /// <summary>
         /// Returns the folder containing the item.
         /// If the item is a folder, it returns the folder itself
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index a476f555fb..fdffa60d0a 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -52,6 +52,14 @@ namespace MediaBrowser.Controller.Entities
 
         public List<ItemImageInfo> ImageInfos { get; set; }
 
+        public virtual bool SupportsAddingToPlaylist
+        {
+            get
+            {
+                return false;
+            }
+        }
+
         /// <summary>
         /// Gets a value indicating whether this instance is in mixed folder.
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs
index 3977d869c2..b82a400fe8 100644
--- a/MediaBrowser.Controller/Entities/TV/Season.cs
+++ b/MediaBrowser.Controller/Entities/TV/Season.cs
@@ -29,6 +29,11 @@ namespace MediaBrowser.Controller.Entities.TV
             }
         }
 
+        public override bool SupportsAddingToPlaylist
+        {
+            get { return true; }
+        }
+
         [IgnoreDataMember]
         public override bool IsPreSorted
         {
diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index 27ca8b18da..856ed4fdf2 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -39,6 +39,11 @@ namespace MediaBrowser.Controller.Entities.TV
             DisplaySpecialsWithSeasons = true;
         }
 
+        public override bool SupportsAddingToPlaylist
+        {
+            get { return true; }
+        }
+
         [IgnoreDataMember]
         public override bool IsPreSorted
         {
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index 5685edc815..ff4c5dd900 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -55,6 +55,11 @@ namespace MediaBrowser.Controller.Entities
             LinkedAlternateVersions = new List<LinkedChild>();
         }
 
+        public override bool SupportsAddingToPlaylist
+        {
+            get { return LocationType == LocationType.FileSystem && RunTimeTicks.HasValue; }
+        }
+
         [IgnoreDataMember]
         public int MediaSourceCount
         {
diff --git a/MediaBrowser.Controller/IServerApplicationHost.cs b/MediaBrowser.Controller/IServerApplicationHost.cs
index 49061e05c7..2af37e84dc 100644
--- a/MediaBrowser.Controller/IServerApplicationHost.cs
+++ b/MediaBrowser.Controller/IServerApplicationHost.cs
@@ -46,5 +46,11 @@ namespace MediaBrowser.Controller
         /// </summary>
         /// <value>The server identifier.</value>
         string ServerId { get; }
+
+        /// <summary>
+        /// Gets the name of the friendly.
+        /// </summary>
+        /// <value>The name of the friendly.</value>
+        string FriendlyName { get; }
     }
 }
diff --git a/MediaBrowser.Controller/Library/TVUtils.cs b/MediaBrowser.Controller/Library/TVUtils.cs
index 541dfd2268..d8d836597b 100644
--- a/MediaBrowser.Controller/Library/TVUtils.cs
+++ b/MediaBrowser.Controller/Library/TVUtils.cs
@@ -126,7 +126,7 @@ namespace MediaBrowser.Controller.Library
         {
             var filename = Path.GetFileName(path);
 
-            if (string.Equals(path, "specials", StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(filename, "specials", StringComparison.OrdinalIgnoreCase))
             {
                 return 0;
             }
diff --git a/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs b/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
index 6e9bcef2ea..9e32fc32b0 100644
--- a/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
+++ b/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
@@ -13,6 +13,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         /// <param name="inputFormat">The input format.</param>
         /// <param name="outputFormat">The output format.</param>
         /// <param name="startTimeTicks">The start time ticks.</param>
+        /// <param name="endTimeTicks">The end time ticks.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{Stream}.</returns>
         Task<Stream> ConvertSubtitles(
@@ -20,6 +21,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             string inputFormat,
             string outputFormat,
             long startTimeTicks,
+            long? endTimeTicks,
             CancellationToken cancellationToken);
 
         /// <summary>
@@ -30,6 +32,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         /// <param name="subtitleStreamIndex">Index of the subtitle stream.</param>
         /// <param name="outputFormat">The output format.</param>
         /// <param name="startTimeTicks">The start time ticks.</param>
+        /// <param name="endTimeTicks">The end time ticks.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{Stream}.</returns>
         Task<Stream> GetSubtitles(string itemId,
@@ -37,6 +40,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             int subtitleStreamIndex,
             string outputFormat,
             long startTimeTicks,
+            long? endTimeTicks,
             CancellationToken cancellationToken);
 
         /// <summary>
diff --git a/MediaBrowser.Dlna/PlayTo/PlaylistItemFactory.cs b/MediaBrowser.Dlna/PlayTo/PlaylistItemFactory.cs
index 796ccb004c..83d7f322d1 100644
--- a/MediaBrowser.Dlna/PlayTo/PlaylistItemFactory.cs
+++ b/MediaBrowser.Dlna/PlayTo/PlaylistItemFactory.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Session;
 using System;
 using System.Globalization;
 using System.IO;
@@ -29,7 +30,7 @@ namespace MediaBrowser.Dlna.PlayTo
 
             if (directPlay != null)
             {
-                playlistItem.StreamInfo.IsDirectStream = true;
+                playlistItem.StreamInfo.PlayMethod = PlayMethod.DirectStream;
                 playlistItem.StreamInfo.Container = Path.GetExtension(item.Path);
 
                 return playlistItem;
@@ -40,7 +41,7 @@ namespace MediaBrowser.Dlna.PlayTo
 
             if (transcodingProfile != null)
             {
-                playlistItem.StreamInfo.IsDirectStream = true;
+                playlistItem.StreamInfo.PlayMethod = PlayMethod.Transcode;
                 playlistItem.StreamInfo.Container = "." + transcodingProfile.Container.TrimStart('.');
             }
 
diff --git a/MediaBrowser.Dlna/Profiles/Windows81Profile.cs b/MediaBrowser.Dlna/Profiles/Windows81Profile.cs
index 921019f8e7..029fefc645 100644
--- a/MediaBrowser.Dlna/Profiles/Windows81Profile.cs
+++ b/MediaBrowser.Dlna/Profiles/Windows81Profile.cs
@@ -155,6 +155,13 @@ namespace MediaBrowser.Dlna.Profiles
                 }
             };
 
+            ExternalSubtitleProfiles = new[]
+            {
+                new SubtitleProfile
+                {
+                    Format = "ttml"
+                }
+            };
         }
     }
 }
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml
index 5b5125b30c..5859b2439e 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml	
@@ -69,9 +69,7 @@
   </CodecProfiles>
   <ResponseProfiles />
   <SoftSubtitleProfiles>
-    <SubtitleProfile>
-      <Format>srt</Format>
-    </SubtitleProfile>
+    <SubtitleProfile format="srt" />
   </SoftSubtitleProfiles>
   <ExternalSubtitleProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml
index 209c029b5d..28f170bc02 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml	
@@ -107,9 +107,7 @@
     </ResponseProfile>
   </ResponseProfiles>
   <SoftSubtitleProfiles>
-    <SubtitleProfile>
-      <Format>smi</Format>
-    </SubtitleProfile>
+    <SubtitleProfile format="smi" />
   </SoftSubtitleProfiles>
   <ExternalSubtitleProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Windows 8 RT.xml b/MediaBrowser.Dlna/Profiles/Xml/Windows 8 RT.xml
index 61ee595494..1847d844f8 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Windows 8 RT.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Windows 8 RT.xml	
@@ -63,5 +63,7 @@
   </CodecProfiles>
   <ResponseProfiles />
   <SoftSubtitleProfiles />
-  <ExternalSubtitleProfiles />
+  <ExternalSubtitleProfiles>
+    <SubtitleProfile format="ttml" />
+  </ExternalSubtitleProfiles>
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.LocalMetadata/Parsers/PlaylistXmlParser.cs b/MediaBrowser.LocalMetadata/Parsers/PlaylistXmlParser.cs
index 83bc6a49ee..c7f9742008 100644
--- a/MediaBrowser.LocalMetadata/Parsers/PlaylistXmlParser.cs
+++ b/MediaBrowser.LocalMetadata/Parsers/PlaylistXmlParser.cs
@@ -18,6 +18,20 @@ namespace MediaBrowser.LocalMetadata.Parsers
         {
             switch (reader.Name)
             {
+                case "OwnerUserId":
+                    {
+                        item.OwnerUserId = reader.ReadElementContentAsString();
+
+                        break;
+                    }
+
+                case "PlaylistMediaType":
+                    {
+                        item.PlaylistMediaType = reader.ReadElementContentAsString();
+
+                        break;
+                    }
+
                 case "PlaylistItems":
 
                     using (var subReader = reader.ReadSubtree())
diff --git a/MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs
index abc7e3b3fa..1541c2176b 100644
--- a/MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Controller.Entities;
+using System.Security;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Playlists;
 using System.Collections.Generic;
@@ -42,17 +43,34 @@ namespace MediaBrowser.LocalMetadata.Savers
         /// <returns>Task.</returns>
         public void Save(IHasMetadata item, CancellationToken cancellationToken)
         {
+            var playlist = (Playlist)item;
+
             var builder = new StringBuilder();
 
             builder.Append("<Item>");
 
-            XmlSaverHelpers.AddCommonNodes((Playlist)item, builder);
+            if (!string.IsNullOrEmpty(playlist.OwnerUserId))
+            {
+                builder.Append("<OwnerUserId>" + SecurityElement.Escape(playlist.OwnerUserId) + "</OwnerUserId>");
+            }
+
+            if (!string.IsNullOrEmpty(playlist.PlaylistMediaType))
+            {
+                builder.Append("<PlaylistMediaType>" + SecurityElement.Escape(playlist.PlaylistMediaType) + "</PlaylistMediaType>");
+            }
+            
+            XmlSaverHelpers.AddCommonNodes(playlist, builder);
 
             builder.Append("</Item>");
 
             var xmlFilePath = GetSavePath(item);
 
-            XmlSaverHelpers.Save(builder, xmlFilePath, new List<string> { });
+            XmlSaverHelpers.Save(builder, xmlFilePath, new List<string>
+            {
+                "OwnerUserId",
+                "PlaylistMediaType"
+
+            });
         }
 
         /// <summary>
diff --git a/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs b/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs
index a007a95cf0..0801b73589 100644
--- a/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs
+++ b/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs
@@ -704,7 +704,7 @@ namespace MediaBrowser.LocalMetadata.Savers
         public static void AddLinkedChildren(Folder item, StringBuilder builder, string pluralNodeName, string singularNodeName)
         {
             var items = item.LinkedChildren
-                .Where(i => i.Type == LinkedChildType.Manual && !string.IsNullOrWhiteSpace(i.ItemName))
+                .Where(i => i.Type == LinkedChildType.Manual)
                 .ToList();
 
             if (items.Count == 0)
@@ -717,14 +717,20 @@ namespace MediaBrowser.LocalMetadata.Savers
             {
                 builder.Append("<" + singularNodeName + ">");
 
-                builder.Append("<Type>" + SecurityElement.Escape(link.ItemType) + "</Type>");
+                if (!string.IsNullOrWhiteSpace(link.ItemType))
+                {
+                    builder.Append("<Type>" + SecurityElement.Escape(link.ItemType) + "</Type>");
+                }
 
                 if (link.ItemYear.HasValue)
                 {
                     builder.Append("<Year>" + SecurityElement.Escape(link.ItemYear.Value.ToString(UsCulture)) + "</Year>");
                 }
 
-                builder.Append("<Path>" + SecurityElement.Escape((link.Path ?? string.Empty)) + "</Path>");
+                if (!string.IsNullOrWhiteSpace(link.Path))
+                {
+                    builder.Append("<Path>" + SecurityElement.Escape((link.Path)) + "</Path>");
+                }
 
                 builder.Append("</" + singularNodeName + ">");
             }
diff --git a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
index f11c261e21..12a03a8768 100644
--- a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
+++ b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
@@ -66,6 +66,7 @@
     <Compile Include="Subtitles\SsaParser.cs" />
     <Compile Include="Subtitles\SubtitleEncoder.cs" />
     <Compile Include="Subtitles\SubtitleTrackInfo.cs" />
+    <Compile Include="Subtitles\TtmlWriter.cs" />
     <Compile Include="Subtitles\VttWriter.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index ab9cd546aa..82e331dd87 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -48,6 +48,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             string inputFormat,
             string outputFormat,
             long startTimeTicks,
+            long? endTimeTicks,
             CancellationToken cancellationToken)
         {
             var ms = new MemoryStream();
@@ -56,6 +57,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             {
                 // Return the original without any conversions, if possible
                 if (startTimeTicks == 0 && 
+                    !endTimeTicks.HasValue &&
                     string.Equals(inputFormat, outputFormat, StringComparison.OrdinalIgnoreCase))
                 {
                     await stream.CopyToAsync(ms, 81920, cancellationToken).ConfigureAwait(false);
@@ -64,7 +66,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 {
                     var trackInfo = await GetTrackInfo(stream, inputFormat, cancellationToken).ConfigureAwait(false);
 
-                    UpdateStartingPosition(trackInfo, startTimeTicks);
+                    FilterEvents(trackInfo, startTimeTicks, endTimeTicks, false);
 
                     var writer = GetWriter(outputFormat);
 
@@ -81,19 +83,30 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             return ms;
         }
 
-        private void UpdateStartingPosition(SubtitleTrackInfo track, long startPositionTicks)
+        private void FilterEvents(SubtitleTrackInfo track, long startPositionTicks, long? endTimeTicks, bool preserveTimestamps)
         {
-            if (startPositionTicks == 0) return;
+            // Drop subs that are earlier than what we're looking for
+            track.TrackEvents = track.TrackEvents
+                .SkipWhile(i => (i.StartPositionTicks - startPositionTicks) < 0 || (i.EndPositionTicks - startPositionTicks) < 0)
+                .ToList();
 
-            foreach (var trackEvent in track.TrackEvents)
+            if (endTimeTicks.HasValue)
             {
-                trackEvent.EndPositionTicks -= startPositionTicks;
-                trackEvent.StartPositionTicks -= startPositionTicks;
+                var endTime = endTimeTicks.Value;
+
+                track.TrackEvents = track.TrackEvents
+                    .TakeWhile(i => i.StartPositionTicks <= endTime)
+                    .ToList();
             }
 
-            track.TrackEvents = track.TrackEvents
-                .SkipWhile(i => i.StartPositionTicks < 0 || i.EndPositionTicks < 0)
-                .ToList();
+            if (!preserveTimestamps)
+            {
+                foreach (var trackEvent in track.TrackEvents)
+                {
+                    trackEvent.EndPositionTicks -= startPositionTicks;
+                    trackEvent.StartPositionTicks -= startPositionTicks;
+                }
+            }
         }
 
         public async Task<Stream> GetSubtitles(string itemId,
@@ -101,6 +114,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             int subtitleStreamIndex,
             string outputFormat,
             long startTimeTicks,
+            long? endTimeTicks,
             CancellationToken cancellationToken)
         {
             var subtitle = await GetSubtitleStream(itemId, mediaSourceId, subtitleStreamIndex, cancellationToken)
@@ -110,7 +124,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             {
                 var inputFormat = subtitle.Item2;
 
-                return await ConvertSubtitles(stream, inputFormat, outputFormat, startTimeTicks, cancellationToken).ConfigureAwait(false);
+                return await ConvertSubtitles(stream, inputFormat, outputFormat, startTimeTicks, endTimeTicks, cancellationToken).ConfigureAwait(false);
             }
         }
 
@@ -254,6 +268,10 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             {
                 return new VttWriter();
             }
+            if (string.Equals(format, SubtitleFormat.TTML, StringComparison.OrdinalIgnoreCase))
+            {
+                return new TtmlWriter();
+            }
 
             throw new ArgumentException("Unsupported format: " + format);
         }
diff --git a/MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs
new file mode 100644
index 0000000000..a937175f01
--- /dev/null
+++ b/MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs
@@ -0,0 +1,59 @@
+using System;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+
+namespace MediaBrowser.MediaEncoding.Subtitles
+{
+    public class TtmlWriter : ISubtitleWriter
+    {
+        public void Write(SubtitleTrackInfo info, Stream stream, CancellationToken cancellationToken)
+        {
+            // Example: https://github.com/zmalltalker/ttml2vtt/blob/master/data/sample.xml
+            // Parser example: https://github.com/mozilla/popcorn-js/blob/master/parsers/parserTTML/popcorn.parserTTML.js
+
+            using (var writer = new StreamWriter(stream, Encoding.UTF8, 1024, true))
+            {
+                writer.WriteLine("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
+                writer.WriteLine("<tt xmlns=\"http://www.w3.org/ns/ttml\" xmlns:tts=\"http://www.w3.org/2006/04/ttaf1#styling\" lang=\"no\">");
+
+                writer.WriteLine("<head>");
+                writer.WriteLine("<styling>");
+                writer.WriteLine("<style id=\"italic\" tts:fontStyle=\"italic\" />");
+                writer.WriteLine("<style id=\"left\" tts:textAlign=\"left\" />");
+                writer.WriteLine("<style id=\"center\" tts:textAlign=\"center\" />");
+                writer.WriteLine("<style id=\"right\" tts:textAlign=\"right\" />");
+                writer.WriteLine("</styling>");
+                writer.WriteLine("</head>");
+
+                writer.WriteLine("<body>");
+                writer.WriteLine("<div>");
+
+                foreach (var trackEvent in info.TrackEvents)
+                {
+                    var text = trackEvent.Text;
+
+                    text = Regex.Replace(text, @"\\N", "<br/>", RegexOptions.IgnoreCase);
+
+                    writer.WriteLine("<p begin=\"{0}\" dur=\"{1}\">{2}</p>",
+                        trackEvent.StartPositionTicks,
+                        (trackEvent.EndPositionTicks - trackEvent.StartPositionTicks),
+                        text);
+                }
+
+                writer.WriteLine("</div>");
+                writer.WriteLine("</body>");
+                
+                writer.WriteLine("</tt>");
+            }
+        }
+
+        private string FormatTime(long ticks)
+        {
+            var time = TimeSpan.FromTicks(ticks);
+
+            return string.Format(@"{0:hh\:mm\:ss\,fff}", time);
+        }
+    }
+}
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 6e929564e4..22e817de15 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -2,6 +2,7 @@
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.MediaInfo;
+using MediaBrowser.Model.Session;
 using System;
 using System.Collections.Generic;
 
@@ -9,7 +10,7 @@ namespace MediaBrowser.Model.Dlna
 {
     public class StreamBuilder
     {
-        private string[] _serverTextSubtitleOutputs = new string[] { "srt", "vtt" };
+        private readonly string[] _serverTextSubtitleOutputs = { "srt", "vtt", "ttml" };
 
         public StreamInfo BuildAudioItem(AudioOptions options)
         {
@@ -158,7 +159,7 @@ namespace MediaBrowser.Model.Dlna
 
                         if (all)
                         {
-                            playlistItem.IsDirectStream = true;
+                            playlistItem.PlayMethod = PlayMethod.DirectStream;
                             playlistItem.Container = item.Container;
 
                             return playlistItem;
@@ -179,7 +180,7 @@ namespace MediaBrowser.Model.Dlna
 
             if (transcodingProfile != null)
             {
-                playlistItem.IsDirectStream = false;
+                playlistItem.PlayMethod = PlayMethod.Transcode;
                 playlistItem.TranscodeSeekInfo = transcodingProfile.TranscodeSeekInfo;
                 playlistItem.EstimateContentLength = transcodingProfile.EstimateContentLength;
                 playlistItem.Container = transcodingProfile.Container;
@@ -252,12 +253,12 @@ namespace MediaBrowser.Model.Dlna
 
                 if (directPlay != null)
                 {
-                    playlistItem.IsDirectStream = true;
+                    playlistItem.PlayMethod = PlayMethod.DirectStream;
                     playlistItem.Container = item.Container;
 
                     if (subtitleStream != null)
                     {
-                        playlistItem.SubtitleDeliveryMethod = GetDirectStreamSubtitleDeliveryMethod(subtitleStream, options);
+                        playlistItem.SubtitleDeliveryMethod = GetSubtitleDeliveryMethod(subtitleStream, options);
                     }
 
                     return playlistItem;
@@ -279,10 +280,10 @@ namespace MediaBrowser.Model.Dlna
             {
                 if (subtitleStream != null)
                 {
-                    playlistItem.SubtitleDeliveryMethod = GetTranscodedSubtitleDeliveryMethod(subtitleStream, options);
+                    playlistItem.SubtitleDeliveryMethod = GetSubtitleDeliveryMethod(subtitleStream, options);
                 }
 
-                playlistItem.IsDirectStream = false;
+                playlistItem.PlayMethod = PlayMethod.Transcode;
                 playlistItem.Container = transcodingProfile.Container;
                 playlistItem.EstimateContentLength = transcodingProfile.EstimateContentLength;
                 playlistItem.TranscodeSeekInfo = transcodingProfile.TranscodeSeekInfo;
@@ -499,9 +500,9 @@ namespace MediaBrowser.Model.Dlna
                     return false;
                 }
 
-                SubtitleDeliveryMethod subtitleMethod = GetDirectStreamSubtitleDeliveryMethod(subtitleStream, options);
+                SubtitleDeliveryMethod subtitleMethod = GetSubtitleDeliveryMethod(subtitleStream, options);
 
-                if (subtitleMethod != SubtitleDeliveryMethod.External && subtitleMethod != SubtitleDeliveryMethod.Direct)
+                if (subtitleMethod != SubtitleDeliveryMethod.External && subtitleMethod != SubtitleDeliveryMethod.Embed)
                 {
                     return false;
                 }
@@ -510,34 +511,7 @@ namespace MediaBrowser.Model.Dlna
             return IsAudioEligibleForDirectPlay(item, maxBitrate);
         }
 
-        private SubtitleDeliveryMethod GetDirectStreamSubtitleDeliveryMethod(MediaStream subtitleStream,
-            VideoOptions options)
-        {
-            if (subtitleStream.IsTextSubtitleStream)
-            {
-                string subtitleFormat = NormalizeSubtitleFormat(subtitleStream.Codec);
-
-                bool supportsDirect = ContainsSubtitleFormat(options.Profile.SoftSubtitleProfiles, new[] { subtitleFormat });
-
-                if (supportsDirect)
-                {
-                    return SubtitleDeliveryMethod.Direct;
-                }
-                
-                // See if the device can retrieve the subtitles externally
-                bool supportsSubsExternally = options.Context == EncodingContext.Streaming &&
-                    ContainsSubtitleFormat(options.Profile.ExternalSubtitleProfiles, _serverTextSubtitleOutputs);
-
-                if (supportsSubsExternally)
-                {
-                    return SubtitleDeliveryMethod.External;
-                }
-            }
-
-            return SubtitleDeliveryMethod.Encode;
-        }
-
-        private SubtitleDeliveryMethod GetTranscodedSubtitleDeliveryMethod(MediaStream subtitleStream,
+        private SubtitleDeliveryMethod GetSubtitleDeliveryMethod(MediaStream subtitleStream,
             VideoOptions options)
         {
             if (subtitleStream.IsTextSubtitleStream)
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index 8bf9f2a04e..4f02d64508 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -3,6 +3,7 @@ using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.MediaInfo;
+using MediaBrowser.Model.Session;
 using System;
 using System.Collections.Generic;
 
@@ -15,7 +16,7 @@ namespace MediaBrowser.Model.Dlna
     {
         public string ItemId { get; set; }
 
-        public bool IsDirectStream { get; set; }
+        public PlayMethod PlayMethod { get; set; }
 
         public DlnaProfileType MediaType { get; set; }
 
@@ -59,6 +60,7 @@ namespace MediaBrowser.Model.Dlna
         public MediaSourceInfo MediaSource { get; set; }
 
         public SubtitleDeliveryMethod SubtitleDeliveryMethod { get; set; }
+        public string SubtitleFormat { get; set; }
 
         public string MediaSourceId
         {
@@ -68,6 +70,11 @@ namespace MediaBrowser.Model.Dlna
             }
         }
 
+        public bool IsDirectStream
+        {
+            get { return PlayMethod == PlayMethod.DirectStream; }
+        }
+
         public string ToUrl(string baseUrl)
         {
             return ToDlnaUrl(baseUrl);
@@ -124,6 +131,32 @@ namespace MediaBrowser.Model.Dlna
             return string.Format("Params={0}", string.Join(";", list.ToArray()));
         }
 
+        public string ToSubtitleUrl(string baseUrl)
+        {
+            if (SubtitleDeliveryMethod != SubtitleDeliveryMethod.External)
+            {
+                return null;
+            }
+
+            if (!SubtitleStreamIndex.HasValue)
+            {
+                return null;
+            }
+
+            // HLS will preserve timestamps so we can just grab the full subtitle stream
+            long startPositionTicks = StringHelper.EqualsIgnoreCase(Protocol, "hls")
+                ? 0
+                : StartPositionTicks;
+
+            return string.Format("{0}/Videos/{1}/{2}/Subtitles/{3}/{4}/Stream.{5}", 
+                baseUrl,
+                ItemId,
+                MediaSourceId,
+                StringHelper.ToStringCultureInvariant(SubtitleStreamIndex.Value),
+                StringHelper.ToStringCultureInvariant(startPositionTicks),
+                SubtitleFormat);
+        }
+
         /// <summary>
         /// Returns the audio stream that will be used
         /// </summary>
@@ -437,16 +470,12 @@ namespace MediaBrowser.Model.Dlna
         /// </summary>
         Encode = 0,
         /// <summary>
-        /// Internal format is supported natively
-        /// </summary>
-        Direct = 1,
-        /// <summary>
         /// The embed
         /// </summary>
-        Embed = 2,
+        Embed = 1,
         /// <summary>
         /// The external
         /// </summary>
-        External = 3
+        External = 2
     }
 }
diff --git a/MediaBrowser.Model/Dlna/SubtitleProfile.cs b/MediaBrowser.Model/Dlna/SubtitleProfile.cs
index ec38d96aeb..7aa5e17713 100644
--- a/MediaBrowser.Model/Dlna/SubtitleProfile.cs
+++ b/MediaBrowser.Model/Dlna/SubtitleProfile.cs
@@ -1,8 +1,13 @@
-
+using System.Xml.Serialization;
+
 namespace MediaBrowser.Model.Dlna
 {
     public class SubtitleProfile
     {
+        [XmlAttribute("format")]
         public string Format { get; set; }
+
+        [XmlAttribute("protocol")]
+        public string Protocol { get; set; }
     }
-}
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index 9581b57407..32bf4b816b 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -525,6 +525,12 @@ namespace MediaBrowser.Model.Dto
             return IsType(type.Name);
         }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether [supports playlists].
+        /// </summary>
+        /// <value><c>true</c> if [supports playlists]; otherwise, <c>false</c>.</value>
+        public bool SupportsPlaylists { get; set; }
+
         /// <summary>
         /// Determines whether the specified type is type.
         /// </summary>
@@ -631,12 +637,6 @@ namespace MediaBrowser.Model.Dto
         /// <value>The type of the media.</value>
         public string MediaType { get; set; }
 
-        /// <summary>
-        /// Gets or sets the overview HTML.
-        /// </summary>
-        /// <value>The overview HTML.</value>
-        public string OverviewHtml { get; set; }
-
         /// <summary>
         /// Gets or sets the end date.
         /// </summary>
diff --git a/MediaBrowser.Model/MediaInfo/SubtitleFormat.cs b/MediaBrowser.Model/MediaInfo/SubtitleFormat.cs
index 7e9cdf53f7..60b0bb54dc 100644
--- a/MediaBrowser.Model/MediaInfo/SubtitleFormat.cs
+++ b/MediaBrowser.Model/MediaInfo/SubtitleFormat.cs
@@ -8,5 +8,6 @@
         public const string VTT = "vtt";
         public const string SUB = "sub";
         public const string SMI = "smi";
+        public const string TTML = "ttml";
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
index 5fb7ef11b7..a1c229f9bb 100644
--- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj
+++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
@@ -147,6 +147,7 @@
     <Compile Include="Photos\PhotoHelper.cs" />
     <Compile Include="Photos\PhotoMetadataService.cs" />
     <Compile Include="Photos\PhotoProvider.cs" />
+    <Compile Include="Playlists\PlaylistMetadataService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Manager\ProviderUtils.cs" />
     <Compile Include="Studios\StudiosImageProvider.cs" />
diff --git a/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs b/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
new file mode 100644
index 0000000000..d7615eb022
--- /dev/null
+++ b/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
@@ -0,0 +1,47 @@
+using MediaBrowser.Common.IO;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Playlists;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Providers.Manager;
+using System.Collections.Generic;
+
+namespace MediaBrowser.Providers.Playlists
+{
+    class PlaylistMetadataService : MetadataService<Playlist, ItemLookupInfo>
+    {
+        public PlaylistMetadataService(IServerConfigurationManager serverConfigurationManager, ILogger logger, IProviderManager providerManager, IProviderRepository providerRepo, IFileSystem fileSystem)
+            : base(serverConfigurationManager, logger, providerManager, providerRepo, fileSystem)
+        {
+        }
+
+        /// <summary>
+        /// Merges the specified source.
+        /// </summary>
+        /// <param name="source">The source.</param>
+        /// <param name="target">The target.</param>
+        /// <param name="lockedFields">The locked fields.</param>
+        /// <param name="replaceData">if set to <c>true</c> [replace data].</param>
+        /// <param name="mergeMetadataSettings">if set to <c>true</c> [merge metadata settings].</param>
+        protected override void MergeData(Playlist source, Playlist target, List<MetadataFields> lockedFields, bool replaceData, bool mergeMetadataSettings)
+        {
+            ProviderUtils.MergeBaseItemData(source, target, lockedFields, replaceData, mergeMetadataSettings);
+
+            if (replaceData || string.IsNullOrEmpty(target.PlaylistMediaType))
+            {
+                target.PlaylistMediaType = source.PlaylistMediaType;
+            }
+
+            if (replaceData || string.IsNullOrEmpty(target.OwnerUserId))
+            {
+                target.OwnerUserId = source.OwnerUserId;
+            }
+
+            if (mergeMetadataSettings)
+            {
+                target.LinkedChildren = source.LinkedChildren;
+            }
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index e3a386841b..ace794b197 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -112,6 +112,8 @@ namespace MediaBrowser.Server.Implementations.Dto
 
             var dto = new BaseItemDto();
 
+            dto.SupportsPlaylists = item.SupportsAddingToPlaylist;
+
             if (fields.Contains(ItemFields.People))
             {
                 AttachPeople(dto, item);
@@ -849,17 +851,7 @@ namespace MediaBrowser.Server.Implementations.Dto
 
             if (fields.Contains(ItemFields.Overview))
             {
-                // TODO: Remove this after a while, since it's been moved to the providers
-                if (item is MusicArtist)
-                {
-                    var strippedOverview = string.IsNullOrEmpty(item.Overview) ? item.Overview : item.Overview.StripHtml();
-
-                    dto.Overview = strippedOverview;
-                }
-                else
-                {
-                    dto.Overview = item.Overview;
-                }
+                dto.Overview = item.Overview;
             }
 
             if (fields.Contains(ItemFields.ShortOverview))
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 251acb02dd..8ffe8aa632 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -12,7 +12,6 @@ using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Sorting;
-using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.LiveTv;
diff --git a/MediaBrowser.Server.Implementations/Udp/UdpServer.cs b/MediaBrowser.Server.Implementations/Udp/UdpServer.cs
index e4626bec6c..9028b540f8 100644
--- a/MediaBrowser.Server.Implementations/Udp/UdpServer.cs
+++ b/MediaBrowser.Server.Implementations/Udp/UdpServer.cs
@@ -124,7 +124,7 @@ namespace MediaBrowser.Server.Implementations.Udp
                 {
                     Address = serverAddress,
                     Id = _appHost.ServerId,
-                    Name = _appHost.Name
+                    Name = _appHost.FriendlyName
                 };
 
                 await SendAsync(Encoding.UTF8.GetBytes(_json.SerializeToString(response)), endpoint);
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 993cc4e1a6..a4ac7e0ba1 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -1058,10 +1058,20 @@ namespace MediaBrowser.ServerApplication
                 SupportsAutoRunAtStartup = SupportsAutoRunAtStartup,
                 TranscodingTempPath = ApplicationPaths.TranscodingTempPath,
                 IsRunningAsService = IsRunningAsService,
-                ServerName = string.IsNullOrWhiteSpace(ServerConfigurationManager.Configuration.ServerName) ? Environment.MachineName : ServerConfigurationManager.Configuration.ServerName
+                ServerName = FriendlyName
             };
         }
 
+        public string FriendlyName
+        {
+            get
+            {
+                return string.IsNullOrWhiteSpace(ServerConfigurationManager.Configuration.ServerName)
+                    ? Environment.MachineName
+                    : ServerConfigurationManager.Configuration.ServerName;
+            }
+        }
+
         public int HttpServerPort
         {
             get { return ServerConfigurationManager.Configuration.HttpServerPortNumber; }
-- 
cgit v1.2.3


From e84ba17b9f48a3bc8811b1a89c54c25bc6607599 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 10 Aug 2014 18:13:17 -0400
Subject: add activity log feature

---
 MediaBrowser.Api/ChannelService.cs                 |   2 +-
 MediaBrowser.Api/Images/ImageService.cs            |   1 +
 MediaBrowser.Api/MediaBrowser.Api.csproj           |  11 +-
 .../Session/SessionInfoWebSocketListener.cs        | 116 +++++
 MediaBrowser.Api/Session/SessionsService.cs        | 506 +++++++++++++++++++
 MediaBrowser.Api/SessionsService.cs                | 506 -------------------
 MediaBrowser.Api/System/ActivityLogService.cs      |  44 ++
 .../System/SystemInfoWebSocketListener.cs          |  49 ++
 MediaBrowser.Api/System/SystemService.cs           | 178 +++++++
 MediaBrowser.Api/SystemService.cs                  | 177 -------
 MediaBrowser.Api/UserService.cs                    |  21 +-
 .../WebSocket/SessionInfoWebSocketListener.cs      | 116 -----
 .../WebSocket/SystemInfoWebSocketListener.cs       |  49 --
 .../Configuration/BaseConfigurationManager.cs      |  12 +
 .../ScheduledTasks/ScheduledTaskWorker.cs          |   1 +
 .../Configuration/IConfigurationManager.cs         |   5 +
 .../ScheduledTasks/IConfigurableScheduledTask.cs   |   5 +
 .../Activity/IActivityManager.cs                   |  17 +
 .../Activity/IActivityRepository.cs                |  13 +
 .../Configuration/IServerConfigurationManager.cs   |   7 -
 MediaBrowser.Controller/Entities/Movies/BoxSet.cs  |  14 +-
 MediaBrowser.Controller/Library/IUserManager.cs    |   1 +
 MediaBrowser.Controller/Library/TVUtils.cs         |   2 +-
 .../MediaBrowser.Controller.csproj                 |   6 +-
 .../Notifications/INotificationsRepository.cs      |  12 -
 .../Session/AuthenticationRequest.cs               |  14 +
 MediaBrowser.Controller/Session/ISessionManager.cs |  28 +-
 .../Subtitles/ISubtitleManager.cs                  |  17 +-
 .../Subtitles/SubtitleDownloadEventArgs.cs         |  27 +
 MediaBrowser.LocalMetadata/BaseXmlProvider.cs      |   4 +-
 .../MediaBrowser.Model.Portable.csproj             |   9 +-
 .../MediaBrowser.Model.net35.csproj                |   9 +-
 MediaBrowser.Model/Activity/ActivityLogEntry.cs    |  62 +++
 MediaBrowser.Model/ApiClient/IApiClient.cs         |   2 +-
 MediaBrowser.Model/Channels/ChannelItemQuery.cs    |   5 +-
 .../Configuration/ServerConfiguration.cs           |   3 +-
 .../Configuration/SubtitleOptions.cs               |  22 -
 MediaBrowser.Model/Events/GenericEventArgs.cs      |  16 +
 MediaBrowser.Model/MediaBrowser.Model.csproj       |   5 +-
 MediaBrowser.Model/Providers/SubtitleOptions.cs    |  22 +
 MediaBrowser.Model/Tasks/TaskResult.cs             |   6 +
 .../MediaBrowser.Providers.csproj                  |   3 +-
 .../MediaInfo/FFProbeVideoInfo.cs                  |  19 +-
 .../MediaInfo/SubtitleScheduledTask.cs             |  30 +-
 .../Subtitles/ConfigurationExtension.cs            |  29 ++
 .../Subtitles/OpenSubtitleDownloader.cs            |  35 +-
 .../Subtitles/SubtitleManager.cs                   |  69 ++-
 .../Activity/ActivityManager.cs                    |  40 ++
 .../Activity/ActivityRepository.cs                 | 293 +++++++++++
 .../EntryPoints/ActivityLogEntryPoint.cs           | 543 +++++++++++++++++++++
 .../EntryPoints/Notifications/Notifications.cs     |   8 +-
 .../EntryPoints/Notifications/WebSocketNotifier.cs |   9 -
 .../EntryPoints/ServerEventNotifier.cs             |  13 +-
 .../FileOrganization/OrganizerScheduledTask.cs     |   7 +-
 .../SocketSharp/WebSocketSharpListener.cs          |   2 +-
 .../Library/UserManager.cs                         |   7 +-
 .../Localization/Server/server.json                | 138 ++++--
 .../MediaBrowser.Server.Implementations.csproj     |   5 +-
 .../Notifications/SqliteNotificationsRepository.cs |  66 ---
 .../ServerManager/ServerManager.cs                 |   2 +
 .../Session/SessionManager.cs                      |  51 +-
 .../Session/SessionWebSocketListener.cs            |   1 -
 .../Sync/SyncRepository.cs                         |  46 +-
 MediaBrowser.ServerApplication/ApplicationHost.cs  |  22 +
 64 files changed, 2398 insertions(+), 1162 deletions(-)
 create mode 100644 MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs
 create mode 100644 MediaBrowser.Api/Session/SessionsService.cs
 delete mode 100644 MediaBrowser.Api/SessionsService.cs
 create mode 100644 MediaBrowser.Api/System/ActivityLogService.cs
 create mode 100644 MediaBrowser.Api/System/SystemInfoWebSocketListener.cs
 create mode 100644 MediaBrowser.Api/System/SystemService.cs
 delete mode 100644 MediaBrowser.Api/SystemService.cs
 delete mode 100644 MediaBrowser.Api/WebSocket/SessionInfoWebSocketListener.cs
 delete mode 100644 MediaBrowser.Api/WebSocket/SystemInfoWebSocketListener.cs
 create mode 100644 MediaBrowser.Controller/Activity/IActivityManager.cs
 create mode 100644 MediaBrowser.Controller/Activity/IActivityRepository.cs
 create mode 100644 MediaBrowser.Controller/Session/AuthenticationRequest.cs
 create mode 100644 MediaBrowser.Controller/Subtitles/SubtitleDownloadEventArgs.cs
 create mode 100644 MediaBrowser.Model/Activity/ActivityLogEntry.cs
 delete mode 100644 MediaBrowser.Model/Configuration/SubtitleOptions.cs
 create mode 100644 MediaBrowser.Model/Providers/SubtitleOptions.cs
 create mode 100644 MediaBrowser.Providers/Subtitles/ConfigurationExtension.cs
 create mode 100644 MediaBrowser.Server.Implementations/Activity/ActivityManager.cs
 create mode 100644 MediaBrowser.Server.Implementations/Activity/ActivityRepository.cs
 create mode 100644 MediaBrowser.Server.Implementations/EntryPoints/ActivityLogEntryPoint.cs

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Api/ChannelService.cs b/MediaBrowser.Api/ChannelService.cs
index 2cc046f1d4..3736814e57 100644
--- a/MediaBrowser.Api/ChannelService.cs
+++ b/MediaBrowser.Api/ChannelService.cs
@@ -230,7 +230,7 @@ namespace MediaBrowser.Api
                 SortOrder = request.SortOrder,
                 SortBy = (request.SortBy ?? string.Empty).Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToArray(),
                 Filters = request.GetFilters().ToArray(),
-                Fields = request.GetItemFields().ToList()
+                Fields = request.GetItemFields().ToArray()
 
             }, CancellationToken.None).Result;
 
diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs
index ea7eaa9471..43e9ad3efe 100644
--- a/MediaBrowser.Api/Images/ImageService.cs
+++ b/MediaBrowser.Api/Images/ImageService.cs
@@ -40,6 +40,7 @@ namespace MediaBrowser.Api.Images
     [Route("/Items/{Id}/Images/{Type}", "GET")]
     [Route("/Items/{Id}/Images/{Type}/{Index}", "GET")]
     [Route("/Items/{Id}/Images/{Type}/{Index}/{Tag}/{Format}/{MaxWidth}/{MaxHeight}", "GET")]
+    [Route("/Items/{Id}/Images/{Type}/{Index}/{Tag}/{Format}/{MaxWidth}/{MaxHeight}", "HEAD")]
     [Api(Description = "Gets an item image")]
     public class GetItemImage : ImageRequest
     {
diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index 9a7d28ec43..df689cb24d 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -118,10 +118,11 @@
     <Compile Include="ScheduledTasks\ScheduledTasksWebSocketListener.cs" />
     <Compile Include="ApiEntryPoint.cs" />
     <Compile Include="SearchService.cs" />
-    <Compile Include="SessionsService.cs" />
+    <Compile Include="Session\SessionsService.cs" />
     <Compile Include="SimilarItemsHelper.cs" />
     <Compile Include="Sync\SyncService.cs" />
-    <Compile Include="SystemService.cs" />
+    <Compile Include="System\ActivityLogService.cs" />
+    <Compile Include="System\SystemService.cs" />
     <Compile Include="Movies\TrailersService.cs" />
     <Compile Include="TvShowsService.cs" />
     <Compile Include="UserLibrary\ArtistsService.cs" />
@@ -139,8 +140,8 @@
     <Compile Include="UserService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="VideosService.cs" />
-    <Compile Include="WebSocket\SessionInfoWebSocketListener.cs" />
-    <Compile Include="WebSocket\SystemInfoWebSocketListener.cs" />
+    <Compile Include="Session\SessionInfoWebSocketListener.cs" />
+    <Compile Include="System\SystemInfoWebSocketListener.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj">
@@ -173,4 +174,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs b/MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs
new file mode 100644
index 0000000000..e6b525e534
--- /dev/null
+++ b/MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs
@@ -0,0 +1,116 @@
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Session;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Api.Session
+{
+    /// <summary>
+    /// Class SessionInfoWebSocketListener
+    /// </summary>
+    class SessionInfoWebSocketListener : BasePeriodicWebSocketListener<IEnumerable<SessionInfoDto>, WebSocketListenerState>
+    {
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        protected override string Name
+        {
+            get { return "Sessions"; }
+        }
+
+        /// <summary>
+        /// The _kernel
+        /// </summary>
+        private readonly ISessionManager _sessionManager;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SessionInfoWebSocketListener"/> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        /// <param name="sessionManager">The session manager.</param>
+        public SessionInfoWebSocketListener(ILogger logger, ISessionManager sessionManager)
+            : base(logger)
+        {
+            _sessionManager = sessionManager;
+
+            _sessionManager.SessionStarted += _sessionManager_SessionStarted;
+            _sessionManager.SessionEnded += _sessionManager_SessionEnded;
+            _sessionManager.PlaybackStart += _sessionManager_PlaybackStart;
+            _sessionManager.PlaybackStopped += _sessionManager_PlaybackStopped;
+            _sessionManager.PlaybackProgress += _sessionManager_PlaybackProgress;
+            _sessionManager.CapabilitiesChanged += _sessionManager_CapabilitiesChanged;
+            _sessionManager.SessionActivity += _sessionManager_SessionActivity;
+        }
+
+        void _sessionManager_SessionActivity(object sender, SessionEventArgs e)
+        {
+            SendData(false);
+        }
+
+        void _sessionManager_CapabilitiesChanged(object sender, SessionEventArgs e)
+        {
+            SendData(true);
+        }
+
+        void _sessionManager_PlaybackProgress(object sender, PlaybackProgressEventArgs e)
+        {
+            SendData(false);
+        }
+
+        void _sessionManager_PlaybackStopped(object sender, PlaybackStopEventArgs e)
+        {
+            SendData(true);
+        }
+
+        void _sessionManager_PlaybackStart(object sender, PlaybackProgressEventArgs e)
+        {
+            SendData(true);
+        }
+
+        void _sessionManager_SessionEnded(object sender, SessionEventArgs e)
+        {
+            SendData(true);
+        }
+
+        void _sessionManager_SessionStarted(object sender, SessionEventArgs e)
+        {
+            SendData(true);
+        }
+
+        /// <summary>
+        /// Gets the data to send.
+        /// </summary>
+        /// <param name="state">The state.</param>
+        /// <returns>Task{SystemInfo}.</returns>
+        protected override Task<IEnumerable<SessionInfoDto>> GetDataToSend(WebSocketListenerState state)
+        {
+            return Task.FromResult(_sessionManager.Sessions.Where(i => i.IsActive).Select(_sessionManager.GetSessionInfoDto));
+        }
+
+        protected override bool SendOnTimer
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        protected override void Dispose(bool dispose)
+        {
+            _sessionManager.SessionStarted -= _sessionManager_SessionStarted;
+            _sessionManager.SessionEnded -= _sessionManager_SessionEnded;
+            _sessionManager.PlaybackStart -= _sessionManager_PlaybackStart;
+            _sessionManager.PlaybackStopped -= _sessionManager_PlaybackStopped;
+            _sessionManager.PlaybackProgress -= _sessionManager_PlaybackProgress;
+            _sessionManager.CapabilitiesChanged -= _sessionManager_CapabilitiesChanged;
+            _sessionManager.SessionActivity -= _sessionManager_SessionActivity;
+
+            base.Dispose(dispose);
+        }
+    }
+}
diff --git a/MediaBrowser.Api/Session/SessionsService.cs b/MediaBrowser.Api/Session/SessionsService.cs
new file mode 100644
index 0000000000..e2c95eba9c
--- /dev/null
+++ b/MediaBrowser.Api/Session/SessionsService.cs
@@ -0,0 +1,506 @@
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Controller.Security;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Session;
+using ServiceStack;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Api.Session
+{
+    /// <summary>
+    /// Class GetSessions
+    /// </summary>
+    [Route("/Sessions", "GET", Summary = "Gets a list of sessions")]
+    [Authenticated]
+    public class GetSessions : IReturn<List<SessionInfoDto>>
+    {
+        [ApiMember(Name = "ControllableByUserId", Description = "Optional. Filter by sessions that a given user is allowed to remote control.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
+        public Guid? ControllableByUserId { get; set; }
+
+        [ApiMember(Name = "DeviceId", Description = "Optional. Filter by device id.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
+        public string DeviceId { get; set; }
+    }
+
+    /// <summary>
+    /// Class DisplayContent
+    /// </summary>
+    [Route("/Sessions/{Id}/Viewing", "POST", Summary = "Instructs a session to browse to an item or view")]
+    [Authenticated]
+    public class DisplayContent : IReturnVoid
+    {
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// Artist, Genre, Studio, Person, or any kind of BaseItem
+        /// </summary>
+        /// <value>The type of the item.</value>
+        [ApiMember(Name = "ItemType", Description = "The type of item to browse to.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
+        public string ItemType { get; set; }
+
+        /// <summary>
+        /// Artist name, genre name, item Id, etc
+        /// </summary>
+        /// <value>The item identifier.</value>
+        [ApiMember(Name = "ItemId", Description = "The Id of the item.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
+        public string ItemId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the item.
+        /// </summary>
+        /// <value>The name of the item.</value>
+        [ApiMember(Name = "ItemName", Description = "The name of the item.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
+        public string ItemName { get; set; }
+    }
+
+    [Route("/Sessions/{Id}/Playing", "POST", Summary = "Instructs a session to play an item")]
+    [Authenticated]
+    public class Play : IReturnVoid
+    {
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// Artist, Genre, Studio, Person, or any kind of BaseItem
+        /// </summary>
+        /// <value>The type of the item.</value>
+        [ApiMember(Name = "ItemIds", Description = "The ids of the items to play, comma delimited", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST", AllowMultiple = true)]
+        public string ItemIds { get; set; }
+
+        /// <summary>
+        /// Gets or sets the start position ticks that the first item should be played at
+        /// </summary>
+        /// <value>The start position ticks.</value>
+        [ApiMember(Name = "StartPositionTicks", Description = "The starting position of the first item.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
+        public long? StartPositionTicks { get; set; }
+
+        /// <summary>
+        /// Gets or sets the play command.
+        /// </summary>
+        /// <value>The play command.</value>
+        [ApiMember(Name = "PlayCommand", Description = "The type of play command to issue (PlayNow, PlayNext, PlayLast). Clients who have not yet implemented play next and play last may play now.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
+        public PlayCommand PlayCommand { get; set; }
+    }
+
+    [Route("/Sessions/{Id}/Playing/{Command}", "POST", Summary = "Issues a playstate command to a client")]
+    [Authenticated]
+    public class SendPlaystateCommand : IReturnVoid
+    {
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets the position to seek to
+        /// </summary>
+        [ApiMember(Name = "SeekPositionTicks", Description = "The position to seek to.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
+        public long? SeekPositionTicks { get; set; }
+
+        /// <summary>
+        /// Gets or sets the play command.
+        /// </summary>
+        /// <value>The play command.</value>
+        [ApiMember(Name = "Command", Description = "The command to send - stop, pause, unpause, nexttrack, previoustrack, seek, fullscreen.", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public PlaystateCommand Command { get; set; }
+    }
+
+    [Route("/Sessions/{Id}/System/{Command}", "POST", Summary = "Issues a system command to a client")]
+    [Authenticated]
+    public class SendSystemCommand : IReturnVoid
+    {
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets the command.
+        /// </summary>
+        /// <value>The play command.</value>
+        [ApiMember(Name = "Command", Description = "The command to send.", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public string Command { get; set; }
+    }
+
+    [Route("/Sessions/{Id}/Command/{Command}", "POST", Summary = "Issues a system command to a client")]
+    [Authenticated]
+    public class SendGeneralCommand : IReturnVoid
+    {
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets the command.
+        /// </summary>
+        /// <value>The play command.</value>
+        [ApiMember(Name = "Command", Description = "The command to send.", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public string Command { get; set; }
+    }
+
+    [Route("/Sessions/{Id}/Command", "POST", Summary = "Issues a system command to a client")]
+    [Authenticated]
+    public class SendFullGeneralCommand : GeneralCommand, IReturnVoid
+    {
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public string Id { get; set; }
+    }
+
+    [Route("/Sessions/{Id}/Message", "POST", Summary = "Issues a command to a client to display a message to the user")]
+    [Authenticated]
+    public class SendMessageCommand : IReturnVoid
+    {
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public string Id { get; set; }
+
+        [ApiMember(Name = "Text", Description = "The message text.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
+        public string Text { get; set; }
+
+        [ApiMember(Name = "Header", Description = "The message header.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
+        public string Header { get; set; }
+
+        [ApiMember(Name = "TimeoutMs", Description = "The message timeout. If omitted the user will have to confirm viewing the message.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
+        public long? TimeoutMs { get; set; }
+    }
+
+    [Route("/Sessions/{Id}/Users/{UserId}", "POST", Summary = "Adds an additional user to a session")]
+    [Authenticated]
+    public class AddUserToSession : IReturnVoid
+    {
+        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public string Id { get; set; }
+
+        [ApiMember(Name = "UserId", Description = "UserId Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public Guid UserId { get; set; }
+    }
+
+    [Route("/Sessions/{Id}/Users/{UserId}", "DELETE", Summary = "Removes an additional user from a session")]
+    [Authenticated]
+    public class RemoveUserFromSession : IReturnVoid
+    {
+        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public string Id { get; set; }
+
+        [ApiMember(Name = "UserId", Description = "UserId Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public Guid UserId { get; set; }
+    }
+
+    [Route("/Sessions/Capabilities", "POST", Summary = "Updates capabilities for a device")]
+    [Authenticated]
+    public class PostCapabilities : IReturnVoid
+    {
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public string Id { get; set; }
+
+        [ApiMember(Name = "PlayableMediaTypes", Description = "A list of playable media types, comma delimited. Audio, Video, Book, Game, Photo.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
+        public string PlayableMediaTypes { get; set; }
+
+        [ApiMember(Name = "SupportedCommands", Description = "A list of supported remote control commands, comma delimited", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
+        public string SupportedCommands { get; set; }
+
+        [ApiMember(Name = "MessageCallbackUrl", Description = "A url to post messages to, including remote control commands.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
+        public string MessageCallbackUrl { get; set; }
+
+        [ApiMember(Name = "SupportsMediaControl", Description = "Determines whether media can be played remotely.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "POST")]
+        public bool SupportsMediaControl { get; set; }
+    }
+
+    [Route("/Sessions/Logout", "POST", Summary = "Reports that a session has ended")]
+    public class ReportSessionEnded : IReturnVoid
+    {
+    }
+
+    [Route("/Auth/Keys", "GET")]
+    public class GetApiKeys
+    {
+    }
+
+    [Route("/Auth/Keys/{Key}", "DELETE")]
+    public class RevokeKey
+    {
+        [ApiMember(Name = "Key", Description = "Auth Key", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public string Key { get; set; }
+    }
+
+    [Route("/Auth/Keys", "POST")]
+    public class CreateKey
+    {
+        [ApiMember(Name = "App", Description = "App", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
+        public string App { get; set; }
+    }
+
+    /// <summary>
+    /// Class SessionsService
+    /// </summary>
+    public class SessionsService : BaseApiService
+    {
+        /// <summary>
+        /// The _session manager
+        /// </summary>
+        private readonly ISessionManager _sessionManager;
+
+        private readonly IUserManager _userManager;
+        private readonly IAuthorizationContext _authContext;
+        private readonly IAuthenticationRepository _authRepo;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SessionsService" /> class.
+        /// </summary>
+        /// <param name="sessionManager">The session manager.</param>
+        /// <param name="userManager">The user manager.</param>
+        /// <param name="authContext">The authentication context.</param>
+        /// <param name="authRepo">The authentication repo.</param>
+        public SessionsService(ISessionManager sessionManager, IUserManager userManager, IAuthorizationContext authContext, IAuthenticationRepository authRepo)
+        {
+            _sessionManager = sessionManager;
+            _userManager = userManager;
+            _authContext = authContext;
+            _authRepo = authRepo;
+        }
+
+        public void Delete(RevokeKey request)
+        {
+            var task = _sessionManager.RevokeToken(request.Key);
+
+            Task.WaitAll(task);
+        }
+
+        public void Post(CreateKey request)
+        {
+            var task = _authRepo.Create(new AuthenticationInfo
+            {
+                AppName = request.App,
+                IsActive = true,
+                AccessToken = Guid.NewGuid().ToString("N"),
+                DateCreated = DateTime.UtcNow
+
+            }, CancellationToken.None);
+
+            Task.WaitAll(task);
+        }
+
+        public void Post(ReportSessionEnded request)
+        {
+            var auth = _authContext.GetAuthorizationInfo(Request);
+
+            _sessionManager.Logout(auth.Token);
+        }
+
+        public object Get(GetApiKeys request)
+        {
+            var result = _authRepo.Get(new AuthenticationInfoQuery
+            {
+                IsActive = true
+            });
+
+            return ToOptimizedResult(result);
+        }
+
+        /// <summary>
+        /// Gets the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>System.Object.</returns>
+        public object Get(GetSessions request)
+        {
+            var result = _sessionManager.Sessions.Where(i => i.IsActive);
+
+            if (!string.IsNullOrEmpty(request.DeviceId))
+            {
+                result = result.Where(i => string.Equals(i.DeviceId, request.DeviceId, StringComparison.OrdinalIgnoreCase));
+            }
+
+            if (request.ControllableByUserId.HasValue)
+            {
+                result = result.Where(i => i.SupportsMediaControl);
+
+                var user = _userManager.GetUserById(request.ControllableByUserId.Value);
+
+                if (!user.Configuration.EnableRemoteControlOfOtherUsers)
+                {
+                    result = result.Where(i => !i.UserId.HasValue || i.ContainsUser(request.ControllableByUserId.Value));
+                }
+            }
+
+            return ToOptimizedResult(result.Select(_sessionManager.GetSessionInfoDto).ToList());
+        }
+
+        public void Post(SendPlaystateCommand request)
+        {
+            var command = new PlaystateRequest
+            {
+                Command = request.Command,
+                SeekPositionTicks = request.SeekPositionTicks
+            };
+
+            var task = _sessionManager.SendPlaystateCommand(GetSession().Id, request.Id, command, CancellationToken.None);
+
+            Task.WaitAll(task);
+        }
+
+        /// <summary>
+        /// Posts the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        public void Post(DisplayContent request)
+        {
+            var command = new BrowseRequest
+            {
+                ItemId = request.ItemId,
+                ItemName = request.ItemName,
+                ItemType = request.ItemType
+            };
+
+            var task = _sessionManager.SendBrowseCommand(GetSession().Id, request.Id, command, CancellationToken.None);
+
+            Task.WaitAll(task);
+        }
+
+        /// <summary>
+        /// Posts the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        public void Post(SendSystemCommand request)
+        {
+            GeneralCommandType commandType;
+
+            if (Enum.TryParse(request.Command, true, out commandType))
+            {
+                var currentSession = GetSession();
+
+                var command = new GeneralCommand
+                {
+                    Name = commandType.ToString(),
+                    ControllingUserId = currentSession.UserId.HasValue ? currentSession.UserId.Value.ToString("N") : null
+                };
+
+                var task = _sessionManager.SendGeneralCommand(currentSession.Id, request.Id, command, CancellationToken.None);
+
+                Task.WaitAll(task);
+            }
+        }
+
+        /// <summary>
+        /// Posts the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        public void Post(SendMessageCommand request)
+        {
+            var command = new MessageCommand
+            {
+                Header = string.IsNullOrEmpty(request.Header) ? "Message from Server" : request.Header,
+                TimeoutMs = request.TimeoutMs,
+                Text = request.Text
+            };
+
+            var task = _sessionManager.SendMessageCommand(GetSession().Id, request.Id, command, CancellationToken.None);
+
+            Task.WaitAll(task);
+        }
+
+        /// <summary>
+        /// Posts the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        public void Post(Play request)
+        {
+            var command = new PlayRequest
+            {
+                ItemIds = request.ItemIds.Split(',').ToArray(),
+
+                PlayCommand = request.PlayCommand,
+                StartPositionTicks = request.StartPositionTicks
+            };
+
+            var task = _sessionManager.SendPlayCommand(GetSession().Id, request.Id, command, CancellationToken.None);
+
+            Task.WaitAll(task);
+        }
+
+        public void Post(SendGeneralCommand request)
+        {
+            var currentSession = GetSession();
+
+            var command = new GeneralCommand
+            {
+                Name = request.Command,
+                ControllingUserId = currentSession.UserId.HasValue ? currentSession.UserId.Value.ToString("N") : null
+            };
+
+            var task = _sessionManager.SendGeneralCommand(currentSession.Id, request.Id, command, CancellationToken.None);
+
+            Task.WaitAll(task);
+        }
+
+        public void Post(SendFullGeneralCommand request)
+        {
+            var currentSession = GetSession();
+
+            request.ControllingUserId = currentSession.UserId.HasValue ? currentSession.UserId.Value.ToString("N") : null;
+
+            var task = _sessionManager.SendGeneralCommand(currentSession.Id, request.Id, request, CancellationToken.None);
+
+            Task.WaitAll(task);
+        }
+
+        public void Post(AddUserToSession request)
+        {
+            _sessionManager.AddAdditionalUser(request.Id, request.UserId);
+        }
+
+        public void Delete(RemoveUserFromSession request)
+        {
+            _sessionManager.RemoveAdditionalUser(request.Id, request.UserId);
+        }
+
+        public void Post(PostCapabilities request)
+        {
+            if (string.IsNullOrWhiteSpace(request.Id))
+            {
+                request.Id = GetSession().Id;
+            }
+            _sessionManager.ReportCapabilities(request.Id, new SessionCapabilities
+            {
+                PlayableMediaTypes = request.PlayableMediaTypes.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(),
+
+                SupportedCommands = request.SupportedCommands.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(),
+
+                SupportsMediaControl = request.SupportsMediaControl,
+
+                MessageCallbackUrl = request.MessageCallbackUrl
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Api/SessionsService.cs b/MediaBrowser.Api/SessionsService.cs
deleted file mode 100644
index 8017f35231..0000000000
--- a/MediaBrowser.Api/SessionsService.cs
+++ /dev/null
@@ -1,506 +0,0 @@
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Controller.Security;
-using MediaBrowser.Controller.Session;
-using MediaBrowser.Model.Session;
-using ServiceStack;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Api
-{
-    /// <summary>
-    /// Class GetSessions
-    /// </summary>
-    [Route("/Sessions", "GET", Summary = "Gets a list of sessions")]
-    [Authenticated]
-    public class GetSessions : IReturn<List<SessionInfoDto>>
-    {
-        [ApiMember(Name = "ControllableByUserId", Description = "Optional. Filter by sessions that a given user is allowed to remote control.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
-        public Guid? ControllableByUserId { get; set; }
-
-        [ApiMember(Name = "DeviceId", Description = "Optional. Filter by device id.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
-        public string DeviceId { get; set; }
-    }
-
-    /// <summary>
-    /// Class DisplayContent
-    /// </summary>
-    [Route("/Sessions/{Id}/Viewing", "POST", Summary = "Instructs a session to browse to an item or view")]
-    [Authenticated]
-    public class DisplayContent : IReturnVoid
-    {
-        /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        /// <value>The id.</value>
-        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public string Id { get; set; }
-
-        /// <summary>
-        /// Artist, Genre, Studio, Person, or any kind of BaseItem
-        /// </summary>
-        /// <value>The type of the item.</value>
-        [ApiMember(Name = "ItemType", Description = "The type of item to browse to.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string ItemType { get; set; }
-
-        /// <summary>
-        /// Artist name, genre name, item Id, etc
-        /// </summary>
-        /// <value>The item identifier.</value>
-        [ApiMember(Name = "ItemId", Description = "The Id of the item.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string ItemId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the name of the item.
-        /// </summary>
-        /// <value>The name of the item.</value>
-        [ApiMember(Name = "ItemName", Description = "The name of the item.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string ItemName { get; set; }
-    }
-
-    [Route("/Sessions/{Id}/Playing", "POST", Summary = "Instructs a session to play an item")]
-    [Authenticated]
-    public class Play : IReturnVoid
-    {
-        /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        /// <value>The id.</value>
-        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public string Id { get; set; }
-
-        /// <summary>
-        /// Artist, Genre, Studio, Person, or any kind of BaseItem
-        /// </summary>
-        /// <value>The type of the item.</value>
-        [ApiMember(Name = "ItemIds", Description = "The ids of the items to play, comma delimited", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST", AllowMultiple = true)]
-        public string ItemIds { get; set; }
-
-        /// <summary>
-        /// Gets or sets the start position ticks that the first item should be played at
-        /// </summary>
-        /// <value>The start position ticks.</value>
-        [ApiMember(Name = "StartPositionTicks", Description = "The starting position of the first item.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public long? StartPositionTicks { get; set; }
-
-        /// <summary>
-        /// Gets or sets the play command.
-        /// </summary>
-        /// <value>The play command.</value>
-        [ApiMember(Name = "PlayCommand", Description = "The type of play command to issue (PlayNow, PlayNext, PlayLast). Clients who have not yet implemented play next and play last may play now.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public PlayCommand PlayCommand { get; set; }
-    }
-
-    [Route("/Sessions/{Id}/Playing/{Command}", "POST", Summary = "Issues a playstate command to a client")]
-    [Authenticated]
-    public class SendPlaystateCommand : IReturnVoid
-    {
-        /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        /// <value>The id.</value>
-        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public string Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the position to seek to
-        /// </summary>
-        [ApiMember(Name = "SeekPositionTicks", Description = "The position to seek to.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public long? SeekPositionTicks { get; set; }
-
-        /// <summary>
-        /// Gets or sets the play command.
-        /// </summary>
-        /// <value>The play command.</value>
-        [ApiMember(Name = "Command", Description = "The command to send - stop, pause, unpause, nexttrack, previoustrack, seek, fullscreen.", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public PlaystateCommand Command { get; set; }
-    }
-
-    [Route("/Sessions/{Id}/System/{Command}", "POST", Summary = "Issues a system command to a client")]
-    [Authenticated]
-    public class SendSystemCommand : IReturnVoid
-    {
-        /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        /// <value>The id.</value>
-        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public string Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the command.
-        /// </summary>
-        /// <value>The play command.</value>
-        [ApiMember(Name = "Command", Description = "The command to send.", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public string Command { get; set; }
-    }
-
-    [Route("/Sessions/{Id}/Command/{Command}", "POST", Summary = "Issues a system command to a client")]
-    [Authenticated]
-    public class SendGeneralCommand : IReturnVoid
-    {
-        /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        /// <value>The id.</value>
-        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public string Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the command.
-        /// </summary>
-        /// <value>The play command.</value>
-        [ApiMember(Name = "Command", Description = "The command to send.", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public string Command { get; set; }
-    }
-
-    [Route("/Sessions/{Id}/Command", "POST", Summary = "Issues a system command to a client")]
-    [Authenticated]
-    public class SendFullGeneralCommand : GeneralCommand, IReturnVoid
-    {
-        /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        /// <value>The id.</value>
-        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public string Id { get; set; }
-    }
-
-    [Route("/Sessions/{Id}/Message", "POST", Summary = "Issues a command to a client to display a message to the user")]
-    [Authenticated]
-    public class SendMessageCommand : IReturnVoid
-    {
-        /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        /// <value>The id.</value>
-        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public string Id { get; set; }
-
-        [ApiMember(Name = "Text", Description = "The message text.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string Text { get; set; }
-
-        [ApiMember(Name = "Header", Description = "The message header.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string Header { get; set; }
-
-        [ApiMember(Name = "TimeoutMs", Description = "The message timeout. If omitted the user will have to confirm viewing the message.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public long? TimeoutMs { get; set; }
-    }
-
-    [Route("/Sessions/{Id}/Users/{UserId}", "POST", Summary = "Adds an additional user to a session")]
-    [Authenticated]
-    public class AddUserToSession : IReturnVoid
-    {
-        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public string Id { get; set; }
-
-        [ApiMember(Name = "UserId", Description = "UserId Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public Guid UserId { get; set; }
-    }
-
-    [Route("/Sessions/{Id}/Users/{UserId}", "DELETE", Summary = "Removes an additional user from a session")]
-    [Authenticated]
-    public class RemoveUserFromSession : IReturnVoid
-    {
-        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public string Id { get; set; }
-
-        [ApiMember(Name = "UserId", Description = "UserId Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public Guid UserId { get; set; }
-    }
-
-    [Route("/Sessions/Capabilities", "POST", Summary = "Updates capabilities for a device")]
-    [Authenticated]
-    public class PostCapabilities : IReturnVoid
-    {
-        /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        /// <value>The id.</value>
-        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public string Id { get; set; }
-
-        [ApiMember(Name = "PlayableMediaTypes", Description = "A list of playable media types, comma delimited. Audio, Video, Book, Game, Photo.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string PlayableMediaTypes { get; set; }
-
-        [ApiMember(Name = "SupportedCommands", Description = "A list of supported remote control commands, comma delimited", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string SupportedCommands { get; set; }
-
-        [ApiMember(Name = "MessageCallbackUrl", Description = "A url to post messages to, including remote control commands.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string MessageCallbackUrl { get; set; }
-
-        [ApiMember(Name = "SupportsMediaControl", Description = "Determines whether media can be played remotely.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "POST")]
-        public bool SupportsMediaControl { get; set; }
-    }
-
-    [Route("/Sessions/Logout", "POST", Summary = "Reports that a session has ended")]
-    public class ReportSessionEnded : IReturnVoid
-    {
-    }
-
-    [Route("/Auth/Keys", "GET")]
-    public class GetApiKeys
-    {
-    }
-
-    [Route("/Auth/Keys/{Key}", "DELETE")]
-    public class RevokeKey
-    {
-        [ApiMember(Name = "Key", Description = "Auth Key", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public string Key { get; set; }
-    }
-
-    [Route("/Auth/Keys", "POST")]
-    public class CreateKey
-    {
-        [ApiMember(Name = "App", Description = "App", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string App { get; set; }
-    }
-
-    /// <summary>
-    /// Class SessionsService
-    /// </summary>
-    public class SessionsService : BaseApiService
-    {
-        /// <summary>
-        /// The _session manager
-        /// </summary>
-        private readonly ISessionManager _sessionManager;
-
-        private readonly IUserManager _userManager;
-        private readonly IAuthorizationContext _authContext;
-        private readonly IAuthenticationRepository _authRepo;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SessionsService" /> class.
-        /// </summary>
-        /// <param name="sessionManager">The session manager.</param>
-        /// <param name="userManager">The user manager.</param>
-        /// <param name="authContext">The authentication context.</param>
-        /// <param name="authRepo">The authentication repo.</param>
-        public SessionsService(ISessionManager sessionManager, IUserManager userManager, IAuthorizationContext authContext, IAuthenticationRepository authRepo)
-        {
-            _sessionManager = sessionManager;
-            _userManager = userManager;
-            _authContext = authContext;
-            _authRepo = authRepo;
-        }
-
-        public void Delete(RevokeKey request)
-        {
-            var task = _sessionManager.RevokeToken(request.Key);
-
-            Task.WaitAll(task);
-        }
-
-        public void Post(CreateKey request)
-        {
-            var task = _authRepo.Create(new AuthenticationInfo
-            {
-                AppName = request.App,
-                IsActive = true,
-                AccessToken = Guid.NewGuid().ToString("N"),
-                DateCreated = DateTime.UtcNow
-
-            }, CancellationToken.None);
-
-            Task.WaitAll(task);
-        }
-
-        public void Post(ReportSessionEnded request)
-        {
-            var auth = _authContext.GetAuthorizationInfo(Request);
-
-            _sessionManager.Logout(auth.Token);
-        }
-
-        public object Get(GetApiKeys request)
-        {
-            var result = _authRepo.Get(new AuthenticationInfoQuery
-            {
-                IsActive = true
-            });
-
-            return ToOptimizedResult(result);
-        }
-
-        /// <summary>
-        /// Gets the specified request.
-        /// </summary>
-        /// <param name="request">The request.</param>
-        /// <returns>System.Object.</returns>
-        public object Get(GetSessions request)
-        {
-            var result = _sessionManager.Sessions.Where(i => i.IsActive);
-
-            if (!string.IsNullOrEmpty(request.DeviceId))
-            {
-                result = result.Where(i => string.Equals(i.DeviceId, request.DeviceId, StringComparison.OrdinalIgnoreCase));
-            }
-
-            if (request.ControllableByUserId.HasValue)
-            {
-                result = result.Where(i => i.SupportsMediaControl);
-
-                var user = _userManager.GetUserById(request.ControllableByUserId.Value);
-
-                if (!user.Configuration.EnableRemoteControlOfOtherUsers)
-                {
-                    result = result.Where(i => !i.UserId.HasValue || i.ContainsUser(request.ControllableByUserId.Value));
-                }
-            }
-
-            return ToOptimizedResult(result.Select(_sessionManager.GetSessionInfoDto).ToList());
-        }
-
-        public void Post(SendPlaystateCommand request)
-        {
-            var command = new PlaystateRequest
-            {
-                Command = request.Command,
-                SeekPositionTicks = request.SeekPositionTicks
-            };
-
-            var task = _sessionManager.SendPlaystateCommand(GetSession().Id, request.Id, command, CancellationToken.None);
-
-            Task.WaitAll(task);
-        }
-
-        /// <summary>
-        /// Posts the specified request.
-        /// </summary>
-        /// <param name="request">The request.</param>
-        public void Post(DisplayContent request)
-        {
-            var command = new BrowseRequest
-            {
-                ItemId = request.ItemId,
-                ItemName = request.ItemName,
-                ItemType = request.ItemType
-            };
-
-            var task = _sessionManager.SendBrowseCommand(GetSession().Id, request.Id, command, CancellationToken.None);
-
-            Task.WaitAll(task);
-        }
-
-        /// <summary>
-        /// Posts the specified request.
-        /// </summary>
-        /// <param name="request">The request.</param>
-        public void Post(SendSystemCommand request)
-        {
-            GeneralCommandType commandType;
-
-            if (Enum.TryParse(request.Command, true, out commandType))
-            {
-                var currentSession = GetSession();
-
-                var command = new GeneralCommand
-                {
-                    Name = commandType.ToString(),
-                    ControllingUserId = currentSession.UserId.HasValue ? currentSession.UserId.Value.ToString("N") : null
-                };
-
-                var task = _sessionManager.SendGeneralCommand(currentSession.Id, request.Id, command, CancellationToken.None);
-
-                Task.WaitAll(task);
-            }
-        }
-
-        /// <summary>
-        /// Posts the specified request.
-        /// </summary>
-        /// <param name="request">The request.</param>
-        public void Post(SendMessageCommand request)
-        {
-            var command = new MessageCommand
-            {
-                Header = string.IsNullOrEmpty(request.Header) ? "Message from Server" : request.Header,
-                TimeoutMs = request.TimeoutMs,
-                Text = request.Text
-            };
-
-            var task = _sessionManager.SendMessageCommand(GetSession().Id, request.Id, command, CancellationToken.None);
-
-            Task.WaitAll(task);
-        }
-
-        /// <summary>
-        /// Posts the specified request.
-        /// </summary>
-        /// <param name="request">The request.</param>
-        public void Post(Play request)
-        {
-            var command = new PlayRequest
-            {
-                ItemIds = request.ItemIds.Split(',').ToArray(),
-
-                PlayCommand = request.PlayCommand,
-                StartPositionTicks = request.StartPositionTicks
-            };
-
-            var task = _sessionManager.SendPlayCommand(GetSession().Id, request.Id, command, CancellationToken.None);
-
-            Task.WaitAll(task);
-        }
-
-        public void Post(SendGeneralCommand request)
-        {
-            var currentSession = GetSession();
-
-            var command = new GeneralCommand
-            {
-                Name = request.Command,
-                ControllingUserId = currentSession.UserId.HasValue ? currentSession.UserId.Value.ToString("N") : null
-            };
-
-            var task = _sessionManager.SendGeneralCommand(currentSession.Id, request.Id, command, CancellationToken.None);
-
-            Task.WaitAll(task);
-        }
-
-        public void Post(SendFullGeneralCommand request)
-        {
-            var currentSession = GetSession();
-
-            request.ControllingUserId = currentSession.UserId.HasValue ? currentSession.UserId.Value.ToString("N") : null;
-
-            var task = _sessionManager.SendGeneralCommand(currentSession.Id, request.Id, request, CancellationToken.None);
-
-            Task.WaitAll(task);
-        }
-
-        public void Post(AddUserToSession request)
-        {
-            _sessionManager.AddAdditionalUser(request.Id, request.UserId);
-        }
-
-        public void Delete(RemoveUserFromSession request)
-        {
-            _sessionManager.RemoveAdditionalUser(request.Id, request.UserId);
-        }
-
-        public void Post(PostCapabilities request)
-        {
-            if (string.IsNullOrWhiteSpace(request.Id))
-            {
-                request.Id = GetSession().Id;
-            }
-            _sessionManager.ReportCapabilities(request.Id, new SessionCapabilities
-            {
-                PlayableMediaTypes = request.PlayableMediaTypes.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(),
-
-                SupportedCommands = request.SupportedCommands.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(),
-
-                SupportsMediaControl = request.SupportsMediaControl,
-
-                MessageCallbackUrl = request.MessageCallbackUrl
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Api/System/ActivityLogService.cs b/MediaBrowser.Api/System/ActivityLogService.cs
new file mode 100644
index 0000000000..0ccc28c6ff
--- /dev/null
+++ b/MediaBrowser.Api/System/ActivityLogService.cs
@@ -0,0 +1,44 @@
+using MediaBrowser.Controller.Activity;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Activity;
+using MediaBrowser.Model.Querying;
+using ServiceStack;
+
+namespace MediaBrowser.Api.System
+{
+    [Route("/System/ActivityLog/Entries", "GET", Summary = "Gets activity log entries")]
+    public class GetActivityLogs : IReturn<QueryResult<ActivityLogEntry>>
+    {
+        /// <summary>
+        /// Skips over a given number of items within the results. Use for paging.
+        /// </summary>
+        /// <value>The start index.</value>
+        [ApiMember(Name = "StartIndex", Description = "Optional. The record index to start at. All items with a lower index will be dropped from the results.", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
+        public int? StartIndex { get; set; }
+
+        /// <summary>
+        /// The maximum number of items to return
+        /// </summary>
+        /// <value>The limit.</value>
+        [ApiMember(Name = "Limit", Description = "Optional. The maximum number of records to return", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
+        public int? Limit { get; set; }
+    }
+
+    [Authenticated]
+    public class ActivityLogService : BaseApiService
+    {
+        private readonly IActivityManager _activityManager;
+
+        public ActivityLogService(IActivityManager activityManager)
+        {
+            _activityManager = activityManager;
+        }
+
+        public object Get(GetActivityLogs request)
+        {
+            var result = _activityManager.GetActivityLogEntries(request.StartIndex, request.Limit);
+
+            return ToOptimizedResult(result);
+        }
+    }
+}
diff --git a/MediaBrowser.Api/System/SystemInfoWebSocketListener.cs b/MediaBrowser.Api/System/SystemInfoWebSocketListener.cs
new file mode 100644
index 0000000000..c20cef3b38
--- /dev/null
+++ b/MediaBrowser.Api/System/SystemInfoWebSocketListener.cs
@@ -0,0 +1,49 @@
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.System;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Api.System
+{
+    /// <summary>
+    /// Class SystemInfoWebSocketListener
+    /// </summary>
+    public class SystemInfoWebSocketListener : BasePeriodicWebSocketListener<SystemInfo, WebSocketListenerState>
+    {
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        protected override string Name
+        {
+            get { return "SystemInfo"; }
+        }
+
+        /// <summary>
+        /// The _kernel
+        /// </summary>
+        private readonly IServerApplicationHost _appHost;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SystemInfoWebSocketListener" /> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        /// <param name="appHost">The app host.</param>
+        public SystemInfoWebSocketListener(ILogger logger, IServerApplicationHost appHost)
+            : base(logger)
+        {
+            _appHost = appHost;
+        }
+
+        /// <summary>
+        /// Gets the data to send.
+        /// </summary>
+        /// <param name="state">The state.</param>
+        /// <returns>Task{SystemInfo}.</returns>
+        protected override Task<SystemInfo> GetDataToSend(WebSocketListenerState state)
+        {
+            return Task.FromResult(_appHost.GetSystemInfo());
+        }
+    }
+}
diff --git a/MediaBrowser.Api/System/SystemService.cs b/MediaBrowser.Api/System/SystemService.cs
new file mode 100644
index 0000000000..3913275eee
--- /dev/null
+++ b/MediaBrowser.Api/System/SystemService.cs
@@ -0,0 +1,178 @@
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.IO;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.System;
+using ServiceStack;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Api.System
+{
+    /// <summary>
+    /// Class GetSystemInfo
+    /// </summary>
+    [Route("/System/Info", "GET", Summary = "Gets information about the server")]
+    [Authenticated]
+    public class GetSystemInfo : IReturn<SystemInfo>
+    {
+
+    }
+
+    [Route("/System/Info/Public", "GET", Summary = "Gets public information about the server")]
+    public class GetPublicSystemInfo : IReturn<PublicSystemInfo>
+    {
+
+    }
+
+    /// <summary>
+    /// Class RestartApplication
+    /// </summary>
+    [Route("/System/Restart", "POST", Summary = "Restarts the application, if needed")]
+    [Authenticated]
+    public class RestartApplication
+    {
+    }
+
+    [Route("/System/Shutdown", "POST", Summary = "Shuts down the application")]
+    [Authenticated]
+    public class ShutdownApplication
+    {
+    }
+
+    [Route("/System/Logs", "GET", Summary = "Gets a list of available server log files")]
+    [Authenticated]
+    public class GetServerLogs : IReturn<List<LogFile>>
+    {
+    }
+
+    [Route("/System/Logs/Log", "GET", Summary = "Gets a log file")]
+    public class GetLogFile
+    {
+        [ApiMember(Name = "Name", Description = "The log file name.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
+        public string Name { get; set; }
+    }
+
+    /// <summary>
+    /// Class SystemInfoService
+    /// </summary>
+    public class SystemService : BaseApiService
+    {
+        /// <summary>
+        /// The _app host
+        /// </summary>
+        private readonly IServerApplicationHost _appHost;
+        private readonly IApplicationPaths _appPaths;
+        private readonly IFileSystem _fileSystem;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SystemService" /> class.
+        /// </summary>
+        /// <param name="appHost">The app host.</param>
+        /// <param name="appPaths">The application paths.</param>
+        /// <param name="fileSystem">The file system.</param>
+        /// <exception cref="ArgumentNullException">jsonSerializer</exception>
+        public SystemService(IServerApplicationHost appHost, IApplicationPaths appPaths, IFileSystem fileSystem)
+        {
+            _appHost = appHost;
+            _appPaths = appPaths;
+            _fileSystem = fileSystem;
+        }
+
+        public object Get(GetServerLogs request)
+        {
+            List<FileInfo> files;
+
+            try
+            {
+                files = new DirectoryInfo(_appPaths.LogDirectoryPath)
+                    .EnumerateFiles("*", SearchOption.AllDirectories)
+                    .Where(i => string.Equals(i.Extension, ".txt", global::System.StringComparison.OrdinalIgnoreCase))
+                    .ToList();
+            }
+            catch (DirectoryNotFoundException)
+            {
+                files = new List<FileInfo>();
+            }
+
+            var result = files.Select(i => new LogFile
+            {
+                DateCreated = _fileSystem.GetCreationTimeUtc(i),
+                DateModified = _fileSystem.GetLastWriteTimeUtc(i),
+                Name = i.Name,
+                Size = i.Length
+
+            }).OrderByDescending(i => i.DateModified)
+                .ThenByDescending(i => i.DateCreated)
+                .ThenBy(i => i.Name)
+                .ToList();
+
+            return ToOptimizedResult(result);
+        }
+
+        public object Get(GetLogFile request)
+        {
+            var file = new DirectoryInfo(_appPaths.LogDirectoryPath)
+                .EnumerateFiles("*", SearchOption.AllDirectories)
+                .First(i => string.Equals(i.Name, request.Name, global::System.StringComparison.OrdinalIgnoreCase));
+
+            return ResultFactory.GetStaticFileResult(Request, file.FullName, FileShare.ReadWrite);
+        }
+
+        /// <summary>
+        /// Gets the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>System.Object.</returns>
+        public object Get(GetSystemInfo request)
+        {
+            var result = _appHost.GetSystemInfo();
+
+            return ToOptimizedResult(result);
+        }
+
+        public object Get(GetPublicSystemInfo request)
+        {
+            var result = _appHost.GetSystemInfo();
+
+            var publicInfo = new PublicSystemInfo
+            {
+                Id = result.Id,
+                ServerName = result.ServerName,
+                Version = result.Version
+            };
+
+            return ToOptimizedResult(publicInfo);
+        }
+
+        /// <summary>
+        /// Posts the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        public void Post(RestartApplication request)
+        {
+            Task.Run(async () =>
+            {
+                await Task.Delay(100).ConfigureAwait(false);
+                await _appHost.Restart().ConfigureAwait(false);
+            });
+        }
+
+        /// <summary>
+        /// Posts the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        public void Post(ShutdownApplication request)
+        {
+            Task.Run(async () =>
+            {
+                await Task.Delay(100).ConfigureAwait(false);
+                await _appHost.Shutdown().ConfigureAwait(false);
+            });
+        }
+
+    }
+}
diff --git a/MediaBrowser.Api/SystemService.cs b/MediaBrowser.Api/SystemService.cs
deleted file mode 100644
index 259b1d8921..0000000000
--- a/MediaBrowser.Api/SystemService.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.System;
-using ServiceStack;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Api
-{
-    /// <summary>
-    /// Class GetSystemInfo
-    /// </summary>
-    [Route("/System/Info", "GET", Summary = "Gets information about the server")]
-    [Authenticated]
-    public class GetSystemInfo : IReturn<SystemInfo>
-    {
-
-    }
-
-    [Route("/System/Info/Public", "GET", Summary = "Gets public information about the server")]
-    public class GetPublicSystemInfo : IReturn<PublicSystemInfo>
-    {
-
-    }
-
-    /// <summary>
-    /// Class RestartApplication
-    /// </summary>
-    [Route("/System/Restart", "POST", Summary = "Restarts the application, if needed")]
-    [Authenticated]
-    public class RestartApplication
-    {
-    }
-
-    [Route("/System/Shutdown", "POST", Summary = "Shuts down the application")]
-    [Authenticated]
-    public class ShutdownApplication
-    {
-    }
-
-    [Route("/System/Logs", "GET", Summary = "Gets a list of available server log files")]
-    [Authenticated]
-    public class GetServerLogs : IReturn<List<LogFile>>
-    {
-    }
-
-    [Route("/System/Logs/Log", "GET", Summary = "Gets a log file")]
-    public class GetLogFile
-    {
-        [ApiMember(Name = "Name", Description = "The log file name.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
-        public string Name { get; set; }
-    }
-
-    /// <summary>
-    /// Class SystemInfoService
-    /// </summary>
-    public class SystemService : BaseApiService
-    {
-        /// <summary>
-        /// The _app host
-        /// </summary>
-        private readonly IServerApplicationHost _appHost;
-        private readonly IApplicationPaths _appPaths;
-        private readonly IFileSystem _fileSystem;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SystemService" /> class.
-        /// </summary>
-        /// <param name="appHost">The app host.</param>
-        /// <param name="appPaths">The application paths.</param>
-        /// <param name="fileSystem">The file system.</param>
-        /// <exception cref="System.ArgumentNullException">jsonSerializer</exception>
-        public SystemService(IServerApplicationHost appHost, IApplicationPaths appPaths, IFileSystem fileSystem)
-        {
-            _appHost = appHost;
-            _appPaths = appPaths;
-            _fileSystem = fileSystem;
-        }
-
-        public object Get(GetServerLogs request)
-        {
-            List<FileInfo> files;
-
-            try
-            {
-                files = new DirectoryInfo(_appPaths.LogDirectoryPath)
-                    .EnumerateFiles("*", SearchOption.AllDirectories)
-                    .Where(i => string.Equals(i.Extension, ".txt", System.StringComparison.OrdinalIgnoreCase))
-                    .ToList();
-            }
-            catch (DirectoryNotFoundException)
-            {
-                files = new List<FileInfo>();
-            }
-
-            var result = files.Select(i => new LogFile
-            {
-                DateCreated = _fileSystem.GetCreationTimeUtc(i),
-                DateModified = _fileSystem.GetLastWriteTimeUtc(i),
-                Name = i.Name,
-                Size = i.Length
-
-            }).OrderByDescending(i => i.DateModified)
-                .ThenByDescending(i => i.DateCreated)
-                .ThenBy(i => i.Name)
-                .ToList();
-
-            return ToOptimizedResult(result);
-        }
-
-        public object Get(GetLogFile request)
-        {
-            var file = new DirectoryInfo(_appPaths.LogDirectoryPath)
-                .EnumerateFiles("*", SearchOption.AllDirectories)
-                .First(i => string.Equals(i.Name, request.Name, System.StringComparison.OrdinalIgnoreCase));
-
-            return ResultFactory.GetStaticFileResult(Request, file.FullName, FileShare.ReadWrite);
-        }
-
-        /// <summary>
-        /// Gets the specified request.
-        /// </summary>
-        /// <param name="request">The request.</param>
-        /// <returns>System.Object.</returns>
-        public object Get(GetSystemInfo request)
-        {
-            var result = _appHost.GetSystemInfo();
-
-            return ToOptimizedResult(result);
-        }
-
-        public object Get(GetPublicSystemInfo request)
-        {
-            var result = _appHost.GetSystemInfo();
-
-            var publicInfo = new PublicSystemInfo
-            {
-                Id = result.Id,
-                ServerName = result.ServerName,
-                Version = result.Version
-            };
-
-            return ToOptimizedResult(publicInfo);
-        }
-
-        /// <summary>
-        /// Posts the specified request.
-        /// </summary>
-        /// <param name="request">The request.</param>
-        public void Post(RestartApplication request)
-        {
-            Task.Run(async () =>
-            {
-                await Task.Delay(100).ConfigureAwait(false);
-                await _appHost.Restart().ConfigureAwait(false);
-            });
-        }
-
-        /// <summary>
-        /// Posts the specified request.
-        /// </summary>
-        /// <param name="request">The request.</param>
-        public void Post(ShutdownApplication request)
-        {
-            Task.Run(async () =>
-            {
-                await Task.Delay(100).ConfigureAwait(false);
-                await _appHost.Shutdown().ConfigureAwait(false);
-            });
-        }
-
-    }
-}
diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs
index f5a1f54cbb..4ffe5b3911 100644
--- a/MediaBrowser.Api/UserService.cs
+++ b/MediaBrowser.Api/UserService.cs
@@ -195,7 +195,7 @@ namespace MediaBrowser.Api
             var authInfo = AuthorizationContext.GetAuthorizationInfo(Request);
             var isDashboard = string.Equals(authInfo.Client, "Dashboard", StringComparison.OrdinalIgnoreCase);
 
-            if ((Request.IsLocal && isDashboard) || 
+            if ((Request.IsLocal && isDashboard) ||
                 !_config.Configuration.IsStartupWizardCompleted)
             {
                 return Get(new GetUsers
@@ -327,7 +327,7 @@ namespace MediaBrowser.Api
             var revokeTask = _sessionMananger.RevokeUserTokens(user.Id.ToString("N"));
 
             Task.WaitAll(revokeTask);
-            
+
             var task = _userManager.DeleteUser(user);
 
             Task.WaitAll(task);
@@ -374,8 +374,17 @@ namespace MediaBrowser.Api
                 auth.DeviceId = "Unknown device id";
             }
 
-            var result = _sessionMananger.AuthenticateNewSession(request.Username, request.Password, auth.Client, auth.Version,
-                        auth.DeviceId, auth.Device, Request.RemoteIp, Request.IsLocal).Result;
+            var result = _sessionMananger.AuthenticateNewSession(new AuthenticationRequest
+            {
+                App = auth.Client,
+                AppVersion = auth.Version,
+                DeviceId = auth.DeviceId,
+                DeviceName = auth.Device,
+                Password = request.Password,
+                RemoteEndPoint = Request.RemoteIp,
+                Username = request.Username
+
+            }, Request.IsLocal).Result;
 
             return ToOptimizedResult(result);
         }
@@ -457,8 +466,8 @@ namespace MediaBrowser.Api
                 Task.WaitAll(revokeTask);
             }
 
-            var task = user.Name.Equals(dtoUser.Name, StringComparison.Ordinal) ? 
-                _userManager.UpdateUser(user) : 
+            var task = user.Name.Equals(dtoUser.Name, StringComparison.Ordinal) ?
+                _userManager.UpdateUser(user) :
                 _userManager.RenameUser(user, dtoUser.Name);
 
             Task.WaitAll(task);
diff --git a/MediaBrowser.Api/WebSocket/SessionInfoWebSocketListener.cs b/MediaBrowser.Api/WebSocket/SessionInfoWebSocketListener.cs
deleted file mode 100644
index 600d9e405a..0000000000
--- a/MediaBrowser.Api/WebSocket/SessionInfoWebSocketListener.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Session;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Session;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Api.WebSocket
-{
-    /// <summary>
-    /// Class SessionInfoWebSocketListener
-    /// </summary>
-    class SessionInfoWebSocketListener : BasePeriodicWebSocketListener<IEnumerable<SessionInfoDto>, WebSocketListenerState>
-    {
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        protected override string Name
-        {
-            get { return "Sessions"; }
-        }
-
-        /// <summary>
-        /// The _kernel
-        /// </summary>
-        private readonly ISessionManager _sessionManager;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SessionInfoWebSocketListener"/> class.
-        /// </summary>
-        /// <param name="logger">The logger.</param>
-        /// <param name="sessionManager">The session manager.</param>
-        public SessionInfoWebSocketListener(ILogger logger, ISessionManager sessionManager)
-            : base(logger)
-        {
-            _sessionManager = sessionManager;
-
-            _sessionManager.SessionStarted += _sessionManager_SessionStarted;
-            _sessionManager.SessionEnded += _sessionManager_SessionEnded;
-            _sessionManager.PlaybackStart += _sessionManager_PlaybackStart;
-            _sessionManager.PlaybackStopped += _sessionManager_PlaybackStopped;
-            _sessionManager.PlaybackProgress += _sessionManager_PlaybackProgress;
-            _sessionManager.CapabilitiesChanged += _sessionManager_CapabilitiesChanged;
-            _sessionManager.SessionActivity += _sessionManager_SessionActivity;
-        }
-
-        void _sessionManager_SessionActivity(object sender, SessionEventArgs e)
-        {
-            SendData(false);
-        }
-
-        void _sessionManager_CapabilitiesChanged(object sender, SessionEventArgs e)
-        {
-            SendData(true);
-        }
-
-        void _sessionManager_PlaybackProgress(object sender, PlaybackProgressEventArgs e)
-        {
-            SendData(false);
-        }
-
-        void _sessionManager_PlaybackStopped(object sender, PlaybackStopEventArgs e)
-        {
-            SendData(true);
-        }
-
-        void _sessionManager_PlaybackStart(object sender, PlaybackProgressEventArgs e)
-        {
-            SendData(true);
-        }
-
-        void _sessionManager_SessionEnded(object sender, SessionEventArgs e)
-        {
-            SendData(true);
-        }
-
-        void _sessionManager_SessionStarted(object sender, SessionEventArgs e)
-        {
-            SendData(true);
-        }
-
-        /// <summary>
-        /// Gets the data to send.
-        /// </summary>
-        /// <param name="state">The state.</param>
-        /// <returns>Task{SystemInfo}.</returns>
-        protected override Task<IEnumerable<SessionInfoDto>> GetDataToSend(WebSocketListenerState state)
-        {
-            return Task.FromResult(_sessionManager.Sessions.Where(i => i.IsActive).Select(_sessionManager.GetSessionInfoDto));
-        }
-
-        protected override bool SendOnTimer
-        {
-            get
-            {
-                return false;
-            }
-        }
-
-        protected override void Dispose(bool dispose)
-        {
-            _sessionManager.SessionStarted -= _sessionManager_SessionStarted;
-            _sessionManager.SessionEnded -= _sessionManager_SessionEnded;
-            _sessionManager.PlaybackStart -= _sessionManager_PlaybackStart;
-            _sessionManager.PlaybackStopped -= _sessionManager_PlaybackStopped;
-            _sessionManager.PlaybackProgress -= _sessionManager_PlaybackProgress;
-            _sessionManager.CapabilitiesChanged -= _sessionManager_CapabilitiesChanged;
-            _sessionManager.SessionActivity -= _sessionManager_SessionActivity;
-
-            base.Dispose(dispose);
-        }
-    }
-}
diff --git a/MediaBrowser.Api/WebSocket/SystemInfoWebSocketListener.cs b/MediaBrowser.Api/WebSocket/SystemInfoWebSocketListener.cs
deleted file mode 100644
index 2940bcef06..0000000000
--- a/MediaBrowser.Api/WebSocket/SystemInfoWebSocketListener.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.System;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Api.WebSocket
-{
-    /// <summary>
-    /// Class SystemInfoWebSocketListener
-    /// </summary>
-    public class SystemInfoWebSocketListener : BasePeriodicWebSocketListener<SystemInfo, WebSocketListenerState>
-    {
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        protected override string Name
-        {
-            get { return "SystemInfo"; }
-        }
-
-        /// <summary>
-        /// The _kernel
-        /// </summary>
-        private readonly IServerApplicationHost _appHost;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SystemInfoWebSocketListener" /> class.
-        /// </summary>
-        /// <param name="logger">The logger.</param>
-        /// <param name="appHost">The app host.</param>
-        public SystemInfoWebSocketListener(ILogger logger, IServerApplicationHost appHost)
-            : base(logger)
-        {
-            _appHost = appHost;
-        }
-
-        /// <summary>
-        /// Gets the data to send.
-        /// </summary>
-        /// <param name="state">The state.</param>
-        /// <returns>Task{SystemInfo}.</returns>
-        protected override Task<SystemInfo> GetDataToSend(WebSocketListenerState state)
-        {
-            return Task.FromResult(_appHost.GetSystemInfo());
-        }
-    }
-}
diff --git a/MediaBrowser.Common.Implementations/Configuration/BaseConfigurationManager.cs b/MediaBrowser.Common.Implementations/Configuration/BaseConfigurationManager.cs
index 60abc14f1a..cb6121c9ff 100644
--- a/MediaBrowser.Common.Implementations/Configuration/BaseConfigurationManager.cs
+++ b/MediaBrowser.Common.Implementations/Configuration/BaseConfigurationManager.cs
@@ -28,6 +28,11 @@ namespace MediaBrowser.Common.Implementations.Configuration
         /// </summary>
         public event EventHandler<EventArgs> ConfigurationUpdated;
 
+        /// <summary>
+        /// Occurs when [configuration updating].
+        /// </summary>
+        public event EventHandler<ConfigurationUpdateEventArgs> NamedConfigurationUpdating;
+        
         /// <summary>
         /// Occurs when [named configuration updated].
         /// </summary>
@@ -217,6 +222,13 @@ namespace MediaBrowser.Common.Implementations.Configuration
                 throw new ArgumentException("Expected configuration type is " + configurationType.Name);
             }
 
+            EventHelper.FireEventIfNotNull(NamedConfigurationUpdating, this, new ConfigurationUpdateEventArgs
+            {
+                Key = key,
+                NewConfiguration = configuration
+
+            }, Logger);
+            
             _configurations.AddOrUpdate(key, configuration, (k, v) => configuration);
 
             var path = GetConfigurationFile(key);
diff --git a/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs b/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
index 68222d8436..0dc67f8c00 100644
--- a/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
+++ b/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
@@ -547,6 +547,7 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
             if (ex != null)
             {
                 result.ErrorMessage = ex.Message;
+                result.LongErrorMessage = ex.StackTrace;
             }
 
             var path = GetHistoryFilePath();
diff --git a/MediaBrowser.Common/Configuration/IConfigurationManager.cs b/MediaBrowser.Common/Configuration/IConfigurationManager.cs
index 25698d9729..d826a3ee78 100644
--- a/MediaBrowser.Common/Configuration/IConfigurationManager.cs
+++ b/MediaBrowser.Common/Configuration/IConfigurationManager.cs
@@ -6,6 +6,11 @@ namespace MediaBrowser.Common.Configuration
 {
     public interface IConfigurationManager
     {
+        /// <summary>
+        /// Occurs when [configuration updating].
+        /// </summary>
+        event EventHandler<ConfigurationUpdateEventArgs> NamedConfigurationUpdating;
+
         /// <summary>
         /// Occurs when [configuration updated].
         /// </summary>
diff --git a/MediaBrowser.Common/ScheduledTasks/IConfigurableScheduledTask.cs b/MediaBrowser.Common/ScheduledTasks/IConfigurableScheduledTask.cs
index fc69630709..6989dea06b 100644
--- a/MediaBrowser.Common/ScheduledTasks/IConfigurableScheduledTask.cs
+++ b/MediaBrowser.Common/ScheduledTasks/IConfigurableScheduledTask.cs
@@ -13,4 +13,9 @@
         /// <value><c>true</c> if this instance is enabled; otherwise, <c>false</c>.</value>
         bool IsEnabled { get; }
     }
+
+    public interface IScheduledTaskActivityLog
+    {
+        bool IsActivityLogged { get; }
+    }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Activity/IActivityManager.cs b/MediaBrowser.Controller/Activity/IActivityManager.cs
new file mode 100644
index 0000000000..0c565ae36c
--- /dev/null
+++ b/MediaBrowser.Controller/Activity/IActivityManager.cs
@@ -0,0 +1,17 @@
+using MediaBrowser.Model.Activity;
+using MediaBrowser.Model.Events;
+using MediaBrowser.Model.Querying;
+using System;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Controller.Activity
+{
+    public interface IActivityManager
+    {
+        event EventHandler<GenericEventArgs<ActivityLogEntry>> EntryCreated;
+
+        Task Create(ActivityLogEntry entry);
+
+        QueryResult<ActivityLogEntry> GetActivityLogEntries(int? startIndex, int? limit);
+    }
+}
diff --git a/MediaBrowser.Controller/Activity/IActivityRepository.cs b/MediaBrowser.Controller/Activity/IActivityRepository.cs
new file mode 100644
index 0000000000..29e60ff1f0
--- /dev/null
+++ b/MediaBrowser.Controller/Activity/IActivityRepository.cs
@@ -0,0 +1,13 @@
+using MediaBrowser.Model.Activity;
+using MediaBrowser.Model.Querying;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Controller.Activity
+{
+    public interface IActivityRepository
+    {
+        Task Create(ActivityLogEntry entry);
+
+        QueryResult<ActivityLogEntry> GetActivityLogEntries(int? startIndex, int? limit);
+    }
+}
diff --git a/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs b/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs
index aac8cda2eb..13c9f8d84b 100644
--- a/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs
+++ b/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs
@@ -1,7 +1,5 @@
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Model.Configuration;
-using MediaBrowser.Model.Events;
-using System;
 
 namespace MediaBrowser.Controller.Configuration
 {
@@ -10,11 +8,6 @@ namespace MediaBrowser.Controller.Configuration
     /// </summary>
     public interface IServerConfigurationManager : IConfigurationManager
     {
-        /// <summary>
-        /// Occurs when [configuration updating].
-        /// </summary>
-        event EventHandler<GenericEventArgs<ServerConfiguration>> ConfigurationUpdating;
-        
         /// <summary>
         /// Gets the application paths.
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
index 5e6bd97079..19c9601671 100644
--- a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
+++ b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
@@ -102,17 +102,9 @@ namespace MediaBrowser.Controller.Entities.Movies
             var totalItems = items.Count;
             var percentages = new Dictionary<Guid, double>(totalItems);
 
-            var tasks = new List<Task>();
-
             // Refresh songs
             foreach (var item in items)
             {
-                if (tasks.Count >= 3)
-                {
-                    await Task.WhenAll(tasks).ConfigureAwait(false);
-                    tasks.Clear();
-                }
-
                 cancellationToken.ThrowIfCancellationRequested();
                 var innerProgress = new ActionableProgress<double>();
 
@@ -132,13 +124,9 @@ namespace MediaBrowser.Controller.Entities.Movies
                 });
 
                 // Avoid implicitly captured closure
-                var taskChild = item;
-                tasks.Add(Task.Run(async () => await RefreshItem(taskChild, refreshOptions, innerProgress, cancellationToken).ConfigureAwait(false), cancellationToken));
+                await RefreshItem(item, refreshOptions, innerProgress, cancellationToken).ConfigureAwait(false);
             }
 
-            await Task.WhenAll(tasks).ConfigureAwait(false);
-            tasks.Clear();
-
             // Refresh current item
             await RefreshMetadata(refreshOptions, cancellationToken).ConfigureAwait(false);
 
diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs
index 0da5f92728..c6bbf02ae7 100644
--- a/MediaBrowser.Controller/Library/IUserManager.cs
+++ b/MediaBrowser.Controller/Library/IUserManager.cs
@@ -31,6 +31,7 @@ namespace MediaBrowser.Controller.Library
 
         event EventHandler<GenericEventArgs<User>> UserCreated;
         event EventHandler<GenericEventArgs<User>> UserConfigurationUpdated;
+        event EventHandler<GenericEventArgs<User>> UserPasswordChanged;
 
         /// <summary>
         /// Updates the configuration.
diff --git a/MediaBrowser.Controller/Library/TVUtils.cs b/MediaBrowser.Controller/Library/TVUtils.cs
index d8d836597b..34486182b7 100644
--- a/MediaBrowser.Controller/Library/TVUtils.cs
+++ b/MediaBrowser.Controller/Library/TVUtils.cs
@@ -269,7 +269,7 @@ namespace MediaBrowser.Controller.Library
 
                 if ((attributes & FileAttributes.Hidden) == FileAttributes.Hidden)
                 {
-                    logger.Debug("Igoring series file or folder marked hidden: {0}", child.FullName);
+                    //logger.Debug("Igoring series file or folder marked hidden: {0}", child.FullName);
                     continue;
                 }
 
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 5243e1a2ae..28e1ffb1c8 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -68,6 +68,8 @@
     <Compile Include="..\SharedVersion.cs">
       <Link>Properties\SharedVersion.cs</Link>
     </Compile>
+    <Compile Include="Activity\IActivityManager.cs" />
+    <Compile Include="Activity\IActivityRepository.cs" />
     <Compile Include="Channels\ChannelFolderItem.cs" />
     <Compile Include="Channels\ChannelItemInfo.cs" />
     <Compile Include="Channels\ChannelItemResult.cs" />
@@ -241,6 +243,7 @@
     <Compile Include="Security\AuthenticationInfoQuery.cs" />
     <Compile Include="Security\IAuthenticationRepository.cs" />
     <Compile Include="Security\IEncryptionManager.cs" />
+    <Compile Include="Session\AuthenticationRequest.cs" />
     <Compile Include="Subtitles\ISubtitleManager.cs" />
     <Compile Include="Subtitles\ISubtitleProvider.cs" />
     <Compile Include="Providers\ItemIdentifier.cs" />
@@ -320,6 +323,7 @@
     <Compile Include="Sorting\IUserBaseItemComparer.cs" />
     <Compile Include="Providers\BaseItemXmlParser.cs" />
     <Compile Include="Sorting\SortExtensions.cs" />
+    <Compile Include="Subtitles\SubtitleDownloadEventArgs.cs" />
     <Compile Include="Subtitles\SubtitleResponse.cs" />
     <Compile Include="Subtitles\SubtitleSearchRequest.cs" />
     <Compile Include="Sync\ICloudSyncProvider.cs" />
@@ -360,4 +364,4 @@ xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Notifications/INotificationsRepository.cs b/MediaBrowser.Controller/Notifications/INotificationsRepository.cs
index 87b89e79c8..254e56e059 100644
--- a/MediaBrowser.Controller/Notifications/INotificationsRepository.cs
+++ b/MediaBrowser.Controller/Notifications/INotificationsRepository.cs
@@ -16,10 +16,6 @@ namespace MediaBrowser.Controller.Notifications
         /// </summary>
         event EventHandler<NotificationUpdateEventArgs> NotificationAdded;
         /// <summary>
-        /// Occurs when [notification updated].
-        /// </summary>
-        event EventHandler<NotificationUpdateEventArgs> NotificationUpdated;
-        /// <summary>
         /// Occurs when [notifications marked read].
         /// </summary>
         event EventHandler<NotificationReadEventArgs> NotificationsMarkedRead;
@@ -37,14 +33,6 @@ namespace MediaBrowser.Controller.Notifications
         /// <returns>NotificationResult.</returns>
         NotificationResult GetNotifications(NotificationQuery query);
 
-        /// <summary>
-        /// Gets the notification.
-        /// </summary>
-        /// <param name="id">The id.</param>
-        /// <param name="userId">The user id.</param>
-        /// <returns>Notification.</returns>
-        Notification GetNotification(string id, string userId);
-
         /// <summary>
         /// Adds the notification.
         /// </summary>
diff --git a/MediaBrowser.Controller/Session/AuthenticationRequest.cs b/MediaBrowser.Controller/Session/AuthenticationRequest.cs
new file mode 100644
index 0000000000..38871e8147
--- /dev/null
+++ b/MediaBrowser.Controller/Session/AuthenticationRequest.cs
@@ -0,0 +1,14 @@
+
+namespace MediaBrowser.Controller.Session
+{
+    public class AuthenticationRequest
+    {
+        public string Username { get; set; }
+        public string Password { get; set; }
+        public string App { get; set; }
+        public string AppVersion { get; set; }
+        public string DeviceId { get; set; }
+        public string DeviceName { get; set; }
+        public string RemoteEndPoint { get; set; }
+    }
+}
diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs
index e37a139233..f715ce7703 100644
--- a/MediaBrowser.Controller/Session/ISessionManager.cs
+++ b/MediaBrowser.Controller/Session/ISessionManager.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Session;
 using MediaBrowser.Model.Users;
 using System;
@@ -46,6 +47,16 @@ namespace MediaBrowser.Controller.Session
         /// Occurs when [capabilities changed].
         /// </summary>
         event EventHandler<SessionEventArgs> CapabilitiesChanged;
+
+        /// <summary>
+        /// Occurs when [authentication failed].
+        /// </summary>
+        event EventHandler<GenericEventArgs<AuthenticationRequest>> AuthenticationFailed;
+
+        /// <summary>
+        /// Occurs when [authentication succeeded].
+        /// </summary>
+        event EventHandler<GenericEventArgs<AuthenticationRequest>> AuthenticationSucceeded;
         
         /// <summary>
         /// Gets the sessions.
@@ -211,23 +222,10 @@ namespace MediaBrowser.Controller.Session
         /// <summary>
         /// Authenticates the new session.
         /// </summary>
-        /// <param name="username">The username.</param>
-        /// <param name="password">The password.</param>
-        /// <param name="clientType">Type of the client.</param>
-        /// <param name="appVersion">The application version.</param>
-        /// <param name="deviceId">The device identifier.</param>
-        /// <param name="deviceName">Name of the device.</param>
-        /// <param name="remoteEndPoint">The remote end point.</param>
+        /// <param name="request">The request.</param>
         /// <param name="isLocal">if set to <c>true</c> [is local].</param>
         /// <returns>Task{SessionInfo}.</returns>
-        Task<AuthenticationResult> AuthenticateNewSession(string username, 
-            string password, 
-            string clientType, 
-            string appVersion, 
-            string deviceId, 
-            string deviceName, 
-            string remoteEndPoint,
-            bool isLocal);
+        Task<AuthenticationResult> AuthenticateNewSession(AuthenticationRequest request, bool isLocal);
 
         /// <summary>
         /// Reports the capabilities.
diff --git a/MediaBrowser.Controller/Subtitles/ISubtitleManager.cs b/MediaBrowser.Controller/Subtitles/ISubtitleManager.cs
index 1d66d1505b..0c814c0d4c 100644
--- a/MediaBrowser.Controller/Subtitles/ISubtitleManager.cs
+++ b/MediaBrowser.Controller/Subtitles/ISubtitleManager.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Providers;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
@@ -8,6 +9,16 @@ namespace MediaBrowser.Controller.Subtitles
 {
     public interface ISubtitleManager
     {
+        /// <summary>
+        /// Occurs when [subtitle download failure].
+        /// </summary>
+        event EventHandler<SubtitleDownloadFailureEventArgs> SubtitleDownloadFailure;
+
+        /// <summary>
+        /// Occurs when [subtitles downloaded].
+        /// </summary>
+        event EventHandler<SubtitleDownloadEventArgs> SubtitlesDownloaded;
+
         /// <summary>
         /// Adds the parts.
         /// </summary>
@@ -31,7 +42,7 @@ namespace MediaBrowser.Controller.Subtitles
         /// <param name="request">The request.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{IEnumerable{RemoteSubtitleInfo}}.</returns>
-        Task<IEnumerable<RemoteSubtitleInfo>> SearchSubtitles(SubtitleSearchRequest request, 
+        Task<IEnumerable<RemoteSubtitleInfo>> SearchSubtitles(SubtitleSearchRequest request,
             CancellationToken cancellationToken);
 
         /// <summary>
@@ -41,8 +52,8 @@ namespace MediaBrowser.Controller.Subtitles
         /// <param name="subtitleId">The subtitle identifier.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        Task DownloadSubtitles(Video video, 
-            string subtitleId, 
+        Task DownloadSubtitles(Video video,
+            string subtitleId,
             CancellationToken cancellationToken);
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Subtitles/SubtitleDownloadEventArgs.cs b/MediaBrowser.Controller/Subtitles/SubtitleDownloadEventArgs.cs
new file mode 100644
index 0000000000..1d204f2cbd
--- /dev/null
+++ b/MediaBrowser.Controller/Subtitles/SubtitleDownloadEventArgs.cs
@@ -0,0 +1,27 @@
+using System;
+using MediaBrowser.Controller.Entities;
+
+namespace MediaBrowser.Controller.Subtitles
+{
+    public class SubtitleDownloadEventArgs
+    {
+        public BaseItem Item { get; set; }
+
+        public string Format { get; set; }
+
+        public string Language { get; set; }
+
+        public bool IsForced { get; set; }
+
+        public string Provider { get; set; }
+    }
+
+    public class SubtitleDownloadFailureEventArgs
+    {
+        public BaseItem Item { get; set; }
+
+        public string Provider { get; set; }
+
+        public Exception Exception { get; set; }
+    }
+}
diff --git a/MediaBrowser.LocalMetadata/BaseXmlProvider.cs b/MediaBrowser.LocalMetadata/BaseXmlProvider.cs
index 62aec5ecbd..25778d036b 100644
--- a/MediaBrowser.LocalMetadata/BaseXmlProvider.cs
+++ b/MediaBrowser.LocalMetadata/BaseXmlProvider.cs
@@ -27,7 +27,7 @@ namespace MediaBrowser.LocalMetadata
 
             var path = file.FullName;
 
-            await XmlProviderUtils.XmlParsingResourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
+            //await XmlProviderUtils.XmlParsingResourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
 
             try
             {
@@ -46,7 +46,7 @@ namespace MediaBrowser.LocalMetadata
             }
             finally
             {
-                XmlProviderUtils.XmlParsingResourcePool.Release();
+                //XmlProviderUtils.XmlParsingResourcePool.Release();
             }
 
             return result;
diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
index ca48b88896..2a99076d42 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -83,6 +83,9 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\MediaBrowser.Model\Activity\ActivityLogEntry.cs">
+      <Link>Activity\ActivityLogEntry.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\ApiClient\ApiClientExtensions.cs">
       <Link>ApiClient\ApiClientExtensions.cs</Link>
     </Compile>
@@ -173,9 +176,6 @@
     <Compile Include="..\MediaBrowser.Model\Configuration\ServerConfiguration.cs">
       <Link>Configuration\ServerConfiguration.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Configuration\SubtitleOptions.cs">
-      <Link>Configuration\SubtitleOptions.cs</Link>
-    </Compile>
     <Compile Include="..\MediaBrowser.Model\Configuration\SubtitlePlaybackMode.cs">
       <Link>Configuration\SubtitlePlaybackMode.cs</Link>
     </Compile>
@@ -728,6 +728,9 @@
     <Compile Include="..\MediaBrowser.Model\Providers\RemoteSubtitleInfo.cs">
       <Link>Providers\RemoteSubtitleInfo.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Providers\SubtitleOptions.cs">
+      <Link>Providers\SubtitleOptions.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Querying\AllThemeMediaResult.cs">
       <Link>Querying\AllThemeMediaResult.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
index 1adf83d36a..72414d454c 100644
--- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
+++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
@@ -52,6 +52,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\mediabrowser.model\activity\ActivityLogEntry.cs">
+      <Link>Activity\ActivityLogEntry.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\ApiClient\GeneralCommandEventArgs.cs">
       <Link>ApiClient\GeneralCommandEventArgs.cs</Link>
     </Compile>
@@ -136,9 +139,6 @@
     <Compile Include="..\MediaBrowser.Model\Configuration\ServerConfiguration.cs">
       <Link>Configuration\ServerConfiguration.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Configuration\SubtitleOptions.cs">
-      <Link>Configuration\SubtitleOptions.cs</Link>
-    </Compile>
     <Compile Include="..\MediaBrowser.Model\Configuration\SubtitlePlaybackMode.cs">
       <Link>Configuration\SubtitlePlaybackMode.cs</Link>
     </Compile>
@@ -685,6 +685,9 @@
     <Compile Include="..\MediaBrowser.Model\Providers\RemoteSubtitleInfo.cs">
       <Link>Providers\RemoteSubtitleInfo.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Providers\SubtitleOptions.cs">
+      <Link>Providers\SubtitleOptions.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Querying\AllThemeMediaResult.cs">
       <Link>Querying\AllThemeMediaResult.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model/Activity/ActivityLogEntry.cs b/MediaBrowser.Model/Activity/ActivityLogEntry.cs
new file mode 100644
index 0000000000..8fad574618
--- /dev/null
+++ b/MediaBrowser.Model/Activity/ActivityLogEntry.cs
@@ -0,0 +1,62 @@
+using MediaBrowser.Model.Logging;
+using System;
+
+namespace MediaBrowser.Model.Activity
+{
+    public class ActivityLogEntry
+    {
+        /// <summary>
+        /// Gets or sets the identifier.
+        /// </summary>
+        /// <value>The identifier.</value>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the overview.
+        /// </summary>
+        /// <value>The overview.</value>
+        public string Overview { get; set; }
+
+        /// <summary>
+        /// Gets or sets the short overview.
+        /// </summary>
+        /// <value>The short overview.</value>
+        public string ShortOverview { get; set; }
+
+        /// <summary>
+        /// Gets or sets the type.
+        /// </summary>
+        /// <value>The type.</value>
+        public string Type { get; set; }
+
+        /// <summary>
+        /// Gets or sets the item identifier.
+        /// </summary>
+        /// <value>The item identifier.</value>
+        public string ItemId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the date.
+        /// </summary>
+        /// <value>The date.</value>
+        public DateTime Date { get; set; }
+
+        /// <summary>
+        /// Gets or sets the user identifier.
+        /// </summary>
+        /// <value>The user identifier.</value>
+        public string UserId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the log severity.
+        /// </summary>
+        /// <value>The log severity.</value>
+        public LogSeverity Severity { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index 363500954a..98b765e6bd 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -623,7 +623,7 @@ namespace MediaBrowser.Model.ApiClient
         Task ReportPlaybackStoppedAsync(PlaybackStopInfo info);
 
         /// <summary>
-        /// Instructs antoher client to browse to a library item.
+        /// Instructs another client to browse to a library item.
         /// </summary>
         /// <param name="sessionId">The session id.</param>
         /// <param name="itemId">The id of the item to browse to.</param>
diff --git a/MediaBrowser.Model/Channels/ChannelItemQuery.cs b/MediaBrowser.Model/Channels/ChannelItemQuery.cs
index a76c6cd2d3..4aacc16194 100644
--- a/MediaBrowser.Model/Channels/ChannelItemQuery.cs
+++ b/MediaBrowser.Model/Channels/ChannelItemQuery.cs
@@ -1,6 +1,5 @@
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Querying;
-using System.Collections.Generic;
 
 namespace MediaBrowser.Model.Channels
 {
@@ -39,13 +38,13 @@ namespace MediaBrowser.Model.Channels
         public SortOrder? SortOrder { get; set; }
         public string[] SortBy { get; set; }
         public ItemFilter[] Filters { get; set; }
-        public List<ItemFields> Fields { get; set; }
+        public ItemFields[] Fields { get; set; }
 
         public ChannelItemQuery()
         {
             Filters = new ItemFilter[] { };
             SortBy = new string[] { };
-            Fields = new List<ItemFields>();
+            Fields = new ItemFields[] { };
         }
     }
 
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 4734e2af7d..6600a3e912 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -2,6 +2,7 @@
 using MediaBrowser.Model.FileOrganization;
 using MediaBrowser.Model.LiveTv;
 using MediaBrowser.Model.Notifications;
+using MediaBrowser.Model.Providers;
 
 namespace MediaBrowser.Model.Configuration
 {
@@ -285,8 +286,6 @@ namespace MediaBrowser.Model.Configuration
 
                 new MetadataOptions(0, 1280) {ItemType = "Season"}
             };
-
-            SubtitleOptions = new SubtitleOptions();
         }
     }
 }
diff --git a/MediaBrowser.Model/Configuration/SubtitleOptions.cs b/MediaBrowser.Model/Configuration/SubtitleOptions.cs
deleted file mode 100644
index d50dba1b2e..0000000000
--- a/MediaBrowser.Model/Configuration/SubtitleOptions.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace MediaBrowser.Model.Configuration
-{
-    public class SubtitleOptions
-    {
-        public bool SkipIfGraphicalSubtitlesPresent { get; set; }
-        public bool SkipIfAudioTrackMatches { get; set; }
-        public string[] DownloadLanguages { get; set; }
-        public bool DownloadMovieSubtitles { get; set; }
-        public bool DownloadEpisodeSubtitles { get; set; }
-
-        public string OpenSubtitlesUsername { get; set; }
-        public string OpenSubtitlesPasswordHash { get; set; }
-        public bool IsOpenSubtitleVipAccount { get; set; }
-
-        public SubtitleOptions()
-        {
-            DownloadLanguages = new string[] { };
-
-            SkipIfAudioTrackMatches = true;
-        }
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Events/GenericEventArgs.cs b/MediaBrowser.Model/Events/GenericEventArgs.cs
index 5a83419e19..3c558577ad 100644
--- a/MediaBrowser.Model/Events/GenericEventArgs.cs
+++ b/MediaBrowser.Model/Events/GenericEventArgs.cs
@@ -13,5 +13,21 @@ namespace MediaBrowser.Model.Events
         /// </summary>
         /// <value>The argument.</value>
         public T Argument { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GenericEventArgs{T}"/> class.
+        /// </summary>
+        /// <param name="arg">The argument.</param>
+        public GenericEventArgs(T arg)
+        {
+            Argument = arg;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GenericEventArgs{T}"/> class.
+        /// </summary>
+        public GenericEventArgs()
+        {
+        }
     }
 }
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 042828887f..75694cb04d 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -59,6 +59,7 @@
     <Compile Include="..\SharedVersion.cs">
       <Link>Properties\SharedVersion.cs</Link>
     </Compile>
+    <Compile Include="Activity\ActivityLogEntry.cs" />
     <Compile Include="ApiClient\HttpResponseEventArgs.cs" />
     <Compile Include="ApiClient\IApiClient.cs" />
     <Compile Include="ApiClient\ApiClientExtensions.cs" />
@@ -99,7 +100,7 @@
     <Compile Include="Configuration\PathSubstitution.cs" />
     <Compile Include="Notifications\SendToUserType.cs" />
     <Compile Include="Configuration\ServerConfiguration.cs" />
-    <Compile Include="Configuration\SubtitleOptions.cs" />
+    <Compile Include="Providers\SubtitleOptions.cs" />
     <Compile Include="Configuration\UnratedItem.cs" />
     <Compile Include="Dlna\AudioOptions.cs" />
     <Compile Include="Dlna\CodecProfile.cs" />
@@ -378,4 +379,4 @@ xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\net45\" /y /d /r /i
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/MediaBrowser.Model/Providers/SubtitleOptions.cs b/MediaBrowser.Model/Providers/SubtitleOptions.cs
new file mode 100644
index 0000000000..84f01e0b7a
--- /dev/null
+++ b/MediaBrowser.Model/Providers/SubtitleOptions.cs
@@ -0,0 +1,22 @@
+namespace MediaBrowser.Model.Providers
+{
+    public class SubtitleOptions
+    {
+        public bool SkipIfGraphicalSubtitlesPresent { get; set; }
+        public bool SkipIfAudioTrackMatches { get; set; }
+        public string[] DownloadLanguages { get; set; }
+        public bool DownloadMovieSubtitles { get; set; }
+        public bool DownloadEpisodeSubtitles { get; set; }
+
+        public string OpenSubtitlesUsername { get; set; }
+        public string OpenSubtitlesPasswordHash { get; set; }
+        public bool IsOpenSubtitleVipAccount { get; set; }
+
+        public SubtitleOptions()
+        {
+            DownloadLanguages = new string[] { };
+
+            SkipIfAudioTrackMatches = true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Tasks/TaskResult.cs b/MediaBrowser.Model/Tasks/TaskResult.cs
index e73b4c9a11..956d68ae4d 100644
--- a/MediaBrowser.Model/Tasks/TaskResult.cs
+++ b/MediaBrowser.Model/Tasks/TaskResult.cs
@@ -42,5 +42,11 @@ namespace MediaBrowser.Model.Tasks
         /// </summary>
         /// <value>The error message.</value>
         public string ErrorMessage { get; set; }
+
+        /// <summary>
+        /// Gets or sets the long error message.
+        /// </summary>
+        /// <value>The long error message.</value>
+        public string LongErrorMessage { get; set; }
     }
 }
diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
index 76a1e52f5b..66188f796a 100644
--- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj
+++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
@@ -152,6 +152,7 @@
     <Compile Include="Manager\ProviderUtils.cs" />
     <Compile Include="Studios\StudiosImageProvider.cs" />
     <Compile Include="Studios\StudioMetadataService.cs" />
+    <Compile Include="Subtitles\ConfigurationExtension.cs" />
     <Compile Include="Subtitles\OpenSubtitleDownloader.cs" />
     <Compile Include="Subtitles\SubtitleManager.cs" />
     <Compile Include="TV\EpisodeMetadataService.cs" />
@@ -213,4 +214,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
index a2e1ba05a7..f48707582c 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
@@ -13,10 +13,12 @@ using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Subtitles;
+using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.MediaInfo;
+using MediaBrowser.Model.Providers;
 using MediaBrowser.Model.Serialization;
 using System;
 using System.Collections.Generic;
@@ -464,6 +466,11 @@ namespace MediaBrowser.Providers.MediaInfo
             }
         }
 
+        private SubtitleOptions GetOptions()
+        {
+            return _config.GetConfiguration<SubtitleOptions>("subtitles");
+        }
+
         /// <summary>
         /// Adds the external subtitles.
         /// </summary>
@@ -484,9 +491,11 @@ namespace MediaBrowser.Providers.MediaInfo
             var enableSubtitleDownloading = options.MetadataRefreshMode == MetadataRefreshMode.Default ||
                                             options.MetadataRefreshMode == MetadataRefreshMode.FullRefresh;
 
-            if (enableSubtitleDownloading && (_config.Configuration.SubtitleOptions.DownloadEpisodeSubtitles &&
+            var subtitleOptions = GetOptions();
+
+            if (enableSubtitleDownloading && (subtitleOptions.DownloadEpisodeSubtitles &&
                 video is Episode) ||
-                (_config.Configuration.SubtitleOptions.DownloadMovieSubtitles &&
+                (subtitleOptions.DownloadMovieSubtitles &&
                 video is Movie))
             {
                 var downloadedLanguages = await new SubtitleDownloader(_logger,
@@ -494,9 +503,9 @@ namespace MediaBrowser.Providers.MediaInfo
                     .DownloadSubtitles(video,
                     currentStreams,
                     externalSubtitleStreams,
-                    _config.Configuration.SubtitleOptions.SkipIfGraphicalSubtitlesPresent,
-                    _config.Configuration.SubtitleOptions.SkipIfAudioTrackMatches,
-                    _config.Configuration.SubtitleOptions.DownloadLanguages,
+                    subtitleOptions.SkipIfGraphicalSubtitlesPresent,
+                    subtitleOptions.SkipIfAudioTrackMatches,
+                    subtitleOptions.DownloadLanguages,
                     cancellationToken).ConfigureAwait(false);
 
                 // Rescan
diff --git a/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs b/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs
index 361cc317c2..63df3f50d5 100644
--- a/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs
+++ b/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs
@@ -1,10 +1,12 @@
-using MediaBrowser.Common.ScheduledTasks;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.ScheduledTasks;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Subtitles;
+using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
 using System;
@@ -12,6 +14,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Model.Providers;
 
 namespace MediaBrowser.Providers.MediaInfo
 {
@@ -45,8 +48,15 @@ namespace MediaBrowser.Providers.MediaInfo
             get { return "Library"; }
         }
 
+        private SubtitleOptions GetOptions()
+        {
+            return _config.GetConfiguration<SubtitleOptions>("subtitles");
+        }
+
         public async Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
         {
+            var options = GetOptions();
+
             var videos = _libraryManager.RootFolder
                 .RecursiveChildren
                 .OfType<Video>()
@@ -57,9 +67,9 @@ namespace MediaBrowser.Providers.MediaInfo
                         return false;
                     }
 
-                    return (_config.Configuration.SubtitleOptions.DownloadEpisodeSubtitles &&
+                    return (options.DownloadEpisodeSubtitles &&
                             i is Episode) ||
-                           (_config.Configuration.SubtitleOptions.DownloadMovieSubtitles &&
+                           (options.DownloadMovieSubtitles &&
                             i is Movie);
                 })
                 .ToList();
@@ -70,7 +80,7 @@ namespace MediaBrowser.Providers.MediaInfo
             {
                 try
                 {
-                    await DownloadSubtitles(video, cancellationToken).ConfigureAwait(false);
+                    await DownloadSubtitles(video, options, cancellationToken).ConfigureAwait(false);
                 }
                 catch (Exception ex)
                 {
@@ -86,11 +96,11 @@ namespace MediaBrowser.Providers.MediaInfo
             }
         }
 
-        private async Task DownloadSubtitles(Video video, CancellationToken cancellationToken)
+        private async Task DownloadSubtitles(Video video, SubtitleOptions options, CancellationToken cancellationToken)
         {
-            if ((_config.Configuration.SubtitleOptions.DownloadEpisodeSubtitles &&
+            if ((options.DownloadEpisodeSubtitles &&
                 video is Episode) ||
-                (_config.Configuration.SubtitleOptions.DownloadMovieSubtitles &&
+                (options.DownloadMovieSubtitles &&
                 video is Movie))
             {
                 var mediaStreams = video.GetMediaSources(false).First().MediaStreams;
@@ -103,9 +113,9 @@ namespace MediaBrowser.Providers.MediaInfo
                     .DownloadSubtitles(video,
                     currentStreams,
                     externalSubtitleStreams,
-                    _config.Configuration.SubtitleOptions.SkipIfGraphicalSubtitlesPresent,
-                    _config.Configuration.SubtitleOptions.SkipIfAudioTrackMatches,
-                    _config.Configuration.SubtitleOptions.DownloadLanguages,
+                    options.SkipIfGraphicalSubtitlesPresent,
+                    options.SkipIfAudioTrackMatches,
+                    options.DownloadLanguages,
                     cancellationToken).ConfigureAwait(false);
 
                 // Rescan
diff --git a/MediaBrowser.Providers/Subtitles/ConfigurationExtension.cs b/MediaBrowser.Providers/Subtitles/ConfigurationExtension.cs
new file mode 100644
index 0000000000..f520915d8b
--- /dev/null
+++ b/MediaBrowser.Providers/Subtitles/ConfigurationExtension.cs
@@ -0,0 +1,29 @@
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Model.Providers;
+using System.Collections.Generic;
+
+namespace MediaBrowser.Providers.Subtitles
+{
+    public static class ConfigurationExtension
+    {
+        public static SubtitleOptions GetSubtitleConfiguration(this IConfigurationManager manager)
+        {
+            return manager.GetConfiguration<SubtitleOptions>("subtitles");
+        }
+    }
+
+    public class SubtitleConfigurationFactory : IConfigurationFactory
+    {
+        public IEnumerable<ConfigurationStore> GetConfigurations()
+        {
+            return new List<ConfigurationStore>
+            {
+                new ConfigurationStore
+                {
+                    Key = "subtitles",
+                    ConfigurationType = typeof (SubtitleOptions)
+                }
+            };
+        }
+    }
+}
diff --git a/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs b/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs
index c25fbee6fb..722d0d3f3e 100644
--- a/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs
+++ b/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Providers;
@@ -6,7 +7,6 @@ using MediaBrowser.Controller.Security;
 using MediaBrowser.Controller.Subtitles;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Providers;
 using OpenSubtitlesHandler;
@@ -45,16 +45,21 @@ namespace MediaBrowser.Providers.Subtitles
             _config = config;
             _encryption = encryption;
 
-            _config.ConfigurationUpdating += _config_ConfigurationUpdating;
+            _config.NamedConfigurationUpdating += _config_NamedConfigurationUpdating;
 
             // Reset the count every 24 hours
             _dailyTimer = new Timer(state => _dailyDownloadCount = 0, null, TimeSpan.FromHours(24), TimeSpan.FromHours(24));
         }
 
         private const string PasswordHashPrefix = "h:";
-        void _config_ConfigurationUpdating(object sender, GenericEventArgs<ServerConfiguration> e)
+        void _config_NamedConfigurationUpdating(object sender, ConfigurationUpdateEventArgs e)
         {
-            var options = e.Argument.SubtitleOptions;
+            if (!string.Equals(e.Key, "subtitles", StringComparison.OrdinalIgnoreCase))
+            {
+                return;
+            }
+
+            var options = (SubtitleOptions)e.NewConfiguration;
 
             if (options != null &&
                 !string.IsNullOrWhiteSpace(options.OpenSubtitlesPasswordHash) &&
@@ -85,12 +90,19 @@ namespace MediaBrowser.Providers.Subtitles
             get { return "Open Subtitles"; }
         }
 
+        private SubtitleOptions GetOptions()
+        {
+            return _config.GetSubtitleConfiguration();
+        }
+
         public IEnumerable<VideoContentType> SupportedMediaTypes
         {
             get
             {
-                if (string.IsNullOrWhiteSpace(_config.Configuration.SubtitleOptions.OpenSubtitlesUsername) ||
-                    string.IsNullOrWhiteSpace(_config.Configuration.SubtitleOptions.OpenSubtitlesPasswordHash))
+                var options = GetOptions();
+
+                if (string.IsNullOrWhiteSpace(options.OpenSubtitlesUsername) ||
+                    string.IsNullOrWhiteSpace(options.OpenSubtitlesPasswordHash))
                 {
                     return new VideoContentType[] { };
                 }
@@ -101,10 +113,11 @@ namespace MediaBrowser.Providers.Subtitles
 
         public Task<SubtitleResponse> GetSubtitles(string id, CancellationToken cancellationToken)
         {
-            return GetSubtitlesInternal(id, cancellationToken);
+            return GetSubtitlesInternal(id, GetOptions(), cancellationToken);
         }
 
         private async Task<SubtitleResponse> GetSubtitlesInternal(string id,
+            SubtitleOptions options,
             CancellationToken cancellationToken)
         {
             if (string.IsNullOrWhiteSpace(id))
@@ -113,7 +126,7 @@ namespace MediaBrowser.Providers.Subtitles
             }
 
             if (_dailyDownloadCount >= MaxDownloadsPerDay &&
-                !_config.Configuration.SubtitleOptions.IsOpenSubtitleVipAccount)
+                !options.IsOpenSubtitleVipAccount)
             {
                 throw new InvalidOperationException("Open Subtitle's daily download limit has been exceeded. Please try again tomorrow.");
             }
@@ -167,7 +180,7 @@ namespace MediaBrowser.Providers.Subtitles
                 return;
             }
 
-            var options = _config.Configuration.SubtitleOptions ?? new SubtitleOptions();
+            var options = GetOptions();
 
             var user = options.OpenSubtitlesUsername ?? string.Empty;
             var password = DecryptPassword(options.OpenSubtitlesPasswordHash);
@@ -289,7 +302,7 @@ namespace MediaBrowser.Providers.Subtitles
 
         public void Dispose()
         {
-            _config.ConfigurationUpdating -= _config_ConfigurationUpdating;
+            _config.NamedConfigurationUpdating -= _config_NamedConfigurationUpdating;
 
             if (_dailyTimer != null)
             {
diff --git a/MediaBrowser.Providers/Subtitles/SubtitleManager.cs b/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
index 34656f05bc..179ab425b6 100644
--- a/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
+++ b/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Events;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
@@ -28,6 +29,9 @@ namespace MediaBrowser.Providers.Subtitles
         private readonly ILibraryManager _libraryManager;
         private readonly IItemRepository _itemRepo;
 
+        public event EventHandler<SubtitleDownloadEventArgs> SubtitlesDownloaded;
+        public event EventHandler<SubtitleDownloadFailureEventArgs> SubtitleDownloadFailure;
+
         public SubtitleManager(ILogger logger, IFileSystem fileSystem, ILibraryMonitor monitor, ILibraryManager libraryManager, IItemRepository itemRepo)
         {
             _logger = logger;
@@ -100,35 +104,63 @@ namespace MediaBrowser.Providers.Subtitles
             string subtitleId,
             CancellationToken cancellationToken)
         {
-            var response = await GetRemoteSubtitles(subtitleId, cancellationToken).ConfigureAwait(false);
+            var parts = subtitleId.Split(new[] { '_' }, 2);
+            var provider = GetProvider(parts.First());
 
-            using (var stream = response.Stream)
+            try
             {
-                var savePath = Path.Combine(Path.GetDirectoryName(video.Path),
-                    _fileSystem.GetFileNameWithoutExtension(video.Path) + "." + response.Language.ToLower());
+                var response = await GetRemoteSubtitles(subtitleId, cancellationToken).ConfigureAwait(false);
 
-                if (response.IsForced)
+                using (var stream = response.Stream)
                 {
-                    savePath += ".forced";
-                }
+                    var savePath = Path.Combine(Path.GetDirectoryName(video.Path),
+                        _fileSystem.GetFileNameWithoutExtension(video.Path) + "." + response.Language.ToLower());
 
-                savePath += "." + response.Format.ToLower();
+                    if (response.IsForced)
+                    {
+                        savePath += ".forced";
+                    }
 
-                _logger.Info("Saving subtitles to {0}", savePath);
+                    savePath += "." + response.Format.ToLower();
 
-                _monitor.ReportFileSystemChangeBeginning(savePath);
+                    _logger.Info("Saving subtitles to {0}", savePath);
 
-                try
-                {
-                    using (var fs = _fileSystem.GetFileStream(savePath, FileMode.Create, FileAccess.Write, FileShare.Read, true))
+                    _monitor.ReportFileSystemChangeBeginning(savePath);
+
+                    try
+                    {
+                        using (var fs = _fileSystem.GetFileStream(savePath, FileMode.Create, FileAccess.Write, FileShare.Read, true))
+                        {
+                            await stream.CopyToAsync(fs).ConfigureAwait(false);
+                        }
+
+                        EventHelper.FireEventIfNotNull(SubtitlesDownloaded, this, new SubtitleDownloadEventArgs
+                        {
+                            Item = video,
+                            Format = response.Format,
+                            Language = response.Language,
+                            IsForced = response.IsForced,
+                            Provider = provider.Name
+
+                        }, _logger);
+                    }
+                    finally
                     {
-                        await stream.CopyToAsync(fs).ConfigureAwait(false);
+                        _monitor.ReportFileSystemChangeComplete(savePath, false);
                     }
                 }
-                finally
+            }
+            catch (Exception ex)
+            {
+                EventHelper.FireEventIfNotNull(SubtitleDownloadFailure, this, new SubtitleDownloadFailureEventArgs
                 {
-                    _monitor.ReportFileSystemChangeComplete(savePath, false);
-                }
+                    Item = video,
+                    Exception = ex,
+                    Provider = provider.Name
+
+                }, _logger);
+                
+                throw;
             }
         }
 
@@ -267,5 +299,6 @@ namespace MediaBrowser.Providers.Subtitles
                 Id = GetProviderId(i.Name)
             });
         }
+
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Activity/ActivityManager.cs b/MediaBrowser.Server.Implementations/Activity/ActivityManager.cs
new file mode 100644
index 0000000000..46eaa7f21d
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Activity/ActivityManager.cs
@@ -0,0 +1,40 @@
+using MediaBrowser.Common.Events;
+using MediaBrowser.Controller.Activity;
+using MediaBrowser.Model.Activity;
+using MediaBrowser.Model.Events;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Querying;
+using System;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Server.Implementations.Activity
+{
+    public class ActivityManager : IActivityManager
+    {
+        public event EventHandler<GenericEventArgs<ActivityLogEntry>> EntryCreated;
+        
+        private readonly IActivityRepository _repo;
+        private readonly ILogger _logger;
+
+        public ActivityManager(ILogger logger, IActivityRepository repo)
+        {
+            _logger = logger;
+            _repo = repo;
+        }
+
+        public async Task Create(ActivityLogEntry entry)
+        {
+            entry.Id = Guid.NewGuid().ToString("N");
+            entry.Date = DateTime.UtcNow;
+
+            await _repo.Create(entry).ConfigureAwait(false);
+
+            EventHelper.FireEventIfNotNull(EntryCreated, this, new GenericEventArgs<ActivityLogEntry>(entry), _logger);
+        }
+
+        public QueryResult<ActivityLogEntry> GetActivityLogEntries(int? startIndex, int? limit)
+        {
+            return _repo.GetActivityLogEntries(startIndex, limit);
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/Activity/ActivityRepository.cs b/MediaBrowser.Server.Implementations/Activity/ActivityRepository.cs
new file mode 100644
index 0000000000..787cbcc5b8
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Activity/ActivityRepository.cs
@@ -0,0 +1,293 @@
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Activity;
+using MediaBrowser.Model.Activity;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Querying;
+using MediaBrowser.Server.Implementations.Persistence;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Globalization;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Server.Implementations.Activity
+{
+    public class ActivityRepository : IActivityRepository, IDisposable
+    {
+        private IDbConnection _connection;
+        private readonly ILogger _logger;
+        private readonly SemaphoreSlim _writeLock = new SemaphoreSlim(1, 1);
+        private readonly IServerApplicationPaths _appPaths;
+        private readonly CultureInfo _usCulture = new CultureInfo("en-US");
+
+        private IDbCommand _saveActivityCommand;
+
+        public ActivityRepository(ILogger logger, IServerApplicationPaths appPaths)
+        {
+            _logger = logger;
+            _appPaths = appPaths;
+        }
+
+        public async Task Initialize()
+        {
+            var dbFile = Path.Combine(_appPaths.DataPath, "activitylog.db");
+
+            _connection = await SqliteExtensions.ConnectToDb(dbFile, _logger).ConfigureAwait(false);
+
+            string[] queries = {
+
+                                "create table if not exists ActivityLogEntries (Id GUID PRIMARY KEY, Name TEXT, Overview TEXT, ShortOverview TEXT, Type TEXT, ItemId TEXT, UserId TEXT, DateCreated DATETIME, LogSeverity TEXT)",
+                                "create index if not exists idx_ActivityLogEntries on ActivityLogEntries(Id)",
+
+                                //pragmas
+                                "pragma temp_store = memory",
+
+                                "pragma shrink_memory"
+                               };
+
+            _connection.RunQueries(queries, _logger);
+
+            PrepareStatements();
+        }
+
+        private void PrepareStatements()
+        {
+            _saveActivityCommand = _connection.CreateCommand();
+            _saveActivityCommand.CommandText = "replace into ActivityLogEntries (Id, Name, Overview, ShortOverview, Type, ItemId, UserId, DateCreated, LogSeverity) values (@Id, @Name, @Overview, @ShortOverview, @Type, @ItemId, @UserId, @DateCreated, @LogSeverity)";
+
+            _saveActivityCommand.Parameters.Add(_saveActivityCommand, "@Id");
+            _saveActivityCommand.Parameters.Add(_saveActivityCommand, "@Name");
+            _saveActivityCommand.Parameters.Add(_saveActivityCommand, "@Overview");
+            _saveActivityCommand.Parameters.Add(_saveActivityCommand, "@ShortOverview");
+            _saveActivityCommand.Parameters.Add(_saveActivityCommand, "@Type");
+            _saveActivityCommand.Parameters.Add(_saveActivityCommand, "@ItemId");
+            _saveActivityCommand.Parameters.Add(_saveActivityCommand, "@UserId");
+            _saveActivityCommand.Parameters.Add(_saveActivityCommand, "@DateCreated");
+            _saveActivityCommand.Parameters.Add(_saveActivityCommand, "@LogSeverity");
+        }
+
+        private const string BaseActivitySelectText = "select Id, Name, Overview, ShortOverview, Type, ItemId, UserId, DateCreated, LogSeverity from ActivityLogEntries";
+
+        public Task Create(ActivityLogEntry entry)
+        {
+            return Update(entry);
+        }
+
+        public async Task Update(ActivityLogEntry entry)
+        {
+            if (entry == null)
+            {
+                throw new ArgumentNullException("entry");
+            }
+
+            await _writeLock.WaitAsync().ConfigureAwait(false);
+
+            IDbTransaction transaction = null;
+
+            try
+            {
+                transaction = _connection.BeginTransaction();
+
+                var index = 0;
+
+                _saveActivityCommand.GetParameter(index++).Value = new Guid(entry.Id);
+                _saveActivityCommand.GetParameter(index++).Value = entry.Name;
+                _saveActivityCommand.GetParameter(index++).Value = entry.Overview;
+                _saveActivityCommand.GetParameter(index++).Value = entry.ShortOverview;
+                _saveActivityCommand.GetParameter(index++).Value = entry.Type;
+                _saveActivityCommand.GetParameter(index++).Value = entry.ItemId;
+                _saveActivityCommand.GetParameter(index++).Value = entry.UserId;
+                _saveActivityCommand.GetParameter(index++).Value = entry.Date;
+                _saveActivityCommand.GetParameter(index++).Value = entry.Severity.ToString();
+
+                _saveActivityCommand.Transaction = transaction;
+
+                _saveActivityCommand.ExecuteNonQuery();
+
+                transaction.Commit();
+            }
+            catch (OperationCanceledException)
+            {
+                if (transaction != null)
+                {
+                    transaction.Rollback();
+                }
+
+                throw;
+            }
+            catch (Exception e)
+            {
+                _logger.ErrorException("Failed to save record:", e);
+
+                if (transaction != null)
+                {
+                    transaction.Rollback();
+                }
+
+                throw;
+            }
+            finally
+            {
+                if (transaction != null)
+                {
+                    transaction.Dispose();
+                }
+
+                _writeLock.Release();
+            }
+        }
+
+        public QueryResult<ActivityLogEntry> GetActivityLogEntries(int? startIndex, int? limit)
+        {
+            using (var cmd = _connection.CreateCommand())
+            {
+                cmd.CommandText = BaseActivitySelectText;
+
+                var whereClauses = new List<string>();
+
+                if (startIndex.HasValue && startIndex.Value > 0)
+                {
+                    whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM ActivityLogEntries ORDER BY DateCreated DESC LIMIT {0})",
+                        startIndex.Value.ToString(_usCulture)));
+                }
+
+                if (whereClauses.Count > 0)
+                {
+                    cmd.CommandText += " where " + string.Join(" AND ", whereClauses.ToArray());
+                }
+
+                cmd.CommandText += " ORDER BY DateCreated DESC";
+
+                if (limit.HasValue)
+                {
+                    cmd.CommandText += " LIMIT " + limit.Value.ToString(_usCulture);
+                }
+
+                cmd.CommandText += "; select count (Id) from ActivityLogEntries";
+
+                var list = new List<ActivityLogEntry>();
+                var count = 0;
+
+                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess))
+                {
+                    while (reader.Read())
+                    {
+                        list.Add(GetEntry(reader));
+                    }
+
+                    if (reader.NextResult() && reader.Read())
+                    {
+                        count = reader.GetInt32(0);
+                    }
+                }
+
+                return new QueryResult<ActivityLogEntry>()
+                {
+                    Items = list.ToArray(),
+                    TotalRecordCount = count
+                };
+            }
+        }
+
+        private ActivityLogEntry GetEntry(IDataReader reader)
+        {
+            var index = 0;
+
+            var info = new ActivityLogEntry
+            {
+                Id = reader.GetGuid(index).ToString("N")
+            };
+
+            index++;
+            if (!reader.IsDBNull(index))
+            {
+                info.Name = reader.GetString(index);
+            }
+
+            index++;
+            if (!reader.IsDBNull(index))
+            {
+                info.Overview = reader.GetString(index);
+            }
+
+            index++;
+            if (!reader.IsDBNull(index))
+            {
+                info.ShortOverview = reader.GetString(index);
+            }
+
+            index++;
+            if (!reader.IsDBNull(index))
+            {
+                info.Type = reader.GetString(index);
+            }
+
+            index++;
+            if (!reader.IsDBNull(index))
+            {
+                info.ItemId = reader.GetString(index);
+            }
+
+            index++;
+            if (!reader.IsDBNull(index))
+            {
+                info.UserId = reader.GetString(index);
+            }
+
+            index++;
+            info.Date = reader.GetDateTime(index).ToUniversalTime();
+
+            index++;
+            if (!reader.IsDBNull(index))
+            {
+                info.Severity = (LogSeverity)Enum.Parse(typeof(LogSeverity), reader.GetString(index), true);
+            }
+
+            return info;
+        }
+
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private readonly object _disposeLock = new object();
+
+        /// <summary>
+        /// Releases unmanaged and - optionally - managed resources.
+        /// </summary>
+        /// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        protected virtual void Dispose(bool dispose)
+        {
+            if (dispose)
+            {
+                try
+                {
+                    lock (_disposeLock)
+                    {
+                        if (_connection != null)
+                        {
+                            if (_connection.IsOpen())
+                            {
+                                _connection.Close();
+                            }
+
+                            _connection.Dispose();
+                            _connection = null;
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.ErrorException("Error disposing database", ex);
+                }
+            }
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/ActivityLogEntryPoint.cs b/MediaBrowser.Server.Implementations/EntryPoints/ActivityLogEntryPoint.cs
new file mode 100644
index 0000000000..7af2a1c843
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/EntryPoints/ActivityLogEntryPoint.cs
@@ -0,0 +1,543 @@
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Implementations.Logging;
+using MediaBrowser.Common.Plugins;
+using MediaBrowser.Common.ScheduledTasks;
+using MediaBrowser.Common.Updates;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Activity;
+using MediaBrowser.Controller.Channels;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Controller.Localization;
+using MediaBrowser.Controller.Plugins;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Controller.Subtitles;
+using MediaBrowser.Model.Activity;
+using MediaBrowser.Model.Events;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Tasks;
+using MediaBrowser.Model.Updates;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace MediaBrowser.Server.Implementations.EntryPoints
+{
+    public class ActivityLogEntryPoint : IServerEntryPoint
+    {
+        private readonly IInstallationManager _installationManager;
+
+        //private readonly ILogManager _logManager;
+        private readonly ILogger _logger;
+        private readonly ISessionManager _sessionManager;
+        private readonly ITaskManager _taskManager;
+        private readonly IActivityManager _activityManager;
+        private readonly ILocalizationManager _localization;
+
+        private readonly ILibraryManager _libraryManager;
+        private readonly ISubtitleManager _subManager;
+        private readonly IUserManager _userManager;
+        private readonly IServerConfigurationManager _config;
+        private readonly IServerApplicationHost _appHost;
+
+        public ActivityLogEntryPoint(ISessionManager sessionManager, ITaskManager taskManager, IActivityManager activityManager, ILocalizationManager localization, IInstallationManager installationManager, ILibraryManager libraryManager, ISubtitleManager subManager, IUserManager userManager, IServerConfigurationManager config, IServerApplicationHost appHost)
+        {
+            //_logger = _logManager.GetLogger("ActivityLogEntryPoint");
+            _sessionManager = sessionManager;
+            _taskManager = taskManager;
+            _activityManager = activityManager;
+            _localization = localization;
+            _installationManager = installationManager;
+            _libraryManager = libraryManager;
+            _subManager = subManager;
+            _userManager = userManager;
+            _config = config;
+            //_logManager = logManager;
+            _appHost = appHost;
+        }
+
+        public void Run()
+        {
+            _taskManager.TaskExecuting += _taskManager_TaskExecuting;
+            _taskManager.TaskCompleted += _taskManager_TaskCompleted;
+
+            _installationManager.PluginInstalled += _installationManager_PluginInstalled;
+            _installationManager.PluginUninstalled += _installationManager_PluginUninstalled;
+            _installationManager.PluginUpdated += _installationManager_PluginUpdated;
+
+            _libraryManager.ItemAdded += _libraryManager_ItemAdded;
+            _libraryManager.ItemRemoved += _libraryManager_ItemRemoved;
+
+            _sessionManager.SessionStarted += _sessionManager_SessionStarted;
+            _sessionManager.AuthenticationFailed += _sessionManager_AuthenticationFailed;
+            _sessionManager.AuthenticationSucceeded += _sessionManager_AuthenticationSucceeded;
+            _sessionManager.SessionEnded += _sessionManager_SessionEnded;
+
+            _sessionManager.PlaybackStart += _sessionManager_PlaybackStart;
+            _sessionManager.PlaybackStopped += _sessionManager_PlaybackStopped;
+
+            _subManager.SubtitlesDownloaded += _subManager_SubtitlesDownloaded;
+            _subManager.SubtitleDownloadFailure += _subManager_SubtitleDownloadFailure;
+
+            _userManager.UserCreated += _userManager_UserCreated;
+            _userManager.UserPasswordChanged += _userManager_UserPasswordChanged;
+            _userManager.UserDeleted += _userManager_UserDeleted;
+            _userManager.UserConfigurationUpdated += _userManager_UserConfigurationUpdated;
+
+            _config.ConfigurationUpdated += _config_ConfigurationUpdated;
+            _config.NamedConfigurationUpdated += _config_NamedConfigurationUpdated;
+
+            //_logManager.LoggerLoaded += _logManager_LoggerLoaded;
+
+            _appHost.ApplicationUpdated += _appHost_ApplicationUpdated;
+        }
+
+        void _subManager_SubtitleDownloadFailure(object sender, SubtitleDownloadFailureEventArgs e)
+        {
+            CreateLogEntry(new ActivityLogEntry
+            {
+                Name = string.Format(_localization.GetLocalizedString("SubtitleDownloadFailureForItem"), Notifications.Notifications.GetItemName(e.Item)),
+                Type = "SubtitleDownloadFailure",
+                ItemId = e.Item.Id.ToString("N"),
+                ShortOverview = string.Format(_localization.GetLocalizedString("ProviderValue"), e.Provider),
+                Overview = LogHelper.GetLogMessage(e.Exception).ToString()
+            });
+        }
+
+        void _sessionManager_PlaybackStopped(object sender, PlaybackStopEventArgs e)
+        {
+            var item = e.MediaInfo;
+
+            if (item == null)
+            {
+                //_logger.Warn("PlaybackStopped reported with null media info.");
+                return;
+            }
+
+            if (e.Users.Count == 0)
+            {
+                return;
+            }
+
+            var username = e.Users.First().Name;
+
+            CreateLogEntry(new ActivityLogEntry
+            {
+                Name = string.Format(_localization.GetLocalizedString("UserStoppedPlayingItemWithValues"), username, item.Name),
+                Type = "PlaybackStopped",
+                ShortOverview = string.Format(_localization.GetLocalizedString("AppDeviceValues"), e.ClientName, e.DeviceName)
+            });
+        }
+
+        void _sessionManager_PlaybackStart(object sender, PlaybackProgressEventArgs e)
+        {
+            var item = e.MediaInfo;
+
+            if (item == null)
+            {
+                //_logger.Warn("PlaybackStart reported with null media info.");
+                return;
+            }
+
+            if (e.Users.Count == 0)
+            {
+                return;
+            }
+
+            var username = e.Users.First().Name;
+
+            CreateLogEntry(new ActivityLogEntry
+            {
+                Name = string.Format(_localization.GetLocalizedString("UserStartedPlayingItemWithValues"), username, item.Name),
+                Type = "PlaybackStart",
+                ShortOverview = string.Format(_localization.GetLocalizedString("AppDeviceValues"), e.ClientName, e.DeviceName)
+            });
+        }
+
+        void _sessionManager_SessionEnded(object sender, SessionEventArgs e)
+        {
+            string name;
+            var session = e.SessionInfo;
+
+            if (string.IsNullOrWhiteSpace(session.UserName))
+            {
+                name = string.Format(_localization.GetLocalizedString("DeviceOfflineWithName"), session.DeviceName);
+            }
+            else
+            {
+                name = string.Format(_localization.GetLocalizedString("UserOfflineFromDevice"), session.UserName, session.DeviceName);
+            }
+
+            CreateLogEntry(new ActivityLogEntry
+            {
+                Name = name,
+                Type = "SessionEnded",
+                ShortOverview = string.Format(_localization.GetLocalizedString("LabelIpAddressValue"), session.RemoteEndPoint)
+            });
+        }
+
+        void _sessionManager_AuthenticationSucceeded(object sender, GenericEventArgs<AuthenticationRequest> e)
+        {
+            CreateLogEntry(new ActivityLogEntry
+            {
+                Name = string.Format(_localization.GetLocalizedString("AuthenticationSucceededWithUserName"), e.Argument.Username),
+                Type = "AuthenticationSucceeded"
+            });
+        }
+
+        void _sessionManager_AuthenticationFailed(object sender, GenericEventArgs<AuthenticationRequest> e)
+        {
+            CreateLogEntry(new ActivityLogEntry
+            {
+                Name = string.Format(_localization.GetLocalizedString("FailedLoginAttemptWithUserName"), e.Argument.Username),
+                Type = "AuthenticationFailed"
+            });
+        }
+
+        void _appHost_ApplicationUpdated(object sender, GenericEventArgs<PackageVersionInfo> e)
+        {
+            CreateLogEntry(new ActivityLogEntry
+            {
+                Name = _localization.GetLocalizedString("MessageApplicationUpdated"),
+                Type = "ApplicationUpdated",
+                ShortOverview = string.Format(_localization.GetLocalizedString("VersionNumber"), e.Argument.versionStr),
+                Overview = e.Argument.description
+            });
+        }
+
+        void _logManager_LoggerLoaded(object sender, EventArgs e)
+        {
+        }
+
+        void _config_NamedConfigurationUpdated(object sender, ConfigurationUpdateEventArgs e)
+        {
+            CreateLogEntry(new ActivityLogEntry
+            {
+                Name = string.Format(_localization.GetLocalizedString("MessageNamedServerConfigurationUpdatedWithValue"), e.Key),
+                Type = "NamedConfigurationUpdated"
+            });
+        }
+
+        void _config_ConfigurationUpdated(object sender, EventArgs e)
+        {
+            CreateLogEntry(new ActivityLogEntry
+            {
+                Name = _localization.GetLocalizedString("MessageServerConfigurationUpdated"),
+                Type = "ServerConfigurationUpdated"
+            });
+        }
+
+        void _userManager_UserConfigurationUpdated(object sender, GenericEventArgs<User> e)
+        {
+            CreateLogEntry(new ActivityLogEntry
+            {
+                Name = string.Format(_localization.GetLocalizedString("UserConfigurationUpdatedWithName"), e.Argument.Name),
+                Type = "UserConfigurationUpdated"
+            });
+        }
+
+        void _userManager_UserDeleted(object sender, GenericEventArgs<User> e)
+        {
+            CreateLogEntry(new ActivityLogEntry
+            {
+                Name = string.Format(_localization.GetLocalizedString("UserDeletedWithName"), e.Argument.Name),
+                Type = "UserDeleted"
+            });
+        }
+
+        void _userManager_UserPasswordChanged(object sender, GenericEventArgs<User> e)
+        {
+            CreateLogEntry(new ActivityLogEntry
+            {
+                Name = string.Format(_localization.GetLocalizedString("UserPasswordChangedWithName"), e.Argument.Name),
+                Type = "UserPasswordChanged"
+            });
+        }
+
+        void _userManager_UserCreated(object sender, GenericEventArgs<User> e)
+        {
+            CreateLogEntry(new ActivityLogEntry
+            {
+                Name = string.Format(_localization.GetLocalizedString("UserCreatedWithName"), e.Argument.Name),
+                Type = "UserCreated"
+            });
+        }
+
+        void _subManager_SubtitlesDownloaded(object sender, SubtitleDownloadEventArgs e)
+        {
+            CreateLogEntry(new ActivityLogEntry
+            {
+                Name = string.Format(_localization.GetLocalizedString("SubtitlesDownloadedForItem"), Notifications.Notifications.GetItemName(e.Item)),
+                Type = "SubtitlesDownloaded",
+                ItemId = e.Item.Id.ToString("N"),
+                ShortOverview = string.Format(_localization.GetLocalizedString("ProviderValue"), e.Provider)
+            });
+        }
+
+        void _sessionManager_SessionStarted(object sender, SessionEventArgs e)
+        {
+            string name;
+            var session = e.SessionInfo;
+
+            if (string.IsNullOrWhiteSpace(session.UserName))
+            {
+                name = string.Format(_localization.GetLocalizedString("DeviceOnlineWithName"), session.DeviceName);
+            }
+            else
+            {
+                name = string.Format(_localization.GetLocalizedString("UserOnlineFromDevice"), session.UserName, session.DeviceName);
+            }
+
+            CreateLogEntry(new ActivityLogEntry
+            {
+                Name = name,
+                Type = "SessionStarted",
+                ShortOverview = string.Format(_localization.GetLocalizedString("LabelIpAddressValue"), session.RemoteEndPoint)
+            });
+        }
+
+        void _libraryManager_ItemRemoved(object sender, ItemChangeEventArgs e)
+        {
+            if (e.Item is LiveTvProgram || e.Item is IChannelItem)
+            {
+                return;
+            }
+
+            CreateLogEntry(new ActivityLogEntry
+            {
+                Name = string.Format(_localization.GetLocalizedString("ItemRemovedWithName"), Notifications.Notifications.GetItemName(e.Item)),
+                Type = "ItemRemoved"
+            });
+        }
+
+        void _libraryManager_ItemAdded(object sender, ItemChangeEventArgs e)
+        {
+            if (e.Item is LiveTvProgram || e.Item is IChannelItem)
+            {
+                return;
+            }
+
+            CreateLogEntry(new ActivityLogEntry
+            {
+                Name = string.Format(_localization.GetLocalizedString("ItemAddedWithName"), Notifications.Notifications.GetItemName(e.Item)),
+                Type = "ItemAdded",
+                ItemId = e.Item.Id.ToString("N")
+            });
+        }
+
+        void _installationManager_PluginUpdated(object sender, GenericEventArgs<Tuple<IPlugin, PackageVersionInfo>> e)
+        {
+            CreateLogEntry(new ActivityLogEntry
+            {
+                Name = string.Format(_localization.GetLocalizedString("PluginUpdatedWithName"), e.Argument.Item1.Name),
+                Type = "PluginUpdated",
+                ShortOverview = string.Format(_localization.GetLocalizedString("VersionNumber"), e.Argument.Item2.versionStr),
+                Overview = e.Argument.Item2.description
+            });
+        }
+
+        void _installationManager_PluginUninstalled(object sender, GenericEventArgs<IPlugin> e)
+        {
+            CreateLogEntry(new ActivityLogEntry
+            {
+                Name = string.Format(_localization.GetLocalizedString("PluginUninstalledWithName"), e.Argument.Name),
+                Type = "PluginUninstalled"
+            });
+        }
+
+        void _installationManager_PluginInstalled(object sender, GenericEventArgs<PackageVersionInfo> e)
+        {
+            CreateLogEntry(new ActivityLogEntry
+            {
+                Name = string.Format(_localization.GetLocalizedString("PluginInstalledWithName"), e.Argument.name),
+                Type = "PluginInstalled",
+                ShortOverview = string.Format(_localization.GetLocalizedString("VersionNumber"), e.Argument.versionStr)
+            });
+        }
+
+        void _taskManager_TaskExecuting(object sender, GenericEventArgs<IScheduledTaskWorker> e)
+        {
+            var task = e.Argument;
+
+            var activityTask = task.ScheduledTask as IScheduledTaskActivityLog;
+            if (activityTask != null && !activityTask.IsActivityLogged)
+            {
+                return;
+            }
+
+            CreateLogEntry(new ActivityLogEntry
+            {
+                Name = string.Format(_localization.GetLocalizedString("ScheduledTaskStartedWithName"), task.Name),
+                Type = "ScheduledTaskStarted"
+            });
+        }
+
+        void _taskManager_TaskCompleted(object sender, TaskCompletionEventArgs e)
+        {
+            var result = e.Result;
+            var task = e.Task;
+
+            var activityTask = task.ScheduledTask as IScheduledTaskActivityLog;
+            if (activityTask != null && !activityTask.IsActivityLogged)
+            {
+                return;
+            }
+            
+            var time = result.EndTimeUtc - result.StartTimeUtc;
+            var runningTime = string.Format(_localization.GetLocalizedString("LabelRunningTimeValue"), ToUserFriendlyString(time));
+
+            if (result.Status == TaskCompletionStatus.Cancelled)
+            {
+                CreateLogEntry(new ActivityLogEntry
+                {
+                    Name = string.Format(_localization.GetLocalizedString("ScheduledTaskCancelledWithName"), task.Name),
+                    Type = "ScheduledTaskCancelled",
+                    ShortOverview = runningTime
+                });
+            }
+            else if (result.Status == TaskCompletionStatus.Completed)
+            {
+                CreateLogEntry(new ActivityLogEntry
+                {
+                    Name = string.Format(_localization.GetLocalizedString("ScheduledTaskCompletedWithName"), task.Name),
+                    Type = "ScheduledTaskCompleted",
+                    ShortOverview = runningTime
+                });
+            }
+            else if (result.Status == TaskCompletionStatus.Failed)
+            {
+                var vals = new List<string>();
+
+                if (!string.IsNullOrWhiteSpace(e.Result.ErrorMessage))
+                {
+                    vals.Add(e.Result.ErrorMessage);
+                }
+                if (!string.IsNullOrWhiteSpace(e.Result.LongErrorMessage))
+                {
+                    vals.Add(e.Result.LongErrorMessage);
+                }
+
+                CreateLogEntry(new ActivityLogEntry
+                {
+                    Name = string.Format(_localization.GetLocalizedString("ScheduledTaskFailedWithName"), task.Name),
+                    Type = "ScheduledTaskFailed",
+                    Overview = string.Join(Environment.NewLine, vals.ToArray()),
+                    ShortOverview = runningTime
+                });
+            }
+        }
+
+        private async void CreateLogEntry(ActivityLogEntry entry)
+        {
+            try
+            {
+                await _activityManager.Create(entry).ConfigureAwait(false);
+            }
+            catch
+            {
+                // Logged at lower levels
+            }
+        }
+
+        public void Dispose()
+        {
+            _taskManager.TaskExecuting -= _taskManager_TaskExecuting;
+            _taskManager.TaskCompleted -= _taskManager_TaskCompleted;
+
+            _installationManager.PluginInstalled -= _installationManager_PluginInstalled;
+            _installationManager.PluginUninstalled -= _installationManager_PluginUninstalled;
+            _installationManager.PluginUpdated -= _installationManager_PluginUpdated;
+
+            _libraryManager.ItemAdded -= _libraryManager_ItemAdded;
+            _libraryManager.ItemRemoved -= _libraryManager_ItemRemoved;
+
+            _sessionManager.SessionStarted -= _sessionManager_SessionStarted;
+            _sessionManager.AuthenticationFailed -= _sessionManager_AuthenticationFailed;
+            _sessionManager.AuthenticationSucceeded -= _sessionManager_AuthenticationSucceeded;
+            _sessionManager.SessionEnded -= _sessionManager_SessionEnded;
+
+            _sessionManager.PlaybackStart -= _sessionManager_PlaybackStart;
+            _sessionManager.PlaybackStopped -= _sessionManager_PlaybackStopped;
+
+            _subManager.SubtitlesDownloaded -= _subManager_SubtitlesDownloaded;
+            _subManager.SubtitleDownloadFailure -= _subManager_SubtitleDownloadFailure;
+
+            _userManager.UserCreated -= _userManager_UserCreated;
+            _userManager.UserPasswordChanged -= _userManager_UserPasswordChanged;
+            _userManager.UserDeleted -= _userManager_UserDeleted;
+            _userManager.UserConfigurationUpdated -= _userManager_UserConfigurationUpdated;
+
+            _config.ConfigurationUpdated -= _config_ConfigurationUpdated;
+            _config.NamedConfigurationUpdated -= _config_NamedConfigurationUpdated;
+
+            //_logManager.LoggerLoaded -= _logManager_LoggerLoaded;
+
+            _appHost.ApplicationUpdated -= _appHost_ApplicationUpdated;
+        }
+
+        /// <summary>
+        /// Constructs a user-friendly string for this TimeSpan instance.
+        /// </summary>
+        public static string ToUserFriendlyString(TimeSpan span)
+        {
+            const int DaysInYear = 365;
+            const int DaysInMonth = 30;
+
+            // Get each non-zero value from TimeSpan component
+            List<string> values = new List<string>();
+
+            // Number of years
+            int days = span.Days;
+            if (days >= DaysInYear)
+            {
+                int years = (days / DaysInYear);
+                values.Add(CreateValueString(years, "year"));
+                days = (days % DaysInYear);
+            }
+            // Number of months
+            if (days >= DaysInMonth)
+            {
+                int months = (days / DaysInMonth);
+                values.Add(CreateValueString(months, "month"));
+                days = (days % DaysInMonth);
+            }
+            // Number of days
+            if (days >= 1)
+                values.Add(CreateValueString(days, "day"));
+            // Number of hours
+            if (span.Hours >= 1)
+                values.Add(CreateValueString(span.Hours, "hour"));
+            // Number of minutes
+            if (span.Minutes >= 1)
+                values.Add(CreateValueString(span.Minutes, "minute"));
+            // Number of seconds (include when 0 if no other components included)
+            if (span.Seconds >= 1 || values.Count == 0)
+                values.Add(CreateValueString(span.Seconds, "second"));
+
+            // Combine values into string
+            StringBuilder builder = new StringBuilder();
+            for (int i = 0; i < values.Count; i++)
+            {
+                if (builder.Length > 0)
+                    builder.Append((i == (values.Count - 1)) ? " and " : ", ");
+                builder.Append(values[i]);
+            }
+            // Return result
+            return builder.ToString();
+        }
+
+        /// <summary>
+        /// Constructs a string description of a time-span value.
+        /// </summary>
+        /// <param name="value">The value of this item</param>
+        /// <param name="description">The name of this item (singular form)</param>
+        private static string CreateValueString(int value, string description)
+        {
+            return String.Format("{0:#,##0} {1}",
+                value, (value == 1) ? description : String.Format("{0}s", description));
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
index b10b64c3eb..6a0bb780c4 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
@@ -2,14 +2,12 @@
 using MediaBrowser.Common.ScheduledTasks;
 using MediaBrowser.Common.Updates;
 using MediaBrowser.Controller;
-using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Notifications;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Controller.Session;
-using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Logging;
@@ -37,7 +35,6 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
         private readonly ITaskManager _taskManager;
         private readonly INotificationManager _notificationManager;
 
-        private readonly IServerConfigurationManager _config;
         private readonly ILibraryManager _libraryManager;
         private readonly ISessionManager _sessionManager;
         private readonly IServerApplicationHost _appHost;
@@ -45,14 +42,13 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
         private Timer LibraryUpdateTimer { get; set; }
         private readonly object _libraryChangedSyncLock = new object();
 
-        public Notifications(IInstallationManager installationManager, IUserManager userManager, ILogger logger, ITaskManager taskManager, INotificationManager notificationManager, IServerConfigurationManager config, ILibraryManager libraryManager, ISessionManager sessionManager, IServerApplicationHost appHost)
+        public Notifications(IInstallationManager installationManager, IUserManager userManager, ILogger logger, ITaskManager taskManager, INotificationManager notificationManager, ILibraryManager libraryManager, ISessionManager sessionManager, IServerApplicationHost appHost)
         {
             _installationManager = installationManager;
             _userManager = userManager;
             _logger = logger;
             _taskManager = taskManager;
             _notificationManager = notificationManager;
-            _config = config;
             _libraryManager = libraryManager;
             _sessionManager = sessionManager;
             _appHost = appHost;
@@ -317,7 +313,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
             }
         }
 
-        private string GetItemName(BaseItem item)
+        public static string GetItemName(BaseItem item)
         {
             var name = item.Name;
 
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/WebSocketNotifier.cs b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/WebSocketNotifier.cs
index 42aadf62e5..5f1db03c6b 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/WebSocketNotifier.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/WebSocketNotifier.cs
@@ -23,7 +23,6 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
         public void Run()
         {
             _notificationsRepo.NotificationAdded += _notificationsRepo_NotificationAdded;
-            _notificationsRepo.NotificationUpdated += _notificationsRepo_NotificationUpdated;
 
             _notificationsRepo.NotificationsMarkedRead += _notificationsRepo_NotificationsMarkedRead;
         }
@@ -40,13 +39,6 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
             _serverManager.SendWebSocketMessage("NotificationsMarkedRead", msg);
         }
 
-        void _notificationsRepo_NotificationUpdated(object sender, NotificationUpdateEventArgs e)
-        {
-            var msg = e.Notification.UserId + "|" + e.Notification.Id;
-
-            _serverManager.SendWebSocketMessage("NotificationUpdated", msg);
-        }
-
         void _notificationsRepo_NotificationAdded(object sender, NotificationUpdateEventArgs e)
         {
             var msg = e.Notification.UserId + "|" + e.Notification.Id;
@@ -57,7 +49,6 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
         public void Dispose()
         {
             _notificationsRepo.NotificationAdded -= _notificationsRepo_NotificationAdded;
-            _notificationsRepo.NotificationUpdated -= _notificationsRepo_NotificationUpdated;
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/ServerEventNotifier.cs b/MediaBrowser.Server.Implementations/EntryPoints/ServerEventNotifier.cs
index 305f2800f7..b969d551ad 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/ServerEventNotifier.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/ServerEventNotifier.cs
@@ -3,11 +3,13 @@ using MediaBrowser.Common.Plugins;
 using MediaBrowser.Common.ScheduledTasks;
 using MediaBrowser.Common.Updates;
 using MediaBrowser.Controller;
+using MediaBrowser.Controller.Activity;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Activity;
 using MediaBrowser.Model.Events;
 using System;
 using System.Threading;
@@ -47,6 +49,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
         private readonly IDtoService _dtoService;
 
         private readonly ISessionManager _sessionManager;
+        private readonly IActivityManager _activityManager;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerEventNotifier" /> class.
@@ -58,7 +61,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
         /// <param name="taskManager">The task manager.</param>
         /// <param name="dtoService">The dto service.</param>
         /// <param name="sessionManager">The session manager.</param>
-        public ServerEventNotifier(IServerManager serverManager, IServerApplicationHost appHost, IUserManager userManager, IInstallationManager installationManager, ITaskManager taskManager, IDtoService dtoService, ISessionManager sessionManager)
+        public ServerEventNotifier(IServerManager serverManager, IServerApplicationHost appHost, IUserManager userManager, IInstallationManager installationManager, ITaskManager taskManager, IDtoService dtoService, ISessionManager sessionManager, IActivityManager activityManager)
         {
             _serverManager = serverManager;
             _userManager = userManager;
@@ -67,6 +70,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             _taskManager = taskManager;
             _dtoService = dtoService;
             _sessionManager = sessionManager;
+            _activityManager = activityManager;
         }
 
         public void Run()
@@ -84,6 +88,13 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             _installationManager.PackageInstallationFailed += _installationManager_PackageInstallationFailed;
 
             _taskManager.TaskCompleted += _taskManager_TaskCompleted;
+
+            _activityManager.EntryCreated += _activityManager_EntryCreated;
+        }
+
+        void _activityManager_EntryCreated(object sender, GenericEventArgs<ActivityLogEntry> e)
+        {
+            _serverManager.SendWebSocketMessage("ActivityLogEntryCreated", e.Argument);
         }
 
         void _userManager_UserConfigurationUpdated(object sender, GenericEventArgs<User> e)
diff --git a/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs b/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
index 1c4ccb1414..8dfdfdaece 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
@@ -13,7 +13,7 @@ using System.Threading.Tasks;
 
 namespace MediaBrowser.Server.Implementations.FileOrganization
 {
-    public class OrganizerScheduledTask : IScheduledTask, IConfigurableScheduledTask
+    public class OrganizerScheduledTask : IScheduledTask, IConfigurableScheduledTask, IScheduledTaskActivityLog
     {
         private readonly ILibraryMonitor _libraryMonitor;
         private readonly ILibraryManager _libraryManager;
@@ -77,5 +77,10 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
         {
             get { return GetTvOptions().IsEnabled; }
         }
+
+        public bool IsActivityLogged
+        {
+            get { return false; }
+        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
index b18d0df5eb..cd871d8eb1 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
@@ -110,7 +110,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
         {
             try
             {
-                var webSocketContext = ctx.AcceptWebSocket(null, null);
+                var webSocketContext = ctx.AcceptWebSocket(null);
 
                 if (WebSocketHandler != null)
                 {
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index 43c9f3b9c2..139f8629c0 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -48,6 +48,7 @@ namespace MediaBrowser.Server.Implementations.Library
         /// </summary>
         /// <value>The user repository.</value>
         private IUserRepository UserRepository { get; set; }
+        public event EventHandler<GenericEventArgs<User>> UserPasswordChanged;
 
         private readonly IXmlSerializer _xmlSerializer;
 
@@ -390,7 +391,7 @@ namespace MediaBrowser.Server.Implementations.Library
         /// <param name="user">The user.</param>
         /// <param name="newPassword">The new password.</param>
         /// <returns>Task.</returns>
-        public Task ChangePassword(User user, string newPassword)
+        public async Task ChangePassword(User user, string newPassword)
         {
             if (user == null)
             {
@@ -399,7 +400,9 @@ namespace MediaBrowser.Server.Implementations.Library
 
             user.Password = string.IsNullOrEmpty(newPassword) ? string.Empty : GetSha1String(newPassword);
 
-            return UpdateUser(user);
+            await UpdateUser(user).ConfigureAwait(false);
+
+            EventHelper.FireEventIfNotNull(UserPasswordChanged, this, new GenericEventArgs<User>(user), _logger);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 605bbea0d8..973089795a 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -699,10 +699,10 @@
     "HeaderProfileServerSettingsHelp": "These values control how Media Browser will present itself to the device.",
     "LabelMaxBitrate": "Max bitrate:",
     "LabelMaxBitrateHelp": "Specify a max bitrate in bandwidth constrained environments, or if the device imposes it's own limit.",
-    "LabelMaxStreamingBitrate":  "Max streaming bitrate:",
-    "LabelMaxStreamingBitrateHelp":  "Specify a max bitrate when streaming.",
-    "LabelMaxStaticBitrate":  "Max sync bitrate:",
-    "LabelMaxStaticBitrateHelp":  "Specify a max bitrate when syncing content at high quality.",
+    "LabelMaxStreamingBitrate": "Max streaming bitrate:",
+    "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
+    "LabelMaxStaticBitrate": "Max sync bitrate:",
+    "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -808,8 +808,8 @@
     "TabNextUp": "Next Up",
     "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
     "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the New button to start creating Collections.",
-    "MessageNoPlaylistsAvailable":  "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
-    "MessageNoPlaylistItemsAvailable":  "This playlist is currently empty.",
+    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",
     "ButtonDismiss": "Dismiss",
     "MessageLearnHowToCustomize": "Learn how to customize this page to your own personal tastes. Click your user icon in the top right corner of the screen to view and update your preferences.",
@@ -918,52 +918,84 @@
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
     "OptionContextStatic": "Sync",
-    "ButtonAddToPlaylist":  "Add to playlist",
-    "TabPlaylists":  "Playlists",
-	"ButtonClose": "Close",
-	"LabelAllLanguages": "All languages",
-	"HeaderBrowseOnlineImages": "Browse Online Images",
-	"LabelSource": "Source:",
-	"OptionAll": "All",
-	"LabelImage": "Image:",
-	"ButtonUpload": "Upload",
-	"ButtonBrowseImages": "Browse Images",
-	"HeaderImages": "Images",
-	"HeaderBackdrops": "Backdrops",
-	"HeaderScreenshots": "Screenshots",
-	"HeaderAddUpdateImage": "Add/Update Image",
-	"LabelDropImageHere": "Drop image here",
-	"LabelJpgPngOnly": "JPG/PNG only",
-	"LabelImageType": "Image type:",
-	"OptionPrimary": "Primary",
-	"OptionArt": "Art",
-	"OptionBackdrop": "Backdrop",
-	"OptionBox": "Box",
-	"OptionBoxRear": "Box rear",
-	"OptionDisc": "Disc",
-	"OptionLogo": "Logo",
-	"OptionMenu": "Menu",
-	"OptionScreenshot": "Screenshot",
-	"OptionLocked": "Locked",
-	"OptionUnidentified": "Unidentified",
-	"OptionMissingParentalRating": "Missing parental rating",
-	"OptionStub": "Stub",
-	"HeaderEpisodes": "Episodes:",
-	"OptionSeason0": "Season 0",
-	"LabelReport": "Report:",
-	"OptionReportSongs": "Songs",
-	"OptionReportSeries": "Series",
-	"OptionReportSeasons": "Seasons",
-	"OptionReportTrailers": "Trailers",
-	"OptionReportMusicVideos": "Music videos",
-	"OptionReportMovies": "Movies",
-	"OptionReportHomeVideos": "Home videos",
-	"OptionReportGames": "Games",
-	"OptionReportEpisodes": "Episodes",
-	"OptionReportCollections": "Collections",
-	"OptionReportBooks": "Books",
-	"OptionReportArtists": "Artists",
-	"OptionReportAlbums": "Albums",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "TabPlaylists": "Playlists",
+    "ButtonClose": "Close",
+    "LabelAllLanguages": "All languages",
+    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelSource": "Source:",
+    "OptionAll": "All",
+    "LabelImage": "Image:",
+    "ButtonUpload": "Upload",
+    "ButtonBrowseImages": "Browse Images",
+    "HeaderImages": "Images",
+    "HeaderBackdrops": "Backdrops",
+    "HeaderScreenshots": "Screenshots",
+    "HeaderAddUpdateImage": "Add/Update Image",
+    "LabelDropImageHere": "Drop image here",
+    "LabelJpgPngOnly": "JPG/PNG only",
+    "LabelImageType": "Image type:",
+    "OptionPrimary": "Primary",
+    "OptionArt": "Art",
+    "OptionBackdrop": "Backdrop",
+    "OptionBox": "Box",
+    "OptionBoxRear": "Box rear",
+    "OptionDisc": "Disc",
+    "OptionLogo": "Logo",
+    "OptionMenu": "Menu",
+    "OptionScreenshot": "Screenshot",
+    "OptionLocked": "Locked",
+    "OptionUnidentified": "Unidentified",
+    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionStub": "Stub",
+    "HeaderEpisodes": "Episodes:",
+    "OptionSeason0": "Season 0",
+    "LabelReport": "Report:",
+    "OptionReportSongs": "Songs",
+    "OptionReportSeries": "Series",
+    "OptionReportSeasons": "Seasons",
+    "OptionReportTrailers": "Trailers",
+    "OptionReportMusicVideos": "Music videos",
+    "OptionReportMovies": "Movies",
+    "OptionReportHomeVideos": "Home videos",
+    "OptionReportGames": "Games",
+    "OptionReportEpisodes": "Episodes",
+    "OptionReportCollections": "Collections",
+    "OptionReportBooks": "Books",
+    "OptionReportArtists": "Artists",
+    "OptionReportAlbums": "Albums",
     "OptionReportAdultVideos": "Adult videos",
-    "ButtonMore":  "More"
+    "ButtonMore": "More",
+    "HeaderActivity": "Activity",
+    "ScheduledTaskStartedWithName": "{0} started",
+    "ScheduledTaskCancelledWithName": "{0} was cancelled",
+    "ScheduledTaskCompletedWithName": "{0} completed",
+    "ScheduledTaskFailed": "Scheduled task completed",
+    "PluginInstalledWithName": "{0} was installed",
+    "PluginUpdatedWithName": "{0} was updated",
+    "PluginUninstalledWithName": "{0} was uninstalled",
+    "ScheduledTaskFailedWithName": "{0} failed",
+    "ItemAddedWithName": "{0} was added to the library",
+    "ItemRemovedWithName": "{0} was removed from the library",
+    "DeviceOnlineWithName": "{0} is connected",
+    "UserOnlineFromDevice": "{0} is online from {1}",
+    "DeviceOfflineWithName": "{0} has disconnected",
+    "UserOfflineFromDevice": "{0} has disconnected from {1}",
+    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "LabelRunningTimeValue": "Running time: {0}",
+    "LabelIpAddressValue": "Ip address: {0}",
+    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+    "UserCreatedWithName": "User {0} has been created",
+    "UserPasswordChangedWithName": "Password has been changed for user {0}",
+    "UserDeletedWithName": "User {0} has been deleted",
+    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+    "MessageApplicationUpdated": "Media Browser Server has been updated",
+    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "UserStartedPlayingItemWithValues":  "{0} has started playing {1}",
+    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+    "AppDeviceValues": "App: {0}, Device: {1}",
+    "ProviderValue":  "Provider: {0}"
 }
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 9ee00dd424..58c8ef995b 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -101,6 +101,8 @@
     <Compile Include="..\SharedVersion.cs">
       <Link>Properties\SharedVersion.cs</Link>
     </Compile>
+    <Compile Include="Activity\ActivityManager.cs" />
+    <Compile Include="Activity\ActivityRepository.cs" />
     <Compile Include="Branding\BrandingConfigurationFactory.cs" />
     <Compile Include="Channels\ChannelConfigurations.cs" />
     <Compile Include="Channels\ChannelDownloadScheduledTask.cs" />
@@ -117,6 +119,7 @@
     <Compile Include="Drawing\PlayedIndicatorDrawer.cs" />
     <Compile Include="Drawing\UnplayedCountIndicator.cs" />
     <Compile Include="Dto\DtoService.cs" />
+    <Compile Include="EntryPoints\ActivityLogEntryPoint.cs" />
     <Compile Include="EntryPoints\AutomaticRestartEntryPoint.cs" />
     <Compile Include="EntryPoints\ExternalPortForwarding.cs" />
     <Compile Include="EntryPoints\LibraryChangedNotifier.cs" />
@@ -492,4 +495,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Notifications/SqliteNotificationsRepository.cs b/MediaBrowser.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
index 2424a66521..d34d5a293d 100644
--- a/MediaBrowser.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
+++ b/MediaBrowser.Server.Implementations/Notifications/SqliteNotificationsRepository.cs
@@ -206,46 +206,6 @@ namespace MediaBrowser.Server.Implementations.Notifications
             return notification;
         }
 
-        /// <summary>
-        /// Gets the notification.
-        /// </summary>
-        /// <param name="id">The id.</param>
-        /// <param name="userId">The user id.</param>
-        /// <returns>Notification.</returns>
-        /// <exception cref="System.ArgumentNullException">
-        /// id
-        /// or
-        /// userId
-        /// </exception>
-        public Notification GetNotification(string id, string userId)
-        {
-            if (string.IsNullOrEmpty(id))
-            {
-                throw new ArgumentNullException("id");
-            }
-            if (string.IsNullOrEmpty(userId))
-            {
-                throw new ArgumentNullException("userId");
-            }
-
-            using (var cmd = _connection.CreateCommand())
-            {
-                cmd.CommandText = "select Id,UserId,Date,Name,Description,Url,Level,IsRead,Category,RelatedId where Id=@Id And UserId = @UserId";
-
-                cmd.Parameters.Add(cmd, "@Id", DbType.Guid).Value = new Guid(id);
-                cmd.Parameters.Add(cmd, "@UserId", DbType.Guid).Value = new Guid(userId);
-
-                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow))
-                {
-                    if (reader.Read())
-                    {
-                        return GetNotification(reader);
-                    }
-                }
-                return null;
-            }
-        }
-
         /// <summary>
         /// Gets the level.
         /// </summary>
@@ -289,32 +249,6 @@ namespace MediaBrowser.Server.Implementations.Notifications
             }
         }
 
-        /// <summary>
-        /// Updates the notification.
-        /// </summary>
-        /// <param name="notification">The notification.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        public async Task UpdateNotification(Notification notification, CancellationToken cancellationToken)
-        {
-            await ReplaceNotification(notification, cancellationToken).ConfigureAwait(false);
-
-            if (NotificationUpdated != null)
-            {
-                try
-                {
-                    NotificationUpdated(this, new NotificationUpdateEventArgs
-                    {
-                        Notification = notification
-                    });
-                }
-                catch (Exception ex)
-                {
-                    _logger.ErrorException("Error in NotificationUpdated event handler", ex);
-                }
-            }
-        }
-
         /// <summary>
         /// Replaces the notification.
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs b/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
index 3d0781e914..7a23d8e082 100644
--- a/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
+++ b/MediaBrowser.Server.Implementations/ServerManager/ServerManager.cs
@@ -153,6 +153,8 @@ namespace MediaBrowser.Server.Implementations.ServerManager
         /// <param name="result">The result.</param>
         private async void ProcessWebSocketMessageReceived(WebSocketMessageInfo result)
         {
+            //_logger.Debug("Websocket message received: {0}", result.MessageType);
+
             var tasks = _webSocketListeners.Select(i => Task.Run(async () =>
             {
                 try
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 61c65cfd6c..7db6d01919 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -14,11 +14,13 @@ using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Security;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Library;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Session;
 using MediaBrowser.Model.Users;
+using MediaBrowser.Server.Implementations.Security;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -27,7 +29,6 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Server.Implementations.Security;
 
 namespace MediaBrowser.Server.Implementations.Session
 {
@@ -76,6 +77,10 @@ namespace MediaBrowser.Server.Implementations.Session
         private readonly ConcurrentDictionary<string, SessionInfo> _activeConnections =
             new ConcurrentDictionary<string, SessionInfo>(StringComparer.OrdinalIgnoreCase);
 
+        public event EventHandler<GenericEventArgs<AuthenticationRequest>> AuthenticationFailed;
+
+        public event EventHandler<GenericEventArgs<AuthenticationRequest>> AuthenticationSucceeded;
+        
         /// <summary>
         /// Occurs when [playback start].
         /// </summary>
@@ -399,6 +404,11 @@ namespace MediaBrowser.Server.Implementations.Session
                         Id = Guid.NewGuid().ToString("N")
                     };
 
+                    sessionInfo.DeviceName = deviceName;
+                    sessionInfo.UserId = userId;
+                    sessionInfo.UserName = username;
+                    sessionInfo.RemoteEndPoint = remoteEndPoint;
+
                     OnSessionStarted(sessionInfo);
 
                     return sessionInfo;
@@ -1191,44 +1201,37 @@ namespace MediaBrowser.Server.Implementations.Session
         /// <summary>
         /// Authenticates the new session.
         /// </summary>
-        /// <param name="username">The username.</param>
-        /// <param name="password">The password.</param>
-        /// <param name="clientType">Type of the client.</param>
-        /// <param name="appVersion">The application version.</param>
-        /// <param name="deviceId">The device identifier.</param>
-        /// <param name="deviceName">Name of the device.</param>
-        /// <param name="remoteEndPoint">The remote end point.</param>
+        /// <param name="request">The request.</param>
         /// <param name="isLocal">if set to <c>true</c> [is local].</param>
         /// <returns>Task{SessionInfo}.</returns>
+        /// <exception cref="AuthenticationException">Invalid user or password entered.</exception>
         /// <exception cref="System.UnauthorizedAccessException">Invalid user or password entered.</exception>
         /// <exception cref="UnauthorizedAccessException">Invalid user or password entered.</exception>
-        public async Task<AuthenticationResult> AuthenticateNewSession(string username,
-            string password,
-            string clientType,
-            string appVersion,
-            string deviceId,
-            string deviceName,
-            string remoteEndPoint,
+        public async Task<AuthenticationResult> AuthenticateNewSession(AuthenticationRequest request,
             bool isLocal)
         {
-            var result = (isLocal && string.Equals(clientType, "Dashboard", StringComparison.OrdinalIgnoreCase)) ||
-                await _userManager.AuthenticateUser(username, password).ConfigureAwait(false);
+            var result = (isLocal && string.Equals(request.App, "Dashboard", StringComparison.OrdinalIgnoreCase)) ||
+                await _userManager.AuthenticateUser(request.Username, request.Password).ConfigureAwait(false);
 
             if (!result)
             {
+                EventHelper.FireEventIfNotNull(AuthenticationFailed, this, new GenericEventArgs<AuthenticationRequest>(request), _logger);
+
                 throw new AuthenticationException("Invalid user or password entered.");
             }
 
             var user = _userManager.Users
-                .First(i => string.Equals(username, i.Name, StringComparison.OrdinalIgnoreCase));
+                .First(i => string.Equals(request.Username, i.Name, StringComparison.OrdinalIgnoreCase));
 
-            var token = await GetAuthorizationToken(user.Id.ToString("N"), deviceId, clientType, deviceName).ConfigureAwait(false);
+            var token = await GetAuthorizationToken(user.Id.ToString("N"), request.DeviceId, request.App, request.DeviceName).ConfigureAwait(false);
 
-            var session = await LogSessionActivity(clientType,
-                appVersion,
-                deviceId,
-                deviceName,
-                remoteEndPoint,
+            EventHelper.FireEventIfNotNull(AuthenticationSucceeded, this, new GenericEventArgs<AuthenticationRequest>(request), _logger);
+            
+            var session = await LogSessionActivity(request.App,
+                request.AppVersion,
+                request.DeviceId,
+                request.DeviceName,
+                request.RemoteEndPoint,
                 user)
                 .ConfigureAwait(false);
 
diff --git a/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs b/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
index a50a6f02ef..ed590a1f24 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
@@ -1,5 +1,4 @@
 using MediaBrowser.Common.Net;
-using MediaBrowser.Controller;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs b/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs
index bb22e992b6..65da74f9e5 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncRepository.cs
@@ -15,7 +15,7 @@ using System.Threading.Tasks;
 
 namespace MediaBrowser.Server.Implementations.Sync
 {
-    public class SyncRepository : ISyncRepository
+    public class SyncRepository : ISyncRepository, IDisposable
     {
         private IDbConnection _connection;
         private readonly ILogger _logger;
@@ -422,8 +422,50 @@ namespace MediaBrowser.Server.Implementations.Sync
             }
 
             info.TargetId = reader.GetString(5);
-            
+
             return info;
         }
+
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private readonly object _disposeLock = new object();
+
+        /// <summary>
+        /// Releases unmanaged and - optionally - managed resources.
+        /// </summary>
+        /// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        protected virtual void Dispose(bool dispose)
+        {
+            if (dispose)
+            {
+                try
+                {
+                    lock (_disposeLock)
+                    {
+                        if (_connection != null)
+                        {
+                            if (_connection.IsOpen())
+                            {
+                                _connection.Close();
+                            }
+
+                            _connection.Dispose();
+                            _connection = null;
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.ErrorException("Error disposing database", ex);
+                }
+            }
+        }
     }
 }
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index d44ac250de..357395e722 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -9,6 +9,7 @@ using MediaBrowser.Common.IO;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Progress;
 using MediaBrowser.Controller;
+using MediaBrowser.Controller.Activity;
 using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Chapters;
 using MediaBrowser.Controller.Collections;
@@ -53,6 +54,7 @@ using MediaBrowser.Providers.Chapters;
 using MediaBrowser.Providers.Manager;
 using MediaBrowser.Providers.Subtitles;
 using MediaBrowser.Server.Implementations;
+using MediaBrowser.Server.Implementations.Activity;
 using MediaBrowser.Server.Implementations.Channels;
 using MediaBrowser.Server.Implementations.Collections;
 using MediaBrowser.Server.Implementations.Configuration;
@@ -343,6 +345,13 @@ namespace MediaBrowser.ServerApplication
                 saveConfig = true;
             }
 
+            if (ServerConfigurationManager.Configuration.SubtitleOptions != null)
+            {
+                ServerConfigurationManager.SaveConfiguration("subtitles", ServerConfigurationManager.Configuration.SubtitleOptions);
+                ServerConfigurationManager.Configuration.SubtitleOptions = null;
+                saveConfig = true;
+            }
+
             if (saveConfig)
             {
                 ServerConfigurationManager.SaveConfiguration();
@@ -641,6 +650,10 @@ namespace MediaBrowser.ServerApplication
                 MediaEncoder, ChapterManager);
             RegisterSingleInstance(EncodingManager);
 
+            var activityLogRepo = await GetActivityLogRepository().ConfigureAwait(false);
+            RegisterSingleInstance(activityLogRepo);
+            RegisterSingleInstance<IActivityManager>(new ActivityManager(LogManager.GetLogger("ActivityManager"), activityLogRepo));
+
             var authContext = new AuthorizationContext();
             RegisterSingleInstance<IAuthorizationContext>(authContext);
             RegisterSingleInstance<ISessionContext>(new SessionContext(UserManager, authContext, SessionManager));
@@ -730,6 +743,15 @@ namespace MediaBrowser.ServerApplication
             return repo;
         }
 
+        private async Task<IActivityRepository> GetActivityLogRepository()
+        {
+            var repo = new ActivityRepository(LogManager.GetLogger("ActivityRepository"), ServerConfigurationManager.ApplicationPaths);
+
+            await repo.Initialize().ConfigureAwait(false);
+
+            return repo;
+        }
+
         private async Task<ISyncRepository> GetSyncRepository()
         {
             var repo = new SyncRepository(LogManager.GetLogger("SyncRepository"), ServerConfigurationManager.ApplicationPaths);
-- 
cgit v1.2.3


From 9c5cceb4ecc277ffb5a3a988f655ad674bf41c58 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 14 Aug 2014 09:24:30 -0400
Subject: update translations

---
 MediaBrowser.Api/System/ActivityLogService.cs      |  11 +-
 MediaBrowser.Api/UserLibrary/UserLibraryService.cs |  11 +-
 .../Activity/IActivityManager.cs                   |   2 +-
 .../Activity/IActivityRepository.cs                |   3 +-
 .../Channels/ChannelFolderItem.cs                  |   1 -
 MediaBrowser.Controller/Entities/BaseItem.cs       |  11 +
 MediaBrowser.Controller/Entities/Folder.cs         |  27 ++-
 MediaBrowser.Controller/Entities/IHasImages.cs     |   6 +
 .../Entities/IHasMediaSources.cs                   |   6 +
 MediaBrowser.Controller/Entities/LinkedChild.cs    |   1 -
 MediaBrowser.Controller/Entities/Movies/BoxSet.cs  |  19 +-
 MediaBrowser.Controller/Entities/TV/Episode.cs     |  14 ++
 MediaBrowser.Controller/Entities/UserView.cs       |  32 +++
 .../Library/IUserViewManager.cs                    |   2 +
 MediaBrowser.Controller/LiveTv/ILiveTvManager.cs   |  17 ++
 MediaBrowser.Controller/LiveTv/RecordingGroup.cs   |  22 ++
 .../MediaBrowser.Controller.csproj                 |   1 +
 MediaBrowser.Controller/Playlists/Playlist.cs      |  40 +++-
 .../ContentDirectory/ControlHandler.cs             |  20 +-
 MediaBrowser.Dlna/Didl/DidlBuilder.cs              |  31 +--
 MediaBrowser.Dlna/Profiles/DefaultProfile.cs       |   2 +
 MediaBrowser.Dlna/Profiles/Xml/Android.xml         |   3 +
 MediaBrowser.Dlna/Profiles/Xml/Default.xml         |   3 +
 MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml       |   3 +
 MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml     |   3 +
 MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml |   3 +
 MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml     |   3 +
 MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml |   2 +
 .../Profiles/Xml/Samsung Smart TV.xml              |   2 +
 .../Profiles/Xml/Sony Blu-ray Player 2013.xml      |   3 +
 .../Profiles/Xml/Sony Blu-ray Player.xml           |   3 +
 .../Profiles/Xml/Sony Bravia (2010).xml            |   3 +
 .../Profiles/Xml/Sony Bravia (2011).xml            |   3 +
 .../Profiles/Xml/Sony Bravia (2012).xml            |   3 +
 .../Profiles/Xml/Sony Bravia (2013).xml            |   3 +
 .../Profiles/Xml/Sony PlayStation 3.xml            |   3 +
 MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml       |   3 +
 MediaBrowser.Dlna/Profiles/Xml/Windows 8 RT.xml    |   2 +
 MediaBrowser.Dlna/Profiles/Xml/Windows Phone.xml   |   3 +
 MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml        |   3 +
 MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml        |   3 +
 MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml      |   3 +
 MediaBrowser.Dlna/Ssdp/SsdpHandler.cs              |   2 +-
 .../MediaBrowser.Model.Portable.csproj             |   3 +
 .../MediaBrowser.Model.net35.csproj                |   3 +
 MediaBrowser.Model/ApiClient/IApiClient.cs         |   7 +
 MediaBrowser.Model/Configuration/ChannelOptions.cs |   3 +
 .../Configuration/ServerConfiguration.cs           |  20 ++
 .../Configuration/UserConfiguration.cs             |   1 +
 MediaBrowser.Model/Dlna/AudioOptions.cs            |   6 +
 MediaBrowser.Model/Dlna/DeviceProfile.cs           |   3 +
 MediaBrowser.Model/Dlna/StreamBuilder.cs           |   9 +-
 MediaBrowser.Model/Entities/CollectionType.cs      |   4 +
 MediaBrowser.Model/MediaBrowser.Model.csproj       |   1 +
 MediaBrowser.Model/Querying/LatestItemsQuery.cs    |  54 +++++
 .../Manager/ItemImageProvider.cs                   |   5 +
 .../Playlists/PlaylistMetadataService.cs           |  10 +-
 .../TV/TvdbEpisodeImageProvider.cs                 |   7 +-
 .../Activity/ActivityManager.cs                    |   4 +-
 .../Activity/ActivityRepository.cs                 |  30 ++-
 .../Channels/ChannelDownloadScheduledTask.cs       |  31 ++-
 .../EntryPoints/ActivityLogEntryPoint.cs           |  28 ++-
 .../HttpServer/HttpListenerHost.cs                 |   5 +-
 .../SocketSharp/WebSocketSharpListener.cs          | 115 ++++++++--
 .../Library/LibraryManager.cs                      |   2 +-
 .../Library/UserViewManager.cs                     |   9 +-
 .../Library/Validators/PeopleValidator.cs          | 103 ++++++++-
 .../LiveTv/LiveTvManager.cs                        |  74 ++++--
 .../Localization/JavaScript/ar.json                |   4 +-
 .../Localization/JavaScript/ca.json                |   4 +-
 .../Localization/JavaScript/cs.json                |   2 +-
 .../Localization/JavaScript/da.json                |   4 +-
 .../Localization/JavaScript/el.json                |   4 +-
 .../Localization/JavaScript/en_GB.json             |   4 +-
 .../Localization/JavaScript/en_US.json             |   4 +-
 .../Localization/JavaScript/es_MX.json             |  34 +--
 .../Localization/JavaScript/fr.json                |  44 ++--
 .../Localization/JavaScript/he.json                |   4 +-
 .../Localization/JavaScript/it.json                |  22 +-
 .../Localization/JavaScript/kk.json                |  40 ++--
 .../Localization/JavaScript/ms.json                |   4 +-
 .../Localization/JavaScript/nl.json                |  28 +--
 .../Localization/JavaScript/pl.json                |   4 +-
 .../Localization/JavaScript/pt_BR.json             |  38 +--
 .../Localization/JavaScript/ru.json                |  52 ++---
 .../Localization/JavaScript/vi.json                |   4 +-
 .../Localization/JavaScript/zh_TW.json             |   4 +-
 .../Localization/Server/ar.json                    |   5 +-
 .../Localization/Server/ca.json                    |   5 +-
 .../Localization/Server/cs.json                    |  11 +-
 .../Localization/Server/da.json                    |   9 +-
 .../Localization/Server/de.json                    |  17 +-
 .../Localization/Server/el.json                    |   5 +-
 .../Localization/Server/en_GB.json                 |   5 +-
 .../Localization/Server/en_US.json                 |   5 +-
 .../Localization/Server/es.json                    |  13 +-
 .../Localization/Server/es_MX.json                 |  73 +++---
 .../Localization/Server/fr.json                    |  67 +++---
 .../Localization/Server/he.json                    |  11 +-
 .../Localization/Server/it.json                    |  81 +++----
 .../Localization/Server/kk.json                    |  77 ++++---
 .../Localization/Server/ko.json                    |   5 +-
 .../Localization/Server/ms.json                    |   5 +-
 .../Localization/Server/nb.json                    |  13 +-
 .../Localization/Server/nl.json                    |  33 +--
 .../Localization/Server/pl.json                    |   5 +-
 .../Localization/Server/pt_BR.json                 |  11 +-
 .../Localization/Server/pt_PT.json                 |  13 +-
 .../Localization/Server/ru.json                    |  81 +++----
 .../Localization/Server/server.json                |  21 +-
 .../Localization/Server/sv.json                    |  13 +-
 .../Localization/Server/tr.json                    |   9 +-
 .../Localization/Server/vi.json                    |   5 +-
 .../Localization/Server/zh_TW.json                 |   7 +-
 .../MediaBrowser.Server.Implementations.csproj     |   3 +-
 .../Playlists/ManualPlaylistsFolder.cs             |   2 +-
 .../Playlists/PlaylistImageEnhancer.cs             |  15 +-
 .../Security/AuthenticationRepository.cs           |  28 ++-
 MediaBrowser.ServerApplication/ApplicationHost.cs  |   2 +
 MediaBrowser.sln                                   | 254 ++++++++++++++++++++-
 Nuget/MediaBrowser.Common.Internal.nuspec          |   4 +-
 Nuget/MediaBrowser.Common.nuspec                   |   2 +-
 Nuget/MediaBrowser.Model.Signed.nuspec             |   2 +-
 Nuget/MediaBrowser.Server.Core.nuspec              |   4 +-
 124 files changed, 1569 insertions(+), 534 deletions(-)
 create mode 100644 MediaBrowser.Controller/LiveTv/RecordingGroup.cs
 create mode 100644 MediaBrowser.Model/Querying/LatestItemsQuery.cs

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Api/System/ActivityLogService.cs b/MediaBrowser.Api/System/ActivityLogService.cs
index 0ccc28c6ff..8dc3079c72 100644
--- a/MediaBrowser.Api/System/ActivityLogService.cs
+++ b/MediaBrowser.Api/System/ActivityLogService.cs
@@ -3,6 +3,8 @@ using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Activity;
 using MediaBrowser.Model.Querying;
 using ServiceStack;
+using System;
+using System.Globalization;
 
 namespace MediaBrowser.Api.System
 {
@@ -22,6 +24,9 @@ namespace MediaBrowser.Api.System
         /// <value>The limit.</value>
         [ApiMember(Name = "Limit", Description = "Optional. The maximum number of records to return", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
         public int? Limit { get; set; }
+
+        [ApiMember(Name = "MinDate", Description = "Optional. The minimum date. Format = ISO", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
+        public string MinDate { get; set; }
     }
 
     [Authenticated]
@@ -36,7 +41,11 @@ namespace MediaBrowser.Api.System
 
         public object Get(GetActivityLogs request)
         {
-            var result = _activityManager.GetActivityLogEntries(request.StartIndex, request.Limit);
+            DateTime? minDate = string.IsNullOrWhiteSpace(request.MinDate) ?
+                (DateTime?)null :
+                DateTime.Parse(request.MinDate, null, DateTimeStyles.RoundtripKind).ToUniversalTime();
+
+            var result = _activityManager.GetActivityLogEntries(minDate, request.StartIndex, request.Limit);
 
             return ToOptimizedResult(result);
         }
diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
index de2801dcc2..d746d47ff2 100644
--- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
@@ -318,11 +318,12 @@ namespace MediaBrowser.Api.UserLibrary
                 .OrderByDescending(i => i.DateCreated)
                 .Where(i => i.LocationType != LocationType.Virtual);
 
-            if (request.IsFolder.HasValue)
-            {
-                var val = request.IsFolder.Value;
-                libraryItems = libraryItems.Where(f => f.IsFolder == val);
-            }
+
+            //if (request.IsFolder.HasValue)
+            //{
+                //var val = request.IsFolder.Value;
+                libraryItems = libraryItems.Where(f => f.IsFolder == false);
+            //}
             
             if (!string.IsNullOrEmpty(request.IncludeItemTypes))
             {
diff --git a/MediaBrowser.Controller/Activity/IActivityManager.cs b/MediaBrowser.Controller/Activity/IActivityManager.cs
index 0c565ae36c..7285489112 100644
--- a/MediaBrowser.Controller/Activity/IActivityManager.cs
+++ b/MediaBrowser.Controller/Activity/IActivityManager.cs
@@ -12,6 +12,6 @@ namespace MediaBrowser.Controller.Activity
 
         Task Create(ActivityLogEntry entry);
 
-        QueryResult<ActivityLogEntry> GetActivityLogEntries(int? startIndex, int? limit);
+        QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit);
     }
 }
diff --git a/MediaBrowser.Controller/Activity/IActivityRepository.cs b/MediaBrowser.Controller/Activity/IActivityRepository.cs
index 29e60ff1f0..7ccbc2e99b 100644
--- a/MediaBrowser.Controller/Activity/IActivityRepository.cs
+++ b/MediaBrowser.Controller/Activity/IActivityRepository.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Model.Activity;
 using MediaBrowser.Model.Querying;
+using System;
 using System.Threading.Tasks;
 
 namespace MediaBrowser.Controller.Activity
@@ -8,6 +9,6 @@ namespace MediaBrowser.Controller.Activity
     {
         Task Create(ActivityLogEntry entry);
 
-        QueryResult<ActivityLogEntry> GetActivityLogEntries(int? startIndex, int? limit);
+        QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit);
     }
 }
diff --git a/MediaBrowser.Controller/Channels/ChannelFolderItem.cs b/MediaBrowser.Controller/Channels/ChannelFolderItem.cs
index d6e315fd1f..077138f3cc 100644
--- a/MediaBrowser.Controller/Channels/ChannelFolderItem.cs
+++ b/MediaBrowser.Controller/Channels/ChannelFolderItem.cs
@@ -1,7 +1,6 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Channels;
 using MediaBrowser.Model.Configuration;
-using System.Collections.Generic;
 
 namespace MediaBrowser.Controller.Channels
 {
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index fdffa60d0a..e718a53ff8 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -2,6 +2,7 @@
 using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Providers;
@@ -66,6 +67,15 @@ namespace MediaBrowser.Controller.Entities
         /// <value><c>true</c> if this instance is in mixed folder; otherwise, <c>false</c>.</value>
         public bool IsInMixedFolder { get; set; }
 
+        [IgnoreDataMember]
+        public virtual bool SupportsRemoteImageDownloading
+        {
+            get
+            {
+                return true;
+            }
+        }
+
         private string _name;
         /// <summary>
         /// Gets or sets the name.
@@ -227,6 +237,7 @@ namespace MediaBrowser.Controller.Entities
         public static IItemRepository ItemRepository { get; set; }
         public static IFileSystem FileSystem { get; set; }
         public static IUserDataManager UserDataManager { get; set; }
+        public static ILiveTvManager LiveTvManager { get; set; }
 
         /// <summary>
         /// Returns a <see cref="System.String" /> that represents this instance.
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 243d7fd2df..96a8c579e2 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -840,7 +840,7 @@ namespace MediaBrowser.Controller.Entities
 
             if (includeLinkedChildren)
             {
-                foreach (var child in GetLinkedChildren())
+                foreach (var child in GetLinkedChildren(user))
                 {
                     if (child.IsVisible(user))
                     {
@@ -924,6 +924,31 @@ namespace MediaBrowser.Controller.Entities
                 .Where(i => i != null);
         }
 
+        protected virtual bool FilterLinkedChildrenPerUser
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        public IEnumerable<BaseItem> GetLinkedChildren(User user)
+        {
+            if (!FilterLinkedChildrenPerUser)
+            {
+                return GetLinkedChildren();
+            }
+
+            var locations = user.RootFolder
+                .Children
+                .OfType<CollectionFolder>()
+                .SelectMany(i => i.PhysicalLocations)
+                .ToList();
+            
+            return LinkedChildren.Where(i => string.IsNullOrWhiteSpace(i.Path) || locations.Any(l => FileSystem.ContainsSubPath(l, i.Path)))
+                .Select(GetLinkedChild)
+                .Where(i => i != null);
+        }
 
         /// <summary>
         /// Gets the linked children.
diff --git a/MediaBrowser.Controller/Entities/IHasImages.cs b/MediaBrowser.Controller/Entities/IHasImages.cs
index bac2263697..67acc1cae6 100644
--- a/MediaBrowser.Controller/Entities/IHasImages.cs
+++ b/MediaBrowser.Controller/Entities/IHasImages.cs
@@ -154,6 +154,12 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <value><c>true</c> if this instance is locked; otherwise, <c>false</c>.</value>
         bool IsLocked { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether [supports remote image downloading].
+        /// </summary>
+        /// <value><c>true</c> if [supports remote image downloading]; otherwise, <c>false</c>.</value>
+        bool SupportsRemoteImageDownloading { get; }
     }
 
     public static class HasImagesExtensions
diff --git a/MediaBrowser.Controller/Entities/IHasMediaSources.cs b/MediaBrowser.Controller/Entities/IHasMediaSources.cs
index da040f296a..d487362f54 100644
--- a/MediaBrowser.Controller/Entities/IHasMediaSources.cs
+++ b/MediaBrowser.Controller/Entities/IHasMediaSources.cs
@@ -9,6 +9,12 @@ namespace MediaBrowser.Controller.Entities
 {
     public interface IHasMediaSources
     {
+        /// <summary>
+        /// Gets the identifier.
+        /// </summary>
+        /// <value>The identifier.</value>
+        Guid Id { get; }
+
         /// <summary>
         /// Gets the media sources.
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/LinkedChild.cs b/MediaBrowser.Controller/Entities/LinkedChild.cs
index eb94b37dbc..78e8e49594 100644
--- a/MediaBrowser.Controller/Entities/LinkedChild.cs
+++ b/MediaBrowser.Controller/Entities/LinkedChild.cs
@@ -19,7 +19,6 @@ namespace MediaBrowser.Controller.Entities
         /// <summary>
         /// Serves as a cache
         /// </summary>
-        [IgnoreDataMember]
         public Guid? ItemId { get; set; }
 
         public static LinkedChild Create(BaseItem item)
diff --git a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
index 19c9601671..5d8fff38f4 100644
--- a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
+++ b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
@@ -1,5 +1,6 @@
 using System.Runtime.Serialization;
 using MediaBrowser.Common.Progress;
+using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
@@ -26,6 +27,14 @@ namespace MediaBrowser.Controller.Entities.Movies
             Keywords = new List<string>();
         }
 
+        protected override bool FilterLinkedChildrenPerUser
+        {
+            get
+            {
+                return true;
+            }
+        }
+
         public List<Guid> LocalTrailerIds { get; set; }
 
         /// <summary>
@@ -72,6 +81,8 @@ namespace MediaBrowser.Controller.Entities.Movies
         {
             var children = base.GetChildren(user, includeLinkedChildren);
 
+            children = Playlist.FilterInaccessibleItems(children, user);
+
             if (string.Equals(DisplayOrder, ItemSortBy.SortName, StringComparison.OrdinalIgnoreCase))
             {
                 // Sort by name
@@ -83,11 +94,17 @@ namespace MediaBrowser.Controller.Entities.Movies
                 // Sort by release date
                 return LibraryManager.Sort(children, user, new[] { ItemSortBy.ProductionYear, ItemSortBy.PremiereDate, ItemSortBy.SortName }, SortOrder.Ascending);
             }
-            
+
             // Default sorting
             return LibraryManager.Sort(children, user, new[] { ItemSortBy.ProductionYear, ItemSortBy.PremiereDate, ItemSortBy.SortName }, SortOrder.Ascending);
         }
 
+        public override IEnumerable<BaseItem> GetRecursiveChildren(User user, bool includeLinkedChildren = true)
+        {
+            var children = base.GetRecursiveChildren(user, includeLinkedChildren);
+            return Playlist.FilterInaccessibleItems(children, user);
+        }
+
         public BoxSetInfo GetLookupInfo()
         {
             return GetItemLookupInfo<BoxSetInfo>();
diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs
index 8a554c1d5c..70577bbfde 100644
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -188,6 +188,20 @@ namespace MediaBrowser.Controller.Entities.TV
             return false;
         }
 
+        [IgnoreDataMember]
+        public override bool SupportsRemoteImageDownloading
+        {
+            get
+            {
+                if (IsMissingEpisode)
+                {
+                    return false;
+                }
+
+                return true;
+            }
+        }
+
         [IgnoreDataMember]
         public bool IsMissingEpisode
         {
diff --git a/MediaBrowser.Controller/Entities/UserView.cs b/MediaBrowser.Controller/Entities/UserView.cs
index 34ca85d1d7..2abc71752c 100644
--- a/MediaBrowser.Controller/Entities/UserView.cs
+++ b/MediaBrowser.Controller/Entities/UserView.cs
@@ -1,15 +1,20 @@
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.LiveTv;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace MediaBrowser.Controller.Entities
 {
     public class UserView : Folder
     {
         public string ViewType { get; set; }
+        public static IUserViewManager UserViewManager { get; set; }
 
         public override IEnumerable<BaseItem> GetChildren(User user, bool includeLinkedChildren)
         {
@@ -17,6 +22,23 @@ namespace MediaBrowser.Controller.Entities
 
             switch (ViewType)
             {
+                case CollectionType.LiveTvChannels:
+                    return LiveTvManager.GetInternalChannels(new LiveTvChannelQuery
+                    {
+                        UserId = user.Id.ToString("N")
+
+                    }, CancellationToken.None).Result.Items;
+                case CollectionType.LiveTvRecordingGroups:
+                    return LiveTvManager.GetInternalRecordings(new RecordingQuery
+                    {
+                        UserId = user.Id.ToString("N"),
+                        Status = RecordingStatus.Completed
+
+                    }, CancellationToken.None).Result.Items;
+                case CollectionType.LiveTv:
+                    return GetLiveTvFolders(user).Result;
+                case CollectionType.Folders:
+                    return user.RootFolder.GetChildren(user, includeLinkedChildren);
                 case CollectionType.Games:
                     return mediaFolders.SelectMany(i => i.GetRecursiveChildren(user, includeLinkedChildren))
                         .OfType<GameSystem>();
@@ -34,6 +56,16 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
+        private async Task<IEnumerable<BaseItem>> GetLiveTvFolders(User user)
+        {
+            var list = new List<BaseItem>();
+
+            list.Add(await UserViewManager.GetUserView(CollectionType.LiveTvChannels, user, string.Empty, CancellationToken.None).ConfigureAwait(false));
+            list.Add(await UserViewManager.GetUserView(CollectionType.LiveTvRecordingGroups, user, string.Empty, CancellationToken.None).ConfigureAwait(false));
+
+            return list;
+        }
+
         protected override IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
         {
             return GetChildren(user, false);
diff --git a/MediaBrowser.Controller/Library/IUserViewManager.cs b/MediaBrowser.Controller/Library/IUserViewManager.cs
index 7c352d97a7..908525a2f8 100644
--- a/MediaBrowser.Controller/Library/IUserViewManager.cs
+++ b/MediaBrowser.Controller/Library/IUserViewManager.cs
@@ -9,5 +9,7 @@ namespace MediaBrowser.Controller.Library
     public interface IUserViewManager
     {
         Task<IEnumerable<Folder>> GetUserViews(UserViewQuery query, CancellationToken cancellationToken);
+
+        Task<UserView> GetUserView(string type, User user, string sortName, CancellationToken cancellationToken);
     }
 }
diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
index d40ecb463c..b1c6ebffc8 100644
--- a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
+++ b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
@@ -280,5 +280,22 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// <returns>IEnumerable{User}.</returns>
         IEnumerable<User> GetEnabledUsers();
+
+        /// <summary>
+        /// Gets the internal channels.
+        /// </summary>
+        /// <param name="query">The query.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task&lt;QueryResult&lt;LiveTvChannel&gt;&gt;.</returns>
+        Task<QueryResult<LiveTvChannel>> GetInternalChannels(LiveTvChannelQuery query,
+            CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Gets the internal recordings.
+        /// </summary>
+        /// <param name="query">The query.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task&lt;QueryResult&lt;BaseItem&gt;&gt;.</returns>
+        Task<QueryResult<BaseItem>> GetInternalRecordings(RecordingQuery query, CancellationToken cancellationToken);
     }
 }
diff --git a/MediaBrowser.Controller/LiveTv/RecordingGroup.cs b/MediaBrowser.Controller/LiveTv/RecordingGroup.cs
new file mode 100644
index 0000000000..7bd810b8d1
--- /dev/null
+++ b/MediaBrowser.Controller/LiveTv/RecordingGroup.cs
@@ -0,0 +1,22 @@
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Model.Configuration;
+
+namespace MediaBrowser.Controller.LiveTv
+{
+    public class RecordingGroup : Folder
+    {
+        protected override bool GetBlockUnratedValue(UserConfiguration config)
+        {
+            // Don't block. 
+            return false;
+        }
+
+        public override bool SupportsLocalMetadata
+        {
+            get
+            {
+                return false;
+            }
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 28e1ffb1c8..d12c36fba5 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -168,6 +168,7 @@
     <Compile Include="Library\LibraryManagerExtensions.cs" />
     <Compile Include="Library\PlaybackStopEventArgs.cs" />
     <Compile Include="Library\UserDataSaveEventArgs.cs" />
+    <Compile Include="LiveTv\RecordingGroup.cs" />
     <Compile Include="LiveTv\RecordingStatusChangedEventArgs.cs" />
     <Compile Include="LiveTv\ILiveTvRecording.cs" />
     <Compile Include="LiveTv\LiveStreamInfo.cs" />
diff --git a/MediaBrowser.Controller/Playlists/Playlist.cs b/MediaBrowser.Controller/Playlists/Playlist.cs
index ec3e03339d..7822623a97 100644
--- a/MediaBrowser.Controller/Playlists/Playlist.cs
+++ b/MediaBrowser.Controller/Playlists/Playlist.cs
@@ -12,6 +12,14 @@ namespace MediaBrowser.Controller.Playlists
     {
         public string OwnerUserId { get; set; }
 
+        protected override bool FilterLinkedChildrenPerUser
+        {
+            get
+            {
+                return true;
+            }
+        }
+
         public override IEnumerable<BaseItem> GetChildren(User user, bool includeLinkedChildren)
         {
             return GetPlayableItems(user);
@@ -34,7 +42,12 @@ namespace MediaBrowser.Controller.Playlists
 
         public static IEnumerable<BaseItem> GetPlaylistItems(string playlistMediaType, IEnumerable<BaseItem> inputItems, User user)
         {
-            return inputItems.SelectMany(i =>
+            if (user != null)
+            {
+                inputItems = inputItems.Where(i => i.IsVisible(user));
+            }
+
+            inputItems = inputItems.SelectMany(i =>
             {
                 var folder = i as Folder;
 
@@ -58,6 +71,31 @@ namespace MediaBrowser.Controller.Playlists
                 return new[] { i };
 
             }).Where(m =>  string.Equals(m.MediaType, playlistMediaType, StringComparison.OrdinalIgnoreCase));
+
+            return FilterInaccessibleItems(inputItems, user);
+        }
+
+        public static IEnumerable<BaseItem> FilterInaccessibleItems(IEnumerable<BaseItem> items, User user)
+        {
+            return items;
+            //var locations = user.RootFolder.Children.OfType<CollectionFolder>().SelectMany(i => i.PhysicalLocations).ToList();
+
+            //return items.Where(i =>
+            //{
+            //    var parent = i.Parent;
+
+            //    while (parent != null)
+            //    {
+            //        parent = parent.Parent;
+
+            //        if (parent != null && parent.Parent is AggregateFolder)
+            //        {
+            //            break;
+            //        }
+            //    }
+
+            //    return parent == null || locations.Contains(parent.Path, StringComparer.OrdinalIgnoreCase);
+            //});
         }
 
         [IgnoreDataMember]
diff --git a/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs b/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
index 866f87776c..35522dd06c 100644
--- a/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
+++ b/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
@@ -442,10 +442,6 @@ namespace MediaBrowser.Dlna.ContentDirectory
 
         private async Task<IEnumerable<BaseItem>> GetUserViewChildren(UserView folder, User user, SortCriteria sort)
         {
-            if (string.Equals(folder.ViewType, CollectionType.LiveTv, StringComparison.OrdinalIgnoreCase))
-            {
-                return new List<BaseItem>();
-            }
             if (string.Equals(folder.ViewType, CollectionType.Channels, StringComparison.OrdinalIgnoreCase))
             {
                 var result = await _channelManager.GetChannelsInternal(new ChannelQuery()
@@ -468,6 +464,22 @@ namespace MediaBrowser.Dlna.ContentDirectory
             {
                 return SortItems(folder.GetChildren(user, true).OfType<MusicArtist>(), user, sort);
             }
+            if (string.Equals(folder.ViewType, CollectionType.Folders, StringComparison.OrdinalIgnoreCase))
+            {
+                return SortItems(folder.GetChildren(user, true), user, sort);
+            }
+            if (string.Equals(folder.ViewType, CollectionType.LiveTv, StringComparison.OrdinalIgnoreCase))
+            {
+                return SortItems(folder.GetChildren(user, true), user, sort);
+            }
+            if (string.Equals(folder.ViewType, CollectionType.LiveTvRecordingGroups, StringComparison.OrdinalIgnoreCase))
+            {
+                return SortItems(folder.GetChildren(user, true), user, sort);
+            }
+            if (string.Equals(folder.ViewType, CollectionType.LiveTvChannels, StringComparison.OrdinalIgnoreCase))
+            {
+                return SortItems(folder.GetChildren(user, true), user, sort);
+            }
 
             return GetPlainFolderChildrenSorted(folder, user, sort);
         }
diff --git a/MediaBrowser.Dlna/Didl/DidlBuilder.cs b/MediaBrowser.Dlna/Didl/DidlBuilder.cs
index 279a40a73c..296c968bbe 100644
--- a/MediaBrowser.Dlna/Didl/DidlBuilder.cs
+++ b/MediaBrowser.Dlna/Didl/DidlBuilder.cs
@@ -80,16 +80,18 @@ namespace MediaBrowser.Dlna.Didl
             // refID?
             // storeAttribute(itemNode, object, ClassProperties.REF_ID, false);
 
-            var audio = item as Audio;
-            if (audio != null)
-            {
-                AddAudioResource(element, audio, deviceId, filter, streamInfo);
-            }
+            var hasMediaSources = item as IHasMediaSources;
 
-            var video = item as Video;
-            if (video != null)
+            if (hasMediaSources != null)
             {
-                AddVideoResource(element, video, deviceId, filter, streamInfo);
+                if (string.Equals(item.MediaType, MediaType.Audio, StringComparison.OrdinalIgnoreCase))
+                {
+                    AddAudioResource(element, hasMediaSources, deviceId, filter, streamInfo);
+                }
+                else if (string.Equals(item.MediaType, MediaType.Video, StringComparison.OrdinalIgnoreCase))
+                {
+                    AddVideoResource(element, hasMediaSources, deviceId, filter, streamInfo);
+                }
             }
 
             AddCover(item, element);
@@ -97,7 +99,7 @@ namespace MediaBrowser.Dlna.Didl
             return element;
         }
 
-        private void AddVideoResource(XmlElement container, Video video, string deviceId, Filter filter, StreamInfo streamInfo = null)
+        private void AddVideoResource(XmlElement container, IHasMediaSources video, string deviceId, Filter filter, StreamInfo streamInfo = null)
         {
             if (streamInfo == null)
             {
@@ -181,7 +183,7 @@ namespace MediaBrowser.Dlna.Didl
             }
         }
 
-        private void AddVideoResource(XmlElement container, Video video, string deviceId, Filter filter, string contentFeatures, StreamInfo streamInfo)
+        private void AddVideoResource(XmlElement container, IHasMediaSources video, string deviceId, Filter filter, string contentFeatures, StreamInfo streamInfo)
         {
             var res = container.OwnerDocument.CreateElement(string.Empty, "res", NS_DIDL);
 
@@ -270,7 +272,7 @@ namespace MediaBrowser.Dlna.Didl
             container.AppendChild(res);
         }
         
-        private void AddAudioResource(XmlElement container, Audio audio, string deviceId, Filter filter, StreamInfo streamInfo = null)
+        private void AddAudioResource(XmlElement container, IHasMediaSources audio, string deviceId, Filter filter, StreamInfo streamInfo = null)
         {
             var res = container.OwnerDocument.CreateElement(string.Empty, "res", NS_DIDL);
 
@@ -636,9 +638,12 @@ namespace MediaBrowser.Dlna.Didl
 
             if (!_profile.EnableAlbumArtInDidl)
             {
-                if (!(item is Photo) && !(item is Video))
+                if (!string.Equals(item.MediaType, MediaType.Photo, StringComparison.OrdinalIgnoreCase) && !string.Equals(item.MediaType, MediaType.Video, StringComparison.OrdinalIgnoreCase))
                 {
-                    return;
+                    if (!item.IsFolder)
+                    {
+                        return;
+                    }
                 }
             }
 
diff --git a/MediaBrowser.Dlna/Profiles/DefaultProfile.cs b/MediaBrowser.Dlna/Profiles/DefaultProfile.cs
index ff5b3a046f..5c317d94dc 100644
--- a/MediaBrowser.Dlna/Profiles/DefaultProfile.cs
+++ b/MediaBrowser.Dlna/Profiles/DefaultProfile.cs
@@ -32,6 +32,8 @@ namespace MediaBrowser.Dlna.Profiles
 
             MaxStreamingBitrate = 8000000;
             MaxStaticBitrate = 8000000;
+            MusicStreamingTranscodingBitrate = 128000;
+            MusicSyncBitrate = 128000;
 
             EnableAlbumArtInDidl = false;
 
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Android.xml b/MediaBrowser.Dlna/Profiles/Xml/Android.xml
index efab21021d..642f93c149 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Android.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/Android.xml
@@ -18,6 +18,8 @@
   <MaxIconHeight>48</MaxIconHeight>
   <MaxStreamingBitrate>8000000</MaxStreamingBitrate>
   <MaxStaticBitrate>8000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
+  <MusicSyncBitrate>128000</MusicSyncBitrate>
   <XDlnaDoc>DMS-1.50</XDlnaDoc>
   <ProtocolInfo>http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_HD_50_AC3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_BASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_FULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-matroska:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_720p_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_1080i_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_HP_HD_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_LPCM;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_ASP_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_SP_L6_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_NDSD;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_LPCM_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000</ProtocolInfo>
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
@@ -65,4 +67,5 @@
     </CodecProfile>
   </CodecProfiles>
   <ResponseProfiles />
+  <SubtitleProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Default.xml b/MediaBrowser.Dlna/Profiles/Xml/Default.xml
index 164ea943df..61aebdb891 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Default.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/Default.xml
@@ -18,6 +18,8 @@
   <MaxIconHeight>48</MaxIconHeight>
   <MaxStreamingBitrate>8000000</MaxStreamingBitrate>
   <MaxStaticBitrate>8000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
+  <MusicSyncBitrate>128000</MusicSyncBitrate>
   <XDlnaDoc>DMS-1.50</XDlnaDoc>
   <ProtocolInfo>http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_HD_50_AC3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_BASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_FULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-matroska:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_720p_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_1080i_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_HP_HD_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_LPCM;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_ASP_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_SP_L6_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_NDSD;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_LPCM_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000</ProtocolInfo>
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
@@ -35,4 +37,5 @@
   <ContainerProfiles />
   <CodecProfiles />
   <ResponseProfiles />
+  <SubtitleProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml b/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml
index 9a4322b68f..b9b7b6e8e7 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml	
@@ -23,6 +23,8 @@
   <MaxIconHeight>48</MaxIconHeight>
   <MaxStreamingBitrate>8000000</MaxStreamingBitrate>
   <MaxStaticBitrate>8000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
+  <MusicSyncBitrate>128000</MusicSyncBitrate>
   <XDlnaDoc>DMS-1.50</XDlnaDoc>
   <ProtocolInfo>http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_HD_50_AC3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_BASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_FULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-matroska:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_720p_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_1080i_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_HP_HD_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_LPCM;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_ASP_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_SP_L6_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_NDSD;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_LPCM_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000</ProtocolInfo>
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
@@ -39,4 +41,5 @@
   <ContainerProfiles />
   <CodecProfiles />
   <ResponseProfiles />
+  <SubtitleProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml b/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml
index ee18a5efa2..fd5363529c 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml	
@@ -24,6 +24,8 @@
   <MaxIconHeight>48</MaxIconHeight>
   <MaxStreamingBitrate>8000000</MaxStreamingBitrate>
   <MaxStaticBitrate>8000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
+  <MusicSyncBitrate>128000</MusicSyncBitrate>
   <XDlnaDoc>DMS-1.50</XDlnaDoc>
   <ProtocolInfo>http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_HD_50_AC3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_BASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_FULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-matroska:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_720p_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_1080i_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_HP_HD_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_LPCM;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_ASP_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_SP_L6_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_NDSD;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_LPCM_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000</ProtocolInfo>
   <TimelineOffsetSeconds>10</TimelineOffsetSeconds>
@@ -73,4 +75,5 @@
     </CodecProfile>
   </CodecProfiles>
   <ResponseProfiles />
+  <SubtitleProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml b/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml
index 43516a378d..d2cfae46b3 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml	
@@ -22,6 +22,8 @@
   <MaxIconHeight>48</MaxIconHeight>
   <MaxStreamingBitrate>8000000</MaxStreamingBitrate>
   <MaxStaticBitrate>8000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
+  <MusicSyncBitrate>128000</MusicSyncBitrate>
   <XDlnaDoc>DMS-1.50</XDlnaDoc>
   <ProtocolInfo>http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_HD_50_AC3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_BASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_FULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-matroska:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_720p_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_1080i_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_HP_HD_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_LPCM;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_ASP_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_SP_L6_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_NDSD;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_LPCM_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000</ProtocolInfo>
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
@@ -39,4 +41,5 @@
   <ContainerProfiles />
   <CodecProfiles />
   <ResponseProfiles />
+  <SubtitleProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml b/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml
index 1d63d38859..b8360d95ce 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml
@@ -24,6 +24,8 @@
   <MaxIconHeight>48</MaxIconHeight>
   <MaxStreamingBitrate>8000000</MaxStreamingBitrate>
   <MaxStaticBitrate>8000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
+  <MusicSyncBitrate>128000</MusicSyncBitrate>
   <XDlnaDoc>DMS-1.50</XDlnaDoc>
   <ProtocolInfo>http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_HD_50_AC3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_BASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_FULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-matroska:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_720p_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_1080i_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_HP_HD_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_LPCM;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_ASP_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_SP_L6_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_NDSD;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_LPCM_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000</ProtocolInfo>
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
@@ -45,4 +47,5 @@
   <ContainerProfiles />
   <CodecProfiles />
   <ResponseProfiles />
+  <SubtitleProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml
index 2ae5524faa..de767b9327 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml	
@@ -25,6 +25,8 @@
   <MaxIconHeight>48</MaxIconHeight>
   <MaxStreamingBitrate>8000000</MaxStreamingBitrate>
   <MaxStaticBitrate>8000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
+  <MusicSyncBitrate>128000</MusicSyncBitrate>
   <XDlnaDoc>DMS-1.50</XDlnaDoc>
   <ProtocolInfo>http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_HD_50_AC3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_BASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_FULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-matroska:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_720p_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_1080i_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_HP_HD_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_LPCM;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_ASP_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_SP_L6_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_NDSD;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_LPCM_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000</ProtocolInfo>
   <TimelineOffsetSeconds>10</TimelineOffsetSeconds>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml
index 1ce80339cb..25dac2f843 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml	
@@ -24,6 +24,8 @@
   <MaxIconHeight>48</MaxIconHeight>
   <MaxStreamingBitrate>8000000</MaxStreamingBitrate>
   <MaxStaticBitrate>8000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
+  <MusicSyncBitrate>128000</MusicSyncBitrate>
   <XDlnaDoc>DMS-1.50</XDlnaDoc>
   <ProtocolInfo>http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_HD_50_AC3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_BASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_FULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-matroska:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_720p_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_1080i_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_HP_HD_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_LPCM;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_ASP_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_SP_L6_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_NDSD;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_LPCM_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000</ProtocolInfo>
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml
index c3c13cdc3d..65f3393ff2 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml	
@@ -24,6 +24,8 @@
   <MaxIconHeight>48</MaxIconHeight>
   <MaxStreamingBitrate>8000000</MaxStreamingBitrate>
   <MaxStaticBitrate>8000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
+  <MusicSyncBitrate>128000</MusicSyncBitrate>
   <XDlnaDoc>DMS-1.50</XDlnaDoc>
   <ProtocolInfo>http-get:*:video/divx:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMABASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMAFULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/flac:DLNA.ORG_PN=FLAC;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/ogg:DLNA.ORG_PN=OGG;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/gif:DLNA.ORG_PN=GIF_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_JP_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-flv:DLNA.ORG_PN=FLV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-dvr:DLNA.ORG_PN=DVR_MS;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/wtv:DLNA.ORG_PN=WTV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/ogg:DLNA.ORG_PN=OGV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.rn-realvideo:DLNA.ORG_PN=REAL_VIDEO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_3GPP_P0_L10_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_MP4_P0_L10_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
@@ -71,4 +73,5 @@
     </CodecProfile>
   </CodecProfiles>
   <ResponseProfiles />
+  <SubtitleProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml
index d48fc34b18..c47e5045eb 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml	
@@ -26,6 +26,8 @@
   <MaxIconHeight>48</MaxIconHeight>
   <MaxStreamingBitrate>8000000</MaxStreamingBitrate>
   <MaxStaticBitrate>8000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
+  <MusicSyncBitrate>128000</MusicSyncBitrate>
   <XDlnaDoc>DMS-1.50</XDlnaDoc>
   <ProtocolInfo>http-get:*:video/divx:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMABASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMAFULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/mp4:DLNA.ORG_PN=AAC_ISO_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/vnd.dlna.adts:DLNA.ORG_PN=AAC_ADTS_320;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/flac:DLNA.ORG_PN=FLAC;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:audio/ogg:DLNA.ORG_PN=OGG;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/png:DLNA.ORG_PN=PNG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/gif:DLNA.ORG_PN=GIF_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_JP_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-flv:DLNA.ORG_PN=FLV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-dvr:DLNA.ORG_PN=DVR_MS;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/wtv:DLNA.ORG_PN=WTV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/ogg:DLNA.ORG_PN=OGV;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/vnd.rn-realvideo:DLNA.ORG_PN=REAL_VIDEO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_P2_3GPP_SP_L0B_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_3GPP_P0_L10_AMR;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:video/3gpp:DLNA.ORG_PN=MPEG4_H263_MP4_P0_L10_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
@@ -99,4 +101,5 @@
       <Conditions />
     </ResponseProfile>
   </ResponseProfiles>
+  <SubtitleProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml
index 319936e0a5..c0164ae533 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml	
@@ -25,6 +25,8 @@
   <MaxIconHeight>48</MaxIconHeight>
   <MaxStreamingBitrate>8000000</MaxStreamingBitrate>
   <MaxStaticBitrate>8000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
+  <MusicSyncBitrate>128000</MusicSyncBitrate>
   <XDlnaDoc>DMS-1.50</XDlnaDoc>
   <SonyAggregationFlags>10</SonyAggregationFlags>
   <ProtocolInfo>http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=81500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=81500000000000000000000000000000</ProtocolInfo>
@@ -107,4 +109,5 @@
       <Conditions />
     </ResponseProfile>
   </ResponseProfiles>
+  <SubtitleProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml
index 541ecf8286..454c7b794d 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml	
@@ -25,6 +25,8 @@
   <MaxIconHeight>48</MaxIconHeight>
   <MaxStreamingBitrate>8000000</MaxStreamingBitrate>
   <MaxStaticBitrate>8000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
+  <MusicSyncBitrate>128000</MusicSyncBitrate>
   <XDlnaDoc>DMS-1.50</XDlnaDoc>
   <SonyAggregationFlags>10</SonyAggregationFlags>
   <ProtocolInfo>http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_HD_50_AC3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_BASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_FULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-matroska:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_720p_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_1080i_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_HP_HD_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_LPCM;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_ASP_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_SP_L6_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_NDSD;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_LPCM_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000</ProtocolInfo>
@@ -110,4 +112,5 @@
       <Conditions />
     </ResponseProfile>
   </ResponseProfiles>
+  <SubtitleProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml
index a99dc6b4e6..f9e20531ad 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml	
@@ -25,6 +25,8 @@
   <MaxIconHeight>48</MaxIconHeight>
   <MaxStreamingBitrate>8000000</MaxStreamingBitrate>
   <MaxStaticBitrate>8000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
+  <MusicSyncBitrate>128000</MusicSyncBitrate>
   <XDlnaDoc>DMS-1.50</XDlnaDoc>
   <SonyAggregationFlags>10</SonyAggregationFlags>
   <ProtocolInfo>http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_HD_50_AC3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_BASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_FULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-matroska:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_720p_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_1080i_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_HP_HD_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_LPCM;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_ASP_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_SP_L6_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_NDSD;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_LPCM_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000</ProtocolInfo>
@@ -93,4 +95,5 @@
       <Conditions />
     </ResponseProfile>
   </ResponseProfiles>
+  <SubtitleProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml
index 40e55e98ad..68e35184c2 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml	
@@ -25,6 +25,8 @@
   <MaxIconHeight>48</MaxIconHeight>
   <MaxStreamingBitrate>8000000</MaxStreamingBitrate>
   <MaxStaticBitrate>8000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
+  <MusicSyncBitrate>128000</MusicSyncBitrate>
   <XDlnaDoc>DMS-1.50</XDlnaDoc>
   <SonyAggregationFlags>10</SonyAggregationFlags>
   <ProtocolInfo>http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_HD_50_AC3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_BASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_FULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-matroska:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_720p_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_1080i_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_HP_HD_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_LPCM;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_ASP_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_SP_L6_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_NDSD;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_LPCM_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000</ProtocolInfo>
@@ -93,4 +95,5 @@
       <Conditions />
     </ResponseProfile>
   </ResponseProfiles>
+  <SubtitleProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml
index 4499b905df..103c8ad273 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml	
@@ -25,6 +25,8 @@
   <MaxIconHeight>48</MaxIconHeight>
   <MaxStreamingBitrate>8000000</MaxStreamingBitrate>
   <MaxStaticBitrate>8000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
+  <MusicSyncBitrate>128000</MusicSyncBitrate>
   <XDlnaDoc>DMS-1.50</XDlnaDoc>
   <SonyAggregationFlags>10</SonyAggregationFlags>
   <ProtocolInfo>http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_HD_50_AC3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_BASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_FULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-matroska:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_720p_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_1080i_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_HP_HD_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_LPCM;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_ASP_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_SP_L6_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_NDSD;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_LPCM_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000</ProtocolInfo>
@@ -93,4 +95,5 @@
       <Conditions />
     </ResponseProfile>
   </ResponseProfiles>
+  <SubtitleProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml b/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml
index 4e0231a535..3717b07c4c 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml	
@@ -25,6 +25,8 @@
   <MaxIconHeight>48</MaxIconHeight>
   <MaxStreamingBitrate>8000000</MaxStreamingBitrate>
   <MaxStaticBitrate>8000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
+  <MusicSyncBitrate>128000</MusicSyncBitrate>
   <XDlnaDoc>DMS-1.50</XDlnaDoc>
   <ProtocolInfo>http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_HD_50_AC3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_BASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_FULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-matroska:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_720p_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_1080i_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_HP_HD_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_LPCM;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_ASP_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_SP_L6_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_NDSD;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_LPCM_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000</ProtocolInfo>
   <TimelineOffsetSeconds>5</TimelineOffsetSeconds>
@@ -78,4 +80,5 @@
       <Conditions />
     </ResponseProfile>
   </ResponseProfiles>
+  <SubtitleProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Windows 8 RT.xml b/MediaBrowser.Dlna/Profiles/Xml/Windows 8 RT.xml
index dec3d02ef3..284166fa32 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Windows 8 RT.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Windows 8 RT.xml	
@@ -22,6 +22,8 @@
   <MaxIconHeight>48</MaxIconHeight>
   <MaxStreamingBitrate>8000000</MaxStreamingBitrate>
   <MaxStaticBitrate>8000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
+  <MusicSyncBitrate>128000</MusicSyncBitrate>
   <XDlnaDoc>DMS-1.50</XDlnaDoc>
   <ProtocolInfo>http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_HD_50_AC3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_BASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_FULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-matroska:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_720p_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_1080i_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_HP_HD_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_LPCM;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_ASP_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_SP_L6_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_NDSD;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_LPCM_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000</ProtocolInfo>
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Windows Phone.xml b/MediaBrowser.Dlna/Profiles/Xml/Windows Phone.xml
index 7c3414b25d..d1f4152918 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Windows Phone.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Windows Phone.xml	
@@ -18,6 +18,8 @@
   <MaxIconHeight>48</MaxIconHeight>
   <MaxStreamingBitrate>8000000</MaxStreamingBitrate>
   <MaxStaticBitrate>8000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
+  <MusicSyncBitrate>128000</MusicSyncBitrate>
   <XDlnaDoc>DMS-1.50</XDlnaDoc>
   <ProtocolInfo>http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_HD_50_AC3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_BASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_FULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-matroska:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_720p_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_1080i_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_HP_HD_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_LPCM;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_ASP_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_SP_L6_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_NDSD;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_LPCM_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000</ProtocolInfo>
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
@@ -76,4 +78,5 @@
     </CodecProfile>
   </CodecProfiles>
   <ResponseProfiles />
+  <SubtitleProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml b/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml
index b629fa5183..3a7eddc1f9 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml	
@@ -25,6 +25,8 @@
   <MaxIconHeight>48</MaxIconHeight>
   <MaxStreamingBitrate>8000000</MaxStreamingBitrate>
   <MaxStaticBitrate>8000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
+  <MusicSyncBitrate>128000</MusicSyncBitrate>
   <XDlnaDoc>DMS-1.50</XDlnaDoc>
   <ProtocolInfo>http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_HD_50_AC3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_BASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_FULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-matroska:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_720p_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_1080i_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_HP_HD_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_LPCM;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_ASP_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_SP_L6_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_NDSD;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_LPCM_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000</ProtocolInfo>
   <TimelineOffsetSeconds>40</TimelineOffsetSeconds>
@@ -100,4 +102,5 @@
       <Conditions />
     </ResponseProfile>
   </ResponseProfiles>
+  <SubtitleProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml
index 5f86a94a9f..13c368328b 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml	
@@ -23,6 +23,8 @@
   <MaxIconHeight>48</MaxIconHeight>
   <MaxStreamingBitrate>8000000</MaxStreamingBitrate>
   <MaxStaticBitrate>8000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
+  <MusicSyncBitrate>128000</MusicSyncBitrate>
   <XDlnaDoc>DMS-1.50</XDlnaDoc>
   <ProtocolInfo>http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_HD_50_AC3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_BASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_FULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-matroska:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_720p_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_1080i_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_HP_HD_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_LPCM;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_ASP_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_SP_L6_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_NDSD;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_LPCM_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000</ProtocolInfo>
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
@@ -90,4 +92,5 @@
       <Conditions />
     </ResponseProfile>
   </ResponseProfiles>
+  <SubtitleProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml b/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml
index 40ad2bc78a..09886210c3 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml
@@ -24,6 +24,8 @@
   <MaxIconHeight>48</MaxIconHeight>
   <MaxStreamingBitrate>8000000</MaxStreamingBitrate>
   <MaxStaticBitrate>8000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
+  <MusicSyncBitrate>128000</MusicSyncBitrate>
   <XDlnaDoc>DMS-1.50</XDlnaDoc>
   <ProtocolInfo>http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_HD_50_AC3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_BASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_FULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-matroska:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_720p_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_1080i_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_HP_HD_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_LPCM;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_ASP_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_SP_L6_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_NDSD;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_LPCM_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000</ProtocolInfo>
   <TimelineOffsetSeconds>0</TimelineOffsetSeconds>
@@ -45,4 +47,5 @@
   <ContainerProfiles />
   <CodecProfiles />
   <ResponseProfiles />
+  <SubtitleProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Ssdp/SsdpHandler.cs b/MediaBrowser.Dlna/Ssdp/SsdpHandler.cs
index d724628122..beeeb31c0f 100644
--- a/MediaBrowser.Dlna/Ssdp/SsdpHandler.cs
+++ b/MediaBrowser.Dlna/Ssdp/SsdpHandler.cs
@@ -184,7 +184,7 @@ namespace MediaBrowser.Dlna.Ssdp
                     values["ST"] = d.Type;
                     values["USN"] = d.USN;
 
-                    SendDatagram(header, values, endpoint);
+                    SendDatagram(header, values, endpoint, null);
 
                     if (_config.GetDlnaConfiguration().EnableDebugLogging)
                     {
diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
index 2a99076d42..dfc7b55d86 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -761,6 +761,9 @@
     <Compile Include="..\MediaBrowser.Model\Querying\ItemsResult.cs">
       <Link>Querying\ItemsResult.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Querying\LatestItemsQuery.cs">
+      <Link>Querying\LatestItemsQuery.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Querying\NextUpQuery.cs">
       <Link>Querying\NextUpQuery.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
index 72414d454c..63dc137ce5 100644
--- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
+++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
@@ -718,6 +718,9 @@
     <Compile Include="..\MediaBrowser.Model\Querying\ItemsResult.cs">
       <Link>Querying\ItemsResult.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Querying\LatestItemsQuery.cs">
+      <Link>Querying\LatestItemsQuery.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Querying\NextUpQuery.cs">
       <Link>Querying\NextUpQuery.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index 98b765e6bd..7e8773c5be 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -203,6 +203,13 @@ namespace MediaBrowser.Model.ApiClient
         /// <exception cref="ArgumentNullException">id</exception>
         Task<BaseItemDto> GetItemAsync(string id, string userId);
 
+        /// <summary>
+        /// Gets the latest items.
+        /// </summary>
+        /// <param name="query">The query.</param>
+        /// <returns>Task&lt;QueryResult&lt;BaseItemDto&gt;&gt;.</returns>
+        Task<QueryResult<BaseItemDto>> GetLatestItems(LatestItemsQuery query);
+        
         /// <summary>
         /// Gets the intros async.
         /// </summary>
diff --git a/MediaBrowser.Model/Configuration/ChannelOptions.cs b/MediaBrowser.Model/Configuration/ChannelOptions.cs
index f0fc4d47c4..26fb1c9bdd 100644
--- a/MediaBrowser.Model/Configuration/ChannelOptions.cs
+++ b/MediaBrowser.Model/Configuration/ChannelOptions.cs
@@ -9,9 +9,12 @@
 
         public string[] DownloadingChannels { get; set; }
 
+        public double? DownloadSizeLimit { get; set; }
+
         public ChannelOptions()
         {
             DownloadingChannels = new string[] { };
+            DownloadSizeLimit = 1;
             MaxDownloadAge = 30;
         }
     }
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 6600a3e912..d96412335e 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -186,6 +186,7 @@ namespace MediaBrowser.Model.Configuration
         public bool DefaultMetadataSettingsApplied { get; set; }
 
         public bool EnableTokenAuthentication { get; set; }
+        public PeopleMetadataOptions PeopleMetadataOptions { get; set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
@@ -229,6 +230,8 @@ namespace MediaBrowser.Model.Configuration
 
             UICulture = "en-us";
 
+            PeopleMetadataOptions = new PeopleMetadataOptions();
+
             MetadataOptions = new[]
             {
                 new MetadataOptions(1, 1280) {ItemType = "Book"},
@@ -288,4 +291,21 @@ namespace MediaBrowser.Model.Configuration
             };
         }
     }
+
+    public class PeopleMetadataOptions
+    {
+        public bool DownloadActorMetadata { get; set; }
+        public bool DownloadDirectorMetadata { get; set; }
+        public bool DownloadProducerMetadata { get; set; }
+        public bool DownloadWriterMetadata { get; set; }
+        public bool DownloadComposerMetadata { get; set; }
+        public bool DownloadOtherPeopleMetadata { get; set; }
+        public bool DownloadGuestStarMetadata { get; set; }
+
+        public PeopleMetadataOptions()
+        {
+            DownloadActorMetadata = true;
+            DownloadDirectorMetadata = true;
+        }
+    }
 }
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 1afc9a191c..8f55fde4b3 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -73,6 +73,7 @@ namespace MediaBrowser.Model.Configuration
 
         public SubtitlePlaybackMode SubtitleMode { get; set; }
         public bool DisplayCollectionsView { get; set; }
+        public bool DisplayFoldersView { get; set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="UserConfiguration" /> class.
diff --git a/MediaBrowser.Model/Dlna/AudioOptions.cs b/MediaBrowser.Model/Dlna/AudioOptions.cs
index 9b54f7e16f..309b675439 100644
--- a/MediaBrowser.Model/Dlna/AudioOptions.cs
+++ b/MediaBrowser.Model/Dlna/AudioOptions.cs
@@ -36,6 +36,12 @@ namespace MediaBrowser.Model.Dlna
         /// <value>The context.</value>
         public EncodingContext Context { get; set; }
 
+        /// <summary>
+        /// Gets or sets the audio transcoding bitrate.
+        /// </summary>
+        /// <value>The audio transcoding bitrate.</value>
+        public int? AudioTranscodingBitrate { get; set; }
+
         /// <summary>
         /// Gets the maximum bitrate.
         /// </summary>
diff --git a/MediaBrowser.Model/Dlna/DeviceProfile.cs b/MediaBrowser.Model/Dlna/DeviceProfile.cs
index ff9e1d6a32..67cfa02088 100644
--- a/MediaBrowser.Model/Dlna/DeviceProfile.cs
+++ b/MediaBrowser.Model/Dlna/DeviceProfile.cs
@@ -52,6 +52,9 @@ namespace MediaBrowser.Model.Dlna
         public int? MaxStreamingBitrate { get; set; }
         public int? MaxStaticBitrate { get; set; }
 
+        public int? MusicStreamingTranscodingBitrate { get; set; }
+        public int? MusicSyncBitrate { get; set; }
+
         /// <summary>
         /// Controls the content of the X_DLNADOC element in the urn:schemas-dlna-org:device-1-0 namespace.
         /// </summary>
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index ad82cdc137..5a3e267e61 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -217,10 +217,11 @@ namespace MediaBrowser.Model.Dlna
                     playlistItem.MaxAudioChannels = Math.Min(options.MaxAudioChannels.Value, currentValue);
                 }
 
-                if (!playlistItem.AudioBitrate.HasValue)
-                {
-                    playlistItem.AudioBitrate = 128000;
-                }
+                var configuredBitrate = options.AudioTranscodingBitrate ??
+                    (options.Context == EncodingContext.Static ? options.Profile.MusicSyncBitrate : options.Profile.MusicStreamingTranscodingBitrate) ??
+                    128000;
+
+                playlistItem.AudioBitrate = Math.Min(configuredBitrate, playlistItem.AudioBitrate ?? configuredBitrate);
             }
 
             return playlistItem;
diff --git a/MediaBrowser.Model/Entities/CollectionType.cs b/MediaBrowser.Model/Entities/CollectionType.cs
index 31cda8303e..a97cc3b120 100644
--- a/MediaBrowser.Model/Entities/CollectionType.cs
+++ b/MediaBrowser.Model/Entities/CollectionType.cs
@@ -24,5 +24,9 @@
         public const string Channels = "channels";
         public const string LiveTv = "livetv";
         public const string Playlists = "playlists";
+        public const string Folders = "folders";
+
+        public const string LiveTvChannels = "LiveTvChannels";
+        public const string LiveTvRecordingGroups = "LiveTvRecordingGroups";
     }
 }
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 75694cb04d..f3360fe52c 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -243,6 +243,7 @@
     <Compile Include="Querying\ItemCountsQuery.cs" />
     <Compile Include="Querying\ItemsByNameQuery.cs" />
     <Compile Include="Entities\BaseItemInfo.cs" />
+    <Compile Include="Querying\LatestItemsQuery.cs" />
     <Compile Include="Querying\NextUpQuery.cs" />
     <Compile Include="Querying\QueryResult.cs" />
     <Compile Include="Querying\SeasonQuery.cs" />
diff --git a/MediaBrowser.Model/Querying/LatestItemsQuery.cs b/MediaBrowser.Model/Querying/LatestItemsQuery.cs
new file mode 100644
index 0000000000..ccf5ab087b
--- /dev/null
+++ b/MediaBrowser.Model/Querying/LatestItemsQuery.cs
@@ -0,0 +1,54 @@
+
+namespace MediaBrowser.Model.Querying
+{
+    public class LatestItemsQuery
+    {
+        /// <summary>
+        /// The user to localize search results for
+        /// </summary>
+        /// <value>The user id.</value>
+        public string UserId { get; set; }
+
+        /// <summary>
+        /// Specify this to localize the search to a specific item or folder. Omit to use the root.
+        /// </summary>
+        /// <value>The parent id.</value>
+        public string ParentId { get; set; }
+
+        /// <summary>
+        /// Skips over a given number of items within the results. Use for paging.
+        /// </summary>
+        /// <value>The start index.</value>
+        public int? StartIndex { get; set; }
+
+        /// <summary>
+        /// The maximum number of items to return
+        /// </summary>
+        /// <value>The limit.</value>
+        public int? Limit { get; set; }
+
+        /// <summary>
+        /// Fields to return within the items, in addition to basic information
+        /// </summary>
+        /// <value>The fields.</value>
+        public ItemFields[] Fields { get; set; }
+
+        /// <summary>
+        /// Gets or sets the include item types.
+        /// </summary>
+        /// <value>The include item types.</value>
+        public string[] IncludeItemTypes { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is played.
+        /// </summary>
+        /// <value><c>null</c> if [is played] contains no value, <c>true</c> if [is played]; otherwise, <c>false</c>.</value>
+        public bool? IsPlayed { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [group items].
+        /// </summary>
+        /// <value><c>true</c> if [group items]; otherwise, <c>false</c>.</value>
+        public bool GroupItems { get; set; }
+    }
+}
diff --git a/MediaBrowser.Providers/Manager/ItemImageProvider.cs b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
index 9e69d08577..ef5c30975b 100644
--- a/MediaBrowser.Providers/Manager/ItemImageProvider.cs
+++ b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
@@ -236,6 +236,11 @@ namespace MediaBrowser.Providers.Manager
         {
             try
             {
+                if (!item.SupportsRemoteImageDownloading)
+                {
+                    return;
+                }
+
                 if (!refreshOptions.ReplaceAllImages && 
                     refreshOptions.ReplaceImages.Count == 0 && 
                     ContainsImages(item, provider.GetSupportedImages(item).ToList(), savedOptions, backdropLimit, screenshotLimit))
diff --git a/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs b/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
index d7615eb022..41c4dcb0de 100644
--- a/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
+++ b/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
@@ -1,5 +1,7 @@
-using MediaBrowser.Common.IO;
+using System.Linq;
+using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
@@ -40,7 +42,11 @@ namespace MediaBrowser.Providers.Playlists
 
             if (mergeMetadataSettings)
             {
-                target.LinkedChildren = source.LinkedChildren;
+                var list = source.LinkedChildren.ToList();
+
+                list.AddRange(target.LinkedChildren);
+
+                target.LinkedChildren = list;
             }
         }
     }
diff --git a/MediaBrowser.Providers/TV/TvdbEpisodeImageProvider.cs b/MediaBrowser.Providers/TV/TvdbEpisodeImageProvider.cs
index ef37784501..d105174706 100644
--- a/MediaBrowser.Providers/TV/TvdbEpisodeImageProvider.cs
+++ b/MediaBrowser.Providers/TV/TvdbEpisodeImageProvider.cs
@@ -188,9 +188,11 @@ namespace MediaBrowser.Providers.TV
 
         public bool HasChanged(IHasMetadata item, IDirectoryService directoryService, DateTime date)
         {
-            if (item.LocationType != LocationType.Virtual)
+            var episode = (Episode)item;
+            
+            if (!episode.IsVirtualUnaired)
             {
-                // For non-virtual items, only enable if configured
+                // For non-unaired items, only enable if configured
                 if (!_config.Configuration.EnableTvDbUpdates)
                 {
                     return false;
@@ -199,7 +201,6 @@ namespace MediaBrowser.Providers.TV
 
             if (!item.HasImage(ImageType.Primary))
             {
-                var episode = (Episode)item;
                 var series = episode.Series;
 
                 var seriesId = series != null ? series.GetProviderId(MetadataProviders.Tvdb) : null;
diff --git a/MediaBrowser.Server.Implementations/Activity/ActivityManager.cs b/MediaBrowser.Server.Implementations/Activity/ActivityManager.cs
index 46eaa7f21d..7b123bad2d 100644
--- a/MediaBrowser.Server.Implementations/Activity/ActivityManager.cs
+++ b/MediaBrowser.Server.Implementations/Activity/ActivityManager.cs
@@ -32,9 +32,9 @@ namespace MediaBrowser.Server.Implementations.Activity
             EventHelper.FireEventIfNotNull(EntryCreated, this, new GenericEventArgs<ActivityLogEntry>(entry), _logger);
         }
 
-        public QueryResult<ActivityLogEntry> GetActivityLogEntries(int? startIndex, int? limit)
+        public QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit)
         {
-            return _repo.GetActivityLogEntries(startIndex, limit);
+            return _repo.GetActivityLogEntries(minDate, startIndex, limit);
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Activity/ActivityRepository.cs b/MediaBrowser.Server.Implementations/Activity/ActivityRepository.cs
index 787cbcc5b8..f491a5c442 100644
--- a/MediaBrowser.Server.Implementations/Activity/ActivityRepository.cs
+++ b/MediaBrowser.Server.Implementations/Activity/ActivityRepository.cs
@@ -139,7 +139,7 @@ namespace MediaBrowser.Server.Implementations.Activity
             }
         }
 
-        public QueryResult<ActivityLogEntry> GetActivityLogEntries(int? startIndex, int? limit)
+        public QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit)
         {
             using (var cmd = _connection.CreateCommand())
             {
@@ -147,17 +147,33 @@ namespace MediaBrowser.Server.Implementations.Activity
 
                 var whereClauses = new List<string>();
 
-                if (startIndex.HasValue && startIndex.Value > 0)
+                if (minDate.HasValue)
                 {
-                    whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM ActivityLogEntries ORDER BY DateCreated DESC LIMIT {0})",
-                        startIndex.Value.ToString(_usCulture)));
+                    whereClauses.Add("DateCreated>=@DateCreated");
+                    cmd.Parameters.Add(cmd, "@DateCreated", DbType.Date).Value = minDate.Value;
                 }
 
-                if (whereClauses.Count > 0)
+                var whereTextWithoutPaging = whereClauses.Count == 0 ?
+                    string.Empty :
+                    " where " + string.Join(" AND ", whereClauses.ToArray());
+
+                if (startIndex.HasValue && startIndex.Value > 0)
                 {
-                    cmd.CommandText += " where " + string.Join(" AND ", whereClauses.ToArray());
+                    var pagingWhereText = whereClauses.Count == 0 ?
+                        string.Empty :
+                        " where " + string.Join(" AND ", whereClauses.ToArray());
+                    
+                    whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM ActivityLogEntries {0} ORDER BY DateCreated DESC LIMIT {1})",
+                        pagingWhereText,
+                        startIndex.Value.ToString(_usCulture)));
                 }
 
+                var whereText = whereClauses.Count == 0 ? 
+                    string.Empty :
+                    " where " + string.Join(" AND ", whereClauses.ToArray());
+
+                cmd.CommandText += whereText;
+
                 cmd.CommandText += " ORDER BY DateCreated DESC";
 
                 if (limit.HasValue)
@@ -165,7 +181,7 @@ namespace MediaBrowser.Server.Implementations.Activity
                     cmd.CommandText += " LIMIT " + limit.Value.ToString(_usCulture);
                 }
 
-                cmd.CommandText += "; select count (Id) from ActivityLogEntries";
+                cmd.CommandText += "; select count (Id) from ActivityLogEntries" + whereTextWithoutPaging;
 
                 var list = new List<ActivityLogEntry>();
                 var count = 0;
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs b/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
index 567092caec..65e5a05499 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
@@ -7,6 +7,7 @@ using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Channels;
+using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.MediaInfo;
@@ -154,7 +155,7 @@ namespace MediaBrowser.Server.Implementations.Channels
                 {
                     try
                     {
-                        await DownloadChannelItem(item, cancellationToken, path);
+                        await DownloadChannelItem(item, options, cancellationToken, path);
                     }
                     catch (OperationCanceledException)
                     {
@@ -176,9 +177,18 @@ namespace MediaBrowser.Server.Implementations.Channels
         }
 
         private async Task DownloadChannelItem(BaseItemDto item,
+            ChannelOptions channelOptions,
             CancellationToken cancellationToken,
             string path)
         {
+            if (channelOptions.DownloadSizeLimit.HasValue)
+            {
+                if (IsSizeLimitReached(path, channelOptions.DownloadSizeLimit.Value))
+                {
+                    return;
+                }    
+            }
+
             var sources = await _manager.GetChannelItemMediaSources(item.Id, cancellationToken)
                 .ConfigureAwait(false);
 
@@ -253,6 +263,25 @@ namespace MediaBrowser.Server.Implementations.Channels
             }
         }
 
+        private bool IsSizeLimitReached(string path, double gbLimit)
+        {
+            var byteLimit = gbLimit*1000000000;
+
+            long total = 0;
+
+            foreach (var file in new DirectoryInfo(path).EnumerateFiles("*", SearchOption.AllDirectories))
+            {
+                total += file.Length;
+
+                if (total >= byteLimit)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         private async Task RefreshMediaSourceItems(IEnumerable<MediaSourceInfo> items, CancellationToken cancellationToken)
         {
             foreach (var item in items)
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/ActivityLogEntryPoint.cs b/MediaBrowser.Server.Implementations/EntryPoints/ActivityLogEntryPoint.cs
index b8290fda75..0bd772a56f 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/ActivityLogEntryPoint.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/ActivityLogEntryPoint.cs
@@ -61,15 +61,15 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
 
         public void Run()
         {
-            _taskManager.TaskExecuting += _taskManager_TaskExecuting;
-            _taskManager.TaskCompleted += _taskManager_TaskCompleted;
+            //_taskManager.TaskExecuting += _taskManager_TaskExecuting;
+            //_taskManager.TaskCompleted += _taskManager_TaskCompleted;
 
-            _installationManager.PluginInstalled += _installationManager_PluginInstalled;
-            _installationManager.PluginUninstalled += _installationManager_PluginUninstalled;
-            _installationManager.PluginUpdated += _installationManager_PluginUpdated;
+            //_installationManager.PluginInstalled += _installationManager_PluginInstalled;
+            //_installationManager.PluginUninstalled += _installationManager_PluginUninstalled;
+            //_installationManager.PluginUpdated += _installationManager_PluginUpdated;
 
-            _libraryManager.ItemAdded += _libraryManager_ItemAdded;
-            _libraryManager.ItemRemoved += _libraryManager_ItemRemoved;
+            //_libraryManager.ItemAdded += _libraryManager_ItemAdded;
+            //_libraryManager.ItemRemoved += _libraryManager_ItemRemoved;
 
             _sessionManager.SessionStarted += _sessionManager_SessionStarted;
             _sessionManager.AuthenticationFailed += _sessionManager_AuthenticationFailed;
@@ -79,7 +79,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             _sessionManager.PlaybackStart += _sessionManager_PlaybackStart;
             _sessionManager.PlaybackStopped += _sessionManager_PlaybackStopped;
 
-            _subManager.SubtitlesDownloaded += _subManager_SubtitlesDownloaded;
+            //_subManager.SubtitlesDownloaded += _subManager_SubtitlesDownloaded;
             _subManager.SubtitleDownloadFailure += _subManager_SubtitleDownloadFailure;
 
             _userManager.UserCreated += _userManager_UserCreated;
@@ -87,8 +87,8 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             _userManager.UserDeleted += _userManager_UserDeleted;
             _userManager.UserConfigurationUpdated += _userManager_UserConfigurationUpdated;
 
-            _config.ConfigurationUpdated += _config_ConfigurationUpdated;
-            _config.NamedConfigurationUpdated += _config_NamedConfigurationUpdated;
+            //_config.ConfigurationUpdated += _config_ConfigurationUpdated;
+            //_config.NamedConfigurationUpdated += _config_NamedConfigurationUpdated;
 
             //_logManager.LoggerLoaded += _logManager_LoggerLoaded;
 
@@ -165,6 +165,9 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             if (string.IsNullOrWhiteSpace(session.UserName))
             {
                 name = string.Format(_localization.GetLocalizedString("DeviceOfflineWithName"), session.DeviceName);
+
+                // Causing too much spam for now
+                return;
             }
             else
             {
@@ -288,6 +291,9 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             if (string.IsNullOrWhiteSpace(session.UserName))
             {
                 name = string.Format(_localization.GetLocalizedString("DeviceOnlineWithName"), session.DeviceName);
+
+                // Causing too much spam for now
+                return;
             }
             else
             {
@@ -394,6 +400,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
 
             if (result.Status == TaskCompletionStatus.Cancelled)
             {
+                return;
                 CreateLogEntry(new ActivityLogEntry
                 {
                     Name = string.Format(_localization.GetLocalizedString("ScheduledTaskCancelledWithName"), task.Name),
@@ -403,6 +410,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             }
             else if (result.Status == TaskCompletionStatus.Completed)
             {
+                return;
                 CreateLogEntry(new ActivityLogEntry
                 {
                     Name = string.Format(_localization.GetLocalizedString("ScheduledTaskCompletedWithName"), task.Name),
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index 90b77828bb..044ed25f91 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -35,8 +35,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
         private IHttpListener _listener;
 
-        private const int IdleTimeout = 300;
-
         private readonly ContainerAdapter _containerAdapter;
 
         public event EventHandler<WebSocketConnectEventArgs> WebSocketConnected;
@@ -152,7 +150,8 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             HostContext.Config.HandlerFactoryPath = ListenerRequest.GetHandlerPathIfAny(UrlPrefixes.First());
 
             _listener = NativeWebSocket.IsSupported
-                ? _listener = new WebSocketSharpListener(_logger)
+                ? _listener = new HttpListenerServer(_logger)
+                //? _listener = new WebSocketSharpListener(_logger)
                 : _listener = new WebSocketSharpListener(_logger);
 
             _listener.WebSocketHandler = WebSocketHandler;
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
index cd871d8eb1..477aa3878e 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
@@ -7,16 +7,17 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using WebSocketSharp.Net;
-using WebSocketSharp.Server;
 
 namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
 {
     public class WebSocketSharpListener : IHttpListener
     {
         private readonly ConcurrentDictionary<string, string> _localEndPoints = new ConcurrentDictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-        private WebSocketSharp.Server.HttpServer _httpsv;
+        private WebSocketSharp.Net.HttpListener _listener;
+        private readonly AutoResetEvent _listenForNextRequest = new AutoResetEvent(false);
 
         private readonly ILogger _logger;
 
@@ -38,16 +39,85 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
 
         public void Start(IEnumerable<string> urlPrefixes)
         {
-            _httpsv = new WebSocketSharp.Server.HttpServer(8096, false, urlPrefixes.First());
+            if (_listener == null)
+                _listener = new WebSocketSharp.Net.HttpListener();
 
-            _httpsv.OnRequest += _httpsv_OnRequest;
+            foreach (var prefix in urlPrefixes)
+            {
+                _logger.Info("Adding HttpListener prefix " + prefix);
+                _listener.Prefixes.Add(prefix);
+            }
+
+            _listener.Start();
 
-            _httpsv.Start();
+            Task.Factory.StartNew(Listen, TaskCreationOptions.LongRunning);
+        }
+
+        private bool IsListening
+        {
+            get { return _listener != null && _listener.IsListening; }
         }
 
-        void _httpsv_OnRequest(object sender, HttpRequestEventArgs e)
+        // Loop here to begin processing of new requests.
+        private void Listen()
         {
-            Task.Factory.StartNew(() => InitTask(e.Context));
+            while (IsListening)
+            {
+                if (_listener == null) return;
+
+                try
+                {
+                    _listener.BeginGetContext(ListenerCallback, _listener);
+                    _listenForNextRequest.WaitOne();
+                }
+                catch (Exception ex)
+                {
+                    _logger.Error("Listen()", ex);
+                    return;
+                }
+                if (_listener == null) return;
+            }
+        }
+
+        // Handle the processing of a request in here.
+        private void ListenerCallback(IAsyncResult asyncResult)
+        {
+            var listener = asyncResult.AsyncState as HttpListener;
+            HttpListenerContext context;
+
+            if (listener == null) return;
+            var isListening = listener.IsListening;
+
+            try
+            {
+                if (!isListening)
+                {
+                    _logger.Debug("Ignoring ListenerCallback() as HttpListener is no longer listening"); return;
+                }
+                // The EndGetContext() method, as with all Begin/End asynchronous methods in the .NET Framework,
+                // blocks until there is a request to be processed or some type of data is available.
+                context = listener.EndGetContext(asyncResult);
+            }
+            catch (Exception ex)
+            {
+                // You will get an exception when httpListener.Stop() is called
+                // because there will be a thread stopped waiting on the .EndGetContext()
+                // method, and again, that is just the way most Begin/End asynchronous
+                // methods of the .NET Framework work.
+                var errMsg = ex + ": " + IsListening;
+                _logger.Warn(errMsg);
+                return;
+            }
+            finally
+            {
+                // Once we know we have a request (or exception), we signal the other thread
+                // so that it calls the BeginGetContext() (or possibly exits if we're not
+                // listening any more) method to start handling the next incoming request
+                // while we continue to process this request on a different thread.
+                _listenForNextRequest.Set();
+            }
+
+            Task.Factory.StartNew(() => InitTask(context));
         }
 
         private void InitTask(HttpListenerContext context)
@@ -169,20 +239,39 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
 
         public void Stop()
         {
-            _httpsv.Stop();
+            if (_listener != null)
+            {
+                foreach (var prefix in _listener.Prefixes.ToList())
+                {
+                    _listener.Prefixes.Remove(prefix);
+                }
+
+                _listener.Close();
+            }
         }
 
-        private readonly object _disposeLock = new object();
         public void Dispose()
         {
+            Dispose(true);
+        }
+
+        private bool _disposed;
+        private readonly object _disposeLock = new object();
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_disposed) return;
+
             lock (_disposeLock)
             {
-                if (_httpsv != null)
+                if (_disposed) return;
+
+                if (disposing)
                 {
-                    _httpsv.OnRequest -= _httpsv_OnRequest;
-                    _httpsv.Stop();
-                    _httpsv = null;
+                    Stop();
                 }
+
+                //release unmanaged resources here...
+                _disposed = true;
             }
         }
     }
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 8310895e67..297d5e0323 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -906,7 +906,7 @@ namespace MediaBrowser.Server.Implementations.Library
             // Ensure the location is available.
             Directory.CreateDirectory(ConfigurationManager.ApplicationPaths.PeoplePath);
 
-            return new PeopleValidator(this, _logger).ValidatePeople(cancellationToken, new MetadataRefreshOptions(), progress);
+            return new PeopleValidator(this, _logger, ConfigurationManager).ValidatePeople(cancellationToken, progress);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
index 0d54d94e8c..e3ac2025f5 100644
--- a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
@@ -93,7 +93,7 @@ namespace MediaBrowser.Server.Implementations.Library
             if (user.Configuration.DisplayCollectionsView &&
                 recursiveChildren.OfType<BoxSet>().Any())
             {
-                list.Add(await GetUserView(CollectionType.BoxSets, user, CollectionType.BoxSets, cancellationToken).ConfigureAwait(false));
+                list.Add(await GetUserView(CollectionType.BoxSets, user, string.Empty, cancellationToken).ConfigureAwait(false));
             }
 
             if (recursiveChildren.OfType<Playlist>().Any())
@@ -101,6 +101,11 @@ namespace MediaBrowser.Server.Implementations.Library
                 list.Add(_playlists.GetPlaylistsFolder(user.Id.ToString("N")));
             }
 
+            if (user.Configuration.DisplayFoldersView)
+            {
+                list.Add(await GetUserView(CollectionType.Folders, user, "zz_" + CollectionType.Folders, cancellationToken).ConfigureAwait(false));
+            }
+
             if (query.IncludeExternalContent)
             {
                 var channelResult = await _channelManager.GetChannels(new ChannelQuery
@@ -131,7 +136,7 @@ namespace MediaBrowser.Server.Implementations.Library
             return _libraryManager.Sort(list, user, new[] { ItemSortBy.SortName }, SortOrder.Ascending).Cast<Folder>();
         }
 
-        private Task<UserView> GetUserView(string type, User user, string sortName, CancellationToken cancellationToken)
+        public Task<UserView> GetUserView(string type, User user, string sortName, CancellationToken cancellationToken)
         {
             var name = _localizationManager.GetLocalizedString("ViewType" + type);
 
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/PeopleValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/PeopleValidator.cs
index 05c972a4ee..059ad2481d 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/PeopleValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/PeopleValidator.cs
@@ -1,8 +1,13 @@
 using MediaBrowser.Common.Progress;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -23,46 +28,128 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
         /// </summary>
         private readonly ILogger _logger;
 
+        private readonly IServerConfigurationManager _config;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="PeopleValidator" /> class.
         /// </summary>
         /// <param name="libraryManager">The library manager.</param>
         /// <param name="logger">The logger.</param>
-        public PeopleValidator(ILibraryManager libraryManager, ILogger logger)
+        public PeopleValidator(ILibraryManager libraryManager, ILogger logger, IServerConfigurationManager config)
         {
             _libraryManager = libraryManager;
             _logger = logger;
+            _config = config;
+        }
+
+        private bool DownloadMetadata(PersonInfo i, PeopleMetadataOptions options)
+        {
+            if (i.IsType(PersonType.Actor))
+            {
+                return options.DownloadActorMetadata;
+            }
+            if (i.IsType(PersonType.Director))
+            {
+                return options.DownloadDirectorMetadata;
+            }
+            if (i.IsType(PersonType.Composer))
+            {
+                return options.DownloadComposerMetadata;
+            }
+            if (i.IsType(PersonType.Writer))
+            {
+                return options.DownloadWriterMetadata;
+            }
+            if (i.IsType(PersonType.Producer))
+            {
+                return options.DownloadProducerMetadata;
+            }
+            if (i.IsType(PersonType.GuestStar))
+            {
+                return options.DownloadGuestStarMetadata;
+            }
+
+            return options.DownloadOtherPeopleMetadata;
+        }
+
+        private IEnumerable<PersonInfo> GetPeopleToValidate(BaseItem item, PeopleMetadataOptions options)
+        {
+            return item.People.Where(i =>
+            {
+                if (i.IsType(PersonType.Actor))
+                {
+                    return options.DownloadActorMetadata;
+                }
+                if (i.IsType(PersonType.Director))
+                {
+                    return options.DownloadDirectorMetadata;
+                }
+                if (i.IsType(PersonType.Composer))
+                {
+                    return options.DownloadComposerMetadata;
+                }
+                if (i.IsType(PersonType.Writer))
+                {
+                    return options.DownloadWriterMetadata;
+                }
+                if (i.IsType(PersonType.Producer))
+                {
+                    return options.DownloadProducerMetadata;
+                }
+                if (i.IsType(PersonType.GuestStar))
+                {
+                    return options.DownloadGuestStarMetadata;
+                }
+
+                return options.DownloadOtherPeopleMetadata;
+            });
         }
 
         /// <summary>
         /// Validates the people.
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
-        /// <param name="options">The options.</param>
         /// <param name="progress">The progress.</param>
         /// <returns>Task.</returns>
-        public async Task ValidatePeople(CancellationToken cancellationToken, MetadataRefreshOptions options, IProgress<double> progress)
+        public async Task ValidatePeople(CancellationToken cancellationToken, IProgress<double> progress)
         {
             var innerProgress = new ActionableProgress<double>();
 
             innerProgress.RegisterAction(pct => progress.Report(pct * .15));
 
+            var peopleOptions = _config.Configuration.PeopleMetadataOptions;
+
             var people = _libraryManager.RootFolder.GetRecursiveChildren()
-                .SelectMany(c => c.People)
+                .SelectMany(i => i.People)
                 .Where(i => !string.IsNullOrWhiteSpace(i.Name))
-                .Select(i => i.Name)
-                .Distinct(StringComparer.OrdinalIgnoreCase)
                 .ToList();
 
-            var numComplete = 0;
+            var dict = new Dictionary<string, bool>(StringComparer.OrdinalIgnoreCase);
 
             foreach (var person in people)
+            {
+                bool current;
+                if (!dict.TryGetValue(person.Name, out current) || !current)
+                {
+                    dict[person.Name] = DownloadMetadata(person, peopleOptions);
+                }
+            }
+
+            var numComplete = 0;
+
+            foreach (var person in dict)
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
                 try
                 {
-                    var item = _libraryManager.GetPerson(person);
+                    var item = _libraryManager.GetPerson(person.Key);
+
+                    var options = new MetadataRefreshOptions
+                    {
+                         MetadataRefreshMode = person.Value ? MetadataRefreshMode.Default : MetadataRefreshMode.ValidationOnly,
+                         ImageRefreshMode = person.Value ? ImageRefreshMode.Default : ImageRefreshMode.ValidationOnly
+                    };
 
                     await item.RefreshMetadata(options, cancellationToken).ConfigureAwait(false);
                 }
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index ad2b503659..7107814622 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -128,7 +128,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             _taskManager.CancelIfRunningAndQueue<RefreshChannelsScheduledTask>();
         }
 
-        public async Task<QueryResult<ChannelInfoDto>> GetChannels(LiveTvChannelQuery query, CancellationToken cancellationToken)
+        public async Task<QueryResult<LiveTvChannel>> GetInternalChannels(LiveTvChannelQuery query, CancellationToken cancellationToken)
         {
             var user = string.IsNullOrEmpty(query.UserId) ? null : _userManager.GetUserById(new Guid(query.UserId));
 
@@ -217,9 +217,24 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 allEnumerable = allEnumerable.Take(query.Limit.Value);
             }
 
+            var result = new QueryResult<LiveTvChannel>
+            {
+                Items = allEnumerable.ToArray(),
+                TotalRecordCount = allChannels.Count
+            };
+
+            return result;
+        }
+
+        public async Task<QueryResult<ChannelInfoDto>> GetChannels(LiveTvChannelQuery query, CancellationToken cancellationToken)
+        {
+            var user = string.IsNullOrEmpty(query.UserId) ? null : _userManager.GetUserById(new Guid(query.UserId));
+
+            var internalResult = await GetInternalChannels(query, cancellationToken).ConfigureAwait(false);
+
             var returnList = new List<ChannelInfoDto>();
 
-            foreach (var channel in allEnumerable)
+            foreach (var channel in internalResult.Items)
             {
                 var currentProgram = await GetCurrentProgram(channel.ExternalId, cancellationToken).ConfigureAwait(false);
 
@@ -229,7 +244,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             var result = new QueryResult<ChannelInfoDto>
             {
                 Items = returnList.ToArray(),
-                TotalRecordCount = allChannels.Count
+                TotalRecordCount = internalResult.TotalRecordCount
             };
 
             return result;
@@ -260,12 +275,20 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             return obj;
         }
 
-        private async Task RefreshIfNeeded(IEnumerable<LiveTvProgram> programs, CancellationToken cancellationToken)
+        private Task RefreshIfNeeded(IEnumerable<LiveTvProgram> programs, CancellationToken cancellationToken)
         {
-            foreach (var program in programs)
+            var list = programs.ToList();
+
+            Task.Run(async () =>
             {
-                await RefreshIfNeeded(program, cancellationToken).ConfigureAwait(false);
-            }
+                foreach (var program in list)
+                {
+                    await RefreshIfNeeded(program, CancellationToken.None).ConfigureAwait(false);
+                }
+
+            }, cancellationToken);
+
+            return Task.FromResult(true);
         }
 
         private async Task RefreshIfNeeded(LiveTvProgram program, CancellationToken cancellationToken)
@@ -275,9 +298,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 return;
             }
 
-            await program.RefreshMetadata(cancellationToken).ConfigureAwait(false);
-
             _refreshedPrograms.TryAdd(program.Id, true);
+            
+            await program.RefreshMetadata(cancellationToken).ConfigureAwait(false);
         }
 
         public async Task<ILiveTvRecording> GetInternalRecording(string id, CancellationToken cancellationToken)
@@ -1028,15 +1051,15 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             return channels.Select(i => new Tuple<string, ChannelInfo>(service.Name, i));
         }
 
-        public async Task<QueryResult<RecordingInfoDto>> GetRecordings(RecordingQuery query, CancellationToken cancellationToken)
+        public async Task<QueryResult<BaseItem>> GetInternalRecordings(RecordingQuery query, CancellationToken cancellationToken)
         {
             var service = ActiveService;
 
             if (service == null)
             {
-                return new QueryResult<RecordingInfoDto>
+                return new QueryResult<BaseItem>
                 {
-                    Items = new RecordingInfoDto[] { }
+                    Items = new BaseItem[] { }
                 };
             }
 
@@ -1121,7 +1144,30 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 entities = entities.Take(query.Limit.Value);
             }
 
-            var returnArray = entities
+            return new QueryResult<BaseItem>
+            {
+                Items = entities.Cast<BaseItem>().ToArray(),
+                TotalRecordCount = entityList.Count
+            };
+        }
+
+        public async Task<QueryResult<RecordingInfoDto>> GetRecordings(RecordingQuery query, CancellationToken cancellationToken)
+        {
+            var service = ActiveService;
+
+            if (service == null)
+            {
+                return new QueryResult<RecordingInfoDto>
+                {
+                    Items = new RecordingInfoDto[] { }
+                };
+            }
+
+            var user = string.IsNullOrEmpty(query.UserId) ? null : _userManager.GetUserById(new Guid(query.UserId));
+
+            var internalResult = await GetInternalRecordings(query, cancellationToken).ConfigureAwait(false);
+
+            var returnArray = internalResult.Items.Cast<ILiveTvRecording>()
                 .Select(i =>
                 {
                     var channel = string.IsNullOrEmpty(i.RecordingInfo.ChannelId) ? null : GetInternalChannel(_tvDtoService.GetInternalChannelId(service.Name, i.RecordingInfo.ChannelId));
@@ -1132,7 +1178,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             return new QueryResult<RecordingInfoDto>
             {
                 Items = returnArray,
-                TotalRecordCount = entityList.Count
+                TotalRecordCount = internalResult.TotalRecordCount
             };
         }
 
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json
index 10f84a8b10..15c9531715 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next Track",
+    "ButtonNextTrack": "Next track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous Track",
+    "ButtonPreviousTrack": "Previous track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/ca.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/ca.json
index 3b607c105e..5522a2970f 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ca.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ca.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next Track",
+    "ButtonNextTrack": "Next track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous Track",
+    "ButtonPreviousTrack": "Previous track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/cs.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/cs.json
index 41f3c31813..40d3aadbee 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/cs.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/cs.json
@@ -58,7 +58,7 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next Track",
+    "ButtonNextTrack": "Next track",
     "ButtonPause": "Pause",
     "ButtonPlay": "P\u0159ehr\u00e1t",
     "ButtonEdit": "Upravit",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/da.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/da.json
index 76aa151ca2..7a029af44f 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/da.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/da.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next Track",
+    "ButtonNextTrack": "Next track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Afspil",
     "ButtonEdit": "Rediger",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous Track",
+    "ButtonPreviousTrack": "Previous track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/el.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/el.json
index a6a6f929ae..9b48db51d2 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/el.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/el.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next Track",
+    "ButtonNextTrack": "Next track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous Track",
+    "ButtonPreviousTrack": "Previous track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_GB.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_GB.json
index 2690aee1ad..0b28351ca1 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_GB.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_GB.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next Track",
+    "ButtonNextTrack": "Next track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous Track",
+    "ButtonPreviousTrack": "Previous track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
index 3210756b90..6a4dfe037a 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next Track",
+    "ButtonNextTrack": "Next track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous Track",
+    "ButtonPreviousTrack": "Previous track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json
index 0a4031fd2a..d8ed664896 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json
@@ -331,24 +331,24 @@
     "ButtonViewSeriesRecording": "Ver grabaciones de series",
     "ValueOriginalAirDate": "Fecha de transmisi\u00f3n original: {0}",
     "ButtonRemoveFromPlaylist": "Eliminar de la lista de reproducci\u00f3n",
-    "HeaderSpecials": "Specials",
-    "HeaderTrailers": "Trailers",
+    "HeaderSpecials": "Especiales",
+    "HeaderTrailers": "Avances",
     "HeaderAudio": "Audio",
-    "HeaderResolution": "Resolution",
+    "HeaderResolution": "Resoluci\u00f3n",
     "HeaderVideo": "Video",
-    "HeaderRuntime": "Runtime",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderParentalRating": "Parental rating",
-    "HeaderReleaseDate": "Release date",
-    "HeaderDateAdded": "Date added",
+    "HeaderRuntime": "Duraci\u00f3n",
+    "HeaderCommunityRating": "Calificaci\u00f3n de la comunidad",
+    "HeaderParentalRating": "Calificaci\u00f3n parental",
+    "HeaderReleaseDate": "Fecha de estreno",
+    "HeaderDateAdded": "Fecha de adici\u00f3n",
     "HeaderSeries": "Series",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year",
-    "HeaderGameSystem": "Game system",
-    "HeaderPlayers": "Players",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderSeason": "Temporada",
+    "HeaderSeasonNumber": "N\u00famero de temporada",
+    "HeaderNetwork": "Cadena",
+    "HeaderYear": "A\u00f1o",
+    "HeaderGameSystem": "Sistema de Juegos",
+    "HeaderPlayers": "Jugadores",
+    "HeaderEmbeddedImage": "Im\u00e1gen embebida",
+    "HeaderTrack": "Pista",
+    "HeaderDisc": "Disco"
 }
\ 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 08e8f6ade5..c2bca5298a 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
@@ -321,34 +321,34 @@
     "ButtonNew": "Nouveau",
     "MessageInternetExplorerWebm": "Pour de meilleurs r\u00e9sultats avec Internet Explorer, merci d'installer le plugin WebM pour IE.",
     "HeaderVideoError": "Erreur vid\u00e9o",
-    "ButtonAddToPlaylist": "Add to playlist",
-    "HeaderAddToPlaylist": "Add to Playlist",
+    "ButtonAddToPlaylist": "Ajouter \u00e0 la liste de lecture",
+    "HeaderAddToPlaylist": "Ajouter \u00e0 la liste de lecture",
     "LabelName": "Nom:",
     "ButtonSubmit": "Soumettre",
-    "LabelSelectPlaylist": "Playlist:",
-    "OptionNewPlaylist": "New playlist...",
-    "MessageAddedToPlaylistSuccess": "Ok",
-    "ButtonViewSeriesRecording": "View series recording",
-    "ValueOriginalAirDate": "Original air date: {0}",
+    "LabelSelectPlaylist": "Liste de lecture:",
+    "OptionNewPlaylist": "Nouvelle liste de lecture...",
+    "MessageAddedToPlaylistSuccess": "OK",
+    "ButtonViewSeriesRecording": "Voir enregistrements de s\u00e9ries",
+    "ValueOriginalAirDate": "Date de diffusion originale: {0}",
     "ButtonRemoveFromPlaylist": "Remove from playlist",
     "HeaderSpecials": "Specials",
-    "HeaderTrailers": "Trailers",
+    "HeaderTrailers": "Bande-Annonces",
     "HeaderAudio": "Audio",
-    "HeaderResolution": "Resolution",
-    "HeaderVideo": "Video",
+    "HeaderResolution": "R\u00e9solution",
+    "HeaderVideo": "Vid\u00e9o",
     "HeaderRuntime": "Runtime",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderParentalRating": "Parental rating",
-    "HeaderReleaseDate": "Release date",
-    "HeaderDateAdded": "Date added",
-    "HeaderSeries": "Series",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year",
-    "HeaderGameSystem": "Game system",
-    "HeaderPlayers": "Players",
+    "HeaderCommunityRating": "Note de communaut\u00e9",
+    "HeaderParentalRating": "Note parentale",
+    "HeaderReleaseDate": "Date de lancement",
+    "HeaderDateAdded": "Date ajout\u00e9e",
+    "HeaderSeries": "S\u00e9ries",
+    "HeaderSeason": "Saison",
+    "HeaderSeasonNumber": "Num\u00e9ro de saison",
+    "HeaderNetwork": "R\u00e9seau",
+    "HeaderYear": "Ann\u00e9e",
+    "HeaderGameSystem": "Plateforme de jeu",
+    "HeaderPlayers": "Lecteurs",
     "HeaderEmbeddedImage": "Embedded image",
     "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderDisc": "Disque"
 }
\ 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 c9925a171b..a5d9e5280e 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/he.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/he.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next Track",
+    "ButtonNextTrack": "Next track",
     "ButtonPause": "Pause",
     "ButtonPlay": "\u05e0\u05d2\u05df",
     "ButtonEdit": "\u05e2\u05e8\u05d5\u05da",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous Track",
+    "ButtonPreviousTrack": "Previous track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/it.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/it.json
index 3ed57d4733..bef7dcbf6c 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/it.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/it.json
@@ -321,15 +321,15 @@
     "ButtonNew": "Nuovo",
     "MessageInternetExplorerWebm": "Se utilizzi internet explorer installa WebM plugin",
     "HeaderVideoError": "Video Error",
-    "ButtonAddToPlaylist": "Add to playlist",
-    "HeaderAddToPlaylist": "Add to Playlist",
+    "ButtonAddToPlaylist": "Aggiungi alla playlist",
+    "HeaderAddToPlaylist": "Aggiungi alla playlist",
     "LabelName": "Nome:",
     "ButtonSubmit": "Invia",
     "LabelSelectPlaylist": "Playlist:",
-    "OptionNewPlaylist": "New playlist...",
+    "OptionNewPlaylist": "Nuova  playlist...",
     "MessageAddedToPlaylistSuccess": "Ok",
-    "ButtonViewSeriesRecording": "View series recording",
-    "ValueOriginalAirDate": "Original air date: {0}",
+    "ButtonViewSeriesRecording": "Vista delle serie in registrazione",
+    "ValueOriginalAirDate": "Prima messa in onda (originale): {0}",
     "ButtonRemoveFromPlaylist": "Remove from playlist",
     "HeaderSpecials": "Specials",
     "HeaderTrailers": "Trailers",
@@ -345,10 +345,10 @@
     "HeaderSeason": "Season",
     "HeaderSeasonNumber": "Season number",
     "HeaderNetwork": "Network",
-    "HeaderYear": "Year",
-    "HeaderGameSystem": "Game system",
-    "HeaderPlayers": "Players",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderYear": "Anno",
+    "HeaderGameSystem": "Gioco Sistema",
+    "HeaderPlayers": "Giocatori",
+    "HeaderEmbeddedImage": "Immagine incorporata",
+    "HeaderTrack": "Traccia",
+    "HeaderDisc": "Disco"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
index 68bb3bd485..1e13564081 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
@@ -331,24 +331,24 @@
     "ButtonViewSeriesRecording": "\u0421\u0435\u0440\u0438\u0430\u043b \u0436\u0430\u0437\u0431\u0430\u0441\u044b\u043d \u049b\u0430\u0440\u0430\u0443",
     "ValueOriginalAirDate": "\u0411\u0430\u0441\u0442\u0430\u043f\u049b\u044b \u044d\u0444\u0438\u0440: {0}",
     "ButtonRemoveFromPlaylist": "\u041e\u0439\u043d\u0430\u0442\u0443 \u0442\u0456\u0437\u0456\u043c\u0456\u043d\u0435\u043d \u0430\u043b\u0430\u0441\u0442\u0430\u0443",
-    "HeaderSpecials": "Specials",
-    "HeaderTrailers": "Trailers",
-    "HeaderAudio": "Audio",
-    "HeaderResolution": "Resolution",
-    "HeaderVideo": "Video",
-    "HeaderRuntime": "Runtime",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderParentalRating": "Parental rating",
-    "HeaderReleaseDate": "Release date",
-    "HeaderDateAdded": "Date added",
-    "HeaderSeries": "Series",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year",
-    "HeaderGameSystem": "Game system",
-    "HeaderPlayers": "Players",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderSpecials": "\u0410\u0440\u043d\u0430\u0439\u044b\u043b\u0430\u0440",
+    "HeaderTrailers": "\u0422\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440",
+    "HeaderAudio": "\u0414\u044b\u0431\u044b\u0441",
+    "HeaderResolution": "\u0410\u0436\u044b\u0440\u0430\u0442\u044b\u043c\u0434\u044b\u043b\u044b\u0493\u044b",
+    "HeaderVideo": "\u0411\u0435\u0439\u043d\u0435",
+    "HeaderRuntime": "\u04b0\u0437\u0430\u049b\u0442\u044b\u0493\u044b",
+    "HeaderCommunityRating": "\u049a\u0430\u0443\u044b\u043c\u0434\u0430\u0441\u0442\u044b\u049b \u0431\u0430\u0493\u0430\u043b\u0430\u0443\u044b",
+    "HeaderParentalRating": "\u0416\u0430\u0441\u0442\u0430\u0441 \u0441\u0430\u043d\u0430\u0442\u044b",
+    "HeaderReleaseDate": "\u0428\u044b\u0493\u0430\u0440\u0443 \u043a\u04af\u043d-\u0430\u0439\u044b",
+    "HeaderDateAdded": "\u04ae\u0441\u0442\u0435\u0443 \u043a\u04af\u043d-\u0430\u0439\u044b",
+    "HeaderSeries": "\u0421\u0435\u0440\u0438\u0430\u043b",
+    "HeaderSeason": "\u041c\u0430\u0443\u0441\u044b\u043c",
+    "HeaderSeasonNumber": "\u041c\u0430\u0443\u0441\u044b\u043c \u043d\u04e9\u043c\u0456\u0440\u0456",
+    "HeaderNetwork": "\u0422\u0435\u043b\u0435\u0436\u0435\u043b\u0456",
+    "HeaderYear": "\u0416\u044b\u043b\u044b",
+    "HeaderGameSystem": "\u041e\u0439\u044b\u043d \u0436\u04af\u0439\u0435\u0441\u0456",
+    "HeaderPlayers": "\u041e\u0439\u044b\u043d\u0448\u044b\u043b\u0430\u0440",
+    "HeaderEmbeddedImage": "\u0415\u043d\u0434\u0456\u0440\u0456\u043b\u0433\u0435\u043d \u0441\u0443\u0440\u0435\u0442",
+    "HeaderTrack": "\u0416\u043e\u043b\u0448\u044b\u049b",
+    "HeaderDisc": "\u0414\u0438\u0441\u043a\u0456"
 }
\ 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 885c0e58b8..542c8eff3a 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ms.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ms.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next Track",
+    "ButtonNextTrack": "Next track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous Track",
+    "ButtonPreviousTrack": "Previous track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
index 0c6058190b..ef49504e27 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
@@ -334,21 +334,21 @@
     "HeaderSpecials": "Specials",
     "HeaderTrailers": "Trailers",
     "HeaderAudio": "Audio",
-    "HeaderResolution": "Resolution",
+    "HeaderResolution": "Resolutie",
     "HeaderVideo": "Video",
-    "HeaderRuntime": "Runtime",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderParentalRating": "Parental rating",
-    "HeaderReleaseDate": "Release date",
-    "HeaderDateAdded": "Date added",
+    "HeaderRuntime": "Speelduur",
+    "HeaderCommunityRating": "Gemeenschap cijfer",
+    "HeaderParentalRating": "Kijkwijzer classificering",
+    "HeaderReleaseDate": "Releasedatum ",
+    "HeaderDateAdded": "Datum toegevoegd",
     "HeaderSeries": "Series",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year",
-    "HeaderGameSystem": "Game system",
-    "HeaderPlayers": "Players",
-    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderSeason": "Seizoen",
+    "HeaderSeasonNumber": "Seizoen nummer",
+    "HeaderNetwork": "Zender",
+    "HeaderYear": "Jaar",
+    "HeaderGameSystem": "Spelsysteem",
+    "HeaderPlayers": "Spelers",
+    "HeaderEmbeddedImage": "Ingesloten afbeelding",
     "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderDisc": "Schijf"
 }
\ 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 c169a30cda..08055fdf54 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pl.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pl.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next Track",
+    "ButtonNextTrack": "Next track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous Track",
+    "ButtonPreviousTrack": "Previous track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json
index 14d99a62d9..ea9c0eb0af 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json
@@ -331,24 +331,24 @@
     "ButtonViewSeriesRecording": "Visualizar grava\u00e7\u00e3o de s\u00e9ries",
     "ValueOriginalAirDate": "Data original de exibi\u00e7\u00e3o: {0}",
     "ButtonRemoveFromPlaylist": "Remover da lista de reprodu\u00e7\u00e3o",
-    "HeaderSpecials": "Specials",
+    "HeaderSpecials": "Especiais",
     "HeaderTrailers": "Trailers",
-    "HeaderAudio": "Audio",
-    "HeaderResolution": "Resolution",
-    "HeaderVideo": "Video",
-    "HeaderRuntime": "Runtime",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderParentalRating": "Parental rating",
-    "HeaderReleaseDate": "Release date",
-    "HeaderDateAdded": "Date added",
-    "HeaderSeries": "Series",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year",
-    "HeaderGameSystem": "Game system",
-    "HeaderPlayers": "Players",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderAudio": "\u00c1udio",
+    "HeaderResolution": "Resolu\u00e7\u00e3o",
+    "HeaderVideo": "V\u00eddeo",
+    "HeaderRuntime": "Dura\u00e7\u00e3o",
+    "HeaderCommunityRating": "Classifica\u00e7\u00e3o da Comunidade",
+    "HeaderParentalRating": "Classifica\u00e7\u00e3o parental",
+    "HeaderReleaseDate": "Data de lan\u00e7amento",
+    "HeaderDateAdded": "Data de adi\u00e7\u00e3o",
+    "HeaderSeries": "S\u00e9rie",
+    "HeaderSeason": "Temporada",
+    "HeaderSeasonNumber": "N\u00famero da temporada",
+    "HeaderNetwork": "Rede de TV",
+    "HeaderYear": "Ano",
+    "HeaderGameSystem": "Sistema do jogo",
+    "HeaderPlayers": "Jogadores",
+    "HeaderEmbeddedImage": "Imagem incorporada",
+    "HeaderTrack": "Faixa",
+    "HeaderDisc": "Disco"
 }
\ 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 a85e19581d..03638ac4b3 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
@@ -29,7 +29,7 @@
     "MessageKeysLinked": "\u041a\u043b\u044e\u0447\u0438 \u0431\u044b\u043b\u0438 \u043f\u0440\u0438\u0432\u044f\u0437\u0430\u043d\u044b.",
     "HeaderConfirmation": "\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435",
     "MessageKeyUpdated": "\u041a\u043b\u044e\u0447 \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u0430 \u0431\u044b\u043b \u043e\u0431\u043d\u043e\u0432\u043b\u0451\u043d.",
-    "MessageKeyRemoved": "\u041a\u043b\u044e\u0447 \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u0430 \u0431\u044b\u043b \u0443\u0431\u0440\u0430\u043d.",
+    "MessageKeyRemoved": "\u041a\u043b\u044e\u0447 \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u0430 \u0431\u044b\u043b \u0443\u0434\u0430\u043b\u0451\u043d.",
     "ErrorLaunchingChromecast": "\u041f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430 \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0437\u0430\u043f\u0443\u0441\u043a\u0435 Chromecast. \u0423\u0431\u0435\u0434\u0438\u0442\u0435\u0441\u044c, \u0447\u0442\u043e \u0432\u0430\u0448\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u043e \u043a \u0431\u0435\u0441\u043f\u0440\u043e\u0432\u043e\u0434\u043d\u043e\u0439 \u0441\u0435\u0442\u0438.",
     "HeaderSearch": "\u041f\u043e\u0438\u0441\u043a",
     "LabelArtist": "\u0418\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c",
@@ -63,7 +63,7 @@
     "ButtonPlay": "\u0412\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0441\u0442\u0438",
     "ButtonEdit": "\u041f\u0440\u0430\u0432\u0438\u0442\u044c",
     "ButtonQueue": "\u041e\u0447\u0435\u0440\u0435\u0434\u044c",
-    "ButtonPlayTrailer": "\u0412\u043e\u0441\u043f\u0440 \u0442\u0440\u0435\u0439\u043b\u0435\u0440",
+    "ButtonPlayTrailer": "\u0412\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0441\u0442\u0438 \u0442\u0440\u0435\u0439\u043b\u0435\u0440",
     "ButtonPlaylist": "\u0421\u043f\u0438\u0441\u043e\u043a \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f",
     "ButtonPreviousTrack": "\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0430\u044f \u0434\u043e\u0440\u043e\u0436\u043a\u0430",
     "LabelEnabled": "\u0412\u043a\u043b\u044e\u0447\u0435\u043d\u043e",
@@ -77,7 +77,7 @@
     "MessageInvalidUser": "\u041d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u043e\u0435 \u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0438\u043b\u0438 \u043f\u0430\u0440\u043e\u043b\u044c.",
     "HeaderAllRecordings": "\u0412\u0441\u0435 \u0437\u0430\u043f\u0438\u0441\u0438",
     "RecommendationBecauseYouLike": "\u0418\u0431\u043e \u0432\u0430\u043c \u043d\u0440\u0430\u0432\u0438\u0442\u0441\u044f {0}",
-    "RecommendationBecauseYouWatched": "\u0422\u0430\u043a \u043a\u0430\u043a \u0432\u044b \u0441\u043c\u043e\u0442\u0440\u0435\u043b\u0438 {0}",
+    "RecommendationBecauseYouWatched": "\u0418\u0431\u043e \u0432\u044b \u0441\u043c\u043e\u0442\u0440\u0435\u043b\u0438 {0}",
     "RecommendationDirectedBy": "\u041f\u043e\u0441\u0442\u0430\u043d\u043e\u0432\u0449\u0438\u043a {0}",
     "RecommendationStarring": "\u0412 \u0433\u043b\u0430\u0432\u043d\u043e\u0439 \u0440\u043e\u043b\u0438 {0}",
     "HeaderConfirmRecordingCancellation": "\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u043e\u0442\u043c\u0435\u043d\u044b \u0437\u0430\u043f\u0438\u0441\u0438",
@@ -144,7 +144,7 @@
     "HeaderSelectChannelDownloadPathHelp": "\u041f\u0435\u0440\u0435\u0439\u0434\u0438\u0442\u0435 \u043a \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0443 \u0438\u043b\u0438 \u0432\u0432\u0435\u0434\u0438\u0442\u0435 \u043f\u0443\u0442\u044c, \u0447\u0442\u043e\u0431\u044b \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0434\u043b\u044f \u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f \u0444\u0430\u0439\u043b\u043e\u0432 \u043a\u0435\u0448\u0430 \u043a\u0430\u043d\u0430\u043b\u043e\u0432. \u041f\u0430\u043f\u043a\u0430 \u0434\u043e\u043b\u0436\u043d\u0430 \u0431\u044b\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u0430 \u0434\u043b\u044f \u0437\u0430\u043f\u0438\u0441\u0438.",
     "OptionNewCollection": "\u041d\u043e\u0432\u0430\u044f...",
     "ButtonAdd": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c",
-    "ButtonRemove": "\u0423\u0431\u0440\u0430\u0442\u044c",
+    "ButtonRemove": "\u0418\u0437\u044a\u044f\u0442\u044c",
     "LabelChapterDownloaders": "\u0417\u0430\u0433\u0440\u0443\u0437\u0447\u0438\u043a\u0438 \u0441\u0446\u0435\u043d:",
     "LabelChapterDownloadersHelp": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u0435 \u0438 \u0440\u0430\u043d\u0436\u0438\u0440\u0443\u0439\u0442\u0435 \u043f\u0440\u0435\u0434\u043f\u043e\u0447\u0438\u0442\u0430\u0435\u043c\u044b\u0435 \u0437\u0430\u0433\u0440\u0443\u0437\u0447\u0438\u043a\u0438 \u0441\u0446\u0435\u043d \u0432 \u043f\u043e\u0440\u044f\u0434\u043a\u0435 \u043f\u0440\u0438\u043e\u0440\u0438\u0442\u0435\u0442\u0430. \u0417\u0430\u0433\u0440\u0443\u0437\u0447\u0438\u043a\u0438 \u043d\u0438\u0437\u043a\u043e\u0433\u043e \u043f\u0440\u0438\u043e\u0440\u0438\u0442\u0435\u0442\u0430 \u0431\u0443\u0434\u0443\u0442 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e \u0434\u043b\u044f \u0437\u0430\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0445 \u0441\u0432\u0435\u0434\u0435\u043d\u0438\u0439.",
     "HeaderFavoriteAlbums": "\u0418\u0437\u0431\u0440\u0430\u043d\u043d\u044b\u0435 \u0430\u043b\u044c\u0431\u043e\u043c\u044b",
@@ -284,7 +284,7 @@
     "LabelPremiereProgram": "\u041f\u0420\u0415\u041c\u042c\u0415\u0420\u0410",
     "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "\u0418\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0435 \u0442\u0438\u043f\u0430 \u043f\u0430\u043f\u043a\u0438",
-    "HeaderChangeFolderTypeHelp": "\u0427\u0442\u043e\u0431\u044b \u0438\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0442\u0438\u043f \u043f\u0430\u043f\u043a\u0438, \u0443\u0434\u0430\u043b\u0438\u0442\u0435 \u0438 \u043f\u0435\u0440\u0435\u0441\u0442\u0440\u043e\u0439\u0442\u0435 \u043a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u044e \u0441 \u043d\u043e\u0432\u044b\u043c \u0442\u0438\u043f\u043e\u043c.",
+    "HeaderChangeFolderTypeHelp": "\u0414\u043b\u044f \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0442\u0438\u043f\u0430 \u043f\u0430\u043f\u043a\u0438, \u0443\u0434\u0430\u043b\u0438\u0442\u0435 \u043c\u0435\u0434\u0438\u0430\u043f\u0430\u043f\u043a\u0443 \u0438 \u043f\u0435\u0440\u0435\u0441\u0442\u0440\u043e\u0439\u0442\u0435 \u0435\u0451 \u0441 \u043d\u043e\u0432\u044b\u043c \u0442\u0438\u043f\u043e\u043c.",
     "HeaderAlert": "\u041e\u043f\u043e\u0432\u0435\u0449\u0435\u043d\u0438\u0435",
     "MessagePleaseRestart": "\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u0435, \u0447\u0442\u043e\u0431\u044b \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435.",
     "ButtonRestart": "\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c",
@@ -330,25 +330,25 @@
     "MessageAddedToPlaylistSuccess": "\u041e\u041a",
     "ButtonViewSeriesRecording": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0437\u0430\u043f\u0438\u0441\u044c \u0441\u0435\u0440\u0438\u0430\u043b\u0430",
     "ValueOriginalAirDate": "\u041f\u0435\u0440\u0432\u043e\u043d\u0430\u0447\u0430\u043b\u044c\u043d\u044b\u0439 \u044d\u0444\u0438\u0440: {0}",
-    "ButtonRemoveFromPlaylist": "\u0423\u0431\u0440\u0430\u0442\u044c \u0438\u0437 \u0441\u043f\u0438\u0441\u043a\u0430 \u0432\u043e\u0441\u043f\u0440-\u0438\u044f",
-    "HeaderSpecials": "Specials",
-    "HeaderTrailers": "Trailers",
-    "HeaderAudio": "Audio",
-    "HeaderResolution": "Resolution",
-    "HeaderVideo": "Video",
-    "HeaderRuntime": "Runtime",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderParentalRating": "Parental rating",
-    "HeaderReleaseDate": "Release date",
-    "HeaderDateAdded": "Date added",
-    "HeaderSeries": "Series",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year",
-    "HeaderGameSystem": "Game system",
-    "HeaderPlayers": "Players",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "ButtonRemoveFromPlaylist": "\u0418\u0437\u044a\u044f\u0442\u044c \u0438\u0437 \u0441\u043f\u0438\u0441\u043a\u0430 \u0432\u043e\u0441\u043f\u0440-\u0438\u044f",
+    "HeaderSpecials": "\u0421\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u044b\u0435",
+    "HeaderTrailers": "\u0422\u0440\u0435\u0439\u043b\u0435\u0440\u044b",
+    "HeaderAudio": "\u0410\u0443\u0434\u0438\u043e",
+    "HeaderResolution": "\u0420\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u0435",
+    "HeaderVideo": "\u0412\u0438\u0434\u0435\u043e",
+    "HeaderRuntime": "\u0414\u043b\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c",
+    "HeaderCommunityRating": "\u041e\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043d\u043d\u0430\u044f \u043e\u0446\u0435\u043d\u043a\u0430",
+    "HeaderParentalRating": "\u0412\u043e\u0437\u0440\u0430\u0441\u0442\u043d\u0430\u044f \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f",
+    "HeaderReleaseDate": "\u0414\u0430\u0442\u0430 \u0432\u044b\u043f\u0443\u0441\u043a\u0430",
+    "HeaderDateAdded": "\u0414\u0430\u0442\u0430 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f",
+    "HeaderSeries": "\u0421\u0435\u0440\u0438\u0430\u043b",
+    "HeaderSeason": "\u0421\u0435\u0437\u043e\u043d",
+    "HeaderSeasonNumber": "\u041d\u043e\u043c\u0435\u0440 \u0441\u0435\u0437\u043e\u043d\u0430",
+    "HeaderNetwork": "\u0422\u0435\u043b\u0435\u0441\u0435\u0442\u044c",
+    "HeaderYear": "\u0413\u043e\u0434",
+    "HeaderGameSystem": "\u0418\u0433\u0440\u043e\u0432\u0430\u044f \u0441\u0438\u0441\u0442\u0435\u043c\u0430",
+    "HeaderPlayers": "\u0418\u0433\u0440\u043e\u043a\u0438",
+    "HeaderEmbeddedImage": "\u0412\u043d\u0435\u0434\u0440\u0451\u043d\u043d\u044b\u0439 \u0440\u0438\u0441\u0443\u043d\u043e\u043a",
+    "HeaderTrack": "\u0414\u043e\u0440\u043e\u0436\u043a\u0430",
+    "HeaderDisc": "\u0414\u0438\u0441\u043a"
 }
\ 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 6df18ed314..4bf6e77141 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/vi.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/vi.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next Track",
+    "ButtonNextTrack": "Next track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous Track",
+    "ButtonPreviousTrack": "Previous track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json
index b5e03e50b4..20ad67cded 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next Track",
+    "ButtonNextTrack": "Next track",
     "ButtonPause": "Pause",
     "ButtonPlay": "\u64ad\u653e",
     "ButtonEdit": "\u7de8\u8f2f",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous Track",
+    "ButtonPreviousTrack": "Previous track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ar.json b/MediaBrowser.Server.Implementations/Localization/Server/ar.json
index 802cf81227..bdf866bdad 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ar.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ar.json
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "Metadata Manager",
     "HeaderPreferences": "Preferences",
     "MessageLoadingChannels": "Loading channel content...",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Mark Read",
     "OptionDefaultSort": "Default",
     "OptionCommunityMostWatchedSort": "Most Watched",
@@ -979,5 +980,7 @@
     "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
     "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
     "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "ProviderValue": "Provider: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ca.json b/MediaBrowser.Server.Implementations/Localization/Server/ca.json
index 706914be5e..89207f4e87 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ca.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ca.json
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "Metadata Manager",
     "HeaderPreferences": "Preferences",
     "MessageLoadingChannels": "Loading channel content...",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Mark Read",
     "OptionDefaultSort": "Default",
     "OptionCommunityMostWatchedSort": "Most Watched",
@@ -979,5 +980,7 @@
     "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
     "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
     "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "ProviderValue": "Provider: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/cs.json b/MediaBrowser.Server.Implementations/Localization/Server/cs.json
index e9b5c42d9d..815789e92f 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/cs.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/cs.json
@@ -480,7 +480,7 @@
     "HeaderProgram": "Program",
     "HeaderClients": "Klienti",
     "LabelCompleted": "Hotovo",
-    "LabelFailed": "Failed",
+    "LabelFailed": "Chyba",
     "LabelSkipped": "P\u0159esko\u010deno",
     "HeaderEpisodeOrganization": "Organizace epizod",
     "LabelSeries": "Series:",
@@ -630,8 +630,8 @@
     "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Sc\u00e9ny",
     "ButtonSubtitles": "Titulky",
-    "ButtonAudioTracks": "Audio tracks",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonAudioTracks": "Audio stopy",
+    "ButtonPreviousTrack": "P\u0159edchod\u00ed stopa",
     "ButtonNextTrack": "Next track",
     "ButtonStop": "Stop",
     "ButtonPause": "Pause",
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "Spr\u00e1vce metadat",
     "HeaderPreferences": "Preferences",
     "MessageLoadingChannels": "Loading channel content...",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Ozna\u010dit jako p\u0159e\u010dten\u00e9",
     "OptionDefaultSort": "Default",
     "OptionCommunityMostWatchedSort": "Nejsledovan\u011bj\u0161\u00ed",
@@ -979,5 +980,7 @@
     "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
     "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
     "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "ProviderValue": "Provider: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/da.json b/MediaBrowser.Server.Implementations/Localization/Server/da.json
index 8d8904f529..07f577724f 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/da.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/da.json
@@ -627,10 +627,10 @@
     "TabNowPlaying": "Spiler nu",
     "TabNavigation": "Navigation",
     "TabControls": "Controls",
-    "ButtonFullscreen": "Toggle fullscreen",
+    "ButtonFullscreen": "Skift til fuldsk\u00e6rm",
     "ButtonScenes": "Scener",
     "ButtonSubtitles": "Undertekster",
-    "ButtonAudioTracks": "Audio tracks",
+    "ButtonAudioTracks": "Lyd filer",
     "ButtonPreviousTrack": "Previous track",
     "ButtonNextTrack": "Next track",
     "ButtonStop": "Stop",
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "Metadata Manager",
     "HeaderPreferences": "Preferences",
     "MessageLoadingChannels": "Loading channel content...",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Mark Read",
     "OptionDefaultSort": "Default",
     "OptionCommunityMostWatchedSort": "Most Watched",
@@ -979,5 +980,7 @@
     "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
     "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
     "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "ProviderValue": "Provider: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/de.json b/MediaBrowser.Server.Implementations/Localization/Server/de.json
index 1e7e9bcfb2..6b5a38dc7f 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/de.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/de.json
@@ -480,10 +480,10 @@
     "HeaderProgram": "Programm",
     "HeaderClients": "Clients",
     "LabelCompleted": "Fertiggestellt",
-    "LabelFailed": "Failed",
+    "LabelFailed": "Gescheitert",
     "LabelSkipped": "\u00dcbersprungen",
     "HeaderEpisodeOrganization": "Episodensortierung",
-    "LabelSeries": "Series:",
+    "LabelSeries": "Serien:",
     "LabelSeasonNumber": "Staffelnummer",
     "LabelEpisodeNumber": "Episodennummer",
     "LabelEndingEpisodeNumber": "Ending episode number",
@@ -627,12 +627,12 @@
     "TabNowPlaying": "Aktuelle Wiedergabe",
     "TabNavigation": "Navigation",
     "TabControls": "Controls",
-    "ButtonFullscreen": "Toggle fullscreen",
+    "ButtonFullscreen": "Schalte Vollbild um",
     "ButtonScenes": "Szenen",
     "ButtonSubtitles": "Untertitel",
-    "ButtonAudioTracks": "Audio tracks",
-    "ButtonPreviousTrack": "Previous track",
-    "ButtonNextTrack": "Next track",
+    "ButtonAudioTracks": "Audiospuren",
+    "ButtonPreviousTrack": "Vorheriger Track",
+    "ButtonNextTrack": "N\u00e4chster Track",
     "ButtonStop": "Stop",
     "ButtonPause": "Pause",
     "LabelGroupMoviesIntoCollections": "Gruppiere Filme in Collections",
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "Metadaten-Manager",
     "HeaderPreferences": "Einstellungen",
     "MessageLoadingChannels": "Lade Channel Inhalt...",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Als gelesen markieren",
     "OptionDefaultSort": "Default",
     "OptionCommunityMostWatchedSort": "Meistgesehen",
@@ -979,5 +980,7 @@
     "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
     "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
     "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "ProviderValue": "Provider: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/el.json b/MediaBrowser.Server.Implementations/Localization/Server/el.json
index a72dbdf757..95b5be3e27 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/el.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/el.json
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "Metadata Manager",
     "HeaderPreferences": "Preferences",
     "MessageLoadingChannels": "Loading channel content...",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Mark Read",
     "OptionDefaultSort": "Default",
     "OptionCommunityMostWatchedSort": "Most Watched",
@@ -979,5 +980,7 @@
     "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
     "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
     "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "ProviderValue": "Provider: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json b/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
index 30215cb927..227ac09c0c 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "Metadata Manager",
     "HeaderPreferences": "Preferences",
     "MessageLoadingChannels": "Loading channel content...",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Mark Read",
     "OptionDefaultSort": "Default",
     "OptionCommunityMostWatchedSort": "Most Watched",
@@ -979,5 +980,7 @@
     "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
     "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
     "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "ProviderValue": "Provider: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/en_US.json b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
index 46e7e45128..8e243a682a 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "Metadata Manager",
     "HeaderPreferences": "Preferences",
     "MessageLoadingChannels": "Loading channel content...",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Mark Read",
     "OptionDefaultSort": "Default",
     "OptionCommunityMostWatchedSort": "Most Watched",
@@ -979,5 +980,7 @@
     "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
     "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
     "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "ProviderValue": "Provider: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/es.json b/MediaBrowser.Server.Implementations/Localization/Server/es.json
index bb40d7be81..75a2ae657b 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/es.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es.json
@@ -480,10 +480,10 @@
     "HeaderProgram": "Programa",
     "HeaderClients": "Clientes",
     "LabelCompleted": "Completado",
-    "LabelFailed": "Error",
+    "LabelFailed": "Err\u00f3neo",
     "LabelSkipped": "Omitido",
     "HeaderEpisodeOrganization": "Organizaci\u00f3n de episodios",
-    "LabelSeries": "Series:",
+    "LabelSeries": "Serie:",
     "LabelSeasonNumber": "Temporada n\u00famero:",
     "LabelEpisodeNumber": "Episodio n\u00famero:",
     "LabelEndingEpisodeNumber": "N\u00famero episodio final:",
@@ -627,10 +627,10 @@
     "TabNowPlaying": "Reproduciendo ahora",
     "TabNavigation": "Navegaci\u00f3n",
     "TabControls": "Controles",
-    "ButtonFullscreen": "Toggle fullscreen",
+    "ButtonFullscreen": "Pantalla completa",
     "ButtonScenes": "Escenas",
     "ButtonSubtitles": "Subt\u00edtulos",
-    "ButtonAudioTracks": "Audio tracks",
+    "ButtonAudioTracks": "Pistas de audio",
     "ButtonPreviousTrack": "Pista anterior",
     "ButtonNextTrack": "Pista siguiente",
     "ButtonStop": "Detener",
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "Metadata Manager",
     "HeaderPreferences": "Preferencias",
     "MessageLoadingChannels": "Cargando contenidos del canal...",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Marcar como le\u00eddo",
     "OptionDefaultSort": "Por defecto",
     "OptionCommunityMostWatchedSort": "M\u00e1s visto",
@@ -979,5 +980,7 @@
     "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
     "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
     "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "ProviderValue": "Provider: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json b/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
index 4fcef706b4..0eb48f1c06 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
@@ -627,12 +627,12 @@
     "TabNowPlaying": "Reproduci\u00e9ndo Ahora",
     "TabNavigation": "Navegaci\u00f3n",
     "TabControls": "Controles",
-    "ButtonFullscreen": "Cambiar a pantalla completa",
+    "ButtonFullscreen": "Alternar pantalla completa",
     "ButtonScenes": "Escenas",
     "ButtonSubtitles": "Subt\u00edtulos",
     "ButtonAudioTracks": "Pistas de audio",
-    "ButtonPreviousTrack": "Pista anterior",
-    "ButtonNextTrack": "Pista siguiente",
+    "ButtonPreviousTrack": "Pista Anterior",
+    "ButtonNextTrack": "Pista Siguiente",
     "ButtonStop": "Detener",
     "ButtonPause": "Pausar",
     "LabelGroupMoviesIntoCollections": "Agrupar pel\u00edculas en colecciones",
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "Administrador de Metadatos",
     "HeaderPreferences": "Preferencias",
     "MessageLoadingChannels": "Cargando contenidos del canal...",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Marcar como Le\u00eddo",
     "OptionDefaultSort": "Por defecto",
     "OptionCommunityMostWatchedSort": "M\u00e1s Visto",
@@ -948,36 +949,38 @@
     "OptionReportAlbums": "\u00c1lbums",
     "OptionReportAdultVideos": "Videos para Adultos",
     "ButtonMore": "M\u00e1s",
-    "HeaderActivity": "Activity",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "ScheduledTaskCancelledWithName": "{0} was cancelled",
-    "ScheduledTaskCompletedWithName": "{0} completed",
-    "ScheduledTaskFailed": "Scheduled task completed",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Media Browser Server has been updated",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "HeaderActivity": "Actividad",
+    "ScheduledTaskStartedWithName": "{0} Iniciado",
+    "ScheduledTaskCancelledWithName": "{0} fue cancelado",
+    "ScheduledTaskCompletedWithName": "{0} completado",
+    "ScheduledTaskFailed": "Tarea programada completada",
+    "PluginInstalledWithName": "{0} fue instalado",
+    "PluginUpdatedWithName": "{0} fue actualizado",
+    "PluginUninstalledWithName": "{0} fue desinstalado",
+    "ScheduledTaskFailedWithName": "{0} fall\u00f3",
+    "ItemAddedWithName": "{0} fue agregado a la biblioteca",
+    "ItemRemovedWithName": "{0} fue removido de la biblioteca",
+    "DeviceOnlineWithName": "{0} est\u00e1 conectado",
+    "UserOnlineFromDevice": "{0} est\u00e1 en l\u00ednea desde {1}",
+    "DeviceOfflineWithName": "{0} se ha desconectado",
+    "UserOfflineFromDevice": "{0} se ha desconecatdo desde {1}",
+    "SubtitlesDownloadedForItem": "Subt\u00edtulos descargados para {0}",
+    "SubtitleDownloadFailureForItem": "Fall\u00f3 la descarga de subt\u00edtulos para {0}",
+    "LabelRunningTimeValue": "Duraci\u00f3n: {0}",
+    "LabelIpAddressValue": "Direcci\u00f3n IP: {0}",
+    "UserConfigurationUpdatedWithName": "Se ha actualizado la configuraci\u00f3n del usuario {0}",
+    "UserCreatedWithName": "Se ha creado el usuario {0}",
+    "UserPasswordChangedWithName": "Se ha cambiado la contrase\u00f1a para el usuario {0}",
+    "UserDeletedWithName": "Se ha eliminado al usuario {0}",
+    "MessageServerConfigurationUpdated": "Se ha actualizado la configuraci\u00f3n del servidor",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Se ha actualizado la secci\u00f3n {0} de la configuraci\u00f3n del servidor",
+    "MessageApplicationUpdated": "Se ha actualizado el Servidor de Media Browser",
+    "AuthenticationSucceededWithUserName": "{0} autenticado con \u00e9xito",
+    "FailedLoginAttemptWithUserName": "Intento fallido de inicio de sesi\u00f3n de {0}",
+    "UserStartedPlayingItemWithValues": "{0} ha iniciado la reproducci\u00f3n de {1}",
+    "UserStoppedPlayingItemWithValues": "{0} ha detenido la reproducci\u00f3n de {1}",
+    "AppDeviceValues": "App: {0}, Dispositivo: {1}",
+    "ProviderValue": "Proveedor: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/fr.json b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
index 84e2555250..cef64513dc 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/fr.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
@@ -397,7 +397,7 @@
     "HeaderCastCrew": "\u00c9quipe de tournage",
     "HeaderAdditionalParts": "Parties Additionelles",
     "ButtonSplitVersionsApart": "S\u00e9parer les versions",
-    "ButtonPlayTrailer": "Trailer",
+    "ButtonPlayTrailer": "Bande-annonce",
     "LabelMissing": "Manquant(s)",
     "LabelOffline": "Hors ligne",
     "PathSubstitutionHelp": "Les substitutions de chemins d'acc\u00e8s sont utilis\u00e9es pour faire correspondre un chemin d'acc\u00e8s du serveur \u00e0 un chemin d'acc\u00e8s accessible par les clients. En autorisant un acc\u00e8s direct aux m\u00e9dias du serveur, les clients pourront les lire directement du r\u00e9seau et \u00e9viter l'utilisation inutiles des ressources du serveur en demandant du transcodage.",
@@ -480,10 +480,10 @@
     "HeaderProgram": "Programme",
     "HeaderClients": "Clients",
     "LabelCompleted": "Compl\u00e9t\u00e9",
-    "LabelFailed": "Failed",
+    "LabelFailed": "\u00c9chec",
     "LabelSkipped": "Saut\u00e9",
     "HeaderEpisodeOrganization": "Organisation d'\u00e9pisodes",
-    "LabelSeries": "Series:",
+    "LabelSeries": "S\u00e9ries:",
     "LabelSeasonNumber": "Num\u00e9ro de saison",
     "LabelEpisodeNumber": "Num\u00e9ro d'\u00e9pisode",
     "LabelEndingEpisodeNumber": "Num\u00e9ro d'\u00e9pisode se terminant",
@@ -627,12 +627,12 @@
     "TabNowPlaying": "En cours de lecture",
     "TabNavigation": "Navigation",
     "TabControls": "Contr\u00f4les",
-    "ButtonFullscreen": "Basculer en plein \u00e9cran",
+    "ButtonFullscreen": "Plein \u00e9cran",
     "ButtonScenes": "Sc\u00e8nes",
     "ButtonSubtitles": "Sous-titres",
-    "ButtonAudioTracks": "Pistes audio",
-    "ButtonPreviousTrack": "Previous track",
-    "ButtonNextTrack": "Next track",
+    "ButtonAudioTracks": "Piste audio",
+    "ButtonPreviousTrack": "Piste pr\u00e9c\u00e9dante",
+    "ButtonNextTrack": "Piste suivante",
     "ButtonStop": "Arr\u00eat",
     "ButtonPause": "Pause",
     "LabelGroupMoviesIntoCollections": "Grouper les films en collections",
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "Gestionnaire de m\u00e9tadonn\u00e9es",
     "HeaderPreferences": "Pr\u00e9f\u00e9rences",
     "MessageLoadingChannels": "Chargement du contenu de la cha\u00eene...",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Marquer lu",
     "OptionDefaultSort": "Par d\u00e9faut",
     "OptionCommunityMostWatchedSort": "Les plus \u00e9cout\u00e9s",
@@ -795,7 +796,7 @@
     "MessageNoMovieSuggestionsAvailable": "Aucune suggestion de film n'est actuellement disponible. Commencez \u00e0 regarder et noter vos films pour avoir des suggestions.",
     "MessageNoCollectionsAvailable": "Les Collections permettent le groupement de films, S\u00e9ries, Albums, Livres et Jeux. Cliquer sur \"Nouveau\" pour commencer la cr\u00e9ation des Collections.",
     "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
-    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
+    "MessageNoPlaylistItemsAvailable": "Cette liste de lecture est pr\u00e9sentement vide.",
     "HeaderWelcomeToMediaBrowserWebClient": "Bienvenue au client Web Media Browser",
     "ButtonDismiss": "Annuler",
     "MessageLearnHowToCustomize": "Apprenez comment personnaliser cette page selon vos propres go\u00fbts. S\u00e9lectionnez votre ic\u00f4ne d'utilisateur dans le coin en haut, \u00e0 droite de l'\u00e9cran pour visionner et mettre \u00e0 jour vos pr\u00e9f\u00e9rences. ",
@@ -896,43 +897,43 @@
     "HeaderChapters": "Chapitres",
     "HeaderResumeSettings": "Reprendre les param\u00e8tres",
     "TabSync": "Sync",
-    "TitleUsers": "Users",
+    "TitleUsers": "Utilisateurs",
     "LabelProtocol": "Protocol:",
     "OptionProtocolHttp": "Http",
     "OptionProtocolHls": "Http Live Streaming",
-    "LabelContext": "Context:",
-    "OptionContextStreaming": "Streaming",
+    "LabelContext": "Contexte:",
+    "OptionContextStreaming": "Diffusion",
     "OptionContextStatic": "Sync",
-    "ButtonAddToPlaylist": "Add to playlist",
-    "TabPlaylists": "Playlists",
+    "ButtonAddToPlaylist": "Ajouter \u00e0 la liste de lecture",
+    "TabPlaylists": "Listes de lecture",
     "ButtonClose": "Fermer",
-    "LabelAllLanguages": "All languages",
-    "HeaderBrowseOnlineImages": "Browse Online Images",
+    "LabelAllLanguages": "Toutes les langues",
+    "HeaderBrowseOnlineImages": "Parcourir les images en ligne",
     "LabelSource": "Source:",
-    "OptionAll": "All",
+    "OptionAll": "Tous",
     "LabelImage": "Image:",
-    "ButtonBrowseImages": "Browse Images",
+    "ButtonBrowseImages": "Parcourir les images:",
     "HeaderImages": "Images",
-    "HeaderBackdrops": "Backdrops",
+    "HeaderBackdrops": "Arri\u00e8re-plans",
     "HeaderScreenshots": "Screenshots",
-    "HeaderAddUpdateImage": "Add\/Update Image",
-    "LabelJpgPngOnly": "JPG\/PNG only",
-    "LabelImageType": "Image type:",
-    "OptionPrimary": "Primary",
+    "HeaderAddUpdateImage": "Ajouter\/mettre \u00e0 jour image",
+    "LabelJpgPngOnly": "JPG\/PNG seulement",
+    "LabelImageType": "Type d'image:",
+    "OptionPrimary": "Principal",
     "OptionArt": "Art",
-    "OptionBox": "Box",
-    "OptionBoxRear": "Box rear",
-    "OptionDisc": "Disc",
+    "OptionBox": "Bo\u00eetier",
+    "OptionBoxRear": "Dos de bo\u00eetier",
+    "OptionDisc": "Disque",
     "OptionLogo": "Logo",
     "OptionMenu": "Menu",
     "OptionScreenshot": "Screenshot",
-    "OptionLocked": "Locked",
-    "OptionUnidentified": "Unidentified",
-    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionLocked": "Verrouill\u00e9",
+    "OptionUnidentified": "Non identifi\u00e9",
+    "OptionMissingParentalRating": "Note de contr\u00f4le parental manquante",
     "OptionStub": "Stub",
-    "HeaderEpisodes": "Episodes:",
-    "OptionSeason0": "Season 0",
-    "LabelReport": "Report:",
+    "HeaderEpisodes": "\u00c9pisodes:",
+    "OptionSeason0": "Saison 0",
+    "LabelReport": "Rapport:",
     "OptionReportSongs": "Songs",
     "OptionReportSeries": "Series",
     "OptionReportSeasons": "Seasons",
@@ -979,5 +980,7 @@
     "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
     "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
     "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "ProviderValue": "Provider: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/he.json b/MediaBrowser.Server.Implementations/Localization/Server/he.json
index 5c05bda3b6..3f656b60cc 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/he.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/he.json
@@ -397,7 +397,7 @@
     "HeaderCastCrew": "\u05e9\u05d7\u05e7\u05e0\u05d9\u05dd \u05d5\u05e6\u05d5\u05d5\u05ea",
     "HeaderAdditionalParts": "\u05d7\u05dc\u05e7\u05d9\u05dd \u05e0\u05d5\u05e1\u05e4\u05d9\u05dd",
     "ButtonSplitVersionsApart": "\u05e4\u05e6\u05dc \u05d2\u05e8\u05e1\u05d0\u05d5\u05ea \u05d1\u05e0\u05e4\u05e8\u05d3",
-    "ButtonPlayTrailer": "Trailer",
+    "ButtonPlayTrailer": "\u05d8\u05e8\u05d9\u05d9\u05dc\u05e8\u05d9\u05dd",
     "LabelMissing": "\u05d7\u05e1\u05e8",
     "LabelOffline": "\u05dc\u05d0 \u05de\u05e7\u05d5\u05d5\u05df",
     "PathSubstitutionHelp": "\u05e0\u05ea\u05d9\u05d1\u05d9\u05dd \u05d7\u05dc\u05d5\u05e4\u05d9\u05d9\u05dd \u05d4\u05dd \u05dc\u05e6\u05d5\u05e8\u05da \u05de\u05d9\u05e4\u05d5\u05d9 \u05e0\u05ea\u05d9\u05d1\u05d9\u05dd \u05d1\u05e9\u05e8\u05ea \u05dc\u05e0\u05ea\u05d9\u05d1\u05d9\u05dd \u05e9\u05de\u05e9\u05ea\u05de\u05e9\u05d9\u05dd \u05d9\u05db\u05d5\u05dc\u05d9\u05dd \u05dc\u05d2\u05e9\u05ea \u05d0\u05dc\u05d9\u05d4\u05dd. \u05e2\u05dc \u05d9\u05d3\u05d9 \u05d4\u05e8\u05e9\u05d0\u05d4 \u05dc\u05de\u05e9\u05ea\u05de\u05e9\u05d9\u05dd \u05d2\u05d9\u05e9\u05d4 \u05d9\u05e9\u05d9\u05e8\u05d4 \u05dc\u05de\u05d3\u05d9\u05d4 \u05d1\u05e9\u05e8\u05ea \u05d0\u05dd \u05d9\u05db\u05d5\u05dc\u05d9\u05dd \u05dc\u05e0\u05d2\u05df \u05d0\u05ea \u05d4\u05e7\u05d1\u05e6\u05d9\u05dd \u05d9\u05e9\u05d9\u05e8\u05d5\u05ea \u05e2\u05dc \u05d2\u05d1\u05d9 \u05d4\u05e8\u05e9\u05ea \u05d5\u05dc\u05d4\u05d9\u05de\u05e0\u05e2 \u05de\u05e9\u05d9\u05de\u05d5\u05e9 \u05d1\u05de\u05e9\u05d0\u05d1\u05d9 \u05d4\u05e9\u05e8\u05ea \u05dc\u05e6\u05d5\u05e8\u05da \u05e7\u05d9\u05d3\u05d5\u05d3 \u05d5\u05e9\u05d9\u05d3\u05d5\u05e8.",
@@ -480,10 +480,10 @@
     "HeaderProgram": "\u05ea\u05d5\u05db\u05e0\u05d4",
     "HeaderClients": "\u05de\u05e9\u05ea\u05de\u05e9\u05d9\u05dd",
     "LabelCompleted": "\u05d4\u05d5\u05e9\u05dc\u05dd",
-    "LabelFailed": "Failed",
+    "LabelFailed": "\u05e0\u05db\u05e9\u05dc",
     "LabelSkipped": "\u05d3\u05d5\u05dc\u05d2",
     "HeaderEpisodeOrganization": "\u05d0\u05d9\u05e8\u05d2\u05d5\u05df \u05e4\u05e8\u05e7\u05d9\u05dd",
-    "LabelSeries": "Series:",
+    "LabelSeries": "\u05e1\u05d3\u05e8\u05d4:",
     "LabelSeasonNumber": "\u05de\u05e1\u05e4\u05e8 \u05e2\u05d5\u05e0\u05d4:",
     "LabelEpisodeNumber": "\u05de\u05e1\u05e4\u05e8 \u05e4\u05e8\u05e7:",
     "LabelEndingEpisodeNumber": "\u05de\u05e1\u05e4\u05e8 \u05e1\u05d9\u05d5\u05dd \u05e4\u05e8\u05e7:",
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "Metadata Manager",
     "HeaderPreferences": "Preferences",
     "MessageLoadingChannels": "Loading channel content...",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Mark Read",
     "OptionDefaultSort": "Default",
     "OptionCommunityMostWatchedSort": "Most Watched",
@@ -979,5 +980,7 @@
     "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
     "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
     "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "ProviderValue": "Provider: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/it.json b/MediaBrowser.Server.Implementations/Localization/Server/it.json
index 17fef888a5..b8ac892e4f 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/it.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/it.json
@@ -480,10 +480,10 @@
     "HeaderProgram": "Programma",
     "HeaderClients": "Dispositivi",
     "LabelCompleted": "Completato",
-    "LabelFailed": "Failed",
+    "LabelFailed": "Fallito",
     "LabelSkipped": "Saltato",
     "HeaderEpisodeOrganization": "Organizzazione Episodi",
-    "LabelSeries": "Series:",
+    "LabelSeries": "Serie:",
     "LabelSeasonNumber": "Numero Stagione",
     "LabelEpisodeNumber": "Numero Episodio",
     "LabelEndingEpisodeNumber": "Ultimo Episodio Numero",
@@ -627,12 +627,12 @@
     "TabNowPlaying": "In esecuzione",
     "TabNavigation": "Navigazione",
     "TabControls": "Controlli",
-    "ButtonFullscreen": "Tutto Schermo",
+    "ButtonFullscreen": "Schermo intero",
     "ButtonScenes": "Scene",
     "ButtonSubtitles": "Sottotitoli",
-    "ButtonAudioTracks": "Tracce audio",
-    "ButtonPreviousTrack": "Previous track",
-    "ButtonNextTrack": "Next track",
+    "ButtonAudioTracks": "Traccia Audio",
+    "ButtonPreviousTrack": "Precedente traccia",
+    "ButtonNextTrack": "traccia Prossima",
     "ButtonStop": "Stop",
     "ButtonPause": "Pausa",
     "LabelGroupMoviesIntoCollections": "Raggruppa i film nelle collection",
@@ -788,14 +788,15 @@
     "HeaderMetadataManager": "Metadata Manager",
     "HeaderPreferences": "Preferenze",
     "MessageLoadingChannels": "Sto caricando il contenuto del canale",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Segna come letto",
     "OptionDefaultSort": "Predefinito",
     "OptionCommunityMostWatchedSort": "Pi\u00f9 visti",
     "TabNextUp": "Da vedere",
     "MessageNoMovieSuggestionsAvailable": "Nessun suggerimento di film sono attualmente disponibili. Iniziare a guardare e valutare i vostri film, e poi tornare per visualizzare le tue segnalazioni.",
     "MessageNoCollectionsAvailable": "Collezioni permettono di godere di raggruppamenti personalizzati di film, serie, album, libri e giochi. Fare clic sul pulsante Nuovo per avviare la creazione di collezioni.",
-    "MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
-    "MessageNoPlaylistItemsAvailable": "This playlist is currently empty.",
+    "MessageNoPlaylistsAvailable": "Playlist ti permettere di mettere in coda gli elementi da riprodurre.Usa il tasto destro o tap e tieni premuto quindi seleziona elemento da aggiungere",
+    "MessageNoPlaylistItemsAvailable": "Questa playlist al momento \u00e8 vuota",
     "HeaderWelcomeToMediaBrowserWebClient": "Benvenuti nel Media Browser Web client",
     "ButtonDismiss": "Dismetti",
     "MessageLearnHowToCustomize": "Ulteriori informazioni su come personalizzare questa pagina ai tuoi gusti personali. Fare clic sull'icona utente in alto a destra dello schermo per visualizzare e aggiornare le vostre preferenze.",
@@ -903,48 +904,48 @@
     "LabelContext": "Contenuto:",
     "OptionContextStreaming": "Streaming",
     "OptionContextStatic": "Sinc",
-    "ButtonAddToPlaylist": "Add to playlist",
+    "ButtonAddToPlaylist": "Aggiungi alla playlist",
     "TabPlaylists": "Playlists",
     "ButtonClose": "Chiudi",
-    "LabelAllLanguages": "All languages",
-    "HeaderBrowseOnlineImages": "Browse Online Images",
-    "LabelSource": "Source:",
-    "OptionAll": "All",
-    "LabelImage": "Image:",
-    "ButtonBrowseImages": "Browse Images",
-    "HeaderImages": "Images",
-    "HeaderBackdrops": "Backdrops",
-    "HeaderScreenshots": "Screenshots",
-    "HeaderAddUpdateImage": "Add\/Update Image",
-    "LabelJpgPngOnly": "JPG\/PNG only",
-    "LabelImageType": "Image type:",
-    "OptionPrimary": "Primary",
+    "LabelAllLanguages": "Tutte le lingue",
+    "HeaderBrowseOnlineImages": "Sfoglia le immagini sul web",
+    "LabelSource": "Origine:",
+    "OptionAll": "Tutto",
+    "LabelImage": "Immagine:",
+    "ButtonBrowseImages": "Sfoglia immagini",
+    "HeaderImages": "Immagini",
+    "HeaderBackdrops": "Sfondi",
+    "HeaderScreenshots": "Immagini",
+    "HeaderAddUpdateImage": "Aggiungi\/aggiorna immagine",
+    "LabelJpgPngOnly": "JPG\/PNG solamente",
+    "LabelImageType": "Tipo immagine",
+    "OptionPrimary": "Primaria",
     "OptionArt": "Art",
     "OptionBox": "Box",
     "OptionBoxRear": "Box rear",
     "OptionDisc": "Disc",
     "OptionLogo": "Logo",
     "OptionMenu": "Menu",
-    "OptionScreenshot": "Screenshot",
-    "OptionLocked": "Locked",
-    "OptionUnidentified": "Unidentified",
-    "OptionMissingParentalRating": "Missing parental rating",
+    "OptionScreenshot": "Immagine",
+    "OptionLocked": "Bloccato",
+    "OptionUnidentified": "Non identificata",
+    "OptionMissingParentalRating": "Voto genitori mancante",
     "OptionStub": "Stub",
-    "HeaderEpisodes": "Episodes:",
-    "OptionSeason0": "Season 0",
+    "HeaderEpisodes": "Episodi:",
+    "OptionSeason0": "Stagione 0",
     "LabelReport": "Report:",
-    "OptionReportSongs": "Songs",
+    "OptionReportSongs": "Canzoni",
     "OptionReportSeries": "Series",
-    "OptionReportSeasons": "Seasons",
+    "OptionReportSeasons": "Stagioni",
     "OptionReportTrailers": "Trailers",
-    "OptionReportMusicVideos": "Music videos",
-    "OptionReportMovies": "Movies",
-    "OptionReportHomeVideos": "Home videos",
-    "OptionReportGames": "Games",
-    "OptionReportEpisodes": "Episodes",
-    "OptionReportCollections": "Collections",
-    "OptionReportBooks": "Books",
-    "OptionReportArtists": "Artists",
+    "OptionReportMusicVideos": "Video musicali",
+    "OptionReportMovies": "Film",
+    "OptionReportHomeVideos": "Video personali",
+    "OptionReportGames": "Giochi",
+    "OptionReportEpisodes": "Episodi",
+    "OptionReportCollections": "Collezioni",
+    "OptionReportBooks": "Libri",
+    "OptionReportArtists": "Cantanti",
     "OptionReportAlbums": "Albums",
     "OptionReportAdultVideos": "Adult videos",
     "ButtonMore": "Pi\u00f9 info...",
@@ -979,5 +980,7 @@
     "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
     "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
     "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "ProviderValue": "Provider: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/kk.json b/MediaBrowser.Server.Implementations/Localization/Server/kk.json
index 86dbc98a15..7765f843f6 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/kk.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/kk.json
@@ -129,7 +129,7 @@
     "OptionAscending": "\u0410\u0440\u0442\u0443\u044b \u0431\u043e\u0439\u044b\u043d\u0448\u0430",
     "OptionDescending": "\u041a\u0435\u043c\u0443\u0456 \u0431\u043e\u0439\u044b\u043d\u0448\u0430",
     "OptionRuntime": "\u041e\u0440\u044b\u043d\u0434\u0430\u0443 \u0443\u0430\u049b\u044b\u0442\u044b",
-    "OptionReleaseDate": "\u0428\u044b\u0493\u0430\u0440\u044b\u043b\u0493\u0430\u043d \u043a\u04af\u043d-\u0430\u0439\u044b",
+    "OptionReleaseDate": "\u0428\u044b\u0493\u0430\u0440\u0443 \u043a\u04af\u043d-\u0430\u0439\u044b",
     "OptionPlayCount": "\u041e\u0439\u043d\u0430\u0442\u0443 \u0441\u0430\u043d\u044b",
     "OptionDatePlayed": "\u041e\u0439\u043d\u0430\u0442\u044b\u043b\u0493\u0430\u043d \u043a\u04af\u043d-\u0430\u0439\u044b",
     "OptionDateAdded": "\u04ae\u0441\u0442\u0435\u043b\u0433\u0435\u043d \u043a\u04af\u043d-\u0430\u0439\u044b",
@@ -137,7 +137,7 @@
     "OptionArtist": "\u041e\u0440\u044b\u043d\u0434\u0430\u0443\u0448\u044b",
     "OptionAlbum": "\u0410\u043b\u044c\u0431\u043e\u043c",
     "OptionTrackName": "\u0416\u043e\u043b\u0448\u044b\u049b \u0430\u0442\u044b",
-    "OptionCommunityRating": "\u049a\u043e\u0493\u0430\u043c\u0434\u044b\u049b \u0431\u0430\u0493\u0430\u043b\u0430\u0443",
+    "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",
     "OptionBudget": "\u0411\u044e\u0434\u0436\u0435\u0442",
@@ -690,7 +690,7 @@
     "LabelIdentificationFieldHelp": "\u0420\u0435\u0433\u0438\u0441\u0442\u0440 \u0435\u0441\u043a\u0435\u0440\u043c\u0435\u0439\u0442\u0456\u043d \u0456\u0448\u043a\u0456 \u0436\u043e\u043b \u043d\u0435\u043c\u0435\u0441\u0435 \u04b1\u0434\u0430\u0439\u044b \u04e9\u0440\u043d\u0435\u043a.",
     "HeaderProfileServerSettingsHelp": "\u0411\u04b1\u043b \u043c\u04d9\u043d\u0434\u0435\u0440 Media Browser \u049b\u0430\u043b\u0430\u0439 \u04e9\u0437\u0456\u043d \u0436\u0430\u0431\u0434\u044b\u049b\u0442\u0430 \u043a\u04e9\u0440\u0441\u0435\u0442\u0435\u0442\u0456\u043d\u0456\u04a3 \u0431\u0430\u0441\u049b\u0430\u0440\u0430\u0434\u044b.",
     "LabelMaxBitrate": "\u0415\u04a3 \u0436\u043e\u0493\u0430\u0440\u044b \u049b\u0430\u0440\u049b\u044b\u043d:",
-    "LabelMaxBitrateHelp": "\u04e8\u0442\u043a\u0456\u0437\u0443 \u043c\u04af\u043c\u043a\u0456\u043d\u0434\u0456\u0433\u0456 \u0448\u0435\u043a\u0442\u0435\u043b\u0433\u0435\u043d \u043e\u0440\u0442\u0430\u043b\u0430\u0440\u0434\u0430\u0493\u044b \u0435\u04a3 \u0436\u043e\u0493\u0430\u0440\u044b \u049b\u0430\u0440\u049b\u044b\u043d\u0434\u044b \u0430\u043d\u044b\u049b\u0442\u0430\u04a3\u044b\u0437.",
+    "LabelMaxBitrateHelp": "\u04e8\u0442\u043a\u0456\u0437\u0443 \u043c\u04af\u043c\u043a\u0456\u043d\u0434\u0456\u0433\u0456 \u0448\u0435\u043a\u0442\u0435\u043b\u0433\u0435\u043d \u043e\u0440\u0442\u0430\u043b\u0430\u0440\u0434\u0430\u0493\u044b \u0435\u04a3 \u0436\u043e\u0493\u0430\u0440\u044b \u049b\u0430\u0440\u049b\u044b\u043d\u044b\u043d, \u043d\u0435\u043c\u0435\u0441\u0435 \u0436\u0430\u0431\u0434\u044b\u049b\u049b\u0430 \u049b\u0430\u0436\u0435\u0442 \u0431\u043e\u043b\u0441\u0430 - \u04e9\u0437 \u0448\u0435\u0433\u0456\u043d \u0430\u043d\u044b\u049b\u0442\u0430\u04a3\u044b\u0437.",
     "LabelMaxStreamingBitrate": "\u0415\u04a3 \u0436\u043e\u0493\u0430\u0440\u044b \u0430\u0493\u044b\u043d \u049b\u0430\u0440\u049b\u044b\u043d\u044b:",
     "LabelMaxStreamingBitrateHelp": "\u0410\u0493\u044b\u043d\u043c\u0435\u043d \u0442\u0430\u0441\u044b\u043c\u0430\u043b\u0434\u0430\u0443 \u043a\u0435\u0437\u0456\u043d\u0434\u0435 \u0435\u04a3 \u0436\u043e\u0493\u0430\u0440\u044b \u049b\u0430\u0440\u049b\u044b\u043d\u0434\u044b \u0430\u043d\u044b\u049b\u0442\u0430\u04a3\u044b\u0437.",
     "LabelMaxStaticBitrate": "\u0415\u04a3 \u0436\u043e\u0493\u0430\u0440\u044b \u0441\u0438\u043d\u0445\u0440\u043e\u043d\u0434\u0430\u0443 \u049b\u0430\u0440\u049b\u044b\u043d\u044b:",
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "\u041c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a \u0431\u0430\u0441\u049b\u0430\u0440\u0443\u0448\u044b",
     "HeaderPreferences": "\u0422\u0435\u04a3\u0448\u0435\u043b\u0456\u043c\u0434\u0435\u0440",
     "MessageLoadingChannels": "\u0410\u0440\u043d\u0430\u043d\u044b\u04a3 \u043c\u0430\u0437\u043c\u04b1\u043d\u044b\u043d \u0436\u04af\u043a\u0442\u0435\u0443\u0434\u0435...",
+    "MessageLoadingContent": "\u041c\u0430\u0437\u043c\u04b1\u043d \u0436\u04af\u043a\u0442\u0435\u043b\u0443\u0434\u0435...",
     "ButtonMarkRead": "\u041e\u049b\u044b\u043b\u0493\u0430\u043d \u0434\u0435\u043f \u0431\u0435\u043b\u0433\u0456\u043b\u0435\u0443",
     "OptionDefaultSort": "\u04d8\u0434\u0435\u043f\u043a\u0456",
     "OptionCommunityMostWatchedSort": "\u0415\u04a3 \u043a\u04e9\u043f \u049b\u0430\u0440\u0430\u043b\u0493\u0430\u043d\u0434\u0430\u0440",
@@ -832,7 +833,7 @@
     "HeaderXbmcMetadataHelp": "Media Browser \u0431\u0430\u0493\u0434\u0430\u0440\u043b\u0430\u043c\u0430\u0441\u044b Xbmc Nfo \u043c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a\u0442\u0442\u0435\u0440\u0456\u043d\u0456\u04a3 \u0436\u04d9\u043d\u0435 \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440\u0456\u043d\u0456\u04a3 \u043a\u0456\u0440\u0456\u043a\u0442\u0456\u0440\u043c\u0435 \u049b\u043e\u043b\u0434\u0430\u0443\u044b\u043d \u049b\u0430\u043c\u0442\u0438\u0434\u044b. Xbmc \u043c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440\u0456\u043d \u049b\u043e\u0441\u0443 \u043d\u0435\u043c\u0435\u0441\u0435 \u04e9\u0448\u0456\u0440\u0443 \u04af\u0448\u0456\u043d \u049a\u044b\u0437\u043c\u0435\u0442\u0442\u0435\u0440 \u049b\u043e\u0439\u044b\u043d\u0434\u044b\u0441\u044b\u043d\u0434\u0430\u0493\u044b \u0442\u0430\u0441\u0443\u0448\u044b \u0442\u04af\u0440\u043b\u0435\u0440\u0456\u043d\u0435 \u0430\u0440\u043d\u0430\u043b\u0493\u0430\u043d \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043b\u0435\u0440\u0434\u0456 \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u044b\u04a3\u044b\u0437.",
     "LabelXbmcMetadataUser": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u043d\u044b\u04a3 \u049b\u0430\u0440\u0430\u0443 \u043a\u04af\u0439\u0456\u043d nfo \u04af\u0448\u0456\u043d \u043c\u044b\u043d\u0430\u0493\u0430\u043d \u049b\u043e\u0441\u0443:",
     "LabelXbmcMetadataUserHelp": "\u041a\u04e9\u0440\u0456\u043b\u0433\u0435\u043d \u043a\u04af\u0439\u0434\u0456 Media Browser \u0436\u04d9\u043d\u0435 Xbmc \u0430\u0440\u0430\u0441\u044b\u043d\u0434\u0430 \u04af\u0439\u043b\u0435\u0441\u0442\u0456\u0440\u0456\u043f \u0442\u04b1\u0440\u0443 \u04af\u0448\u0456\u043d \u0431\u04b1\u043d\u044b \u049b\u043e\u0441\u044b\u04a3\u044b\u0437.",
-    "LabelXbmcMetadataDateFormat": "\u0416\u044b\u0493\u0430\u0440\u0443 \u043a\u04af\u043d-\u0430\u0439\u044b\u043d\u044b\u04a3 \u043f\u0456\u0448\u0456\u043c\u0456:",
+    "LabelXbmcMetadataDateFormat": "\u0428\u044b\u0493\u0430\u0440\u0443 \u043a\u04af\u043d-\u0430\u0439\u044b\u043d\u044b\u04a3 \u043f\u0456\u0448\u0456\u043c\u0456:",
     "LabelXbmcMetadataDateFormatHelp": "\u041e\u0441\u044b \u043f\u0456\u0448\u0456\u043c\u0434\u0456 \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u044b\u043f nfo \u0456\u0448\u0456\u043d\u0434\u0435\u0433\u0456 \u0431\u0430\u0440\u043b\u044b\u049b \u043a\u04af\u043d-\u0430\u0439\u043b\u0430\u0440 \u043e\u049b\u044b\u043b\u0430\u0434\u044b \u0436\u04d9\u043d\u0435 \u0436\u0430\u0437\u044b\u043b\u0430\u0434\u044b.",
     "LabelXbmcMetadataSaveImagePaths": "\u0421\u0443\u0440\u0435\u0442 \u0436\u043e\u043b\u044b\u043d nfo \u0444\u0430\u0439\u043b\u0434\u0430\u0440\u044b\u043d\u0434\u0430 \u0441\u0430\u049b\u0442\u0430\u0443",
     "LabelXbmcMetadataSaveImagePathsHelp": "\u0415\u0433\u0435\u0440 \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440\u0434\u0456\u04a3 Xbmc \u043d\u04b1\u0441\u049b\u0430\u0443\u043b\u044b\u049b \u04b1\u0441\u0442\u0430\u043d\u044b\u043c\u0434\u0430\u0440\u044b\u043d\u0430 \u0441\u0430\u0439 \u043a\u0435\u043b\u043c\u0435\u0433\u0435\u043d \u0430\u0442\u0430\u0443\u043b\u0430\u0440\u044b \u0431\u043e\u043b\u0441\u0430, \u0431\u04b1\u043b \u04b1\u0441\u044b\u043d\u044b\u043b\u0430\u0434\u044b.",
@@ -886,7 +887,7 @@
     "TabSort": "\u0421\u04b1\u0440\u044b\u043f\u0442\u0430\u0443",
     "TabFilter": "\u0421\u04af\u0437\u0443",
     "ButtonView": "\u049a\u0430\u0440\u0430\u0443",
-    "LabelPageSize": "\u042d\u043b\u0435\u043c\u0435\u043d\u0442\u0442\u0456\u04a3 \u0448\u0435\u0433\u0456:",
+    "LabelPageSize": "\u042d\u043b\u0435\u043c\u0435\u043d\u0442\u0442\u0435\u0440 \u0448\u0435\u0433\u0456:",
     "LabelView": "\u041a\u04e9\u0440\u0456\u043d\u0456\u0441:",
     "TabUsers": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u043b\u0430\u0440",
     "HeaderFeatures": "\u041c\u04d9\u043b\u0456\u043c\u0435\u0442\u0442\u0435\u0440",
@@ -948,36 +949,38 @@
     "OptionReportAlbums": "\u0410\u043b\u044c\u0431\u043e\u043c\u0434\u0430\u0440",
     "OptionReportAdultVideos": "\u0415\u0440\u0435\u0441\u0435\u043a\u0442\u0456\u043a \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0440",
     "ButtonMore": "\u041a\u04e9\u0431\u0456\u0440\u0435\u043a",
-    "HeaderActivity": "Activity",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "ScheduledTaskCancelledWithName": "{0} was cancelled",
-    "ScheduledTaskCompletedWithName": "{0} completed",
-    "ScheduledTaskFailed": "Scheduled task completed",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Media Browser Server has been updated",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "HeaderActivity": "\u04d8\u0440\u0435\u043a\u0435\u0442\u0442\u0435\u0440",
+    "ScheduledTaskStartedWithName": "{0} \u0456\u0441\u043a\u0435 \u049b\u043e\u0441\u044b\u043b\u0434\u044b",
+    "ScheduledTaskCancelledWithName": "{0} \u0431\u043e\u043b\u0434\u044b\u0440\u044b\u043b\u043c\u0430\u0434\u044b",
+    "ScheduledTaskCompletedWithName": "{0} \u0430\u044f\u049b\u0442\u0430\u043b\u0434\u044b",
+    "ScheduledTaskFailed": "\u0416\u043e\u0441\u043f\u0430\u0440\u043b\u0430\u0493\u0430\u043d \u0442\u0430\u043f\u0441\u044b\u0440\u043c\u0430 \u0430\u044f\u049b\u0442\u0430\u043b\u0434\u044b",
+    "PluginInstalledWithName": "{0} \u043e\u0440\u043d\u0430\u0442\u044b\u043b\u0434\u044b",
+    "PluginUpdatedWithName": "{0} \u0436\u0430\u04a3\u0430\u0440\u0442\u044b\u043b\u0434\u044b",
+    "PluginUninstalledWithName": "{0} \u0436\u043e\u0439\u044b\u043b\u0434\u044b",
+    "ScheduledTaskFailedWithName": "{0} \u0441\u04d9\u0442\u0441\u0456\u0437 \u0431\u043e\u043b\u0434\u044b",
+    "ItemAddedWithName": "{0} (\u0442\u0430\u0441\u0443\u0448\u044b\u0445\u0430\u043d\u0430\u0493\u0430 \u04af\u0441\u0442\u0435\u043b\u0456\u043d\u0434\u0456)",
+    "ItemRemovedWithName": "{0} (\u0442\u0430\u0441\u0443\u0448\u044b\u0445\u0430\u043d\u0430\u0434\u0430\u043d \u0430\u043b\u0430\u0441\u0442\u0430\u043b\u0434\u044b)",
+    "DeviceOnlineWithName": "{0} \u049b\u043e\u0441\u044b\u043b\u0493\u0430\u043d",
+    "UserOnlineFromDevice": "{0} - {1} \u0430\u0440\u049b\u044b\u043b\u044b \u049b\u043e\u0441\u044b\u043b\u0493\u0430\u043d",
+    "DeviceOfflineWithName": "{0} \u0430\u0436\u044b\u0440\u0430\u0442\u044b\u043b\u0493\u0430\u043d",
+    "UserOfflineFromDevice": "{0} - {1} \u0430\u0440\u049b\u044b\u043b\u044b \u0430\u0436\u044b\u0440\u0430\u0442\u044b\u043b\u0493\u0430\u043d",
+    "SubtitlesDownloadedForItem": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440 {0} \u04af\u0448\u0456\u043d \u0436\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u044b\u043d\u0434\u044b",
+    "SubtitleDownloadFailureForItem": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440 {0} \u04af\u0448\u0456\u043d \u0436\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u044b\u043d\u0443\u044b \u0441\u04d9\u0442\u0441\u0456\u0437 \u0431\u043e\u043b\u0434\u044b",
+    "LabelRunningTimeValue": "\u0406\u0441\u043a\u0435 \u049b\u043e\u0441\u044b\u043b\u0443 \u0443\u0430\u049b\u044b\u0442\u044b: {0}",
+    "LabelIpAddressValue": "IP \u043c\u0435\u043a\u0435\u043d\u0436\u0430\u0439\u044b: {0}",
+    "UserConfigurationUpdatedWithName": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f\u0441\u044b {0} \u04af\u0448\u0456\u043d \u0436\u0430\u04a3\u0430\u0440\u0442\u044b\u043b\u0434\u044b",
+    "UserCreatedWithName": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b {0} \u0436\u0430\u0441\u0430\u043b\u0493\u0430\u043d",
+    "UserPasswordChangedWithName": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b {0} \u04af\u0448\u0456\u043d \u049b\u04b1\u043f\u0438\u044f \u0441\u04e9\u0437 \u04e9\u0437\u0433\u0435\u0440\u0442\u0456\u043b\u0434\u0456",
+    "UserDeletedWithName": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b {0} \u0436\u043e\u0439\u044b\u043b\u0493\u0430\u043d",
+    "MessageServerConfigurationUpdated": "\u0421\u0435\u0440\u0432\u0435\u0440 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f\u0441\u044b \u0436\u0430\u04a3\u0430\u0440\u0442\u044b\u043b\u0434\u044b",
+    "MessageNamedServerConfigurationUpdatedWithValue": "\u0421\u0435\u0440\u0432\u0435\u0440 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f\u0441\u044b\u043d\u044b\u04a3 {0} \u0431\u04e9\u043b\u0456\u043c\u0456 \u0436\u0430\u04a3\u0430\u0440\u0442\u044b\u043b\u0434\u044b",
+    "MessageApplicationUpdated": "Media Browser Server \u0436\u0430\u04a3\u0430\u0440\u0442\u044b\u043b\u0434\u044b",
+    "AuthenticationSucceededWithUserName": "{0} \u0442\u04af\u043f\u043d\u04b1\u0441\u049b\u0430\u043b\u044b\u0493\u044b \u0441\u04d9\u0442\u0442\u0456 \u0440\u0430\u0441\u0442\u0430\u043b\u0434\u044b",
+    "FailedLoginAttemptWithUserName": "{0} \u0430\u0440\u049b\u044b\u043b\u044b \u043a\u0456\u0440\u0443 \u04d9\u0440\u0435\u043a\u0435\u0442\u0456 \u0441\u04d9\u0442\u0441\u0456\u0437",
+    "UserStartedPlayingItemWithValues": "{0} - {1} \u043e\u0439\u043d\u0430\u0442\u0443\u044b \u0431\u0430\u0441\u0442\u0430\u043b\u0434\u044b",
+    "UserStoppedPlayingItemWithValues": "{0}  - {1} \u043e\u0439\u043d\u0430\u0442\u0443\u044b \u0442\u043e\u049b\u0442\u0430\u043b\u0434\u044b",
+    "AppDeviceValues": "\u049a\u043e\u043b\u0434\u0430\u043d\u0431\u0430: {0}, \u0416\u0430\u0431\u0434\u044b\u049b: {1}",
+    "ProviderValue": "\u0416\u0435\u0442\u043a\u0456\u0437\u0443\u0448\u0456: {0}",
+    "LabelChannelDownloadSizeLimit": "\u0416\u04af\u043a\u0442\u0435\u043c\u0435 \u04e9\u043b\u0448\u0435\u043c\u0456\u043d\u0456\u04a3 \u0448\u0435\u0433\u0456 (GB)",
+    "LabelChannelDownloadSizeLimitHelp": "\u0410\u0440\u043d\u0430\u043b\u0430\u0440\u0434\u044b \u0436\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u0443 \u049b\u0430\u043b\u0442\u0430\u0441\u044b\u043d\u044b\u04a3 \u04e9\u043b\u0448\u0435\u043c\u0456\u043d \u0448\u0435\u043a\u0442\u0435\u0439\u0434\u0456"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ko.json b/MediaBrowser.Server.Implementations/Localization/Server/ko.json
index 9db84f032a..2324e6fe63 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ko.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ko.json
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "Metadata Manager",
     "HeaderPreferences": "Preferences",
     "MessageLoadingChannels": "Loading channel content...",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Mark Read",
     "OptionDefaultSort": "Default",
     "OptionCommunityMostWatchedSort": "Most Watched",
@@ -979,5 +980,7 @@
     "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
     "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
     "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "ProviderValue": "Provider: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ms.json b/MediaBrowser.Server.Implementations/Localization/Server/ms.json
index 1685edf961..4ab79f4206 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ms.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ms.json
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "Metadata Manager",
     "HeaderPreferences": "Preferences",
     "MessageLoadingChannels": "Loading channel content...",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Mark Read",
     "OptionDefaultSort": "Default",
     "OptionCommunityMostWatchedSort": "Most Watched",
@@ -979,5 +980,7 @@
     "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
     "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
     "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "ProviderValue": "Provider: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/nb.json b/MediaBrowser.Server.Implementations/Localization/Server/nb.json
index c8dd0cb088..9a3535791a 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/nb.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/nb.json
@@ -627,12 +627,12 @@
     "TabNowPlaying": "Spilles Av",
     "TabNavigation": "Navigering",
     "TabControls": "Kontrollerer",
-    "ButtonFullscreen": "Veksle fullskjerm",
+    "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Scener",
     "ButtonSubtitles": "Undertekster",
-    "ButtonAudioTracks": "Lyd spor",
-    "ButtonPreviousTrack": "Previous track",
-    "ButtonNextTrack": "Next track",
+    "ButtonAudioTracks": "Audio tracks",
+    "ButtonPreviousTrack": "Forrige Spor",
+    "ButtonNextTrack": "Neste Spor",
     "ButtonStop": "Stopp",
     "ButtonPause": "Pause",
     "LabelGroupMoviesIntoCollections": "Grupper filmer inni samlinger",
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "Metadata Behandler",
     "HeaderPreferences": "Preferanser",
     "MessageLoadingChannels": "Laster kanal innhold...",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Marker Som Lest",
     "OptionDefaultSort": "Standard",
     "OptionCommunityMostWatchedSort": "Mest Sett",
@@ -979,5 +980,7 @@
     "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
     "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
     "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "ProviderValue": "Provider: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/nl.json b/MediaBrowser.Server.Implementations/Localization/Server/nl.json
index c1055c77f5..c98fb435c6 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/nl.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/nl.json
@@ -523,7 +523,7 @@
     "HeaderHelpImproveMediaBrowser": "Help Media Browser te verbeteren",
     "HeaderRunningTasks": "Actieve taken",
     "HeaderActiveDevices": "Actieve apparaten",
-    "HeaderPendingInstallations": "In afwachting van Installaties",
+    "HeaderPendingInstallations": "In afwachting van installaties",
     "HeaerServerInformation": "Server Informatie",
     "ButtonRestartNow": "Nu opnieuw opstarten",
     "ButtonRestart": "Herstart",
@@ -627,12 +627,12 @@
     "TabNowPlaying": "Wordt nu afgespeeld",
     "TabNavigation": "Navigatie",
     "TabControls": "Besturing",
-    "ButtonFullscreen": "Schakelen tussen volledig scherm ",
+    "ButtonFullscreen": "Volledig scherm in-\/uitschakelen",
     "ButtonScenes": "Scenes",
     "ButtonSubtitles": "Ondertitels",
     "ButtonAudioTracks": "Audio tracks",
-    "ButtonPreviousTrack": "Vorige track",
-    "ButtonNextTrack": "Volgende track",
+    "ButtonPreviousTrack": "Vorig nummer",
+    "ButtonNextTrack": "Volgend nummer",
     "ButtonStop": "Stop",
     "ButtonPause": "Pauze",
     "LabelGroupMoviesIntoCollections": "Groepeer films in verzamelingen",
@@ -693,8 +693,8 @@
     "LabelMaxBitrateHelp": "Geef een max. bitrate in bandbreedte beperkte omgevingen, of als het apparaat zijn eigen limiet heeft.",
     "LabelMaxStreamingBitrate": "Maximale streaming bitrate:",
     "LabelMaxStreamingBitrateHelp": "Geef een maximale bitrate voor streaming op.",
-    "LabelMaxStaticBitrate": "Maxmimale sync bitrate:",
-    "LabelMaxStaticBitrateHelp": "Geef een maximale bitrate voor sync in hoge kwaliteit op.",
+    "LabelMaxStaticBitrate": "Maximale Synchronisatie bitrate:",
+    "LabelMaxStaticBitrateHelp": "Geef een maximale bitrate op voor synchroniseren in hoge kwaliteit.",
     "OptionIgnoreTranscodeByteRangeRequests": "Transcodeer byte range-aanvragen negeren",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "Indien ingeschakeld, zal deze verzoeken worden gehonoreerd, maar zal de byte bereik header worden genegerd.",
     "LabelFriendlyName": "Aangepaste naam",
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "Metadata Manager",
     "HeaderPreferences": "Voorkeuren",
     "MessageLoadingChannels": "Laden kanaal inhoud ...",
+    "MessageLoadingContent": "Inhoud wordt geladen ...",
     "ButtonMarkRead": "Markeren als gelezen",
     "OptionDefaultSort": "Standaard",
     "OptionCommunityMostWatchedSort": "Meest bekeken",
@@ -891,18 +892,18 @@
     "TabUsers": "Gebruikers",
     "HeaderFeatures": "Toevoegingen",
     "HeaderAdvanced": "Geavanceerd",
-    "ButtonSync": "Sync",
+    "ButtonSync": "Synchronisatie",
     "TabScheduledTasks": "Geplande taken",
     "HeaderChapters": "Hoofdstukken",
     "HeaderResumeSettings": "Instellingen voor Hervatten",
-    "TabSync": "Sync",
+    "TabSync": "Synchronisatie",
     "TitleUsers": "Gebruikers",
     "LabelProtocol": "Protokol:",
     "OptionProtocolHttp": "Http",
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sync",
+    "OptionContextStatic": "Synchronisatie",
     "ButtonAddToPlaylist": "Toevoegen aan afspeellijst",
     "TabPlaylists": "Afspeellijst",
     "ButtonClose": "Sluiten",
@@ -960,12 +961,12 @@
     "ItemAddedWithName": "{0} is toegevoegd aan de bibliotheek",
     "ItemRemovedWithName": "{0} is verwijderd uit de bibliotheek",
     "DeviceOnlineWithName": "{0} is verbonden",
-    "UserOnlineFromDevice": "{0} is online van {1}",
-    "DeviceOfflineWithName": "{0} is afgebroken",
-    "UserOfflineFromDevice": "{0} is afgebroken van {1}",
+    "UserOnlineFromDevice": "{0} is aangemeld met {1}",
+    "DeviceOfflineWithName": "{0} is losgekoppeld",
+    "UserOfflineFromDevice": "{0} is losgekoppeld bij {1}",
     "SubtitlesDownloadedForItem": "Ondertiteling voor {0} is gedownload",
     "SubtitleDownloadFailureForItem": "Downloaden van ondertiteling voor {0} is mislukt",
-    "LabelRunningTimeValue": "Speelduur: {0}",
+    "LabelRunningTimeValue": "Looptijd: {0}",
     "LabelIpAddressValue": "IP adres: {0}",
     "UserConfigurationUpdatedWithName": "Gebruikersinstellingen voor {0} zijn bijgewerkte",
     "UserCreatedWithName": "Gebruiker {0} is aangemaakt",
@@ -974,10 +975,12 @@
     "MessageServerConfigurationUpdated": "Server configuratie is bijgewerkt",
     "MessageNamedServerConfigurationUpdatedWithValue": "Sectie {0} van de server configuratie is bijgewerkt",
     "MessageApplicationUpdated": "Media Browser Server is bijgewerkt",
-    "AuthenticationSucceededWithUserName": "{0} is succesvol geauthenticeerd",
+    "AuthenticationSucceededWithUserName": "{0} is succesvol geverifieerd",
     "FailedLoginAttemptWithUserName": "Mislukte aanmeld poging van {0}",
     "UserStartedPlayingItemWithValues": "{0} heeft afspelen van {1} gestart",
     "UserStoppedPlayingItemWithValues": "{0} heeft afspelen van {1} gestopt",
     "AppDeviceValues": "App: {0}, Apparaat: {1}",
-    "ProviderValue": "Aanbieder: {0}"
+    "ProviderValue": "Aanbieder: {0}",
+    "LabelChannelDownloadSizeLimit": "Downloadlimiet (GB): ",
+    "LabelChannelDownloadSizeLimitHelp": "Beperk de grootte van de kanaal download map"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pl.json b/MediaBrowser.Server.Implementations/Localization/Server/pl.json
index 49081ab602..568d26fd25 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pl.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pl.json
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "Metadata Manager",
     "HeaderPreferences": "Preferences",
     "MessageLoadingChannels": "Loading channel content...",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Mark Read",
     "OptionDefaultSort": "Default",
     "OptionCommunityMostWatchedSort": "Most Watched",
@@ -979,5 +980,7 @@
     "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
     "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
     "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "ProviderValue": "Provider: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json b/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
index 445e86e7a0..6ccd60090c 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
@@ -627,12 +627,12 @@
     "TabNowPlaying": "Reproduzindo Agora",
     "TabNavigation": "Navega\u00e7\u00e3o",
     "TabControls": "Controles",
-    "ButtonFullscreen": "Alternar para tela cheia",
+    "ButtonFullscreen": "Alternar tela cheia",
     "ButtonScenes": "Cenas",
     "ButtonSubtitles": "Legendas",
     "ButtonAudioTracks": "Faixas de \u00e1udio",
-    "ButtonPreviousTrack": "Faixa anterior",
-    "ButtonNextTrack": "Pr\u00f3xima faixa",
+    "ButtonPreviousTrack": "Faixa Anterior",
+    "ButtonNextTrack": "Pr\u00f3xima Faixa",
     "ButtonStop": "Parar",
     "ButtonPause": "Pausar",
     "LabelGroupMoviesIntoCollections": "Agrupar filmes nas cole\u00e7\u00f5es",
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "Gerenciador de Metadados",
     "HeaderPreferences": "Prefer\u00eancias",
     "MessageLoadingChannels": "Carregando conte\u00fado do canal...",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Marcar com lido",
     "OptionDefaultSort": "Padr\u00e3o",
     "OptionCommunityMostWatchedSort": "Mais Assistidos",
@@ -979,5 +980,7 @@
     "UserStartedPlayingItemWithValues": "{0} come\u00e7ou a executar {1}",
     "UserStoppedPlayingItemWithValues": "{0} parou de executar {1}",
     "AppDeviceValues": "App: {0}, Dispositivo: {1}",
-    "ProviderValue": "Provedor: {0}"
+    "ProviderValue": "Provedor: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
index 84a4e2ae77..31cb033a8c 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
@@ -480,10 +480,10 @@
     "HeaderProgram": "Programa",
     "HeaderClients": "Clientes",
     "LabelCompleted": "Terminado",
-    "LabelFailed": "Failed",
+    "LabelFailed": "Falhou",
     "LabelSkipped": "Ignorado",
     "HeaderEpisodeOrganization": "Organiza\u00e7\u00e3o dos Epis\u00f3dios",
-    "LabelSeries": "Series:",
+    "LabelSeries": "S\u00e9rie:",
     "LabelSeasonNumber": "N\u00famero da temporada",
     "LabelEpisodeNumber": "N\u00famero do epis\u00f3dio",
     "LabelEndingEpisodeNumber": "N\u00famero do epis\u00f3dio final",
@@ -631,8 +631,8 @@
     "ButtonScenes": "Cenas",
     "ButtonSubtitles": "Legendas",
     "ButtonAudioTracks": "Faixas de \u00e1udio",
-    "ButtonPreviousTrack": "Previous track",
-    "ButtonNextTrack": "Next track",
+    "ButtonPreviousTrack": "Faixa Anterior",
+    "ButtonNextTrack": "Pr\u00f3xima Faixa",
     "ButtonStop": "Parar",
     "ButtonPause": "Pausar",
     "LabelGroupMoviesIntoCollections": "Group movies into collections",
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "Metadata Manager",
     "HeaderPreferences": "Preferences",
     "MessageLoadingChannels": "Loading channel content...",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Mark Read",
     "OptionDefaultSort": "Default",
     "OptionCommunityMostWatchedSort": "Most Watched",
@@ -979,5 +980,7 @@
     "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
     "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
     "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "ProviderValue": "Provider: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ru.json b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
index 455492feb7..da8b6364d6 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ru.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
@@ -326,7 +326,7 @@
     "ButtonEdit": "\u041f\u0440\u0430\u0432\u0438\u0442\u044c",
     "ButtonRecord": "\u0417\u0430\u043f\u0438\u0441\u0430\u0442\u044c",
     "ButtonDelete": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c",
-    "ButtonRemove": "\u0423\u0431\u0440\u0430\u0442\u044c",
+    "ButtonRemove": "\u0418\u0437\u044a\u044f\u0442\u044c",
     "OptionRecordSeries": "\u0417\u0430\u043f\u0438\u0441\u0430\u0442\u044c \u0441\u0435\u0440\u0438\u0438",
     "HeaderDetails": "\u0414\u0435\u0442\u0430\u043b\u0438",
     "TitleLiveTV": "\u0422\u0412 \u044d\u0444\u0438\u0440",
@@ -426,7 +426,7 @@
     "OptionEnableDebugTranscodingLoggingHelp": "\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 \u0440\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u0443\u0435\u0442\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.",
     "OptionUpscaling": "\u0420\u0430\u0437\u0440\u0435\u0448\u0438\u0442\u044c \u043a\u043b\u0438\u0435\u043d\u0442\u0430\u043c \u0437\u0430\u043f\u0440\u0430\u0448\u0438\u0432\u0430\u0442\u044c \u0432\u0438\u0434\u0435\u043e \u0441 \u043f\u043e\u0432\u044b\u0448\u0430\u044e\u0448\u0438\u043c  \u043c\u0430\u0441\u0448\u0442\u0430\u0431\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435\u043c",
     "OptionUpscalingHelp": "\u0412 \u043d\u0435\u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u0441\u043b\u0443\u0447\u0430\u044f\u0445, \u043f\u0440\u0438 \u044d\u0442\u043e\u043c \u043f\u0440\u043e\u0438\u0437\u043e\u0439\u0434\u0451\u0442 \u0443\u043b\u0443\u0447\u0448\u0435\u043d\u0438\u0435 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u0430 \u0432\u0438\u0434\u0435\u043e, \u043d\u043e \u0443\u0432\u0435\u043b\u0438\u0447\u0438\u0442\u0441\u044f \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u043d\u0430 \u043f\u0440\u043e\u0446\u0435\u0441\u0441\u043e\u0440.",
-    "EditCollectionItemsHelp": "\u0414\u043e\u0431\u0430\u0432\u043b\u044f\u0439\u0442\u0435 \u0438\u043b\u0438 \u0443\u0431\u0438\u0440\u0430\u0439\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 \u0436\u0435\u043b\u0430\u0435\u0442\u0435 \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.",
+    "EditCollectionItemsHelp": "\u0414\u043e\u0431\u0430\u0432\u043b\u044f\u044e\u0442\u0441\u044f \u0438\u043b\u0438 \u0438\u0437\u044b\u043c\u0430\u044e\u0442\u0441\u044f \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 \u0436\u0435\u043b\u0430\u0442\u0435\u043b\u044c\u043d\u043e \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\u0438\u0442\u044c \u043d\u0430\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u043d\u0438\u044f",
     "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": "Media Browser \u0438\u043c\u0435\u0435\u0442 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u0438 \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.",
@@ -480,7 +480,7 @@
     "HeaderProgram": "\u041f\u0435\u0440\u0435\u0434\u0430\u0447\u0430",
     "HeaderClients": "\u041a\u043b\u0438\u0435\u043d\u0442\u044b",
     "LabelCompleted": "\u0412\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u043e",
-    "LabelFailed": "\u041d\u0435\u0443\u0434\u0430\u0447\u0430",
+    "LabelFailed": "\u041d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u043e",
     "LabelSkipped": "\u041e\u0442\u043b\u043e\u0436\u0435\u043d\u043e",
     "HeaderEpisodeOrganization": "\u0420\u0435\u043e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u044f \u044d\u043f\u0438\u0437\u043e\u0434\u0430",
     "LabelSeries": "\u0421\u0435\u0440\u0438\u0430\u043b:",
@@ -630,7 +630,7 @@
     "ButtonFullscreen": "\u041f\u043e\u043b\u043d\u044b\u0439 \u044d\u043a\u0440\u0430\u043d",
     "ButtonScenes": "\u0421\u0446\u0435\u043d\u044b",
     "ButtonSubtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044b",
-    "ButtonAudioTracks": "\u0410\u0443\u0434\u0438\u043e \u0434\u043e\u0440\u043e\u0436\u043a\u0438",
+    "ButtonAudioTracks": "\u0410\u0443\u0434\u0438\u043e\u0434\u043e\u0440\u043e\u0436\u043a\u0438",
     "ButtonPreviousTrack": "\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0430\u044f \u0434\u043e\u0440\u043e\u0436\u043a\u0430",
     "ButtonNextTrack": "\u0421\u043b\u0435\u0434\u0443\u044e\u0449\u0430\u044f \u0434\u043e\u0440\u043e\u0436\u043a\u0430",
     "ButtonStop": "\u041e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c",
@@ -690,7 +690,7 @@
     "LabelIdentificationFieldHelp": "\u041f\u043e\u0434\u0441\u0442\u0440\u043e\u043a\u0430 \u0431\u0435\u0437 \u0443\u0447\u0451\u0442\u0430 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430, \u043b\u0438\u0431\u043e \u0440\u0435\u0433\u0443\u043b\u044f\u0440\u043d\u043e\u0435 \u0432\u044b\u0440\u0430\u0436\u0435\u043d\u0438\u0435.",
     "HeaderProfileServerSettingsHelp": "\u042d\u0442\u0438 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f \u0443\u043f\u0440\u0430\u0432\u043b\u044f\u044e\u0442, \u043a\u0430\u043a Media Browser \u0431\u0443\u0434\u0435\u0442 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u044f\u0442\u044c\u0441\u044f \u043d\u0430 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0435.",
     "LabelMaxBitrate": "\u041c\u0430\u043a\u0441. \u043f\u043e\u0442\u043e\u043a\u043e\u0432\u0430\u044f \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c:",
-    "LabelMaxBitrateHelp": "\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u0443\u044e \u043f\u043e\u0442\u043e\u043a\u043e\u0432\u0443\u044e \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c \u0432 \u0441\u0440\u0435\u0434\u0430\u0445 \u0441 \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u043d\u043e\u0439 \u043f\u0440\u043e\u043f\u0443\u0441\u043a\u043d\u043e\u0439 \u0441\u043f\u043e\u0441\u043e\u0431\u043d\u043e\u0441\u0442\u044c\u044e, \u043b\u0438\u0431\u043e \u0435\u0441\u043b\u0438 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043d\u0430\u043a\u043b\u0430\u0434\u044b\u0432\u0430\u0435\u0442 \u0441\u0432\u043e\u0451 \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u0435 \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u0435.",
+    "LabelMaxBitrateHelp": "\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u0443\u044e \u043f\u043e\u0442\u043e\u043a\u043e\u0432\u0443\u044e \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c \u0432 \u0441\u0440\u0435\u0434\u0430\u0445 \u0441 \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u043d\u043e\u0439 \u043f\u0440\u043e\u043f\u0443\u0441\u043a\u043d\u043e\u0439 \u0441\u043f\u043e\u0441\u043e\u0431\u043d\u043e\u0441\u0442\u044c\u044e, \u043b\u0438\u0431\u043e, \u0435\u0441\u043b\u0438 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0442\u0440\u0435\u0431\u0443\u0435\u0442 - \u0435\u0433\u043e \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u0435 \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u0435.",
     "LabelMaxStreamingBitrate": "\u041c\u0430\u043a\u0441. \u043f\u043e\u0442\u043e\u043a\u043e\u0432\u0430\u044f \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c:",
     "LabelMaxStreamingBitrateHelp": "\u0423\u043a\u0430\u0437\u0430\u0442\u044c \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u0443\u044e \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c \u043f\u0440\u0438 \u043f\u043e\u0442\u043e\u043a\u043e\u0432\u043e\u0439 \u043f\u0435\u0440\u0435\u0434\u0430\u0447\u0435.",
     "LabelMaxStaticBitrate": "\u041c\u0430\u043a\u0441. \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c \u0441\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u0438:",
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "\u0414\u0438\u0441\u043f\u0435\u0442\u0447\u0435\u0440 \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445",
     "HeaderPreferences": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438",
     "MessageLoadingChannels": "\u0417\u0430\u0433\u0440\u0443\u0436\u0430\u0435\u0442\u0441\u044f \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u043a\u0430\u043d\u0430\u043b\u0430...",
+    "MessageLoadingContent": "\u0417\u0430\u0433\u0440\u0443\u0436\u0430\u0435\u0442\u0441\u044f \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435...",
     "ButtonMarkRead": "\u041e\u0442\u043c\u0435\u0442\u0438\u0442\u044c \u043a\u0430\u043a \u043f\u0440\u043e\u0447\u0442\u0451\u043d\u043d\u043e\u0435",
     "OptionDefaultSort": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u0430\u044f",
     "OptionCommunityMostWatchedSort": "\u041d\u0430\u0438\u0431\u043e\u043b\u0435\u0435 \u043f\u0440\u043e\u0441\u043c\u0430\u0442\u0440\u0438\u0432\u0430\u0435\u043c\u044b\u0435",
@@ -886,7 +887,7 @@
     "TabSort": "\u041f\u043e\u0440\u044f\u0434\u043e\u043a",
     "TabFilter": "\u0424\u0438\u043b\u044c\u0442\u0440\u044b",
     "ButtonView": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c",
-    "LabelPageSize": "\u041c\u0430\u043a\u0441. \u0447\u0438\u0441\u043b\u043e \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u043e\u0432:",
+    "LabelPageSize": "\u041e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u0435 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u043e\u0432:",
     "LabelView": "\u041f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435:",
     "TabUsers": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438",
     "HeaderFeatures": "\u041c\u0430\u0442\u0435\u0440\u0438\u0430\u043b\u044b",
@@ -904,7 +905,7 @@
     "OptionContextStreaming": "\u041f\u043e\u0442\u043e\u043a\u043e\u0432\u0430\u044f \u043f\u0435\u0440\u0435\u0434\u0430\u0447\u0430",
     "OptionContextStatic": "\u0421\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u044f",
     "ButtonAddToPlaylist": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432 \u0441\u043f\u0438\u0441\u043e\u043a \u0432\u043e\u0441\u043f\u0440-\u0438\u044f",
-    "TabPlaylists": "\u0421\u043f\u0438\u0441\u043a\u0438 \u0432\u043e\u0441\u043f\u0440-\u0438\u044f",
+    "TabPlaylists": "\u0421\u043f\u0438\u0441\u043a\u0438 \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f",
     "ButtonClose": "\u0417\u0430\u043a\u0440\u044b\u0442\u044c",
     "LabelAllLanguages": "\u0412\u0441\u0435 \u044f\u0437\u044b\u043a\u0438",
     "HeaderBrowseOnlineImages": "\u041e\u0431\u0437\u043e\u0440 \u0440\u0438\u0441\u0443\u043d\u043a\u043e\u0432 \u0432 \u0441\u0435\u0442\u0438",
@@ -948,36 +949,38 @@
     "OptionReportAlbums": "\u0410\u043b\u044c\u0431\u043e\u043c\u044b",
     "OptionReportAdultVideos": "\u0412\u0437\u0440\u043e\u0441\u043b\u043e\u0435 \u0432\u0438\u0434\u0435\u043e",
     "ButtonMore": "\u0415\u0449\u0451",
-    "HeaderActivity": "Activity",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "ScheduledTaskCancelledWithName": "{0} was cancelled",
-    "ScheduledTaskCompletedWithName": "{0} completed",
-    "ScheduledTaskFailed": "Scheduled task completed",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Media Browser Server has been updated",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "HeaderActivity": "\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u044f",
+    "ScheduledTaskStartedWithName": "{0} - \u0437\u0430\u043f\u0443\u0449\u0435\u043d\u043e",
+    "ScheduledTaskCancelledWithName": "{0} - \u043e\u0442\u043c\u0435\u043d\u0435\u043d\u043e",
+    "ScheduledTaskCompletedWithName": "{0} - \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u043e",
+    "ScheduledTaskFailed": "\u041d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u043e\u0435 \u0437\u0430\u0434\u0430\u043d\u0438\u0435 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u043e",
+    "PluginInstalledWithName": "{0} - \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e",
+    "PluginUpdatedWithName": "{0} - \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u043e",
+    "PluginUninstalledWithName": "{0} - \u0443\u0434\u0430\u043b\u0435\u043d\u043e",
+    "ScheduledTaskFailedWithName": "{0} - \u043d\u0435\u0443\u0434\u0430\u0447\u043d\u043e",
+    "ItemAddedWithName": "{0} (\u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0443)",
+    "ItemRemovedWithName": "{0} ( \u0438\u0437\u044a\u044f\u0442\u043e \u0438\u0437 \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438)",
+    "DeviceOnlineWithName": "{0} - \u0432 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u043d\u043d\u043e\u043c \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0438",
+    "UserOnlineFromDevice": "{0} - \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0447\u0435\u0440\u0435\u0437 {1}",
+    "DeviceOfflineWithName": "{0} - \u043f\u0440\u0435\u0440\u0432\u0430\u043d\u043e \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435",
+    "UserOfflineFromDevice": "{0} - \u043f\u0440\u0435\u0440\u0432\u0430\u043d\u043e \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0447\u0435\u0440\u0435\u0437 {1}",
+    "SubtitlesDownloadedForItem": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044b \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043d\u044b \u0434\u043b\u044f {0}",
+    "SubtitleDownloadFailureForItem": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044b \u0434\u043b\u044f {0} - \u043d\u0435\u0443\u0434\u0430\u0447\u043d\u0430\u044f \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0430",
+    "LabelRunningTimeValue": "\u0412\u0440\u0435\u043c\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f: {0}",
+    "LabelIpAddressValue": "IP \u0430\u0434\u0440\u0435\u0441: {0}",
+    "UserConfigurationUpdatedWithName": "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0430 \u0434\u043b\u044f {0}",
+    "UserCreatedWithName": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c {0} \u0431\u044b\u043b \u0441\u043e\u0437\u0434\u0430\u043d",
+    "UserPasswordChangedWithName": "\u041f\u0430\u0440\u043e\u043b\u044c \u0431\u044b\u043b \u0438\u0437\u043c\u0435\u043d\u0451\u043d \u0434\u043b\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f {0}",
+    "UserDeletedWithName": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c {0} \u0431\u044b\u043b \u0443\u0434\u0430\u043b\u0451\u043d",
+    "MessageServerConfigurationUpdated": "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0431\u044b\u043b\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0430",
+    "MessageNamedServerConfigurationUpdatedWithValue": "\u0420\u0430\u0437\u0434\u0435\u043b {0} \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0431\u044b\u043b \u043e\u0431\u043d\u043e\u0432\u043b\u0451\u043d",
+    "MessageApplicationUpdated": "Media Browser Server \u0431\u044b\u043b \u043e\u0431\u043d\u043e\u0432\u043b\u0451\u043d",
+    "AuthenticationSucceededWithUserName": "{0} \u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u043d",
+    "FailedLoginAttemptWithUserName": "\u041d\u0435\u0443\u0434\u0430\u0447\u043d\u0430\u044f \u043f\u043e\u043f\u044b\u0442\u043a\u0430 \u0432\u0445\u043e\u0434\u0430 \u0447\u0435\u0440\u0435\u0437 {0}",
+    "UserStartedPlayingItemWithValues": "{0} - \u0437\u0430\u043f\u0443\u0449\u0435\u043d\u043e \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u0435 {1}",
+    "UserStoppedPlayingItemWithValues": "{0} - \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u0435 {1}",
+    "AppDeviceValues": "\u041f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435: {0}, \u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e: {1}",
+    "ProviderValue": "\u041f\u043e\u0441\u0442\u0430\u0432\u0449\u0438\u043a: {0}",
+    "LabelChannelDownloadSizeLimit": "\u041e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u0435 \u0440\u0430\u0437\u043c\u0435\u0440\u0430 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "\u041e\u0433\u0440\u0430\u043d\u0438\u0447\u0438\u0432\u0430\u0435\u0442 \u0440\u0430\u0437\u043c\u0435\u0440 \u043f\u0430\u043f\u043a\u0438 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u043a\u0430\u043d\u0430\u043b\u043e\u0432"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 973089795a..d09548bab3 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -703,6 +703,10 @@
     "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
     "LabelMaxStaticBitrate": "Max sync bitrate:",
     "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
+    "LabelMusicStaticBitrate": "Music sync bitrate:",
+    "LabelMusicStaticBitrateHelp": "Specify a max bitrate when syncing music",
+    "LabelMusicStreamingTranscodingBitrate": "Music transcoding bitrate:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Specify a max bitrate when streaming music",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -802,6 +806,7 @@
     "HeaderMetadataManager": "Metadata Manager",
     "HeaderPreferences": "Preferences",
     "MessageLoadingChannels": "Loading channel content...",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Mark Read",
     "OptionDefaultSort": "Default",
     "OptionCommunityMostWatchedSort": "Most Watched",
@@ -994,8 +999,20 @@
     "MessageApplicationUpdated": "Media Browser Server has been updated",
     "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
     "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "UserStartedPlayingItemWithValues":  "{0} has started playing {1}",
+    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
     "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
     "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue":  "Provider: {0}"
+    "ProviderValue": "Provider: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder",
+    "HeaderRecentActivity": "Recent Activity",
+    "HeaderPeople": "People",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
+    "OptionComposers": "Composers",
+    "OptionOthers": "Others",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "ViewTypeFolders": "Folders",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
+    "ViewTypeLiveTvRecordingGroups":  "Recordings",
+    "ViewTypeLiveTvChannels":  "Channels"
 }
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/sv.json b/MediaBrowser.Server.Implementations/Localization/Server/sv.json
index 6b46d9c2d1..e06a5d94ab 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/sv.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/sv.json
@@ -480,10 +480,10 @@
     "HeaderProgram": "Program",
     "HeaderClients": "Klienter",
     "LabelCompleted": "Klar",
-    "LabelFailed": "Failed",
+    "LabelFailed": "Misslyckades",
     "LabelSkipped": "Hoppades \u00f6ver",
     "HeaderEpisodeOrganization": "Katalogisering av avsnitt",
-    "LabelSeries": "Series:",
+    "LabelSeries": "Serie:",
     "LabelSeasonNumber": "S\u00e4songsnummer:",
     "LabelEpisodeNumber": "Avsnittsnummer:",
     "LabelEndingEpisodeNumber": "Avslutande avsnittsnummer:",
@@ -631,8 +631,8 @@
     "ButtonScenes": "Scener",
     "ButtonSubtitles": "Undertexter",
     "ButtonAudioTracks": "Ljudsp\u00e5r",
-    "ButtonPreviousTrack": "Previous track",
-    "ButtonNextTrack": "Next track",
+    "ButtonPreviousTrack": "F\u00f6reg\u00e5ende sp\u00e5r",
+    "ButtonNextTrack": "N\u00e4sta sp\u00e5r",
     "ButtonStop": "Stopp",
     "ButtonPause": "Paus",
     "LabelGroupMoviesIntoCollections": "Gruppera filmer i samlingsboxar",
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "Metadatahanteraren",
     "HeaderPreferences": "Inst\u00e4llningar",
     "MessageLoadingChannels": "H\u00e4mtar kanalinneh\u00e5ll...",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Markera som l\u00e4st",
     "OptionDefaultSort": "F\u00f6rval",
     "OptionCommunityMostWatchedSort": "Oftast visade",
@@ -979,5 +980,7 @@
     "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
     "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
     "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "ProviderValue": "Provider: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/tr.json b/MediaBrowser.Server.Implementations/Localization/Server/tr.json
index 8b29b4da89..98218bb772 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/tr.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/tr.json
@@ -631,8 +631,8 @@
     "ButtonScenes": "Sahneler",
     "ButtonSubtitles": "Altyaz\u0131lar",
     "ButtonAudioTracks": "Audio tracks",
-    "ButtonPreviousTrack": "Previous track",
-    "ButtonNextTrack": "Next track",
+    "ButtonPreviousTrack": "\u00d6nceki Par\u00e7a",
+    "ButtonNextTrack": "Sonraki Par\u00e7a",
     "ButtonStop": "Durdur",
     "ButtonPause": "Duraklat",
     "LabelGroupMoviesIntoCollections": "Group movies into collections",
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "Metadata Manager",
     "HeaderPreferences": "Preferences",
     "MessageLoadingChannels": "Loading channel content...",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Mark Read",
     "OptionDefaultSort": "Default",
     "OptionCommunityMostWatchedSort": "Most Watched",
@@ -979,5 +980,7 @@
     "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
     "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
     "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "ProviderValue": "Provider: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/vi.json b/MediaBrowser.Server.Implementations/Localization/Server/vi.json
index 47ed8e035f..ef9f681b58 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/vi.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/vi.json
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "Metadata Manager",
     "HeaderPreferences": "Preferences",
     "MessageLoadingChannels": "Loading channel content...",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Mark Read",
     "OptionDefaultSort": "Default",
     "OptionCommunityMostWatchedSort": "Most Watched",
@@ -979,5 +980,7 @@
     "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
     "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
     "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "ProviderValue": "Provider: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json b/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
index 723c792dc4..c541c80bd3 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
@@ -397,7 +397,7 @@
     "HeaderCastCrew": "\u62cd\u651d\u4eba\u54e1\u53ca\u6f14\u54e1",
     "HeaderAdditionalParts": "\u9644\u52a0\u90e8\u4efd",
     "ButtonSplitVersionsApart": "Split Versions Apart",
-    "ButtonPlayTrailer": "Trailer",
+    "ButtonPlayTrailer": "\u9810\u544a",
     "LabelMissing": "\u7f3a\u5c11",
     "LabelOffline": "\u96e2\u7dda",
     "PathSubstitutionHelp": "Path substitutions are used for mapping a path on the server to a path that clients are able to access. By allowing clients direct access to media on the server they may be able to play them directly over the network and avoid using server resources to stream and transcode them.",
@@ -788,6 +788,7 @@
     "HeaderMetadataManager": "Metadata Manager",
     "HeaderPreferences": "Preferences",
     "MessageLoadingChannels": "Loading channel content...",
+    "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Mark Read",
     "OptionDefaultSort": "Default",
     "OptionCommunityMostWatchedSort": "Most Watched",
@@ -979,5 +980,7 @@
     "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
     "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
     "AppDeviceValues": "App: {0}, Device: {1}",
-    "ProviderValue": "Provider: {0}"
+    "ProviderValue": "Provider: {0}",
+    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index af9c7563be..3ff1644434 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -93,7 +93,8 @@
       <HintPath>..\ThirdParty\ServiceStack.Text\ServiceStack.Text.dll</HintPath>
     </Reference>
     <Reference Include="Mono.Posix" Condition=" '$(ConfigurationName)' == 'Release Mono' " />
-    <Reference Include="websocket-sharp">
+    <Reference Include="websocket-sharp, Version=1.0.2.508, Culture=neutral, PublicKeyToken=5660b08a1845a91e, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ThirdParty\WebsocketSharp\websocket-sharp.dll</HintPath>
     </Reference>
   </ItemGroup>
diff --git a/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs b/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
index e7e53181c9..3d0e36ead3 100644
--- a/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
+++ b/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
@@ -57,7 +57,7 @@ namespace MediaBrowser.Server.Implementations.Playlists
 
         public BasePluginFolder GetFolder()
         {
-            var path = Path.Combine(_appPaths.CachePath, "playlists");
+            var path = Path.Combine(_appPaths.DataPath, "playlists");
 
             Directory.CreateDirectory(path);
 
diff --git a/MediaBrowser.Server.Implementations/Playlists/PlaylistImageEnhancer.cs b/MediaBrowser.Server.Implementations/Playlists/PlaylistImageEnhancer.cs
index 768d372647..6b3170e42e 100644
--- a/MediaBrowser.Server.Implementations/Playlists/PlaylistImageEnhancer.cs
+++ b/MediaBrowser.Server.Implementations/Playlists/PlaylistImageEnhancer.cs
@@ -76,17 +76,16 @@ namespace MediaBrowser.Server.Implementations.Playlists
                 })
                 .Where(i => i != null)
                 .DistinctBy(i => i.Id)
-                .OrderBy(i => Guid.NewGuid())
-                .Take(4)
-                .OrderBy(i => i.Name)
                 .ToList();
 
-            if (items.Count == 0)
-            {
-                return new List<BaseItem>();
-            }
+            // Rotate the images no more than once per day
+            var random = new Random(DateTime.Now.DayOfYear).Next();
 
-            return items;
+            return items
+                .OrderBy(i => random - items.IndexOf(i))
+                .Take(4)
+                .OrderBy(i => i.Name)
+                .ToList();
         }
 
         private const string Version = "3";
diff --git a/MediaBrowser.Server.Implementations/Security/AuthenticationRepository.cs b/MediaBrowser.Server.Implementations/Security/AuthenticationRepository.cs
index 43a960ea29..cd20ad74dd 100644
--- a/MediaBrowser.Server.Implementations/Security/AuthenticationRepository.cs
+++ b/MediaBrowser.Server.Implementations/Security/AuthenticationRepository.cs
@@ -157,12 +157,6 @@ namespace MediaBrowser.Server.Implementations.Security
 
                 var startIndex = query.StartIndex ?? 0;
 
-                if (startIndex > 0)
-                {
-                    whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM AccessTokens ORDER BY DateCreated LIMIT {0})",
-                        startIndex.ToString(_usCulture)));
-                }
-
                 if (!string.IsNullOrWhiteSpace(query.AccessToken))
                 {
                     whereClauses.Add("AccessToken=@AccessToken");
@@ -187,11 +181,27 @@ namespace MediaBrowser.Server.Implementations.Security
                     cmd.Parameters.Add(cmd, "@IsActive", DbType.Boolean).Value = query.IsActive.Value;
                 }
 
-                if (whereClauses.Count > 0)
+                var whereTextWithoutPaging = whereClauses.Count == 0 ?
+                    string.Empty :
+                    " where " + string.Join(" AND ", whereClauses.ToArray());
+
+                if (startIndex > 0)
                 {
-                    cmd.CommandText += " where " + string.Join(" AND ", whereClauses.ToArray());
+                    var pagingWhereText = whereClauses.Count == 0 ?
+                        string.Empty :
+                        " where " + string.Join(" AND ", whereClauses.ToArray());
+
+                    whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM AccessTokens {0} ORDER BY DateCreated LIMIT {1})",
+                        pagingWhereText,
+                        startIndex.ToString(_usCulture)));
                 }
 
+                var whereText = whereClauses.Count == 0 ?
+                    string.Empty :
+                    " where " + string.Join(" AND ", whereClauses.ToArray());
+
+                cmd.CommandText += whereText;
+
                 cmd.CommandText += " ORDER BY DateCreated";
 
                 if (query.Limit.HasValue)
@@ -199,7 +209,7 @@ namespace MediaBrowser.Server.Implementations.Security
                     cmd.CommandText += " LIMIT " + query.Limit.Value.ToString(_usCulture);
                 }
 
-                cmd.CommandText += "; select count (Id) from AccessTokens";
+                cmd.CommandText += "; select count (Id) from AccessTokens" + whereTextWithoutPaging;
 
                 var list = new List<AuthenticationInfo>();
                 var count = 0;
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 357395e722..f28b027d28 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -830,6 +830,8 @@ namespace MediaBrowser.ServerApplication
             BaseItem.FileSystem = FileSystemManager;
             BaseItem.UserDataManager = UserDataManager;
             ChannelVideoItem.ChannelManager = ChannelManager;
+            BaseItem.LiveTvManager = LiveTvManager;
+            UserView.UserViewManager = UserViewManager;
         }
 
         /// <summary>
diff --git a/MediaBrowser.sln b/MediaBrowser.sln
index 36bce0dfdb..cc91983493 100644
--- a/MediaBrowser.sln
+++ b/MediaBrowser.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
+VisualStudioVersion = 12.0.30723.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{F0E0E64C-2A6F-4E35-9533-D53AC07C2CD1}"
 EndProject
@@ -53,11 +53,21 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.LocalMetadata"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug_Ubuntu|Any CPU = Debug_Ubuntu|Any CPU
+		Debug_Ubuntu|Mixed Platforms = Debug_Ubuntu|Mixed Platforms
+		Debug_Ubuntu|Win32 = Debug_Ubuntu|Win32
+		Debug_Ubuntu|x64 = Debug_Ubuntu|x64
+		Debug_Ubuntu|x86 = Debug_Ubuntu|x86
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Mixed Platforms = Debug|Mixed Platforms
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release_Ubuntu|Any CPU = Release_Ubuntu|Any CPU
+		Release_Ubuntu|Mixed Platforms = Release_Ubuntu|Mixed Platforms
+		Release_Ubuntu|Win32 = Release_Ubuntu|Win32
+		Release_Ubuntu|x64 = Release_Ubuntu|x64
+		Release_Ubuntu|x86 = Release_Ubuntu|x86
 		Release|Any CPU = Release|Any CPU
 		Release|Mixed Platforms = Release|Mixed Platforms
 		Release|Win32 = Release|Win32
@@ -65,6 +75,13 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Debug_Ubuntu|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Debug_Ubuntu|Mixed Platforms.Build.0 = Debug|Any CPU
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Debug_Ubuntu|Win32.ActiveCfg = Debug|Any CPU
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Debug_Ubuntu|x64.ActiveCfg = Debug|Any CPU
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Debug_Ubuntu|x86.ActiveCfg = Debug|Any CPU
 		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -73,6 +90,13 @@ Global
 		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Debug|x86.Build.0 = Debug|Any CPU
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release_Ubuntu|Any CPU.ActiveCfg = Release Mono|Any CPU
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release_Ubuntu|Any CPU.Build.0 = Release Mono|Any CPU
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release_Ubuntu|Mixed Platforms.ActiveCfg = Release Mono|Any CPU
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release_Ubuntu|Mixed Platforms.Build.0 = Release Mono|Any CPU
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release_Ubuntu|Win32.ActiveCfg = Release Mono|Any CPU
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release_Ubuntu|x64.ActiveCfg = Release Mono|Any CPU
+		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release_Ubuntu|x86.ActiveCfg = Release Mono|Any CPU
 		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -81,6 +105,13 @@ Global
 		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release|x64.ActiveCfg = Release|Any CPU
 		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release|x86.ActiveCfg = Release|Any CPU
 		{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release|x86.Build.0 = Release|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Debug_Ubuntu|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Debug_Ubuntu|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Debug_Ubuntu|Win32.ActiveCfg = Debug|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Debug_Ubuntu|x64.ActiveCfg = Debug|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Debug_Ubuntu|x86.ActiveCfg = Debug|Any CPU
 		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -89,6 +120,13 @@ Global
 		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Debug|x86.Build.0 = Debug|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Release_Ubuntu|Any CPU.ActiveCfg = Release Mono|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Release_Ubuntu|Any CPU.Build.0 = Release Mono|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Release_Ubuntu|Mixed Platforms.ActiveCfg = Release Mono|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Release_Ubuntu|Mixed Platforms.Build.0 = Release Mono|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Release_Ubuntu|Win32.ActiveCfg = Release Mono|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Release_Ubuntu|x64.ActiveCfg = Release Mono|Any CPU
+		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Release_Ubuntu|x86.ActiveCfg = Release Mono|Any CPU
 		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -97,6 +135,13 @@ Global
 		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Release|x64.ActiveCfg = Release|Any CPU
 		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Release|x86.ActiveCfg = Release|Any CPU
 		{4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Release|x86.Build.0 = Release|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Debug_Ubuntu|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Debug_Ubuntu|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Debug_Ubuntu|Win32.ActiveCfg = Debug|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Debug_Ubuntu|x64.ActiveCfg = Debug|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Debug_Ubuntu|x86.ActiveCfg = Debug|Any CPU
 		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -105,6 +150,13 @@ Global
 		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Debug|x86.Build.0 = Debug|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Release_Ubuntu|Any CPU.ActiveCfg = Release Mono|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Release_Ubuntu|Any CPU.Build.0 = Release Mono|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Release_Ubuntu|Mixed Platforms.ActiveCfg = Release Mono|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Release_Ubuntu|Mixed Platforms.Build.0 = Release Mono|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Release_Ubuntu|Win32.ActiveCfg = Release Mono|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Release_Ubuntu|x64.ActiveCfg = Release Mono|Any CPU
+		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Release_Ubuntu|x86.ActiveCfg = Release Mono|Any CPU
 		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -113,6 +165,13 @@ Global
 		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Release|x64.ActiveCfg = Release|Any CPU
 		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Release|x86.ActiveCfg = Release|Any CPU
 		{9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Release|x86.Build.0 = Release|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Debug_Ubuntu|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Debug_Ubuntu|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Debug_Ubuntu|Win32.ActiveCfg = Debug|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Debug_Ubuntu|x64.ActiveCfg = Debug|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Debug_Ubuntu|x86.ActiveCfg = Debug|Any CPU
 		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -121,6 +180,13 @@ Global
 		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Debug|x86.Build.0 = Debug|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Release_Ubuntu|Any CPU.ActiveCfg = Release Mono|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Release_Ubuntu|Any CPU.Build.0 = Release Mono|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Release_Ubuntu|Mixed Platforms.ActiveCfg = Release Mono|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Release_Ubuntu|Mixed Platforms.Build.0 = Release Mono|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Release_Ubuntu|Win32.ActiveCfg = Release Mono|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Release_Ubuntu|x64.ActiveCfg = Release Mono|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Release_Ubuntu|x86.ActiveCfg = Release Mono|Any CPU
 		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -129,6 +195,13 @@ Global
 		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Release|x64.ActiveCfg = Release|Any CPU
 		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Release|x86.ActiveCfg = Release|Any CPU
 		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Release|x86.Build.0 = Release|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Debug_Ubuntu|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Debug_Ubuntu|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Debug_Ubuntu|Win32.ActiveCfg = Debug|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Debug_Ubuntu|x64.ActiveCfg = Debug|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Debug_Ubuntu|x86.ActiveCfg = Debug|Any CPU
 		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -137,6 +210,13 @@ Global
 		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Debug|x86.Build.0 = Debug|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Release_Ubuntu|Any CPU.ActiveCfg = Release Mono|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Release_Ubuntu|Any CPU.Build.0 = Release Mono|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Release_Ubuntu|Mixed Platforms.ActiveCfg = Release Mono|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Release_Ubuntu|Mixed Platforms.Build.0 = Release Mono|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Release_Ubuntu|Win32.ActiveCfg = Release Mono|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Release_Ubuntu|x64.ActiveCfg = Release Mono|Any CPU
+		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Release_Ubuntu|x86.ActiveCfg = Release Mono|Any CPU
 		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -145,6 +225,13 @@ Global
 		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Release|x64.ActiveCfg = Release|Any CPU
 		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Release|x86.ActiveCfg = Release|Any CPU
 		{5624B7B5-B5A7-41D8-9F10-CC5611109619}.Release|x86.Build.0 = Release|Any CPU
+		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
+		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Debug_Ubuntu|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Debug_Ubuntu|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Debug_Ubuntu|Win32.ActiveCfg = Debug|Any CPU
+		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Debug_Ubuntu|x64.ActiveCfg = Debug|Any CPU
+		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Debug_Ubuntu|x86.ActiveCfg = Debug|Any CPU
 		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -152,6 +239,13 @@ Global
 		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Release_Ubuntu|Any CPU.ActiveCfg = Release Mono|Any CPU
+		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Release_Ubuntu|Any CPU.Build.0 = Release Mono|Any CPU
+		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Release_Ubuntu|Mixed Platforms.ActiveCfg = Release Mono|Any CPU
+		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Release_Ubuntu|Mixed Platforms.Build.0 = Release Mono|Any CPU
+		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Release_Ubuntu|Win32.ActiveCfg = Release Mono|Any CPU
+		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Release_Ubuntu|x64.ActiveCfg = Release Mono|Any CPU
+		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Release_Ubuntu|x86.ActiveCfg = Release Mono|Any CPU
 		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -159,6 +253,13 @@ Global
 		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Release|Win32.ActiveCfg = Release|Any CPU
 		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Release|x64.ActiveCfg = Release|Any CPU
 		{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Release|x86.ActiveCfg = Release|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Debug_Ubuntu|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Debug_Ubuntu|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Debug_Ubuntu|Win32.ActiveCfg = Debug|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Debug_Ubuntu|x64.ActiveCfg = Debug|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Debug_Ubuntu|x86.ActiveCfg = Debug|Any CPU
 		{2E781478-814D-4A48-9D80-BFF206441A65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2E781478-814D-4A48-9D80-BFF206441A65}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2E781478-814D-4A48-9D80-BFF206441A65}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -166,6 +267,13 @@ Global
 		{2E781478-814D-4A48-9D80-BFF206441A65}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{2E781478-814D-4A48-9D80-BFF206441A65}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{2E781478-814D-4A48-9D80-BFF206441A65}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Release_Ubuntu|Any CPU.ActiveCfg = Release Mono|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Release_Ubuntu|Any CPU.Build.0 = Release Mono|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Release_Ubuntu|Mixed Platforms.ActiveCfg = Release Mono|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Release_Ubuntu|Mixed Platforms.Build.0 = Release Mono|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Release_Ubuntu|Win32.ActiveCfg = Release Mono|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Release_Ubuntu|x64.ActiveCfg = Release Mono|Any CPU
+		{2E781478-814D-4A48-9D80-BFF206441A65}.Release_Ubuntu|x86.ActiveCfg = Release Mono|Any CPU
 		{2E781478-814D-4A48-9D80-BFF206441A65}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E781478-814D-4A48-9D80-BFF206441A65}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2E781478-814D-4A48-9D80-BFF206441A65}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -173,6 +281,13 @@ Global
 		{2E781478-814D-4A48-9D80-BFF206441A65}.Release|Win32.ActiveCfg = Release|Any CPU
 		{2E781478-814D-4A48-9D80-BFF206441A65}.Release|x64.ActiveCfg = Release|Any CPU
 		{2E781478-814D-4A48-9D80-BFF206441A65}.Release|x86.ActiveCfg = Release|Any CPU
+		{657B5410-7C3B-4806-9753-D254102CE537}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
+		{657B5410-7C3B-4806-9753-D254102CE537}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
+		{657B5410-7C3B-4806-9753-D254102CE537}.Debug_Ubuntu|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{657B5410-7C3B-4806-9753-D254102CE537}.Debug_Ubuntu|Mixed Platforms.Build.0 = Debug|Any CPU
+		{657B5410-7C3B-4806-9753-D254102CE537}.Debug_Ubuntu|Win32.ActiveCfg = Debug|Any CPU
+		{657B5410-7C3B-4806-9753-D254102CE537}.Debug_Ubuntu|x64.ActiveCfg = Debug|Any CPU
+		{657B5410-7C3B-4806-9753-D254102CE537}.Debug_Ubuntu|x86.ActiveCfg = Debug|Any CPU
 		{657B5410-7C3B-4806-9753-D254102CE537}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{657B5410-7C3B-4806-9753-D254102CE537}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{657B5410-7C3B-4806-9753-D254102CE537}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -180,6 +295,13 @@ Global
 		{657B5410-7C3B-4806-9753-D254102CE537}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{657B5410-7C3B-4806-9753-D254102CE537}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{657B5410-7C3B-4806-9753-D254102CE537}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{657B5410-7C3B-4806-9753-D254102CE537}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
+		{657B5410-7C3B-4806-9753-D254102CE537}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
+		{657B5410-7C3B-4806-9753-D254102CE537}.Release_Ubuntu|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{657B5410-7C3B-4806-9753-D254102CE537}.Release_Ubuntu|Mixed Platforms.Build.0 = Release|Any CPU
+		{657B5410-7C3B-4806-9753-D254102CE537}.Release_Ubuntu|Win32.ActiveCfg = Release|Any CPU
+		{657B5410-7C3B-4806-9753-D254102CE537}.Release_Ubuntu|x64.ActiveCfg = Release|Any CPU
+		{657B5410-7C3B-4806-9753-D254102CE537}.Release_Ubuntu|x86.ActiveCfg = Release|Any CPU
 		{657B5410-7C3B-4806-9753-D254102CE537}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{657B5410-7C3B-4806-9753-D254102CE537}.Release|Any CPU.Build.0 = Release|Any CPU
 		{657B5410-7C3B-4806-9753-D254102CE537}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -187,6 +309,13 @@ Global
 		{657B5410-7C3B-4806-9753-D254102CE537}.Release|Win32.ActiveCfg = Release|Any CPU
 		{657B5410-7C3B-4806-9753-D254102CE537}.Release|x64.ActiveCfg = Release|Any CPU
 		{657B5410-7C3B-4806-9753-D254102CE537}.Release|x86.ActiveCfg = Release|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Debug_Ubuntu|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Debug_Ubuntu|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Debug_Ubuntu|Win32.ActiveCfg = Debug|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Debug_Ubuntu|x64.ActiveCfg = Debug|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Debug_Ubuntu|x86.ActiveCfg = Debug|Any CPU
 		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -194,6 +323,13 @@ Global
 		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Release_Ubuntu|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Release_Ubuntu|Mixed Platforms.Build.0 = Release|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Release_Ubuntu|Win32.ActiveCfg = Release|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Release_Ubuntu|x64.ActiveCfg = Release|Any CPU
+		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Release_Ubuntu|x86.ActiveCfg = Release|Any CPU
 		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -201,6 +337,13 @@ Global
 		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Release|Win32.ActiveCfg = Release|Any CPU
 		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Release|x64.ActiveCfg = Release|Any CPU
 		{E22BFD35-0FCD-4A85-978A-C22DCD73A081}.Release|x86.ActiveCfg = Release|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Debug_Ubuntu|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Debug_Ubuntu|Mixed Platforms.Build.0 = Debug|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Debug_Ubuntu|Win32.ActiveCfg = Debug|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Debug_Ubuntu|x64.ActiveCfg = Debug|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Debug_Ubuntu|x86.ActiveCfg = Debug|Any CPU
 		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -208,6 +351,13 @@ Global
 		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Release_Ubuntu|Any CPU.ActiveCfg = Release Mono|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Release_Ubuntu|Any CPU.Build.0 = Release Mono|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Release_Ubuntu|Mixed Platforms.ActiveCfg = Release Mono|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Release_Ubuntu|Mixed Platforms.Build.0 = Release Mono|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Release_Ubuntu|Win32.ActiveCfg = Release Mono|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Release_Ubuntu|x64.ActiveCfg = Release Mono|Any CPU
+		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Release_Ubuntu|x86.ActiveCfg = Release Mono|Any CPU
 		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -215,6 +365,13 @@ Global
 		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Release|Win32.ActiveCfg = Release|Any CPU
 		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Release|x64.ActiveCfg = Release|Any CPU
 		{442B5058-DCAF-4263-BB6A-F21E31120A1B}.Release|x86.ActiveCfg = Release|Any CPU
+		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
+		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
+		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Debug_Ubuntu|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Debug_Ubuntu|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Debug_Ubuntu|Win32.ActiveCfg = Debug|Any CPU
+		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Debug_Ubuntu|x64.ActiveCfg = Debug|Any CPU
+		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Debug_Ubuntu|x86.ActiveCfg = Debug|Any CPU
 		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -222,6 +379,13 @@ Global
 		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
+		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
+		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Release_Ubuntu|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Release_Ubuntu|Mixed Platforms.Build.0 = Release|Any CPU
+		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Release_Ubuntu|Win32.ActiveCfg = Release|Any CPU
+		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Release_Ubuntu|x64.ActiveCfg = Release|Any CPU
+		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Release_Ubuntu|x86.ActiveCfg = Release|Any CPU
 		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -229,6 +393,15 @@ Global
 		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Release|Win32.ActiveCfg = Release|Any CPU
 		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Release|x64.ActiveCfg = Release|Any CPU
 		{D729ADB1-1C01-428D-B680-8EFACD687B2A}.Release|x86.ActiveCfg = Release|Any CPU
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Debug_Ubuntu|Mixed Platforms.ActiveCfg = Debug|x86
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Debug_Ubuntu|Mixed Platforms.Build.0 = Debug|x86
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Debug_Ubuntu|Win32.ActiveCfg = Debug|x86
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Debug_Ubuntu|Win32.Build.0 = Debug|x86
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Debug_Ubuntu|x64.ActiveCfg = Debug|Any CPU
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Debug_Ubuntu|x86.ActiveCfg = Debug|x86
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Debug_Ubuntu|x86.Build.0 = Debug|x86
 		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Debug|Any CPU.Build.0 = Debug|x86
 		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -236,6 +409,15 @@ Global
 		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Release_Ubuntu|Mixed Platforms.ActiveCfg = Release|x86
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Release_Ubuntu|Mixed Platforms.Build.0 = Release|x86
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Release_Ubuntu|Win32.ActiveCfg = Release|x86
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Release_Ubuntu|Win32.Build.0 = Release|x86
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Release_Ubuntu|x64.ActiveCfg = Release|Any CPU
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Release_Ubuntu|x86.ActiveCfg = Release|x86
+		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Release_Ubuntu|x86.Build.0 = Release|x86
 		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Release|Any CPU.ActiveCfg = Release|x86
 		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Release|Any CPU.Build.0 = Release|x86
 		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -243,6 +425,13 @@ Global
 		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Release|Win32.ActiveCfg = Release|Any CPU
 		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Release|x64.ActiveCfg = Release|Any CPU
 		{94ADE4D3-B7EC-45CD-A200-CC469433072B}.Release|x86.ActiveCfg = Release|Any CPU
+		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
+		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
+		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Debug_Ubuntu|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Debug_Ubuntu|Mixed Platforms.Build.0 = Debug|Any CPU
+		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Debug_Ubuntu|Win32.ActiveCfg = Debug|Any CPU
+		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Debug_Ubuntu|x64.ActiveCfg = Debug|Any CPU
+		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Debug_Ubuntu|x86.ActiveCfg = Debug|Any CPU
 		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -250,6 +439,13 @@ Global
 		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Release_Ubuntu|Any CPU.ActiveCfg = Release Mono|Any CPU
+		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Release_Ubuntu|Any CPU.Build.0 = Release Mono|Any CPU
+		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Release_Ubuntu|Mixed Platforms.ActiveCfg = Release Mono|Any CPU
+		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Release_Ubuntu|Mixed Platforms.Build.0 = Release Mono|Any CPU
+		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Release_Ubuntu|Win32.ActiveCfg = Release Mono|Any CPU
+		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Release_Ubuntu|x64.ActiveCfg = Release Mono|Any CPU
+		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Release_Ubuntu|x86.ActiveCfg = Release Mono|Any CPU
 		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -257,6 +453,13 @@ Global
 		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Release|Win32.ActiveCfg = Release|Any CPU
 		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Release|x64.ActiveCfg = Release|Any CPU
 		{734098EB-6DC1-4DD0-A1CA-3140DCD2737C}.Release|x86.ActiveCfg = Release|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Debug_Ubuntu|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Debug_Ubuntu|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Debug_Ubuntu|Win32.ActiveCfg = Debug|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Debug_Ubuntu|x64.ActiveCfg = Debug|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Debug_Ubuntu|x86.ActiveCfg = Debug|Any CPU
 		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -264,6 +467,13 @@ Global
 		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release_Ubuntu|Any CPU.ActiveCfg = Release Mono|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release_Ubuntu|Any CPU.Build.0 = Release Mono|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release_Ubuntu|Mixed Platforms.ActiveCfg = Release Mono|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release_Ubuntu|Mixed Platforms.Build.0 = Release Mono|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release_Ubuntu|Win32.ActiveCfg = Release Mono|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release_Ubuntu|x64.ActiveCfg = Release Mono|Any CPU
+		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release_Ubuntu|x86.ActiveCfg = Release Mono|Any CPU
 		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -271,6 +481,13 @@ Global
 		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release|Win32.ActiveCfg = Release|Any CPU
 		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release|x64.ActiveCfg = Release|Any CPU
 		{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release|x86.ActiveCfg = Release|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Debug_Ubuntu|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Debug_Ubuntu|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Debug_Ubuntu|Win32.ActiveCfg = Debug|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Debug_Ubuntu|x64.ActiveCfg = Debug|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Debug_Ubuntu|x86.ActiveCfg = Debug|Any CPU
 		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -278,6 +495,13 @@ Global
 		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Release_Ubuntu|Any CPU.ActiveCfg = Release Mono|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Release_Ubuntu|Any CPU.Build.0 = Release Mono|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Release_Ubuntu|Mixed Platforms.ActiveCfg = Release Mono|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Release_Ubuntu|Mixed Platforms.Build.0 = Release Mono|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Release_Ubuntu|Win32.ActiveCfg = Release Mono|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Release_Ubuntu|x64.ActiveCfg = Release Mono|Any CPU
+		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Release_Ubuntu|x86.ActiveCfg = Release Mono|Any CPU
 		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -285,6 +509,13 @@ Global
 		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Release|Win32.ActiveCfg = Release|Any CPU
 		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Release|x64.ActiveCfg = Release|Any CPU
 		{4A4402D4-E910-443B-B8FC-2C18286A2CA0}.Release|x86.ActiveCfg = Release|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Debug_Ubuntu|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Debug_Ubuntu|Mixed Platforms.Build.0 = Debug|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Debug_Ubuntu|Win32.ActiveCfg = Debug|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Debug_Ubuntu|x64.ActiveCfg = Debug|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Debug_Ubuntu|x86.ActiveCfg = Debug|Any CPU
 		{23499896-B135-4527-8574-C26E926EA99E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{23499896-B135-4527-8574-C26E926EA99E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{23499896-B135-4527-8574-C26E926EA99E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -292,6 +523,13 @@ Global
 		{23499896-B135-4527-8574-C26E926EA99E}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{23499896-B135-4527-8574-C26E926EA99E}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{23499896-B135-4527-8574-C26E926EA99E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Release_Ubuntu|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Release_Ubuntu|Mixed Platforms.Build.0 = Release|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Release_Ubuntu|Win32.ActiveCfg = Release|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Release_Ubuntu|x64.ActiveCfg = Release|Any CPU
+		{23499896-B135-4527-8574-C26E926EA99E}.Release_Ubuntu|x86.ActiveCfg = Release|Any CPU
 		{23499896-B135-4527-8574-C26E926EA99E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{23499896-B135-4527-8574-C26E926EA99E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{23499896-B135-4527-8574-C26E926EA99E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -299,6 +537,13 @@ Global
 		{23499896-B135-4527-8574-C26E926EA99E}.Release|Win32.ActiveCfg = Release|Any CPU
 		{23499896-B135-4527-8574-C26E926EA99E}.Release|x64.ActiveCfg = Release|Any CPU
 		{23499896-B135-4527-8574-C26E926EA99E}.Release|x86.ActiveCfg = Release|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Debug_Ubuntu|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Debug_Ubuntu|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Debug_Ubuntu|Win32.ActiveCfg = Debug|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Debug_Ubuntu|x64.ActiveCfg = Debug|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Debug_Ubuntu|x86.ActiveCfg = Debug|Any CPU
 		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -306,6 +551,13 @@ Global
 		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Release_Ubuntu|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Release_Ubuntu|Mixed Platforms.Build.0 = Release|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Release_Ubuntu|Win32.ActiveCfg = Release|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Release_Ubuntu|x64.ActiveCfg = Release|Any CPU
+		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Release_Ubuntu|x86.ActiveCfg = Release|Any CPU
 		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec
index 03fc888db0..3f023c5ef5 100644
--- a/Nuget/MediaBrowser.Common.Internal.nuspec
+++ b/Nuget/MediaBrowser.Common.Internal.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common.Internal</id>
-        <version>3.0.425</version>
+        <version>3.0.426</version>
         <title>MediaBrowser.Common.Internal</title>
         <authors>Luke</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.425" />
+            <dependency id="MediaBrowser.Common" version="3.0.426" />
             <dependency id="NLog" version="3.1.0.0" />
             <dependency id="SimpleInjector" version="2.5.2" />
             <dependency id="sharpcompress" version="0.10.2" />
diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec
index 7048a961d1..908d069544 100644
--- a/Nuget/MediaBrowser.Common.nuspec
+++ b/Nuget/MediaBrowser.Common.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common</id>
-        <version>3.0.425</version>
+        <version>3.0.426</version>
         <title>MediaBrowser.Common</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
diff --git a/Nuget/MediaBrowser.Model.Signed.nuspec b/Nuget/MediaBrowser.Model.Signed.nuspec
index aa7bec8fd9..6a9c203ceb 100644
--- a/Nuget/MediaBrowser.Model.Signed.nuspec
+++ b/Nuget/MediaBrowser.Model.Signed.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Model.Signed</id>
-        <version>3.0.425</version>
+        <version>3.0.426</version>
         <title>MediaBrowser.Model - Signed Edition</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec
index 52523d8bb9..3cbad00b7a 100644
--- a/Nuget/MediaBrowser.Server.Core.nuspec
+++ b/Nuget/MediaBrowser.Server.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Server.Core</id>
-        <version>3.0.425</version>
+        <version>3.0.426</version>
         <title>Media Browser.Server.Core</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains core components required to build plugins for Media Browser Server.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.425" />
+            <dependency id="MediaBrowser.Common" version="3.0.426" />
         </dependencies>
     </metadata>
     <files>
-- 
cgit v1.2.3


From e3c86944718d68806ad42c4d14c964a72da90b44 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 15 Aug 2014 12:35:41 -0400
Subject: 3.0.5340.20849

---
 MediaBrowser.Api/Playback/BaseStreamingService.cs  |  23 +++++
 MediaBrowser.Api/UserService.cs                    |  50 +--------
 MediaBrowser.Common/Net/INetworkManager.cs         |   7 ++
 MediaBrowser.Controller/Dto/IDtoService.cs         |   2 +
 MediaBrowser.Controller/Entities/Folder.cs         |  39 ++++++-
 MediaBrowser.Controller/Entities/Movies/BoxSet.cs  |  13 +--
 MediaBrowser.Controller/Entities/User.cs           |   1 +
 MediaBrowser.Controller/Library/IUserManager.cs    |  14 ++-
 MediaBrowser.Controller/Playlists/Playlist.cs      |  25 +----
 MediaBrowser.Dlna/DlnaManager.cs                   |   1 +
 MediaBrowser.Dlna/MediaBrowser.Dlna.csproj         |   4 +
 MediaBrowser.Dlna/Profiles/DenonAvrProfile.cs      |   5 +-
 MediaBrowser.Dlna/Profiles/DirectTvProfile.cs      | 115 +++++++++++++++++++++
 MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml  |  60 +++++++++++
 .../Configuration/UserConfiguration.cs             |   3 +
 MediaBrowser.Model/Dto/UserDto.cs                  |   2 +
 .../EntryPoints/ServerEventNotifier.cs             |   6 +-
 .../Library/UserManager.cs                         | 114 +++++++++++++++++---
 .../LiveTv/LiveTvManager.cs                        |   8 +-
 .../Localization/JavaScript/ar.json                |  30 +++++-
 .../Localization/JavaScript/ca.json                |  30 +++++-
 .../Localization/JavaScript/cs.json                |  28 ++++-
 .../Localization/JavaScript/da.json                |  30 +++++-
 .../Localization/JavaScript/de.json                |  26 ++++-
 .../Localization/JavaScript/el.json                |  30 +++++-
 .../Localization/JavaScript/en_GB.json             |  30 +++++-
 .../Localization/JavaScript/en_US.json             |  30 +++++-
 .../Localization/JavaScript/es.json                |  26 ++++-
 .../Localization/JavaScript/es_MX.json             |  26 ++++-
 .../Localization/JavaScript/fr.json                |  28 ++++-
 .../Localization/JavaScript/he.json                |  30 +++++-
 .../Localization/JavaScript/it.json                |  56 +++++++---
 .../Localization/JavaScript/javascript.json        |  26 ++++-
 .../Localization/JavaScript/kk.json                |  28 ++++-
 .../Localization/JavaScript/ms.json                |  30 +++++-
 .../Localization/JavaScript/nb.json                |  26 ++++-
 .../Localization/JavaScript/nl.json                |  30 +++++-
 .../Localization/JavaScript/pl.json                |  30 +++++-
 .../Localization/JavaScript/pt_BR.json             |  36 +++++--
 .../Localization/JavaScript/pt_PT.json             |  26 ++++-
 .../Localization/JavaScript/ru.json                |  32 +++++-
 .../Localization/JavaScript/sv.json                |  26 ++++-
 .../Localization/JavaScript/tr.json                |  26 ++++-
 .../Localization/JavaScript/vi.json                |  30 +++++-
 .../Localization/JavaScript/zh_TW.json             |  30 +++++-
 .../Localization/Server/ar.json                    |  20 +++-
 .../Localization/Server/ca.json                    |  20 +++-
 .../Localization/Server/cs.json                    |  26 ++++-
 .../Localization/Server/da.json                    |  24 ++++-
 .../Localization/Server/de.json                    |  32 ++++--
 .../Localization/Server/el.json                    |  20 +++-
 .../Localization/Server/en_GB.json                 |  20 +++-
 .../Localization/Server/en_US.json                 |  20 +++-
 .../Localization/Server/es.json                    |  28 ++++-
 .../Localization/Server/es_MX.json                 |  42 +++++---
 .../Localization/Server/fr.json                    |  58 +++++++----
 .../Localization/Server/he.json                    |  26 ++++-
 .../Localization/Server/it.json                    | 106 +++++++++++--------
 .../Localization/Server/kk.json                    |  20 +++-
 .../Localization/Server/ko.json                    |  20 +++-
 .../Localization/Server/ms.json                    |  20 +++-
 .../Localization/Server/nb.json                    |  28 ++++-
 .../Localization/Server/nl.json                    |  32 ++++--
 .../Localization/Server/pl.json                    |  20 +++-
 .../Localization/Server/pt_BR.json                 |  44 +++++---
 .../Localization/Server/pt_PT.json                 |  28 ++++-
 .../Localization/Server/ru.json                    |  52 +++++++---
 .../Localization/Server/server.json                |   6 +-
 .../Localization/Server/sv.json                    |  28 ++++-
 .../Localization/Server/tr.json                    |  24 ++++-
 .../Localization/Server/vi.json                    |  20 +++-
 .../Localization/Server/zh_TW.json                 |  22 +++-
 .../Session/SessionManager.cs                      |   6 +-
 MediaBrowser.ServerApplication/ApplicationHost.cs  |   4 +-
 .../Networking/NetworkManager.cs                   |  47 ++++++++-
 75 files changed, 1772 insertions(+), 359 deletions(-)
 create mode 100644 MediaBrowser.Dlna/Profiles/DirectTvProfile.cs
 create mode 100644 MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 9d54458a6e..b77c6fd015 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -806,6 +806,8 @@ namespace MediaBrowser.Api.Playback
 
             if (string.IsNullOrEmpty(state.MediaPath))
             {
+                var checkCodecs = false;
+
                 if (string.Equals(state.ItemType, typeof(LiveTvChannel).Name))
                 {
                     var streamInfo = await LiveTvManager.GetChannelStream(state.Request.Id, cancellationTokenSource.Token).ConfigureAwait(false);
@@ -824,6 +826,9 @@ namespace MediaBrowser.Api.Playback
                         state.MediaPath = streamInfo.Url;
                         state.InputProtocol = MediaProtocol.Http;
                     }
+
+                    AttachMediaStreamInfo(state, streamInfo.MediaStreams, state.VideoRequest, state.RequestedUrl);
+                    checkCodecs = true;
                 }
 
                 else if (string.Equals(state.ItemType, typeof(LiveTvVideoRecording).Name) ||
@@ -845,6 +850,24 @@ namespace MediaBrowser.Api.Playback
                         state.MediaPath = streamInfo.Url;
                         state.InputProtocol = MediaProtocol.Http;
                     }
+
+                    AttachMediaStreamInfo(state, streamInfo.MediaStreams, state.VideoRequest, state.RequestedUrl);
+                    checkCodecs = true;
+                }
+
+                var videoRequest = state.VideoRequest;
+
+                if (videoRequest != null && checkCodecs)
+                {
+                    if (state.VideoStream != null && CanStreamCopyVideo(videoRequest, state.VideoStream))
+                    {
+                        state.OutputVideoCodec = "copy";
+                    }
+
+                    if (state.AudioStream != null && CanStreamCopyAudio(videoRequest, state.AudioStream, state.SupportedAudioCodecs))
+                    {
+                        state.OutputAudioCodec = "copy";
+                    }
                 }
             }
         }
diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs
index 4ffe5b3911..6fe428274a 100644
--- a/MediaBrowser.Api/UserService.cs
+++ b/MediaBrowser.Api/UserService.cs
@@ -225,46 +225,6 @@ namespace MediaBrowser.Api
             //return ToOptimizedResult(new List<UserDto>());
         }
 
-        private bool IsInLocalNetwork(string remoteEndpoint)
-        {
-            if (string.IsNullOrWhiteSpace(remoteEndpoint))
-            {
-                throw new ArgumentNullException("remoteEndpoint");
-            }
-
-            IPAddress address;
-            if (!IPAddress.TryParse(remoteEndpoint, out address))
-            {
-                return true;
-            }
-
-            const int lengthMatch = 4;
-
-            if (remoteEndpoint.Length >= lengthMatch)
-            {
-                var prefix = remoteEndpoint.Substring(0, lengthMatch);
-
-                if (_networkManager.GetLocalIpAddresses()
-                    .Any(i => i.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)))
-                {
-                    return true;
-                }
-            }
-
-            // Private address space:
-            // http://en.wikipedia.org/wiki/Private_network
-
-            return
-
-                // If url was requested with computer name, we may see this
-                remoteEndpoint.IndexOf("::", StringComparison.OrdinalIgnoreCase) != -1 ||
-
-                remoteEndpoint.StartsWith("10.", StringComparison.OrdinalIgnoreCase) ||
-                remoteEndpoint.StartsWith("192.", StringComparison.OrdinalIgnoreCase) ||
-                remoteEndpoint.StartsWith("172.", StringComparison.OrdinalIgnoreCase) ||
-                remoteEndpoint.StartsWith("169.", StringComparison.OrdinalIgnoreCase);
-        }
-
         /// <summary>
         /// Gets the specified request.
         /// </summary>
@@ -283,10 +243,10 @@ namespace MediaBrowser.Api
             {
                 users = users.Where(i => i.Configuration.IsHidden == request.IsHidden.Value);
             }
-
+            
             var result = users
                 .OrderBy(u => u.Name)
-                .Select(_dtoService.GetUserDto)
+                .Select(i => _userManager.GetUserDto(i, Request.RemoteIp))
                 .ToList();
 
             return ToOptimizedSerializedResultUsingCache(result);
@@ -306,7 +266,7 @@ namespace MediaBrowser.Api
                 throw new ResourceNotFoundException("User not found");
             }
 
-            var result = _dtoService.GetUserDto(user);
+            var result = _userManager.GetUserDto(user, Request.RemoteIp);
 
             return ToOptimizedSerializedResultUsingCache(result);
         }
@@ -410,7 +370,7 @@ namespace MediaBrowser.Api
             }
             else
             {
-                var success = _userManager.AuthenticateUser(user.Name, request.CurrentPassword).Result;
+                var success = _userManager.AuthenticateUser(user.Name, request.CurrentPassword, Request.RemoteIp).Result;
 
                 if (!success)
                 {
@@ -488,7 +448,7 @@ namespace MediaBrowser.Api
 
             newUser.UpdateConfiguration(dtoUser.Configuration);
 
-            var result = _dtoService.GetUserDto(newUser);
+            var result = _userManager.GetUserDto(newUser, Request.RemoteIp);
 
             return ToOptimizedResult(result);
         }
diff --git a/MediaBrowser.Common/Net/INetworkManager.cs b/MediaBrowser.Common/Net/INetworkManager.cs
index b5f1c82941..979dae49c9 100644
--- a/MediaBrowser.Common/Net/INetworkManager.cs
+++ b/MediaBrowser.Common/Net/INetworkManager.cs
@@ -44,5 +44,12 @@ namespace MediaBrowser.Common.Net
         /// <param name="endpointstring">The endpointstring.</param>
         /// <returns>IPEndPoint.</returns>
         IPEndPoint Parse(string endpointstring);
+
+        /// <summary>
+        /// Determines whether [is in local network] [the specified endpoint].
+        /// </summary>
+        /// <param name="endpoint">The endpoint.</param>
+        /// <returns><c>true</c> if [is in local network] [the specified endpoint]; otherwise, <c>false</c>.</returns>
+        bool IsInLocalNetwork(string endpoint);
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Dto/IDtoService.cs b/MediaBrowser.Controller/Dto/IDtoService.cs
index 434e896dad..fc15eedf04 100644
--- a/MediaBrowser.Controller/Dto/IDtoService.cs
+++ b/MediaBrowser.Controller/Dto/IDtoService.cs
@@ -2,6 +2,7 @@
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Querying;
+using System;
 using System.Collections.Generic;
 
 namespace MediaBrowser.Controller.Dto
@@ -16,6 +17,7 @@ namespace MediaBrowser.Controller.Dto
         /// </summary>
         /// <param name="user">The user.</param>
         /// <returns>UserDto.</returns>
+        [Obsolete]
         UserDto GetUserDto(User user);
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 96a8c579e2..79c96dd5e4 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -934,19 +934,50 @@ namespace MediaBrowser.Controller.Entities
 
         public IEnumerable<BaseItem> GetLinkedChildren(User user)
         {
-            if (!FilterLinkedChildrenPerUser)
+            if (!FilterLinkedChildrenPerUser || user == null)
             {
                 return GetLinkedChildren();
             }
 
             var locations = user.RootFolder
-                .Children
+                .GetChildren(user, true)
                 .OfType<CollectionFolder>()
                 .SelectMany(i => i.PhysicalLocations)
                 .ToList();
             
-            return LinkedChildren.Where(i => string.IsNullOrWhiteSpace(i.Path) || locations.Any(l => FileSystem.ContainsSubPath(l, i.Path)))
-                .Select(GetLinkedChild)
+            return LinkedChildren
+                .Select(i =>
+                {
+                    var requiresPostFilter = true;
+
+                    if (!string.IsNullOrWhiteSpace(i.Path))
+                    {
+                        requiresPostFilter = false;
+
+                        if (!locations.Any(l => FileSystem.ContainsSubPath(l, i.Path)))
+                        {
+                            return null;
+                        }
+                    }
+
+                    var child = GetLinkedChild(i);
+
+                    if (requiresPostFilter && child != null)
+                    {
+                        if (string.IsNullOrWhiteSpace(child.Path))
+                        {
+                            Logger.Debug("Found LinkedChild with null path: {0}", child.Name);
+                            return child;
+                        }
+
+                        if (!locations.Any(l => FileSystem.ContainsSubPath(l, child.Path)))
+                        {
+                            return null;
+                        }
+                    }
+
+                    return child;
+                })
                 .Where(i => i != null);
         }
 
diff --git a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
index 5d8fff38f4..705cf90575 100644
--- a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
+++ b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
@@ -1,6 +1,4 @@
-using System.Runtime.Serialization;
-using MediaBrowser.Common.Progress;
-using MediaBrowser.Controller.Playlists;
+using MediaBrowser.Common.Progress;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
@@ -8,6 +6,7 @@ using MediaBrowser.Model.Querying;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -81,8 +80,6 @@ namespace MediaBrowser.Controller.Entities.Movies
         {
             var children = base.GetChildren(user, includeLinkedChildren);
 
-            children = Playlist.FilterInaccessibleItems(children, user);
-
             if (string.Equals(DisplayOrder, ItemSortBy.SortName, StringComparison.OrdinalIgnoreCase))
             {
                 // Sort by name
@@ -99,12 +96,6 @@ namespace MediaBrowser.Controller.Entities.Movies
             return LibraryManager.Sort(children, user, new[] { ItemSortBy.ProductionYear, ItemSortBy.PremiereDate, ItemSortBy.SortName }, SortOrder.Ascending);
         }
 
-        public override IEnumerable<BaseItem> GetRecursiveChildren(User user, bool includeLinkedChildren = true)
-        {
-            var children = base.GetRecursiveChildren(user, includeLinkedChildren);
-            return Playlist.FilterInaccessibleItems(children, user);
-        }
-
         public BoxSetInfo GetLookupInfo()
         {
             return GetItemLookupInfo<BoxSetInfo>();
diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs
index b9c419722d..e4fd929ffd 100644
--- a/MediaBrowser.Controller/Entities/User.cs
+++ b/MediaBrowser.Controller/Entities/User.cs
@@ -24,6 +24,7 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <value>The password.</value>
         public string Password { get; set; }
+        public string LocalPassword { get; set; }
 
         /// <summary>
         /// Gets or sets the path.
diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs
index c6bbf02ae7..a5d949c8a2 100644
--- a/MediaBrowser.Controller/Library/IUserManager.cs
+++ b/MediaBrowser.Controller/Library/IUserManager.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Events;
 using System;
 using System.Collections.Generic;
@@ -53,10 +54,11 @@ namespace MediaBrowser.Controller.Library
         /// </summary>
         /// <param name="username">The username.</param>
         /// <param name="password">The password.</param>
+        /// <param name="remoteEndPoint">The remote end point.</param>
         /// <returns>Task{System.Boolean}.</returns>
         /// <exception cref="System.ArgumentNullException">user</exception>
-        Task<bool> AuthenticateUser(string username, string password);
-
+        Task<bool> AuthenticateUser(string username, string password, string remoteEndPoint);
+        
         /// <summary>
         /// Refreshes metadata for each user
         /// </summary>
@@ -114,5 +116,13 @@ namespace MediaBrowser.Controller.Library
         /// <param name="newPassword">The new password.</param>
         /// <returns>Task.</returns>
         Task ChangePassword(User user, string newPassword);
+
+        /// <summary>
+        /// Gets the user dto.
+        /// </summary>
+        /// <param name="user">The user.</param>
+        /// <param name="remoteEndPoint">The remote end point.</param>
+        /// <returns>UserDto.</returns>
+        UserDto GetUserDto(User user, string remoteEndPoint = null);
     }
 }
diff --git a/MediaBrowser.Controller/Playlists/Playlist.cs b/MediaBrowser.Controller/Playlists/Playlist.cs
index 7822623a97..05a894223e 100644
--- a/MediaBrowser.Controller/Playlists/Playlist.cs
+++ b/MediaBrowser.Controller/Playlists/Playlist.cs
@@ -72,30 +72,7 @@ namespace MediaBrowser.Controller.Playlists
 
             }).Where(m =>  string.Equals(m.MediaType, playlistMediaType, StringComparison.OrdinalIgnoreCase));
 
-            return FilterInaccessibleItems(inputItems, user);
-        }
-
-        public static IEnumerable<BaseItem> FilterInaccessibleItems(IEnumerable<BaseItem> items, User user)
-        {
-            return items;
-            //var locations = user.RootFolder.Children.OfType<CollectionFolder>().SelectMany(i => i.PhysicalLocations).ToList();
-
-            //return items.Where(i =>
-            //{
-            //    var parent = i.Parent;
-
-            //    while (parent != null)
-            //    {
-            //        parent = parent.Parent;
-
-            //        if (parent != null && parent.Parent is AggregateFolder)
-            //        {
-            //            break;
-            //        }
-            //    }
-
-            //    return parent == null || locations.Contains(parent.Path, StringComparer.OrdinalIgnoreCase);
-            //});
+            return inputItems;
         }
 
         [IgnoreDataMember]
diff --git a/MediaBrowser.Dlna/DlnaManager.cs b/MediaBrowser.Dlna/DlnaManager.cs
index 29bd21407b..2dd863c801 100644
--- a/MediaBrowser.Dlna/DlnaManager.cs
+++ b/MediaBrowser.Dlna/DlnaManager.cs
@@ -79,6 +79,7 @@ namespace MediaBrowser.Dlna
                 //new WindowsMediaCenterProfile(),
                 new WindowsPhoneProfile(),
                 new AndroidProfile(),
+                new DirectTvProfile(),
                 new DefaultProfile()
             };
 
diff --git a/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj b/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj
index 962c2a211e..466c990092 100644
--- a/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj
+++ b/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj
@@ -73,6 +73,7 @@
     <Compile Include="Common\DeviceService.cs" />
     <Compile Include="Didl\DidlBuilder.cs" />
     <Compile Include="PlayTo\PlayToController.cs" />
+    <Compile Include="Profiles\DirectTvProfile.cs" />
     <Compile Include="Ssdp\DeviceDiscoveryInfo.cs" />
     <Compile Include="Ssdp\Extensions.cs" />
     <Compile Include="PlayTo\PlaybackProgressEventArgs.cs" />
@@ -188,6 +189,9 @@
     <EmbeddedResource Include="Images\logo240.jpg" />
     <EmbeddedResource Include="Images\logo240.png" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Profiles\Xml\DirecTV HD-DVR.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/MediaBrowser.Dlna/Profiles/DenonAvrProfile.cs b/MediaBrowser.Dlna/Profiles/DenonAvrProfile.cs
index 2f2d4f3ceb..f8451bdfd8 100644
--- a/MediaBrowser.Dlna/Profiles/DenonAvrProfile.cs
+++ b/MediaBrowser.Dlna/Profiles/DenonAvrProfile.cs
@@ -1,6 +1,5 @@
-using System.Xml.Serialization;
-using MediaBrowser.Controller.Dlna;
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
+using System.Xml.Serialization;
 
 namespace MediaBrowser.Dlna.Profiles
 {
diff --git a/MediaBrowser.Dlna/Profiles/DirectTvProfile.cs b/MediaBrowser.Dlna/Profiles/DirectTvProfile.cs
new file mode 100644
index 0000000000..aeb11c38b1
--- /dev/null
+++ b/MediaBrowser.Dlna/Profiles/DirectTvProfile.cs
@@ -0,0 +1,115 @@
+using MediaBrowser.Model.Dlna;
+using System.Xml.Serialization;
+
+namespace MediaBrowser.Dlna.Profiles
+{
+    [XmlRoot("Profile")]
+    public class DirectTvProfile : DefaultProfile
+    {
+        public DirectTvProfile()
+        {
+            Name = "DirecTV HD-DVR";
+
+            TimelineOffsetSeconds = 10;
+            RequiresPlainFolders = true;
+            RequiresPlainVideoItems = true;
+
+            Identification = new DeviceIdentification
+            {
+                Headers = new[]
+                {
+                    new HttpHeaderInfo
+                    {
+                         Match = HeaderMatchType.Substring,
+                         Name = "User-Agent",
+                         Value = "DIRECTV"
+                    }
+                }
+            };
+
+            DirectPlayProfiles = new[]
+            {
+                new DirectPlayProfile
+                {
+                    Container = "mpeg",
+                    VideoCodec = "mpeg2video",
+                    AudioCodec = "mp2",
+                    Type = DlnaProfileType.Video
+                },
+                new DirectPlayProfile
+                {
+                    Container = "jpeg,jpg",
+                    Type = DlnaProfileType.Photo
+                }
+            };
+
+            TranscodingProfiles = new[]
+            {
+                new TranscodingProfile
+                {
+                    Container = "mpeg",
+                    VideoCodec = "mpeg2video",
+                    AudioCodec = "mp2",
+                    Type = DlnaProfileType.Video
+                },
+                new TranscodingProfile
+                {
+                    Container = "jpeg",
+                    Type = DlnaProfileType.Photo
+                }
+            };
+
+            CodecProfiles = new[]
+            {
+                new CodecProfile
+                {
+                    Codec = "mpeg2video",
+                    Type = CodecType.Video,
+
+                    Conditions = new[]
+                    {
+                        new ProfileCondition
+                        {
+                             Condition = ProfileConditionType.LessThanEqual,
+                             Property = ProfileConditionValue.Width,
+                             Value = "1920"
+                        },
+                        new ProfileCondition
+                        {
+                             Condition = ProfileConditionType.LessThanEqual,
+                             Property = ProfileConditionValue.Height,
+                             Value = "1080"
+                        },
+                        new ProfileCondition
+                        {
+                             Condition = ProfileConditionType.LessThanEqual,
+                             Property = ProfileConditionValue.VideoFramerate,
+                             Value = "30"
+                        },
+                        new ProfileCondition
+                        {
+                             Condition = ProfileConditionType.LessThanEqual,
+                             Property = ProfileConditionValue.VideoBitrate,
+                             Value = "8192000"
+                        }
+                    }
+                },
+                new CodecProfile
+                {
+                    Codec = "mp2",
+                    Type = CodecType.Audio,
+
+                    Conditions = new[]
+                    {
+                        new ProfileCondition
+                        {
+                             Condition = ProfileConditionType.LessThanEqual,
+                             Property = ProfileConditionValue.AudioChannels,
+                             Value = "2"
+                        }
+                    }
+                }
+            };
+        }
+    }
+}
diff --git a/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml b/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml
new file mode 100644
index 0000000000..115ee1b4ed
--- /dev/null
+++ b/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml	
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>DirecTV HD-DVR</Name>
+  <Identification>
+    <Headers>
+      <HttpHeaderInfo name="User-Agent" value="DIRECTV" match="Substring" />
+    </Headers>
+  </Identification>
+  <FriendlyName>Media Browser</FriendlyName>
+  <Manufacturer>Media Browser</Manufacturer>
+  <ManufacturerUrl>http://mediabrowser.tv/</ManufacturerUrl>
+  <ModelName>Media Browser</ModelName>
+  <ModelDescription>Media Browser</ModelDescription>
+  <ModelNumber>Media Browser</ModelNumber>
+  <ModelUrl>http://mediabrowser.tv/</ModelUrl>
+  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
+  <EnableAlbumArtInDidl>false</EnableAlbumArtInDidl>
+  <SupportedMediaTypes>Audio,Photo,Video</SupportedMediaTypes>
+  <AlbumArtPn>JPEG_SM</AlbumArtPn>
+  <MaxAlbumArtWidth>480</MaxAlbumArtWidth>
+  <MaxAlbumArtHeight>480</MaxAlbumArtHeight>
+  <MaxIconWidth>48</MaxIconWidth>
+  <MaxIconHeight>48</MaxIconHeight>
+  <MaxStreamingBitrate>8000000</MaxStreamingBitrate>
+  <MaxStaticBitrate>8000000</MaxStaticBitrate>
+  <MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
+  <MusicSyncBitrate>128000</MusicSyncBitrate>
+  <XDlnaDoc>DMS-1.50</XDlnaDoc>
+  <ProtocolInfo>http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_HD_50_AC3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_BASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_FULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-matroska:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_720p_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_1080i_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_HP_HD_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_LPCM;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_ASP_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_SP_L6_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_NDSD;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_LPCM_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000</ProtocolInfo>
+  <TimelineOffsetSeconds>10</TimelineOffsetSeconds>
+  <RequiresPlainVideoItems>true</RequiresPlainVideoItems>
+  <RequiresPlainFolders>true</RequiresPlainFolders>
+  <XmlRootAttributes />
+  <DirectPlayProfiles>
+    <DirectPlayProfile container="mpeg" audioCodec="mp2" videoCodec="mpeg2video" type="Video" />
+    <DirectPlayProfile container="jpeg,jpg" type="Photo" />
+  </DirectPlayProfiles>
+  <TranscodingProfiles>
+    <TranscodingProfile container="mpeg" type="Video" videoCodec="mpeg2video" audioCodec="mp2" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" context="Streaming" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" context="Streaming" />
+  </TranscodingProfiles>
+  <ContainerProfiles />
+  <CodecProfiles>
+    <CodecProfile type="Video" codec="mpeg2video">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" />
+        <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="8192000" isRequired="true" />
+      </Conditions>
+    </CodecProfile>
+    <CodecProfile type="Audio" codec="mp2">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" />
+      </Conditions>
+    </CodecProfile>
+  </CodecProfiles>
+  <ResponseProfiles />
+  <SubtitleProfiles />
+</Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 8f55fde4b3..4c39c8183c 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -75,6 +75,8 @@ namespace MediaBrowser.Model.Configuration
         public bool DisplayCollectionsView { get; set; }
         public bool DisplayFoldersView { get; set; }
 
+        public bool EnableLocalPassword { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="UserConfiguration" /> class.
         /// </summary>
@@ -95,6 +97,7 @@ namespace MediaBrowser.Model.Configuration
 
             ExcludeFoldersFromGrouping = new string[] { };
             DisplayCollectionsView = true;
+            DisplayFoldersView = true;
         }
     }
 }
diff --git a/MediaBrowser.Model/Dto/UserDto.cs b/MediaBrowser.Model/Dto/UserDto.cs
index fec22e11c5..787f55ec09 100644
--- a/MediaBrowser.Model/Dto/UserDto.cs
+++ b/MediaBrowser.Model/Dto/UserDto.cs
@@ -37,6 +37,8 @@ namespace MediaBrowser.Model.Dto
         /// <value><c>true</c> if this instance has password; otherwise, <c>false</c>.</value>
         public bool HasPassword { get; set; }
 
+        public bool HasConfiguredPassword { get; set; }
+        
         /// <summary>
         /// Gets or sets the last login date.
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/ServerEventNotifier.cs b/MediaBrowser.Server.Implementations/EntryPoints/ServerEventNotifier.cs
index 305f2800f7..1b29971daf 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/ServerEventNotifier.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/ServerEventNotifier.cs
@@ -88,7 +88,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
 
         void _userManager_UserConfigurationUpdated(object sender, GenericEventArgs<User> e)
         {
-            var dto = _dtoService.GetUserDto(e.Argument);
+            var dto = _userManager.GetUserDto(e.Argument);
 
             _serverManager.SendWebSocketMessage("UserConfigurationUpdated", dto);
         }
@@ -145,8 +145,8 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
         /// <param name="e">The e.</param>
         void userManager_UserUpdated(object sender, GenericEventArgs<User> e)
         {
-            var dto = _dtoService.GetUserDto(e.Argument);
-
+            var dto = _userManager.GetUserDto(e.Argument);
+            
             _serverManager.SendWebSocketMessage("UserUpdated", dto);
         }
 
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index 139f8629c0..94cc612408 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -1,14 +1,20 @@
 using MediaBrowser.Common.Events;
 using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Drawing;
+using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
+using MediaBrowser.Server.Implementations.Security;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -17,7 +23,6 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Server.Implementations.Security;
 
 namespace MediaBrowser.Server.Implementations.Library
 {
@@ -52,17 +57,25 @@ namespace MediaBrowser.Server.Implementations.Library
 
         private readonly IXmlSerializer _xmlSerializer;
 
+        private readonly INetworkManager _networkManager;
+
+        private readonly Func<IImageProcessor> _imageProcessorFactory;
+        private readonly Func<IDtoService> _dtoServiceFactory;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="UserManager" /> class.
         /// </summary>
         /// <param name="logger">The logger.</param>
         /// <param name="configurationManager">The configuration manager.</param>
         /// <param name="userRepository">The user repository.</param>
-        public UserManager(ILogger logger, IServerConfigurationManager configurationManager, IUserRepository userRepository, IXmlSerializer xmlSerializer)
+        public UserManager(ILogger logger, IServerConfigurationManager configurationManager, IUserRepository userRepository, IXmlSerializer xmlSerializer, INetworkManager networkManager, Func<IImageProcessor> imageProcessorFactory, Func<IDtoService> dtoServiceFactory)
         {
             _logger = logger;
             UserRepository = userRepository;
             _xmlSerializer = xmlSerializer;
+            _networkManager = networkManager;
+            _imageProcessorFactory = imageProcessorFactory;
+            _dtoServiceFactory = dtoServiceFactory;
             ConfigurationManager = configurationManager;
             Users = new List<User>();
         }
@@ -120,15 +133,7 @@ namespace MediaBrowser.Server.Implementations.Library
             Users = await LoadUsers().ConfigureAwait(false);
         }
 
-        /// <summary>
-        /// Authenticates a User and returns a result indicating whether or not it succeeded
-        /// </summary>
-        /// <param name="username">The username.</param>
-        /// <param name="password">The password.</param>
-        /// <returns>Task{System.Boolean}.</returns>
-        /// <exception cref="System.ArgumentNullException">user</exception>
-        /// <exception cref="System.UnauthorizedAccessException"></exception>
-        public async Task<bool> AuthenticateUser(string username, string password)
+        public async Task<bool> AuthenticateUser(string username, string password, string remoteEndPoint)
         {
             if (string.IsNullOrWhiteSpace(username))
             {
@@ -142,9 +147,12 @@ namespace MediaBrowser.Server.Implementations.Library
                 throw new AuthenticationException(string.Format("The {0} account is currently disabled. Please consult with your administrator.", user.Name));
             }
 
-            var existingPasswordString = string.IsNullOrEmpty(user.Password) ? GetSha1String(string.Empty) : user.Password;
+            var success = string.Equals(GetPasswordHash(user), password.Replace("-", string.Empty), StringComparison.OrdinalIgnoreCase);
 
-            var success = string.Equals(existingPasswordString, password.Replace("-", string.Empty), StringComparison.OrdinalIgnoreCase);
+            if (!success && _networkManager.IsInLocalNetwork(remoteEndPoint) && user.Configuration.EnableLocalPassword)
+            {
+                success = string.Equals(GetLocalPasswordHash(user), password.Replace("-", string.Empty), StringComparison.OrdinalIgnoreCase);
+            }
 
             // Update LastActivityDate and LastLoginDate, then save
             if (success)
@@ -158,6 +166,25 @@ namespace MediaBrowser.Server.Implementations.Library
             return success;
         }
 
+        private string GetPasswordHash(User user)
+        {
+            return string.IsNullOrEmpty(user.Password)
+                ? GetSha1String(string.Empty)
+                : user.Password;
+        }
+
+        private string GetLocalPasswordHash(User user)
+        {
+            return string.IsNullOrEmpty(user.LocalPassword)
+                ? GetSha1String(string.Empty)
+                : user.LocalPassword;
+        }
+
+        private bool IsPasswordEmpty(string passwordHash)
+        {
+            return string.Equals(passwordHash, GetSha1String(string.Empty), StringComparison.OrdinalIgnoreCase);
+        }
+
         /// <summary>
         /// Gets the sha1 string.
         /// </summary>
@@ -197,6 +224,65 @@ namespace MediaBrowser.Server.Implementations.Library
             return users;
         }
 
+        public UserDto GetUserDto(User user, string remoteEndPoint = null)
+        {
+            if (user == null)
+            {
+                throw new ArgumentNullException("user");
+            }
+
+            var passwordHash = GetPasswordHash(user);
+
+            var hasConfiguredDefaultPassword = !IsPasswordEmpty(passwordHash);
+
+            var hasPassword = user.Configuration.EnableLocalPassword && !string.IsNullOrEmpty(remoteEndPoint) && _networkManager.IsInLocalNetwork(remoteEndPoint) ?
+                !IsPasswordEmpty(GetLocalPasswordHash(user)) :
+                hasConfiguredDefaultPassword;
+
+            var dto = new UserDto
+            {
+                Id = user.Id.ToString("N"),
+                Name = user.Name,
+                HasPassword = hasPassword,
+                HasConfiguredPassword = hasConfiguredDefaultPassword,
+                LastActivityDate = user.LastActivityDate,
+                LastLoginDate = user.LastLoginDate,
+                Configuration = user.Configuration
+            };
+
+            var image = user.GetImageInfo(ImageType.Primary, 0);
+
+            if (image != null)
+            {
+                dto.PrimaryImageTag = GetImageCacheTag(user, image);
+
+                try
+                {
+                    _dtoServiceFactory().AttachPrimaryImageAspectRatio(dto, user);
+                }
+                catch (Exception ex)
+                {
+                    // Have to use a catch-all unfortunately because some .net image methods throw plain Exceptions
+                    _logger.ErrorException("Error generating PrimaryImageAspectRatio for {0}", ex, user.Name);
+                }
+            }
+
+            return dto;
+        }
+
+        private string GetImageCacheTag(BaseItem item, ItemImageInfo image)
+        {
+            try
+            {
+                return _imageProcessorFactory().GetImageCacheTag(item, image);
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error getting {0} image info for {1}", ex, image.Type, image.Path);
+                return null;
+            }
+        }
+
         /// <summary>
         /// Refreshes metadata for each user
         /// </summary>
@@ -398,7 +484,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 throw new ArgumentNullException("user");
             }
 
-            user.Password = string.IsNullOrEmpty(newPassword) ? string.Empty : GetSha1String(newPassword);
+            user.Password = string.IsNullOrEmpty(newPassword) ? GetSha1String(string.Empty) : GetSha1String(newPassword);
 
             await UpdateUser(user).ConfigureAwait(false);
 
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 7107814622..cc06c6c50b 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -17,6 +17,7 @@ using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.LiveTv;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Querying;
+using MediaBrowser.Model.Serialization;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -40,6 +41,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
         private readonly IUserDataManager _userDataManager;
         private readonly ILibraryManager _libraryManager;
         private readonly ITaskManager _taskManager;
+        private readonly IJsonSerializer _jsonSerializer;
 
         private readonly IDtoService _dtoService;
         private readonly ILocalizationManager _localization;
@@ -57,7 +59,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
         private readonly SemaphoreSlim _refreshSemaphore = new SemaphoreSlim(1, 1);
 
-        public LiveTvManager(IServerConfigurationManager config, IFileSystem fileSystem, ILogger logger, IItemRepository itemRepo, IImageProcessor imageProcessor, IUserDataManager userDataManager, IDtoService dtoService, IUserManager userManager, ILibraryManager libraryManager, ITaskManager taskManager, ILocalizationManager localization)
+        public LiveTvManager(IServerConfigurationManager config, IFileSystem fileSystem, ILogger logger, IItemRepository itemRepo, IImageProcessor imageProcessor, IUserDataManager userDataManager, IDtoService dtoService, IUserManager userManager, ILibraryManager libraryManager, ITaskManager taskManager, ILocalizationManager localization, IJsonSerializer jsonSerializer)
         {
             _config = config;
             _fileSystem = fileSystem;
@@ -67,6 +69,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             _libraryManager = libraryManager;
             _taskManager = taskManager;
             _localization = localization;
+            _jsonSerializer = jsonSerializer;
             _dtoService = dtoService;
             _userDataManager = userDataManager;
 
@@ -299,7 +302,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             }
 
             _refreshedPrograms.TryAdd(program.Id, true);
-            
+
             await program.RefreshMetadata(cancellationToken).ConfigureAwait(false);
         }
 
@@ -351,6 +354,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                     info = await service.GetRecordingStream(recording.Id, cancellationToken).ConfigureAwait(false);
                 }
 
+                _logger.Info("Live stream info: {0}", _jsonSerializer.SerializeToString(info));
                 Sanitize(info);
 
                 var data = new LiveStreamData
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json
index 15c9531715..9cfd5b4d2c 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -350,5 +350,29 @@
     "HeaderPlayers": "Players",
     "HeaderEmbeddedImage": "Embedded image",
     "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderDisc": "Disc",
+    "OptionMovies": "Movies",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "Episodes",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 5522a2970f..4468615a9a 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ca.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ca.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -350,5 +350,29 @@
     "HeaderPlayers": "Players",
     "HeaderEmbeddedImage": "Embedded image",
     "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderDisc": "Disc",
+    "OptionMovies": "Movies",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "Episodes",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 40d3aadbee..341206c4b4 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/cs.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/cs.json
@@ -58,7 +58,7 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "P\u0159ehr\u00e1t",
     "ButtonEdit": "Upravit",
@@ -350,5 +350,29 @@
     "HeaderPlayers": "Players",
     "HeaderEmbeddedImage": "Embedded image",
     "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderDisc": "Disc",
+    "OptionMovies": "Filmy",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "Episody",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 7a029af44f..3b28ca62fd 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/da.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/da.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Afspil",
     "ButtonEdit": "Rediger",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -350,5 +350,29 @@
     "HeaderPlayers": "Players",
     "HeaderEmbeddedImage": "Embedded image",
     "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderDisc": "Disc",
+    "OptionMovies": "Film",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "Episoder",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 f5212eeacf..11fb1d3086 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
@@ -350,5 +350,29 @@
     "HeaderPlayers": "Players",
     "HeaderEmbeddedImage": "Embedded image",
     "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderDisc": "Disc",
+    "OptionMovies": "Filme",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "Episoden",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 9b48db51d2..81ebf49c99 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/el.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/el.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -350,5 +350,29 @@
     "HeaderPlayers": "Players",
     "HeaderEmbeddedImage": "Embedded image",
     "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderDisc": "Disc",
+    "OptionMovies": "Movies",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "Episodes",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 0b28351ca1..a2e79058d2 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_GB.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_GB.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -350,5 +350,29 @@
     "HeaderPlayers": "Players",
     "HeaderEmbeddedImage": "Embedded image",
     "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderDisc": "Disc",
+    "OptionMovies": "Movies",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "Episodes",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 6a4dfe037a..a7524ba827 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -350,5 +350,29 @@
     "HeaderPlayers": "Players",
     "HeaderEmbeddedImage": "Embedded image",
     "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderDisc": "Disc",
+    "OptionMovies": "Movies",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "Episodes",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 f263d4af17..ad1757900a 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json
@@ -350,5 +350,29 @@
     "HeaderPlayers": "Players",
     "HeaderEmbeddedImage": "Embedded image",
     "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderDisc": "Disc",
+    "OptionMovies": "Pel\u00edculas",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "Episodios",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 d8ed664896..885109fcb3 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json
@@ -350,5 +350,29 @@
     "HeaderPlayers": "Jugadores",
     "HeaderEmbeddedImage": "Im\u00e1gen embebida",
     "HeaderTrack": "Pista",
-    "HeaderDisc": "Disco"
+    "HeaderDisc": "Disco",
+    "OptionMovies": "Pel\u00edculas",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "Episodios",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 c2bca5298a..49a5803d0e 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
@@ -349,6 +349,30 @@
     "HeaderGameSystem": "Plateforme de jeu",
     "HeaderPlayers": "Lecteurs",
     "HeaderEmbeddedImage": "Embedded image",
-    "HeaderTrack": "Track",
-    "HeaderDisc": "Disque"
+    "HeaderTrack": "Piste",
+    "HeaderDisc": "Disque",
+    "OptionMovies": "Films",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "\u00c9pisodes",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 a5d9e5280e..0f40dac0be 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/he.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/he.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "\u05e0\u05d2\u05df",
     "ButtonEdit": "\u05e2\u05e8\u05d5\u05da",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -350,5 +350,29 @@
     "HeaderPlayers": "Players",
     "HeaderEmbeddedImage": "Embedded image",
     "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderDisc": "Disc",
+    "OptionMovies": "\u05e1\u05e8\u05d8\u05d9\u05dd",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "\u05e4\u05e8\u05e7\u05d9\u05dd",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 bef7dcbf6c..b21b3172b3 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/it.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/it.json
@@ -123,8 +123,8 @@
     "HeaderMyViews": "Mie viste",
     "HeaderLibraryFolders": "Cartelle dei mediata",
     "HeaderLatestMedia": "Ultimi Media",
-    "ButtonMoreItems": "More...",
-    "ButtonMore": "Pi\u00f9 info...",
+    "ButtonMoreItems": "Pi\u00f9...",
+    "ButtonMore": "Dettagli",
     "HeaderFavoriteMovies": "Film preferiti",
     "HeaderFavoriteShows": "Show preferiti",
     "HeaderFavoriteEpisodes": "Episodi preferiti",
@@ -136,7 +136,7 @@
     "HeaderSelectTranscodingPath": "Selezionare transcodifica Percorso temporaneo",
     "HeaderSelectImagesByNamePath": "Selezionare Immagini per nome Path",
     "HeaderSelectMetadataPath": "Selezionare metadati Path",
-    "HeaderSelectServerCachePathHelp": "Sfoglia o immettere il percorso da utilizzare per i file di cache server. La cartella deve essere scrivibile. La posizione di questa cartella avr\u00e0 un impatto diretto sulle prestazioni del server e dovrebbe idealmente essere collocato su un disco a stato solido.",
+    "HeaderSelectServerCachePathHelp": "Sfoglia o immetti il percorso da utilizzare per i file di cache server. La cartella deve essere scrivibile",
     "HeaderSelectTranscodingPathHelp": "Sfoglia o immettere il percorso da utilizzare per la transcodifica dei file temporanei. La cartella deve essere scrivibile.",
     "HeaderSelectImagesByNamePathHelp": "Sfoglia oppure immettere il percorso per i vostri articoli per cartella nome. La cartella deve essere scrivibile.",
     "HeaderSelectMetadataPathHelp": "Sfoglia o inserire il percorso vuoi archiviare i metadati all'interno. La cartella deve essere scrivibile.",
@@ -319,7 +319,7 @@
     "HeaderSelectPlayer": "Utente selezionato:",
     "ButtonSelect": "Seleziona",
     "ButtonNew": "Nuovo",
-    "MessageInternetExplorerWebm": "Se utilizzi internet explorer installa WebM plugin",
+    "MessageInternetExplorerWebm": "Se utilizzi internet  Explorer installa WebM plugin",
     "HeaderVideoError": "Video Error",
     "ButtonAddToPlaylist": "Aggiungi alla playlist",
     "HeaderAddToPlaylist": "Aggiungi alla playlist",
@@ -330,25 +330,49 @@
     "MessageAddedToPlaylistSuccess": "Ok",
     "ButtonViewSeriesRecording": "Vista delle serie in registrazione",
     "ValueOriginalAirDate": "Prima messa in onda (originale): {0}",
-    "ButtonRemoveFromPlaylist": "Remove from playlist",
-    "HeaderSpecials": "Specials",
+    "ButtonRemoveFromPlaylist": "Rimuovi dalla playlist",
+    "HeaderSpecials": "Speciali",
     "HeaderTrailers": "Trailers",
     "HeaderAudio": "Audio",
-    "HeaderResolution": "Resolution",
+    "HeaderResolution": "Risoluzione",
     "HeaderVideo": "Video",
-    "HeaderRuntime": "Runtime",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderParentalRating": "Parental rating",
-    "HeaderReleaseDate": "Release date",
-    "HeaderDateAdded": "Date added",
+    "HeaderRuntime": "Durata",
+    "HeaderCommunityRating": "Voto Comunit\u00e0",
+    "HeaderParentalRating": "Voto genitore",
+    "HeaderReleaseDate": "Data Rilascio",
+    "HeaderDateAdded": "Aggiunto il",
     "HeaderSeries": "Series",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderNetwork": "Network",
+    "HeaderSeason": "Stagione",
+    "HeaderSeasonNumber": "Stagione Numero",
+    "HeaderNetwork": "Rete",
     "HeaderYear": "Anno",
     "HeaderGameSystem": "Gioco Sistema",
     "HeaderPlayers": "Giocatori",
     "HeaderEmbeddedImage": "Immagine incorporata",
     "HeaderTrack": "Traccia",
-    "HeaderDisc": "Disco"
+    "HeaderDisc": "Disco",
+    "OptionMovies": "Film",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 df852476a1..ef979a2c99 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -356,5 +356,29 @@
     "HeaderPlayers": "Players",
     "HeaderEmbeddedImage": "Embedded image",
     "HeaderTrack": "Track",
-    "HeaderDisc":  "Disc"
+    "HeaderDisc": "Disc",
+    "OptionMovies": "Movies",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "Episodes",
+    "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",
+    "LabelMetadataReaders":  "Metadata readers:",
+    "LabelMetadataReadersHelp":  "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
index 1e13564081..9520907ac7 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
@@ -237,7 +237,7 @@
     "ValueAudioCodec": "\u0414\u044b\u0431\u044b\u0441 \u043a\u043e\u0434\u0435\u0433\u0456: {0}",
     "ValueVideoCodec": "\u0411\u0435\u0439\u043d\u0435 \u043a\u043e\u0434\u0435\u0433\u0456: {0}",
     "ValueCodec": "\u041a\u043e\u0434\u0435\u043a: {0}",
-    "ValueConditions": "\u0428\u0430\u0440\u0442\u0442\u0430\u0440: {0}",
+    "ValueConditions": "\u0416\u0430\u0493\u0434\u0430\u0439\u043b\u0430\u0440: {0}",
     "LabelAll": "\u0411\u0430\u0440\u043b\u044b\u049b",
     "HeaderDeleteImage": "\u0421\u0443\u0440\u0435\u0442\u0442\u0456 \u0436\u043e\u044e",
     "MessageFileNotFound": "\u0424\u0430\u0439\u043b \u0442\u0430\u0431\u044b\u043b\u043c\u0430\u0434\u044b.",
@@ -350,5 +350,29 @@
     "HeaderPlayers": "\u041e\u0439\u044b\u043d\u0448\u044b\u043b\u0430\u0440",
     "HeaderEmbeddedImage": "\u0415\u043d\u0434\u0456\u0440\u0456\u043b\u0433\u0435\u043d \u0441\u0443\u0440\u0435\u0442",
     "HeaderTrack": "\u0416\u043e\u043b\u0448\u044b\u049b",
-    "HeaderDisc": "\u0414\u0438\u0441\u043a\u0456"
+    "HeaderDisc": "\u0414\u0438\u0441\u043a\u0456",
+    "OptionMovies": "\u0424\u0438\u043b\u044c\u043c\u0434\u0435\u0440",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "\u042d\u043f\u0438\u0437\u043e\u0434\u0442\u0430\u0440",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 542c8eff3a..ec46aa6f07 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ms.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ms.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -350,5 +350,29 @@
     "HeaderPlayers": "Players",
     "HeaderEmbeddedImage": "Embedded image",
     "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderDisc": "Disc",
+    "OptionMovies": "Movies",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "Episodes",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 64e98dde0e..af32a0f6ad 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/nb.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/nb.json
@@ -350,5 +350,29 @@
     "HeaderPlayers": "Players",
     "HeaderEmbeddedImage": "Embedded image",
     "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderDisc": "Disc",
+    "OptionMovies": "Filmer",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "Episoder",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 ef49504e27..781ef70cf6 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
@@ -201,7 +201,7 @@
     "ButtonInstantMix": "Instant mix",
     "ButtonResume": "Hervatten",
     "HeaderScenes": "Scenes",
-    "HeaderAudioTracks": "Audio Tracks",
+    "HeaderAudioTracks": "Audio sporen",
     "HeaderSubtitles": "Ondertitels",
     "HeaderVideoQuality": "Video Kwalitet",
     "MessageErrorPlayingVideo": "Er ging iets mis bij het afspelen van de video.",
@@ -311,7 +311,7 @@
     "TabHelp": "Hulp",
     "TabScheduledTasks": "Geplande taken",
     "ButtonFullscreen": "Volledig scherm",
-    "ButtonAudioTracks": "Audio Tracks",
+    "ButtonAudioTracks": "Audio sporen",
     "ButtonSubtitles": "Ondertitels",
     "ButtonScenes": "Scenes",
     "ButtonQuality": "Kwaliteit",
@@ -350,5 +350,29 @@
     "HeaderPlayers": "Spelers",
     "HeaderEmbeddedImage": "Ingesloten afbeelding",
     "HeaderTrack": "Track",
-    "HeaderDisc": "Schijf"
+    "HeaderDisc": "Schijf",
+    "OptionMovies": "Films",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "Afleveringen",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 08055fdf54..6c72a9aa74 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pl.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pl.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -350,5 +350,29 @@
     "HeaderPlayers": "Players",
     "HeaderEmbeddedImage": "Embedded image",
     "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderDisc": "Disc",
+    "OptionMovies": "Filmy",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "Odcinki",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 ea9c0eb0af..6bd2717566 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mudo",
     "ButtonUnmute": "Remover Mudo",
     "ButtonStop": "Parar",
-    "ButtonNextTrack": "Pr\u00f3xima Faixa",
+    "ButtonNextTrack": "Pr\u00f3xima faixa",
     "ButtonPause": "Pausar",
     "ButtonPlay": "Reproduzir",
     "ButtonEdit": "Editar",
     "ButtonQueue": "Adicionar \u00e0 fila",
     "ButtonPlayTrailer": "Reproduzir trailer",
     "ButtonPlaylist": "Lista de reprodu\u00e7\u00e3o",
-    "ButtonPreviousTrack": "Faixa Anterior",
+    "ButtonPreviousTrack": "Faixa anterior",
     "LabelEnabled": "Ativada",
     "LabelDisabled": "Desativada",
     "ButtonMoreInformation": "Mais informa\u00e7\u00f5es",
@@ -129,7 +129,7 @@
     "HeaderFavoriteShows": "S\u00e9ries Favoritas",
     "HeaderFavoriteEpisodes": "Epis\u00f3dios Favoritos",
     "HeaderFavoriteGames": "Jogos Favoritos",
-    "HeaderRatingsDownloads": "Critica  \/ Downloads",
+    "HeaderRatingsDownloads": "Avalia\u00e7\u00e3o  \/ Downloads",
     "HeaderConfirmProfileDeletion": "Confirmar Exclus\u00e3o do Perfil",
     "MessageConfirmProfileDeletion": "Deseja realmente excluir este perfil?",
     "HeaderSelectServerCachePath": "Selecione o Caminho do Cache do Servidor",
@@ -165,7 +165,7 @@
     "HeaderSelectWatchFolderHelp": "Localize ou digite o caminho para a sua pasta de monitora\u00e7\u00e3o. A pasta deve permitir escrita.",
     "OrganizePatternResult": "Resultado: {0}",
     "HeaderRestart": "Reiniciar",
-    "HeaderShutdown": "Terminar",
+    "HeaderShutdown": "Desligar",
     "MessageConfirmRestart": "Deseja realmente reiniciar o Servidor Media Browser?",
     "MessageConfirmShutdown": "Deseja realmente desligar o Servidor Media Browser?",
     "ButtonUpdateNow": "Atualizar Agora",
@@ -337,7 +337,7 @@
     "HeaderResolution": "Resolu\u00e7\u00e3o",
     "HeaderVideo": "V\u00eddeo",
     "HeaderRuntime": "Dura\u00e7\u00e3o",
-    "HeaderCommunityRating": "Classifica\u00e7\u00e3o da Comunidade",
+    "HeaderCommunityRating": "Avalia\u00e7\u00e3o da Comunidade",
     "HeaderParentalRating": "Classifica\u00e7\u00e3o parental",
     "HeaderReleaseDate": "Data de lan\u00e7amento",
     "HeaderDateAdded": "Data de adi\u00e7\u00e3o",
@@ -350,5 +350,29 @@
     "HeaderPlayers": "Jogadores",
     "HeaderEmbeddedImage": "Imagem incorporada",
     "HeaderTrack": "Faixa",
-    "HeaderDisc": "Disco"
+    "HeaderDisc": "Disco",
+    "OptionMovies": "Filmes",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "Epis\u00f3dios",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 03ffa3c80b..620a71c718 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
@@ -350,5 +350,29 @@
     "HeaderPlayers": "Players",
     "HeaderEmbeddedImage": "Embedded image",
     "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderDisc": "Disc",
+    "OptionMovies": "Filmes",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "Epis\u00f3dios",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 03638ac4b3..25c2731e9d 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
@@ -112,8 +112,8 @@
     "StatusWatching": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440",
     "StatusRecordingProgram": "\u0417\u0430\u043f\u0438\u0441\u044b\u0432\u0430\u0435\u0442\u0441\u044f {0}",
     "StatusWatchingProgram": "\u041f\u0440\u043e\u0441\u043c\u0430\u0442\u0440\u0438\u0432\u0430\u0435\u0442\u0441\u044f {0}",
-    "HeaderSplitMedia": "\u0420\u0430\u0437\u0431\u0438\u0442\u044c \u043d\u043e\u0441\u0438\u0442\u0435\u043b\u0438 \u043f\u043e \u043e\u0442\u0434\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u0438",
-    "MessageConfirmSplitMedia": "\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0440\u0430\u0437\u0431\u0438\u0442\u044c \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0438 \u043d\u043e\u0441\u0438\u0442\u0435\u043b\u0435\u0439 \u043d\u0430 \u043e\u0442\u0434\u0435\u043b\u044c\u043d\u044b\u0435 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u044b?",
+    "HeaderSplitMedia": "\u0420\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u044c \u043d\u043e\u0441\u0438\u0442\u0435\u043b\u0438 \u043f\u043e \u043e\u0442\u0434\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u0438",
+    "MessageConfirmSplitMedia": "\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0440\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u044c \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0438 \u043d\u043e\u0441\u0438\u0442\u0435\u043b\u0435\u0439 \u043d\u0430 \u043e\u0442\u0434\u0435\u043b\u044c\u043d\u044b\u0435 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u044b?",
     "HeaderError": "\u041e\u0448\u0438\u0431\u043a\u0430",
     "MessagePleaseSelectOneItem": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435, \u043f\u043e \u043a\u0440\u0430\u0439\u043d\u0435\u0439 \u043c\u0435\u0440\u0435, \u043e\u0434\u0438\u043d \u044d\u043b\u0435\u043c\u0435\u043d\u0442.",
     "MessagePleaseSelectTwoItems": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435, \u043f\u043e \u043a\u0440\u0430\u0439\u043d\u0435\u0439 \u043c\u0435\u0440\u0435, \u0434\u0432\u0430 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430.",
@@ -297,7 +297,7 @@
     "MessageBrowserDoesNotSupportWebSockets": "\u0414\u0430\u043d\u043d\u044b\u0439 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u0432\u0435\u0431-\u0441\u043e\u043a\u0435\u0442\u044b. \u0414\u043b\u044f \u0431\u043e\u043b\u0435\u0435 \u044d\u0444\u0444\u0435\u043a\u0442\u0438\u0432\u043d\u043e\u0439 \u0440\u0430\u0431\u043e\u0442\u044b \u0441\u0434\u0435\u043b\u0430\u0439\u0442\u0435 \u043f\u043e\u043f\u044b\u0442\u043a\u0443 \u0441 \u0431\u043e\u043b\u0435\u0435 \u043d\u043e\u0432\u044b\u043c \u0431\u0440\u0430\u0443\u0437\u0435\u0440\u043e\u043c, \u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, Chrome, Firefox, IE10+, Safari (iOS) \u0438\u043b\u0438 Opera.",
     "LabelInstallingPackage": "\u0423\u0441\u0442\u0430\u043d\u0430\u0432\u043b\u0438\u0432\u0430\u0435\u0442\u0441\u044f {0}",
     "LabelPackageInstallCompleted": "\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430 {0} \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u0430.",
-    "LabelPackageInstallFailed": "\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430 {0} \u043d\u0435\u0443\u0434\u0430\u0447\u043d\u0430.",
+    "LabelPackageInstallFailed": "\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430 {0} \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u0430 \u043d\u0435\u0443\u0434\u0430\u0447\u043d\u043e.",
     "LabelPackageInstallCancelled": "\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430 {0} \u043e\u0442\u043c\u0435\u043d\u0435\u043d\u0430.",
     "TabServer": "\u0421\u0435\u0440\u0432\u0435\u0440",
     "TabUsers": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438",
@@ -350,5 +350,29 @@
     "HeaderPlayers": "\u0418\u0433\u0440\u043e\u043a\u0438",
     "HeaderEmbeddedImage": "\u0412\u043d\u0435\u0434\u0440\u0451\u043d\u043d\u044b\u0439 \u0440\u0438\u0441\u0443\u043d\u043e\u043a",
     "HeaderTrack": "\u0414\u043e\u0440\u043e\u0436\u043a\u0430",
-    "HeaderDisc": "\u0414\u0438\u0441\u043a"
+    "HeaderDisc": "\u0414\u0438\u0441\u043a",
+    "OptionMovies": "\u0424\u0438\u043b\u044c\u043c\u044b",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "\u042d\u043f\u0438\u0437\u043e\u0434\u044b",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 823534b35c..a49dda0dc0 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/sv.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/sv.json
@@ -350,5 +350,29 @@
     "HeaderPlayers": "Players",
     "HeaderEmbeddedImage": "Embedded image",
     "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderDisc": "Disc",
+    "OptionMovies": "Filmer",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "Avsnitt",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 505f756920..dadfecdf1e 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/tr.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/tr.json
@@ -350,5 +350,29 @@
     "HeaderPlayers": "Players",
     "HeaderEmbeddedImage": "Embedded image",
     "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderDisc": "Disc",
+    "OptionMovies": "Filmler",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "Episodes",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 4bf6e77141..2cda3c98d5 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/vi.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/vi.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -350,5 +350,29 @@
     "HeaderPlayers": "Players",
     "HeaderEmbeddedImage": "Embedded image",
     "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderDisc": "Disc",
+    "OptionMovies": "Movies",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "Episodes",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 20ad67cded..04dec94466 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Next track",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "\u64ad\u653e",
     "ButtonEdit": "\u7de8\u8f2f",
     "ButtonQueue": "Queue",
     "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Previous track",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -350,5 +350,29 @@
     "HeaderPlayers": "Players",
     "HeaderEmbeddedImage": "Embedded image",
     "HeaderTrack": "Track",
-    "HeaderDisc": "Disc"
+    "HeaderDisc": "Disc",
+    "OptionMovies": "Movies",
+    "OptionCollections": "Collection",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "Episodes",
+    "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",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "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.",
+    "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."
 }
\ 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 bdf866bdad..c11f87dc46 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ar.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ar.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "\u062e\u0631\u0648\u062c",
+    "HeaderPassword": "Password",
     "LabelVisitCommunity": "\u0632\u064a\u0627\u0631\u0629 \u0627\u0644\u0645\u062c\u062a\u0645\u0639",
+    "HeaderLocalAccess": "Local Access",
     "LabelGithubWiki": "Github Wiki",
     "LabelSwagger": "Swagger",
     "LabelStandard": "\u0642\u064a\u0627\u0633\u0649",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
     "LabelMaxStaticBitrate": "Max sync bitrate:",
     "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
+    "LabelMusicStaticBitrate": "Music sync bitrate:",
+    "LabelMusicStaticBitrateHelp": "Specify a max bitrate when syncing music",
+    "LabelMusicStreamingTranscodingBitrate": "Music transcoding bitrate:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Specify a max bitrate when streaming music",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -982,5 +988,17 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "ProviderValue": "Provider: {0}",
     "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder",
+    "HeaderRecentActivity": "Recent Activity",
+    "HeaderPeople": "People",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
+    "OptionComposers": "Composers",
+    "OptionOthers": "Others",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "ViewTypeFolders": "Folders",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ca.json b/MediaBrowser.Server.Implementations/Localization/Server/ca.json
index 89207f4e87..c3bb3a00a9 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ca.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ca.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "Sortir",
+    "HeaderPassword": "Password",
     "LabelVisitCommunity": "Visitar la comunitat",
+    "HeaderLocalAccess": "Local Access",
     "LabelGithubWiki": "Github Wiki",
     "LabelSwagger": "Swagger",
     "LabelStandard": "Est\u00e0ndard",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
     "LabelMaxStaticBitrate": "Max sync bitrate:",
     "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
+    "LabelMusicStaticBitrate": "Music sync bitrate:",
+    "LabelMusicStaticBitrateHelp": "Specify a max bitrate when syncing music",
+    "LabelMusicStreamingTranscodingBitrate": "Music transcoding bitrate:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Specify a max bitrate when streaming music",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -982,5 +988,17 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "ProviderValue": "Provider: {0}",
     "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder",
+    "HeaderRecentActivity": "Recent Activity",
+    "HeaderPeople": "People",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
+    "OptionComposers": "Composers",
+    "OptionOthers": "Others",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "ViewTypeFolders": "Folders",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/cs.json b/MediaBrowser.Server.Implementations/Localization/Server/cs.json
index 815789e92f..0631352efa 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/cs.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/cs.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "Zav\u0159\u00edt",
+    "HeaderPassword": "Password",
     "LabelVisitCommunity": "Nav\u0161t\u00edvit komunitu",
+    "HeaderLocalAccess": "Local Access",
     "LabelGithubWiki": "Github Wiki",
     "LabelSwagger": "Swagger",
     "LabelStandard": "Standardn\u00ed",
@@ -480,7 +482,7 @@
     "HeaderProgram": "Program",
     "HeaderClients": "Klienti",
     "LabelCompleted": "Hotovo",
-    "LabelFailed": "Chyba",
+    "LabelFailed": "Failed",
     "LabelSkipped": "P\u0159esko\u010deno",
     "HeaderEpisodeOrganization": "Organizace epizod",
     "LabelSeries": "Series:",
@@ -630,8 +632,8 @@
     "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Sc\u00e9ny",
     "ButtonSubtitles": "Titulky",
-    "ButtonAudioTracks": "Audio stopy",
-    "ButtonPreviousTrack": "P\u0159edchod\u00ed stopa",
+    "ButtonAudioTracks": "Audio tracks",
+    "ButtonPreviousTrack": "Previous track",
     "ButtonNextTrack": "Next track",
     "ButtonStop": "Stop",
     "ButtonPause": "Pause",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
     "LabelMaxStaticBitrate": "Max sync bitrate:",
     "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
+    "LabelMusicStaticBitrate": "Music sync bitrate:",
+    "LabelMusicStaticBitrateHelp": "Specify a max bitrate when syncing music",
+    "LabelMusicStreamingTranscodingBitrate": "Music transcoding bitrate:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Specify a max bitrate when streaming music",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -982,5 +988,17 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "ProviderValue": "Provider: {0}",
     "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder",
+    "HeaderRecentActivity": "Recent Activity",
+    "HeaderPeople": "People",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
+    "OptionComposers": "Composers",
+    "OptionOthers": "Others",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "ViewTypeFolders": "Folders",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/da.json b/MediaBrowser.Server.Implementations/Localization/Server/da.json
index 07f577724f..c45a36e9d8 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/da.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/da.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "Afslut",
+    "HeaderPassword": "Password",
     "LabelVisitCommunity": "Bes\u00f8g F\u00e6lleskab",
+    "HeaderLocalAccess": "Local Access",
     "LabelGithubWiki": "Github Wiki",
     "LabelSwagger": "Swagger",
     "LabelStandard": "Standard",
@@ -627,10 +629,10 @@
     "TabNowPlaying": "Spiler nu",
     "TabNavigation": "Navigation",
     "TabControls": "Controls",
-    "ButtonFullscreen": "Skift til fuldsk\u00e6rm",
+    "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Scener",
     "ButtonSubtitles": "Undertekster",
-    "ButtonAudioTracks": "Lyd filer",
+    "ButtonAudioTracks": "Audio tracks",
     "ButtonPreviousTrack": "Previous track",
     "ButtonNextTrack": "Next track",
     "ButtonStop": "Stop",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
     "LabelMaxStaticBitrate": "Max sync bitrate:",
     "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
+    "LabelMusicStaticBitrate": "Music sync bitrate:",
+    "LabelMusicStaticBitrateHelp": "Specify a max bitrate when syncing music",
+    "LabelMusicStreamingTranscodingBitrate": "Music transcoding bitrate:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Specify a max bitrate when streaming music",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "System venligt navn",
@@ -982,5 +988,17 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "ProviderValue": "Provider: {0}",
     "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder",
+    "HeaderRecentActivity": "Recent Activity",
+    "HeaderPeople": "People",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
+    "OptionComposers": "Composers",
+    "OptionOthers": "Others",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "ViewTypeFolders": "Folders",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/de.json b/MediaBrowser.Server.Implementations/Localization/Server/de.json
index 6b5a38dc7f..6aaecd48ff 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/de.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/de.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "Ende",
+    "HeaderPassword": "Password",
     "LabelVisitCommunity": "Besuche die Community",
+    "HeaderLocalAccess": "Local Access",
     "LabelGithubWiki": "Github Wiki",
     "LabelSwagger": "Swagger",
     "LabelStandard": "Standard",
@@ -480,10 +482,10 @@
     "HeaderProgram": "Programm",
     "HeaderClients": "Clients",
     "LabelCompleted": "Fertiggestellt",
-    "LabelFailed": "Gescheitert",
+    "LabelFailed": "Failed",
     "LabelSkipped": "\u00dcbersprungen",
     "HeaderEpisodeOrganization": "Episodensortierung",
-    "LabelSeries": "Serien:",
+    "LabelSeries": "Series:",
     "LabelSeasonNumber": "Staffelnummer",
     "LabelEpisodeNumber": "Episodennummer",
     "LabelEndingEpisodeNumber": "Ending episode number",
@@ -627,12 +629,12 @@
     "TabNowPlaying": "Aktuelle Wiedergabe",
     "TabNavigation": "Navigation",
     "TabControls": "Controls",
-    "ButtonFullscreen": "Schalte Vollbild um",
+    "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Szenen",
     "ButtonSubtitles": "Untertitel",
-    "ButtonAudioTracks": "Audiospuren",
-    "ButtonPreviousTrack": "Vorheriger Track",
-    "ButtonNextTrack": "N\u00e4chster Track",
+    "ButtonAudioTracks": "Audio tracks",
+    "ButtonPreviousTrack": "Previous track",
+    "ButtonNextTrack": "Next track",
     "ButtonStop": "Stop",
     "ButtonPause": "Pause",
     "LabelGroupMoviesIntoCollections": "Gruppiere Filme in Collections",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
     "LabelMaxStaticBitrate": "Max sync bitrate:",
     "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
+    "LabelMusicStaticBitrate": "Music sync bitrate:",
+    "LabelMusicStaticBitrateHelp": "Specify a max bitrate when syncing music",
+    "LabelMusicStreamingTranscodingBitrate": "Music transcoding bitrate:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Specify a max bitrate when streaming music",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Freundlicher Name",
@@ -982,5 +988,17 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "ProviderValue": "Provider: {0}",
     "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder",
+    "HeaderRecentActivity": "Recent Activity",
+    "HeaderPeople": "People",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
+    "OptionComposers": "Composers",
+    "OptionOthers": "Others",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "ViewTypeFolders": "Folders",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/el.json b/MediaBrowser.Server.Implementations/Localization/Server/el.json
index 95b5be3e27..95ec3ed357 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/el.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/el.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "\u03ad\u03be\u03bf\u03b4\u03bf\u03c2",
+    "HeaderPassword": "Password",
     "LabelVisitCommunity": "\u0395\u03c0\u03af\u03c3\u03ba\u03b5\u03c8\u03b7 \u039a\u03bf\u03b9\u03bd\u03cc\u03c4\u03b7\u03c4\u03b1",
+    "HeaderLocalAccess": "Local Access",
     "LabelGithubWiki": "Github Wiki",
     "LabelSwagger": "Swagger",
     "LabelStandard": "\u03c0\u03c1\u03cc\u03c4\u03c5\u03c0\u03bf",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
     "LabelMaxStaticBitrate": "Max sync bitrate:",
     "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
+    "LabelMusicStaticBitrate": "Music sync bitrate:",
+    "LabelMusicStaticBitrateHelp": "Specify a max bitrate when syncing music",
+    "LabelMusicStreamingTranscodingBitrate": "Music transcoding bitrate:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Specify a max bitrate when streaming music",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -982,5 +988,17 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "ProviderValue": "Provider: {0}",
     "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder",
+    "HeaderRecentActivity": "Recent Activity",
+    "HeaderPeople": "People",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
+    "OptionComposers": "Composers",
+    "OptionOthers": "Others",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "ViewTypeFolders": "Folders",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json b/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
index 227ac09c0c..68662e2829 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "Exit",
+    "HeaderPassword": "Password",
     "LabelVisitCommunity": "Visit Community",
+    "HeaderLocalAccess": "Local Access",
     "LabelGithubWiki": "Github Wiki",
     "LabelSwagger": "Swagger",
     "LabelStandard": "Standard",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
     "LabelMaxStaticBitrate": "Max sync bitrate:",
     "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
+    "LabelMusicStaticBitrate": "Music sync bitrate:",
+    "LabelMusicStaticBitrateHelp": "Specify a max bitrate when syncing music",
+    "LabelMusicStreamingTranscodingBitrate": "Music transcoding bitrate:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Specify a max bitrate when streaming music",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -982,5 +988,17 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "ProviderValue": "Provider: {0}",
     "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder",
+    "HeaderRecentActivity": "Recent Activity",
+    "HeaderPeople": "People",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
+    "OptionComposers": "Composers",
+    "OptionOthers": "Others",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "ViewTypeFolders": "Folders",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/en_US.json b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
index 8e243a682a..8b035525e9 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "Exit",
+    "HeaderPassword": "Password",
     "LabelVisitCommunity": "Visit Community",
+    "HeaderLocalAccess": "Local Access",
     "LabelGithubWiki": "Github Wiki",
     "LabelSwagger": "Swagger",
     "LabelStandard": "Standard",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
     "LabelMaxStaticBitrate": "Max sync bitrate:",
     "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
+    "LabelMusicStaticBitrate": "Music sync bitrate:",
+    "LabelMusicStaticBitrateHelp": "Specify a max bitrate when syncing music",
+    "LabelMusicStreamingTranscodingBitrate": "Music transcoding bitrate:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Specify a max bitrate when streaming music",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -982,5 +988,17 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "ProviderValue": "Provider: {0}",
     "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder",
+    "HeaderRecentActivity": "Recent Activity",
+    "HeaderPeople": "People",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
+    "OptionComposers": "Composers",
+    "OptionOthers": "Others",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "ViewTypeFolders": "Folders",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/es.json b/MediaBrowser.Server.Implementations/Localization/Server/es.json
index 75a2ae657b..31ddbbbede 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/es.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "Salir",
+    "HeaderPassword": "Password",
     "LabelVisitCommunity": "Visitar la comunidad",
+    "HeaderLocalAccess": "Local Access",
     "LabelGithubWiki": "Wiki de Github",
     "LabelSwagger": "Swagger",
     "LabelStandard": "Est\u00e1ndar",
@@ -480,10 +482,10 @@
     "HeaderProgram": "Programa",
     "HeaderClients": "Clientes",
     "LabelCompleted": "Completado",
-    "LabelFailed": "Err\u00f3neo",
+    "LabelFailed": "Error",
     "LabelSkipped": "Omitido",
     "HeaderEpisodeOrganization": "Organizaci\u00f3n de episodios",
-    "LabelSeries": "Serie:",
+    "LabelSeries": "Series:",
     "LabelSeasonNumber": "Temporada n\u00famero:",
     "LabelEpisodeNumber": "Episodio n\u00famero:",
     "LabelEndingEpisodeNumber": "N\u00famero episodio final:",
@@ -627,10 +629,10 @@
     "TabNowPlaying": "Reproduciendo ahora",
     "TabNavigation": "Navegaci\u00f3n",
     "TabControls": "Controles",
-    "ButtonFullscreen": "Pantalla completa",
+    "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Escenas",
     "ButtonSubtitles": "Subt\u00edtulos",
-    "ButtonAudioTracks": "Pistas de audio",
+    "ButtonAudioTracks": "Audio tracks",
     "ButtonPreviousTrack": "Pista anterior",
     "ButtonNextTrack": "Pista siguiente",
     "ButtonStop": "Detener",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
     "LabelMaxStaticBitrate": "Max sync bitrate:",
     "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
+    "LabelMusicStaticBitrate": "Music sync bitrate:",
+    "LabelMusicStaticBitrateHelp": "Specify a max bitrate when syncing music",
+    "LabelMusicStreamingTranscodingBitrate": "Music transcoding bitrate:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Specify a max bitrate when streaming music",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignorar las solicitudes de intervalo de bytes de transcodificaci\u00f3n",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "Si est\u00e1 activado, estas solicitudes ser\u00e1n atendidas pero ignorar\u00e1n el encabezado de intervalo de bytes.",
     "LabelFriendlyName": "Nombre amigable",
@@ -982,5 +988,17 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "ProviderValue": "Provider: {0}",
     "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder",
+    "HeaderRecentActivity": "Recent Activity",
+    "HeaderPeople": "People",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
+    "OptionComposers": "Composers",
+    "OptionOthers": "Others",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "ViewTypeFolders": "Folders",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json b/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
index 0eb48f1c06..af3dcc765c 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "Salir",
+    "HeaderPassword": "Contrase\u00f1a",
     "LabelVisitCommunity": "Visitar la Comunidad",
+    "HeaderLocalAccess": "Acceso Local",
     "LabelGithubWiki": "Wiki de Github",
     "LabelSwagger": "Swagger",
     "LabelStandard": "Est\u00e1ndar",
@@ -46,7 +48,7 @@
     "HeaderPreferredMetadataLanguage": "Idioma preferido para metadatos:",
     "LabelSaveLocalMetadata": "Guardar im\u00e1genes y metadatos en las carpetas de medios",
     "LabelSaveLocalMetadataHelp": "Guardar im\u00e1genes y metadatos directamente en las carpetas de medios los colocar\u00e1 en un lugar donde se pueden editar f\u00e1cilmente.",
-    "LabelDownloadInternetMetadata": "Descargar imagenes y metadatos de internet",
+    "LabelDownloadInternetMetadata": "Descargar im\u00e1genes y metadatos de internet",
     "LabelDownloadInternetMetadataHelp": "Media Browser permite descargar informaci\u00f3n de sus medios para enriquecer la presentaci\u00f3n.",
     "TabPreferences": "Preferencias",
     "TabPassword": "Contrase\u00f1a",
@@ -88,7 +90,7 @@
     "LabelSelectUsers": "Seleccionar Usuarios:",
     "ButtonUpload": "Subir",
     "HeaderUploadNewImage": "Subir Nueva Imagen",
-    "LabelDropImageHere": "Depositar Imagen Aqu\u00ed",
+    "LabelDropImageHere": "Depositar imagen aqu\u00ed",
     "ImageUploadAspectRatioHelp": "Se Recomienda una Proporci\u00f3n de Aspecto 1:1. Solo JPG\/PNG.",
     "MessageNothingHere": "Nada aqu\u00ed.",
     "MessagePleaseEnsureInternetMetadata": "Por favor aseg\u00farese que la descarga de metadatos de internet esta habilitada.",
@@ -627,12 +629,12 @@
     "TabNowPlaying": "Reproduci\u00e9ndo Ahora",
     "TabNavigation": "Navegaci\u00f3n",
     "TabControls": "Controles",
-    "ButtonFullscreen": "Alternar pantalla completa",
+    "ButtonFullscreen": "Cambiar a pantalla completa",
     "ButtonScenes": "Escenas",
     "ButtonSubtitles": "Subt\u00edtulos",
     "ButtonAudioTracks": "Pistas de audio",
-    "ButtonPreviousTrack": "Pista Anterior",
-    "ButtonNextTrack": "Pista Siguiente",
+    "ButtonPreviousTrack": "Pista anterior",
+    "ButtonNextTrack": "Pista siguiente",
     "ButtonStop": "Detener",
     "ButtonPause": "Pausar",
     "LabelGroupMoviesIntoCollections": "Agrupar pel\u00edculas en colecciones",
@@ -691,10 +693,14 @@
     "HeaderProfileServerSettingsHelp": "Estos valores controlan la manera en que Media Browser se presentar\u00e1 a s\u00ed mismo ante el dispositivo.",
     "LabelMaxBitrate": "Tasa de bits m\u00e1xima:",
     "LabelMaxBitrateHelp": "Especifique la tasa de bits m\u00e1xima para ambientes con un ancho de banda limitado, o si el dispositivo impone sus propios l\u00edmites.",
-    "LabelMaxStreamingBitrate": "Tasa de bits m\u00e1xima para transmisi\u00f3n :",
-    "LabelMaxStreamingBitrateHelp": "Especifique una tasa de bits m\u00e1xima para transmitir.",
+    "LabelMaxStreamingBitrate": "Tasa de bits m\u00e1xima para transmisi\u00f3n:",
+    "LabelMaxStreamingBitrateHelp": "Especifique una tasa de bits m\u00e1xima al transferir en tiempo real.",
     "LabelMaxStaticBitrate": "Tasa m\u00e1xima de bits de sinc",
     "LabelMaxStaticBitrateHelp": "Especifique una tasa de bits cuando se sincronice contenido en alta calidad.",
+    "LabelMusicStaticBitrate": "Tasa de bits de sinc de m\u00fascia",
+    "LabelMusicStaticBitrateHelp": "Especifique la tasa de bits m\u00e1xima al sincronizar m\u00fasica",
+    "LabelMusicStreamingTranscodingBitrate": "Tasa de transcodificaci\u00f3n de m\u00fasica:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Especifique la tasa de bits m\u00e1xima al transferir musica en tiempo real",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignorar solicitudes de transcodificaci\u00f3n de rango de byte.",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "Si se habilita, estas solicitudes seran honradas pero se ignorar\u00e1 el encabezado de rango de byte.",
     "LabelFriendlyName": "Nombre amistoso:",
@@ -788,7 +794,7 @@
     "HeaderMetadataManager": "Administrador de Metadatos",
     "HeaderPreferences": "Preferencias",
     "MessageLoadingChannels": "Cargando contenidos del canal...",
-    "MessageLoadingContent": "Loading content...",
+    "MessageLoadingContent": "Cargando contenido...",
     "ButtonMarkRead": "Marcar como Le\u00eddo",
     "OptionDefaultSort": "Por defecto",
     "OptionCommunityMostWatchedSort": "M\u00e1s Visto",
@@ -802,14 +808,14 @@
     "MessageLearnHowToCustomize": "Aprenda c\u00f3mo personalizar esta p\u00e1gina a sus gustos personales. Haga clic en su icono de usuario en la esquina superior derecha de la pantalla para ver y actualizar sus preferencias.",
     "ButtonEditOtherUserPreferences": "Edita las preferencias personales de este usuario.",
     "LabelChannelStreamQuality": "Calidad por defecto para transmisi\u00f3n por internet:",
-    "LabelChannelStreamQualityHelp": "En un ambiente de ancho de banda limitado, limitar la calidad puede ayudar a asegurar una experiencia de transimisi\u00f3n fluida.",
+    "LabelChannelStreamQualityHelp": "En un ambiente de ancho de banda limitado, limitar la calidad puede ayudar a asegurar una experiencia de transimisi\u00f3n en tiempo real fluida.",
     "OptionBestAvailableStreamQuality": "La mejor disponible",
     "LabelEnableChannelContentDownloadingFor": "Habilitar descarga de contenidos del canal para:",
     "LabelEnableChannelContentDownloadingForHelp": "Algunos canales soportan la descarga de contenido previo a su despliegue. Habilite esto en ambientes de ancho de banda limitados para descargar contenido del canal en horarios no pico. El contenido es descargado como parte de la tarea programada para descarga del canal.",
     "LabelChannelDownloadPath": "Ruta de descarga de contenido del canal:",
     "LabelChannelDownloadPathHelp": "Especifique una ruta personalizada para descargas si as\u00ed lo desea. D\u00e9jelo vac\u00edo para descargar a una carpeta de datos interna del programa.",
     "LabelChannelDownloadAge": "Eliminar contenido despu\u00e9s de: (d\u00edas)",
-    "LabelChannelDownloadAgeHelp": "El contenido descargado anterior a esto ser\u00e1 eliminado. Permanecer\u00e1 reproducible via transmisi\u00f3n por Internet.",
+    "LabelChannelDownloadAgeHelp": "El contenido descargado anterior a esto ser\u00e1 eliminado. Permanecer\u00e1 reproducible via transmisi\u00f3n en tiempo real por Internet.",
     "ChannelSettingsFormHelp": "Instale canales tales como Avances y Vimeo desde el cat\u00e1logo de complementos.",
     "LabelSelectCollection": "Elegir colecci\u00f3n:",
     "ViewTypeMovies": "Pel\u00edculas",
@@ -981,6 +987,18 @@
     "UserStoppedPlayingItemWithValues": "{0} ha detenido la reproducci\u00f3n de {1}",
     "AppDeviceValues": "App: {0}, Dispositivo: {1}",
     "ProviderValue": "Proveedor: {0}",
-    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
+    "LabelChannelDownloadSizeLimit": "L\u00edmite de tama\u00f1o de descarga (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limitar el tama\u00f1o de la carpeta de descargas del canal",
+    "HeaderRecentActivity": "Actividad Reciente",
+    "HeaderPeople": "Personas",
+    "HeaderDownloadPeopleMetadataFor": "Descargar biograf\u00eda e im\u00e1genes para:",
+    "OptionComposers": "Compositores",
+    "OptionOthers": "Otros",
+    "HeaderDownloadPeopleMetadataForHelp": "Habilitar opciones adicionales proporcionar\u00e1 m\u00e1s informaci\u00f3n en pantalla pero resultar\u00e1 en barridos de la biblioteca m\u00e1s lentos",
+    "ViewTypeFolders": "Carpetas",
+    "LabelDisplayFoldersView": "Mostrar una vista de carpetas para mostrar carpetas de medios simples",
+    "ViewTypeLiveTvRecordingGroups": "Grabaciones",
+    "ViewTypeLiveTvChannels": "Canales",
+    "LabelAllowLocalAccessWithoutPassword": "Permite acceso local sin una contrase\u00f1a",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "Al habilitarse, no se requerir\u00e1 de una contrase\u00f1a cuando se inicie sesi\u00f3n desde su red local."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/fr.json b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
index cef64513dc..9e9c42197b 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/fr.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "Quitter",
+    "HeaderPassword": "Password",
     "LabelVisitCommunity": "Visiter la Communaut\u00e9",
+    "HeaderLocalAccess": "Local Access",
     "LabelGithubWiki": "GitHub Wiki",
     "LabelSwagger": "Swagger",
     "LabelStandard": "Standard",
@@ -480,7 +482,7 @@
     "HeaderProgram": "Programme",
     "HeaderClients": "Clients",
     "LabelCompleted": "Compl\u00e9t\u00e9",
-    "LabelFailed": "\u00c9chec",
+    "LabelFailed": "\u00c9chou\u00e9",
     "LabelSkipped": "Saut\u00e9",
     "HeaderEpisodeOrganization": "Organisation d'\u00e9pisodes",
     "LabelSeries": "S\u00e9ries:",
@@ -627,11 +629,11 @@
     "TabNowPlaying": "En cours de lecture",
     "TabNavigation": "Navigation",
     "TabControls": "Contr\u00f4les",
-    "ButtonFullscreen": "Plein \u00e9cran",
+    "ButtonFullscreen": "Basculer en plein \u00e9cran",
     "ButtonScenes": "Sc\u00e8nes",
     "ButtonSubtitles": "Sous-titres",
-    "ButtonAudioTracks": "Piste audio",
-    "ButtonPreviousTrack": "Piste pr\u00e9c\u00e9dante",
+    "ButtonAudioTracks": "Pistes audio",
+    "ButtonPreviousTrack": "Piste pr\u00e9c\u00e9dente",
     "ButtonNextTrack": "Piste suivante",
     "ButtonStop": "Arr\u00eat",
     "ButtonPause": "Pause",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
     "LabelMaxStaticBitrate": "Max sync bitrate:",
     "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
+    "LabelMusicStaticBitrate": "Music sync bitrate:",
+    "LabelMusicStaticBitrateHelp": "Specify a max bitrate when syncing music",
+    "LabelMusicStreamingTranscodingBitrate": "Music transcoding bitrate:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Specify a max bitrate when streaming music",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore le transcodage des demandes de plage d'octets",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "Si activ\u00e9, ces requ\u00eates\/demandes seront honor\u00e9es mais l'ent\u00eate de plage d'octets sera ignor\u00e9. ",
     "LabelFriendlyName": "Surnom d'affichage",
@@ -934,22 +940,22 @@
     "HeaderEpisodes": "\u00c9pisodes:",
     "OptionSeason0": "Saison 0",
     "LabelReport": "Rapport:",
-    "OptionReportSongs": "Songs",
-    "OptionReportSeries": "Series",
-    "OptionReportSeasons": "Seasons",
-    "OptionReportTrailers": "Trailers",
+    "OptionReportSongs": "Chansons",
+    "OptionReportSeries": "S\u00e9ries",
+    "OptionReportSeasons": "Saisons",
+    "OptionReportTrailers": "Bandes-annonces",
     "OptionReportMusicVideos": "Music videos",
-    "OptionReportMovies": "Movies",
+    "OptionReportMovies": "Films",
     "OptionReportHomeVideos": "Home videos",
-    "OptionReportGames": "Games",
-    "OptionReportEpisodes": "Episodes",
+    "OptionReportGames": "Jeux",
+    "OptionReportEpisodes": "\u00c9pisodes",
     "OptionReportCollections": "Collections",
-    "OptionReportBooks": "Books",
-    "OptionReportArtists": "Artists",
+    "OptionReportBooks": "Livres",
+    "OptionReportArtists": "Artistes",
     "OptionReportAlbums": "Albums",
     "OptionReportAdultVideos": "Adult videos",
     "ButtonMore": "Plus...",
-    "HeaderActivity": "Activity",
+    "HeaderActivity": "Activit\u00e9",
     "ScheduledTaskStartedWithName": "{0} started",
     "ScheduledTaskCancelledWithName": "{0} was cancelled",
     "ScheduledTaskCompletedWithName": "{0} completed",
@@ -960,18 +966,18 @@
     "ScheduledTaskFailedWithName": "{0} failed",
     "ItemAddedWithName": "{0} was added to the library",
     "ItemRemovedWithName": "{0} was removed from the library",
-    "DeviceOnlineWithName": "{0} is connected",
+    "DeviceOnlineWithName": "{0} est connect\u00e9",
     "UserOnlineFromDevice": "{0} is online from {1}",
     "DeviceOfflineWithName": "{0} has disconnected",
     "UserOfflineFromDevice": "{0} has disconnected from {1}",
     "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+    "SubtitleDownloadFailureForItem": "Le t\u00e9l\u00e9chargement des sous-titres pour {0} a \u00e9chou\u00e9.",
     "LabelRunningTimeValue": "Running time: {0}",
     "LabelIpAddressValue": "Ip address: {0}",
     "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
+    "UserCreatedWithName": "L'utilisateur {0} a \u00e9t\u00e9 cr\u00e9\u00e9.",
+    "UserPasswordChangedWithName": "Le mot de passe pour l'utilisateur {0} a \u00e9t\u00e9 modifi\u00e9.",
+    "UserDeletedWithName": "L'utilisateur {0} a \u00e9t\u00e9 supprim\u00e9.",
     "MessageServerConfigurationUpdated": "Server configuration has been updated",
     "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
     "MessageApplicationUpdated": "Media Browser Server has been updated",
@@ -982,5 +988,17 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "ProviderValue": "Provider: {0}",
     "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder",
+    "HeaderRecentActivity": "Recent Activity",
+    "HeaderPeople": "People",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
+    "OptionComposers": "Composers",
+    "OptionOthers": "Others",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "ViewTypeFolders": "Folders",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/he.json b/MediaBrowser.Server.Implementations/Localization/Server/he.json
index 3f656b60cc..280830e3c2 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/he.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/he.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "\u05d9\u05e6\u05d9\u05d0\u05d4",
+    "HeaderPassword": "Password",
     "LabelVisitCommunity": "\u05d1\u05e7\u05e8 \u05d1\u05e7\u05d4\u05d9\u05dc\u05d4",
+    "HeaderLocalAccess": "Local Access",
     "LabelGithubWiki": "\u05e1\u05e4\u05e8\u05d9\u05d9\u05ea \u05d4\u05e7\u05d5\u05d3",
     "LabelSwagger": "Swagger",
     "LabelStandard": "\u05e8\u05d2\u05d9\u05dc",
@@ -397,7 +399,7 @@
     "HeaderCastCrew": "\u05e9\u05d7\u05e7\u05e0\u05d9\u05dd \u05d5\u05e6\u05d5\u05d5\u05ea",
     "HeaderAdditionalParts": "\u05d7\u05dc\u05e7\u05d9\u05dd \u05e0\u05d5\u05e1\u05e4\u05d9\u05dd",
     "ButtonSplitVersionsApart": "\u05e4\u05e6\u05dc \u05d2\u05e8\u05e1\u05d0\u05d5\u05ea \u05d1\u05e0\u05e4\u05e8\u05d3",
-    "ButtonPlayTrailer": "\u05d8\u05e8\u05d9\u05d9\u05dc\u05e8\u05d9\u05dd",
+    "ButtonPlayTrailer": "Trailer",
     "LabelMissing": "\u05d7\u05e1\u05e8",
     "LabelOffline": "\u05dc\u05d0 \u05de\u05e7\u05d5\u05d5\u05df",
     "PathSubstitutionHelp": "\u05e0\u05ea\u05d9\u05d1\u05d9\u05dd \u05d7\u05dc\u05d5\u05e4\u05d9\u05d9\u05dd \u05d4\u05dd \u05dc\u05e6\u05d5\u05e8\u05da \u05de\u05d9\u05e4\u05d5\u05d9 \u05e0\u05ea\u05d9\u05d1\u05d9\u05dd \u05d1\u05e9\u05e8\u05ea \u05dc\u05e0\u05ea\u05d9\u05d1\u05d9\u05dd \u05e9\u05de\u05e9\u05ea\u05de\u05e9\u05d9\u05dd \u05d9\u05db\u05d5\u05dc\u05d9\u05dd \u05dc\u05d2\u05e9\u05ea \u05d0\u05dc\u05d9\u05d4\u05dd. \u05e2\u05dc \u05d9\u05d3\u05d9 \u05d4\u05e8\u05e9\u05d0\u05d4 \u05dc\u05de\u05e9\u05ea\u05de\u05e9\u05d9\u05dd \u05d2\u05d9\u05e9\u05d4 \u05d9\u05e9\u05d9\u05e8\u05d4 \u05dc\u05de\u05d3\u05d9\u05d4 \u05d1\u05e9\u05e8\u05ea \u05d0\u05dd \u05d9\u05db\u05d5\u05dc\u05d9\u05dd \u05dc\u05e0\u05d2\u05df \u05d0\u05ea \u05d4\u05e7\u05d1\u05e6\u05d9\u05dd \u05d9\u05e9\u05d9\u05e8\u05d5\u05ea \u05e2\u05dc \u05d2\u05d1\u05d9 \u05d4\u05e8\u05e9\u05ea \u05d5\u05dc\u05d4\u05d9\u05de\u05e0\u05e2 \u05de\u05e9\u05d9\u05de\u05d5\u05e9 \u05d1\u05de\u05e9\u05d0\u05d1\u05d9 \u05d4\u05e9\u05e8\u05ea \u05dc\u05e6\u05d5\u05e8\u05da \u05e7\u05d9\u05d3\u05d5\u05d3 \u05d5\u05e9\u05d9\u05d3\u05d5\u05e8.",
@@ -480,10 +482,10 @@
     "HeaderProgram": "\u05ea\u05d5\u05db\u05e0\u05d4",
     "HeaderClients": "\u05de\u05e9\u05ea\u05de\u05e9\u05d9\u05dd",
     "LabelCompleted": "\u05d4\u05d5\u05e9\u05dc\u05dd",
-    "LabelFailed": "\u05e0\u05db\u05e9\u05dc",
+    "LabelFailed": "Failed",
     "LabelSkipped": "\u05d3\u05d5\u05dc\u05d2",
     "HeaderEpisodeOrganization": "\u05d0\u05d9\u05e8\u05d2\u05d5\u05df \u05e4\u05e8\u05e7\u05d9\u05dd",
-    "LabelSeries": "\u05e1\u05d3\u05e8\u05d4:",
+    "LabelSeries": "Series:",
     "LabelSeasonNumber": "\u05de\u05e1\u05e4\u05e8 \u05e2\u05d5\u05e0\u05d4:",
     "LabelEpisodeNumber": "\u05de\u05e1\u05e4\u05e8 \u05e4\u05e8\u05e7:",
     "LabelEndingEpisodeNumber": "\u05de\u05e1\u05e4\u05e8 \u05e1\u05d9\u05d5\u05dd \u05e4\u05e8\u05e7:",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
     "LabelMaxStaticBitrate": "Max sync bitrate:",
     "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
+    "LabelMusicStaticBitrate": "Music sync bitrate:",
+    "LabelMusicStaticBitrateHelp": "Specify a max bitrate when syncing music",
+    "LabelMusicStreamingTranscodingBitrate": "Music transcoding bitrate:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Specify a max bitrate when streaming music",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -982,5 +988,17 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "ProviderValue": "Provider: {0}",
     "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder",
+    "HeaderRecentActivity": "Recent Activity",
+    "HeaderPeople": "People",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
+    "OptionComposers": "Composers",
+    "OptionOthers": "Others",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "ViewTypeFolders": "Folders",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/it.json b/MediaBrowser.Server.Implementations/Localization/Server/it.json
index b8ac892e4f..618038868c 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/it.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/it.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "Esci",
+    "HeaderPassword": "Password",
     "LabelVisitCommunity": "Visita Comunit\u00e0",
+    "HeaderLocalAccess": "Accesso locale",
     "LabelGithubWiki": "Github Wiki",
     "LabelSwagger": "Swagger",
     "LabelStandard": "Standard",
@@ -88,7 +90,7 @@
     "LabelSelectUsers": "Seleziona Utenti:",
     "ButtonUpload": "Carica",
     "HeaderUploadNewImage": "Carica nuova immagine",
-    "LabelDropImageHere": "Trascina immagine qui",
+    "LabelDropImageHere": "Trascina l'immagine qui",
     "ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG\/PNG only.",
     "MessageNothingHere": "Niente qui.",
     "MessagePleaseEnsureInternetMetadata": "Assicurarsi che download di metadati internet \u00e8 abilitata.",
@@ -627,12 +629,12 @@
     "TabNowPlaying": "In esecuzione",
     "TabNavigation": "Navigazione",
     "TabControls": "Controlli",
-    "ButtonFullscreen": "Schermo intero",
+    "ButtonFullscreen": "Tutto Schermo",
     "ButtonScenes": "Scene",
     "ButtonSubtitles": "Sottotitoli",
-    "ButtonAudioTracks": "Traccia Audio",
-    "ButtonPreviousTrack": "Precedente traccia",
-    "ButtonNextTrack": "traccia Prossima",
+    "ButtonAudioTracks": "Tracce audio",
+    "ButtonPreviousTrack": "Traccia Precedente",
+    "ButtonNextTrack": "Prossima Traccia",
     "ButtonStop": "Stop",
     "ButtonPause": "Pausa",
     "LabelGroupMoviesIntoCollections": "Raggruppa i film nelle collection",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "Specifica il bitrate massimo per lo streaming",
     "LabelMaxStaticBitrate": "Massimo sinc. Bitrate",
     "LabelMaxStaticBitrateHelp": "Specifica il bitrate massimo quando sincronizzi ad alta qualit\u00e0",
+    "LabelMusicStaticBitrate": "Musica sync bitrate:",
+    "LabelMusicStaticBitrateHelp": "Specifica il max Bitrate quando sincronizzi la musica",
+    "LabelMusicStreamingTranscodingBitrate": "Musica trascodifica bitrate:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Specifica il max Bitrate per lo streaming musica",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignorare le richieste di intervallo di byte di trascodifica",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "Se abilitata, queste richieste saranno onorati, ma ignorano l'intestazione intervallo di byte.",
     "LabelFriendlyName": "Nome Condiviso",
@@ -788,7 +794,7 @@
     "HeaderMetadataManager": "Metadata Manager",
     "HeaderPreferences": "Preferenze",
     "MessageLoadingChannels": "Sto caricando il contenuto del canale",
-    "MessageLoadingContent": "Loading content...",
+    "MessageLoadingContent": "Caricamento contenuto....",
     "ButtonMarkRead": "Segna come letto",
     "OptionDefaultSort": "Predefinito",
     "OptionCommunityMostWatchedSort": "Pi\u00f9 visti",
@@ -861,7 +867,7 @@
     "LabelLogs": "Log:",
     "LabelMetadata": "Metadata:",
     "LabelImagesByName": "Immagini per nome:",
-    "LabelTranscodingTemporaryFiles": "transcodifica file temporanei:",
+    "LabelTranscodingTemporaryFiles": "Transcodifica file temporanei:",
     "HeaderLatestMusic": "Musica Recente",
     "HeaderBranding": "Branding",
     "HeaderApiKeys": "Chiavi Api",
@@ -872,7 +878,7 @@
     "HeaderUser": "Utente",
     "HeaderDateIssued": "data di pubblicazione",
     "LabelChapterName": "Capitolo {0}",
-    "HeaderNewApiKey": "Nessuna Chiave Api",
+    "HeaderNewApiKey": "Nuova Chiave Api",
     "LabelAppName": "Nome app",
     "LabelAppNameExample": "Example: Sickbeard, NzbDrone",
     "HeaderNewApiKeyHelp": "Garantisci all'applicazione il permesso di comunicare con Media Browser.",
@@ -946,41 +952,53 @@
     "OptionReportCollections": "Collezioni",
     "OptionReportBooks": "Libri",
     "OptionReportArtists": "Cantanti",
-    "OptionReportAlbums": "Albums",
-    "OptionReportAdultVideos": "Adult videos",
-    "ButtonMore": "Pi\u00f9 info...",
-    "HeaderActivity": "Activity",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "ScheduledTaskCancelledWithName": "{0} was cancelled",
-    "ScheduledTaskCompletedWithName": "{0} completed",
-    "ScheduledTaskFailed": "Scheduled task completed",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Media Browser Server has been updated",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "AppDeviceValues": "App: {0}, Device: {1}",
+    "OptionReportAlbums": "Album",
+    "OptionReportAdultVideos": "Video x adulti",
+    "ButtonMore": "Dettagli",
+    "HeaderActivity": "Attivit\u00e0",
+    "ScheduledTaskStartedWithName": "{0} Avviati",
+    "ScheduledTaskCancelledWithName": "{0} cancellati",
+    "ScheduledTaskCompletedWithName": "{0} completati",
+    "ScheduledTaskFailed": "Operazione pianificata completata",
+    "PluginInstalledWithName": "{0} sono stati Installati",
+    "PluginUpdatedWithName": "{0} sono stati aggiornati",
+    "PluginUninstalledWithName": "{0} non sono stati installati",
+    "ScheduledTaskFailedWithName": "{0} Falliti",
+    "ItemAddedWithName": "{0} aggiunti alla libreria",
+    "ItemRemovedWithName": "{0} rimossi dalla libreria",
+    "DeviceOnlineWithName": "{0} \u00e8 connesso",
+    "UserOnlineFromDevice": "{0} \u00e8 online da {1}",
+    "DeviceOfflineWithName": "{0} \u00e8 stato disconesso",
+    "UserOfflineFromDevice": "{0} \u00e8 stato disconesso da {1}",
+    "SubtitlesDownloadedForItem": "Sottotitoli scaricati per {0}",
+    "SubtitleDownloadFailureForItem": "Sottotitoli non scaricati per {0}",
+    "LabelRunningTimeValue": "Durata: {0}",
+    "LabelIpAddressValue": "Indirizzo IP: {0}",
+    "UserConfigurationUpdatedWithName": "Configurazione utente \u00e8 stata aggiornata per {0}",
+    "UserCreatedWithName": "Utente {0} \u00e8 stato creato",
+    "UserPasswordChangedWithName": "Password utente cambiata per {0}",
+    "UserDeletedWithName": "Utente {0} \u00e8 stato cancellato",
+    "MessageServerConfigurationUpdated": "Configurazione server aggioprnata",
+    "MessageNamedServerConfigurationUpdatedWithValue": "La sezione  {0} \u00e8 stata aggiornata",
+    "MessageApplicationUpdated": "Media Browser Server \u00e8 stato aggiornato",
+    "AuthenticationSucceededWithUserName": "{0} Autenticati con successo",
+    "FailedLoginAttemptWithUserName": "Login fallito da  {0}",
+    "UserStartedPlayingItemWithValues": "{0} \u00e8 partito da {1}",
+    "UserStoppedPlayingItemWithValues": "{0} stoppato {1}",
+    "AppDeviceValues": "App: {0}, Dispositivo: {1}",
     "ProviderValue": "Provider: {0}",
-    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
+    "LabelChannelDownloadSizeLimit": "Dimensione massima Download (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Dimensione massima del canale relativo alla cartella di download",
+    "HeaderRecentActivity": "Attivit\u00e0 recenti",
+    "HeaderPeople": "Persone",
+    "HeaderDownloadPeopleMetadataFor": "Scarica biografia e immagini per:",
+    "OptionComposers": "Compositori",
+    "OptionOthers": "Altri",
+    "HeaderDownloadPeopleMetadataForHelp": "Abilitando il provider scaricher\u00e0 pi\u00f9 informazioni ( la scansione sar\u00e0 pi\u00f9 lenta)",
+    "ViewTypeFolders": "Cartelle",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
+    "ViewTypeLiveTvRecordingGroups": "Registrazioni",
+    "ViewTypeLiveTvChannels": "canali",
+    "LabelAllowLocalAccessWithoutPassword": "Consenti di accedere localmente senza password",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "Quando abilitato la password non \u00e8 necessaria"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/kk.json b/MediaBrowser.Server.Implementations/Localization/Server/kk.json
index 7765f843f6..e466c73001 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/kk.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/kk.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "\u0428\u044b\u0493\u0443",
+    "HeaderPassword": "\u049a\u04b1\u043f\u0438\u044f \u0441\u04e9\u0437",
     "LabelVisitCommunity": "\u049a\u0430\u0443\u044b\u043c\u0434\u0430\u0441\u0442\u044b\u049b\u049b\u0430 \u0431\u0430\u0440\u0443",
+    "HeaderLocalAccess": "\u0416\u0435\u0440\u0433\u0456\u043b\u0456\u043a\u0442\u0456 \u049b\u0430\u0442\u044b\u043d\u0430\u0441",
     "LabelGithubWiki": "Github \u0443\u0438\u043a\u0438\u0456",
     "LabelSwagger": "Swagger \u0442\u0456\u043b\u0434\u0435\u0441\u0443\u0456",
     "LabelStandard": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u0442\u044b",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "\u0410\u0493\u044b\u043d\u043c\u0435\u043d \u0442\u0430\u0441\u044b\u043c\u0430\u043b\u0434\u0430\u0443 \u043a\u0435\u0437\u0456\u043d\u0434\u0435 \u0435\u04a3 \u0436\u043e\u0493\u0430\u0440\u044b \u049b\u0430\u0440\u049b\u044b\u043d\u0434\u044b \u0430\u043d\u044b\u049b\u0442\u0430\u04a3\u044b\u0437.",
     "LabelMaxStaticBitrate": "\u0415\u04a3 \u0436\u043e\u0493\u0430\u0440\u044b \u0441\u0438\u043d\u0445\u0440\u043e\u043d\u0434\u0430\u0443 \u049b\u0430\u0440\u049b\u044b\u043d\u044b:",
     "LabelMaxStaticBitrateHelp": "\u0416\u043e\u0493\u0430\u0440\u044b \u0441\u0430\u043f\u0430\u043c\u0435\u043d \u043c\u0430\u0437\u043c\u04b1\u043d\u0434\u044b \u0441\u0438\u043d\u0445\u0440\u043e\u043d\u0434\u0430\u0443 \u043a\u0435\u0437\u0456\u043d\u0434\u0435 \u0435\u04a3 \u0436\u043e\u0493\u0430\u0440\u044b \u049b\u0430\u0440\u049b\u044b\u043d\u0434\u044b \u0430\u043d\u044b\u049b\u0442\u0430\u04a3\u044b\u0437.",
+    "LabelMusicStaticBitrate": "\u041c\u0443\u0437\u044b\u043a\u0430\u043d\u044b \u0441\u0438\u043d\u0445\u0440\u043e\u043d\u0434\u0430\u0443 \u049b\u0430\u0440\u049b\u044b\u043d\u044b:",
+    "LabelMusicStaticBitrateHelp": "\u041c\u0443\u0437\u044b\u043a\u0430\u043d\u044b \u0441\u0438\u043d\u0445\u0440\u043e\u043d\u0434\u0430\u0443 \u043a\u0435\u0437\u0456\u043d\u0434\u0435 \u0435\u04a3 \u0436\u043e\u0493\u0430\u0440\u044b \u049b\u0430\u0440\u049b\u044b\u043d\u0434\u044b \u0430\u043d\u044b\u049b\u0442\u0430\u0443",
+    "LabelMusicStreamingTranscodingBitrate": "\u041c\u0443\u0437\u044b\u043a\u0430\u043d\u044b \u049b\u0430\u0439\u0442\u0430 \u043a\u043e\u0434\u0442\u0430\u0443 \u049b\u0430\u0440\u049b\u044b\u043d\u044b:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "\u041c\u0443\u0437\u044b\u043a\u0430\u043d\u044b \u0430\u0493\u044b\u043d\u043c\u0435\u043d \u0442\u0430\u0441\u044b\u043c\u0430\u043b\u0434\u0430\u0443 \u043a\u0435\u0437\u0456\u043d\u0434\u0435 \u0435\u04a3 \u0436\u043e\u0493\u0430\u0440\u044b \u049b\u0430\u0440\u049b\u044b\u043d\u0434\u044b \u0430\u043d\u044b\u049b\u0442\u0430\u04a3\u044b\u0437",
     "OptionIgnoreTranscodeByteRangeRequests": "\u049a\u0430\u0439\u0442\u0430 \u043a\u043e\u0434\u0442\u0430\u0443 \u0431\u0430\u0439\u0442 \u0430\u0443\u049b\u044b\u043c\u044b \u0441\u04b1\u0440\u0430\u043d\u044b\u0441\u0442\u0430\u0440\u044b\u043d \u0435\u043b\u0435\u043c\u0435\u0443",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "\u049a\u043e\u0441\u044b\u043b\u0493\u0430\u043d\u0434\u0430, \u043e\u0441\u044b \u0441\u04b1\u0440\u0430\u043d\u044b\u0441\u0442\u0430\u0440\u043c\u0435\u043d \u0441\u0430\u043d\u0430\u0441\u0443 \u0431\u043e\u043b\u0430\u0434\u044b, \u0431\u0456\u0440\u0430\u049b \u0431\u0430\u0439\u0442 \u0430\u0443\u049b\u044b\u043c\u044b\u043d\u044b\u04a3 \u0431\u0430\u0441 \u0434\u0435\u0440\u0435\u043a\u0442\u0435\u043c\u0435\u0441\u0456 \u0435\u043b\u0435\u043f \u0435\u0441\u043a\u0435\u0440\u0456\u043b\u043c\u0435\u0439\u0434\u0456.",
     "LabelFriendlyName": "\u0422\u04af\u0441\u0456\u043d\u0456\u043a\u0442\u0456 \u0430\u0442\u044b",
@@ -982,5 +988,17 @@
     "AppDeviceValues": "\u049a\u043e\u043b\u0434\u0430\u043d\u0431\u0430: {0}, \u0416\u0430\u0431\u0434\u044b\u049b: {1}",
     "ProviderValue": "\u0416\u0435\u0442\u043a\u0456\u0437\u0443\u0448\u0456: {0}",
     "LabelChannelDownloadSizeLimit": "\u0416\u04af\u043a\u0442\u0435\u043c\u0435 \u04e9\u043b\u0448\u0435\u043c\u0456\u043d\u0456\u04a3 \u0448\u0435\u0433\u0456 (GB)",
-    "LabelChannelDownloadSizeLimitHelp": "\u0410\u0440\u043d\u0430\u043b\u0430\u0440\u0434\u044b \u0436\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u0443 \u049b\u0430\u043b\u0442\u0430\u0441\u044b\u043d\u044b\u04a3 \u04e9\u043b\u0448\u0435\u043c\u0456\u043d \u0448\u0435\u043a\u0442\u0435\u0439\u0434\u0456"
+    "LabelChannelDownloadSizeLimitHelp": "\u0410\u0440\u043d\u0430\u043b\u0430\u0440\u0434\u044b \u0436\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u0443 \u049b\u0430\u043b\u0442\u0430\u0441\u044b\u043d\u044b\u04a3 \u04e9\u043b\u0448\u0435\u043c\u0456\u043d \u0448\u0435\u043a\u0442\u0435\u0439\u0434\u0456",
+    "HeaderRecentActivity": "\u041a\u0435\u0438\u0456\u043d\u0433\u0456 \u04d9\u0440\u0435\u043a\u0435\u0442\u0442\u0435\u0440",
+    "HeaderPeople": "\u0410\u0434\u0430\u043c\u0434\u0430\u0440",
+    "HeaderDownloadPeopleMetadataFor": "\u04e8\u043c\u0456\u0440\u0431\u0430\u044f\u043d \u0431\u0435\u043d \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440\u0434\u0456 \u0436\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u0443 \u043c\u0430\u049b\u0441\u0430\u0442\u044b;",
+    "OptionComposers": "\u041a\u043e\u043c\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u043b\u0430\u0440",
+    "OptionOthers": "\u0411\u0430\u0441\u049b\u0430\u043b\u0430\u0440",
+    "HeaderDownloadPeopleMetadataForHelp": "\u049a\u043e\u0441\u044b\u043c\u0448\u0430 \u0442\u0435\u04a3\u0448\u0435\u043b\u0456\u043c\u0434\u0435\u0440\u0434\u0456 \u049b\u043e\u0441\u049b\u0430\u043d\u0434\u0430 \u044d\u043a\u0440\u0430\u043d\u0434\u0430\u0493\u044b \u0430\u049b\u043f\u0430\u0440\u0430\u0442\u0442\u044b \u043a\u04e9\u0431\u0456\u0440\u0435\u043a \u04b1\u0441\u044b\u043d\u0430\u0434\u044b, \u0431\u0456\u0440\u0430\u049b \u0442\u0430\u0441\u0443\u0448\u044b\u0445\u0430\u043d\u0430\u043d\u044b\u04a3 \u0441\u043a\u0430\u043d\u0435\u0440\u043b\u0435\u0443\u043b\u0435\u0440\u0456 \u0431\u0430\u044f\u0443\u043b\u0430\u0439\u0434\u044b.",
+    "ViewTypeFolders": "\u049a\u0430\u043b\u0442\u0430\u043b\u0430\u0440",
+    "LabelDisplayFoldersView": "\u0416\u0430\u0439 \u0442\u0430\u0441\u0443\u0448\u044b \u049b\u0430\u043b\u0442\u0430\u043b\u0430\u0440\u044b\u043d \u043a\u04e9\u0440\u0441\u0435\u0442\u0443 \u04af\u0448\u0456\u043d \u049b\u0430\u043b\u0442\u0430\u043b\u0430\u0440 \u043a\u04e9\u0440\u0456\u043d\u0456\u0441\u0456\u043d \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0443",
+    "ViewTypeLiveTvRecordingGroups": "\u0416\u0430\u0437\u0431\u0430\u043b\u0430\u0440",
+    "ViewTypeLiveTvChannels": "\u0410\u0440\u043d\u0430\u043b\u0430\u0440",
+    "LabelAllowLocalAccessWithoutPassword": "\u049a\u04b1\u043f\u0438\u044f \u0441\u04e9\u0437\u0441\u0456\u0437 \u0436\u0435\u0440\u0433\u0456\u043b\u0456\u043a\u0442\u0456 \u049b\u0430\u0442\u044b\u043d\u0441\u0443 \u04af\u0448\u0456\u043d \u0440\u04b1\u049b\u0441\u0430\u0442 \u0435\u0442\u0443",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "\u049a\u043e\u0441\u044b\u043b\u0493\u0430\u043d \u0431\u043e\u043b\u0441\u0430, \u04af\u0439\u0456\u04a3\u0456\u0437\u0434\u0435\u0433\u0456 \u0436\u0435\u043b\u0456 \u0456\u0448\u0456\u043d\u0435\u043d \u043a\u0456\u0440\u0433\u0435\u043d\u0434\u0435 \u049b\u04b1\u043f\u0438\u044f \u0441\u04e9\u0437 \u049b\u0430\u0436\u0435\u0442 \u0431\u043e\u043b\u043c\u0430\u0439\u0434\u044b."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ko.json b/MediaBrowser.Server.Implementations/Localization/Server/ko.json
index 2324e6fe63..ac8fe87c98 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ko.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ko.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "Schweinsteiger",
+    "HeaderPassword": "Password",
     "LabelVisitCommunity": "Visit Community",
+    "HeaderLocalAccess": "Local Access",
     "LabelGithubWiki": "Github Wiki",
     "LabelSwagger": "Swagger",
     "LabelStandard": "Standard",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
     "LabelMaxStaticBitrate": "Max sync bitrate:",
     "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
+    "LabelMusicStaticBitrate": "Music sync bitrate:",
+    "LabelMusicStaticBitrateHelp": "Specify a max bitrate when syncing music",
+    "LabelMusicStreamingTranscodingBitrate": "Music transcoding bitrate:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Specify a max bitrate when streaming music",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -982,5 +988,17 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "ProviderValue": "Provider: {0}",
     "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder",
+    "HeaderRecentActivity": "Recent Activity",
+    "HeaderPeople": "People",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
+    "OptionComposers": "Composers",
+    "OptionOthers": "Others",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "ViewTypeFolders": "Folders",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ms.json b/MediaBrowser.Server.Implementations/Localization/Server/ms.json
index 4ab79f4206..23d47bd0fc 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ms.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ms.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "Tutup",
+    "HeaderPassword": "Password",
     "LabelVisitCommunity": "Melawat Masyarakat",
+    "HeaderLocalAccess": "Local Access",
     "LabelGithubWiki": "Github Wiki",
     "LabelSwagger": "Swagger",
     "LabelStandard": "Biasa",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
     "LabelMaxStaticBitrate": "Max sync bitrate:",
     "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
+    "LabelMusicStaticBitrate": "Music sync bitrate:",
+    "LabelMusicStaticBitrateHelp": "Specify a max bitrate when syncing music",
+    "LabelMusicStreamingTranscodingBitrate": "Music transcoding bitrate:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Specify a max bitrate when streaming music",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -982,5 +988,17 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "ProviderValue": "Provider: {0}",
     "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder",
+    "HeaderRecentActivity": "Recent Activity",
+    "HeaderPeople": "People",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
+    "OptionComposers": "Composers",
+    "OptionOthers": "Others",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "ViewTypeFolders": "Folders",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/nb.json b/MediaBrowser.Server.Implementations/Localization/Server/nb.json
index 9a3535791a..8639c63dee 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/nb.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/nb.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "Exit",
+    "HeaderPassword": "Password",
     "LabelVisitCommunity": "Bes\u00f8k oss",
+    "HeaderLocalAccess": "Local Access",
     "LabelGithubWiki": "Github Wiki",
     "LabelSwagger": "Swagger",
     "LabelStandard": "Standard",
@@ -627,12 +629,12 @@
     "TabNowPlaying": "Spilles Av",
     "TabNavigation": "Navigering",
     "TabControls": "Kontrollerer",
-    "ButtonFullscreen": "Toggle fullscreen",
+    "ButtonFullscreen": "Veksle fullskjerm",
     "ButtonScenes": "Scener",
     "ButtonSubtitles": "Undertekster",
-    "ButtonAudioTracks": "Audio tracks",
-    "ButtonPreviousTrack": "Forrige Spor",
-    "ButtonNextTrack": "Neste Spor",
+    "ButtonAudioTracks": "Lyd spor",
+    "ButtonPreviousTrack": "Previous track",
+    "ButtonNextTrack": "Next track",
     "ButtonStop": "Stopp",
     "ButtonPause": "Pause",
     "LabelGroupMoviesIntoCollections": "Grupper filmer inni samlinger",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "Spesifiser en maks bitrate n\u00e5r streaming.",
     "LabelMaxStaticBitrate": "Maks synk bitrate:",
     "LabelMaxStaticBitrateHelp": "Spesifiser en maks bitrate ved synkronisering av innhold i h\u00f8y kvalitet.",
+    "LabelMusicStaticBitrate": "Music sync bitrate:",
+    "LabelMusicStaticBitrateHelp": "Specify a max bitrate when syncing music",
+    "LabelMusicStreamingTranscodingBitrate": "Music transcoding bitrate:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Specify a max bitrate when streaming music",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignorer Transcode byte rekkevidde foresp\u00f8rsler",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "Hvis aktivert vil disse foresp\u00f8rslene bli honorert men ignorert i byte rekkevidde headeren.",
     "LabelFriendlyName": "Vennlig navn",
@@ -982,5 +988,17 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "ProviderValue": "Provider: {0}",
     "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder",
+    "HeaderRecentActivity": "Recent Activity",
+    "HeaderPeople": "People",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
+    "OptionComposers": "Composers",
+    "OptionOthers": "Others",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "ViewTypeFolders": "Folders",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/nl.json b/MediaBrowser.Server.Implementations/Localization/Server/nl.json
index c98fb435c6..9286fa7110 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/nl.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/nl.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "Afsluiten",
+    "HeaderPassword": "Wachtwoord",
     "LabelVisitCommunity": "Bezoek Gemeenschap",
+    "HeaderLocalAccess": "Lokale toegang",
     "LabelGithubWiki": "Github Wiki",
     "LabelSwagger": "Swagger",
     "LabelStandard": "Standaard",
@@ -627,12 +629,12 @@
     "TabNowPlaying": "Wordt nu afgespeeld",
     "TabNavigation": "Navigatie",
     "TabControls": "Besturing",
-    "ButtonFullscreen": "Volledig scherm in-\/uitschakelen",
+    "ButtonFullscreen": "Schakelen tussen volledig scherm ",
     "ButtonScenes": "Scenes",
     "ButtonSubtitles": "Ondertitels",
     "ButtonAudioTracks": "Audio tracks",
-    "ButtonPreviousTrack": "Vorig nummer",
-    "ButtonNextTrack": "Volgend nummer",
+    "ButtonPreviousTrack": "Vorige track",
+    "ButtonNextTrack": "Volgende track",
     "ButtonStop": "Stop",
     "ButtonPause": "Pauze",
     "LabelGroupMoviesIntoCollections": "Groepeer films in verzamelingen",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "Geef een maximale bitrate voor streaming op.",
     "LabelMaxStaticBitrate": "Maximale Synchronisatie bitrate:",
     "LabelMaxStaticBitrateHelp": "Geef een maximale bitrate op voor synchroniseren in hoge kwaliteit.",
+    "LabelMusicStaticBitrate": "Muzieksynchronisatie bitrate:",
+    "LabelMusicStaticBitrateHelp": "Geef een maximum bitrate op voor het synchroniseren van muziek",
+    "LabelMusicStreamingTranscodingBitrate": "Muziek transcodering bitrate: ",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Geef een maximum bitrate op voor het streamen van muziek",
     "OptionIgnoreTranscodeByteRangeRequests": "Transcodeer byte range-aanvragen negeren",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "Indien ingeschakeld, zal deze verzoeken worden gehonoreerd, maar zal de byte bereik header worden genegerd.",
     "LabelFriendlyName": "Aangepaste naam",
@@ -740,7 +746,7 @@
     "LabelSubtitlePlaybackMode": "Ondertitelingsmode:",
     "LabelDownloadLanguages": "Download talen:",
     "ButtonRegister": "Aanmelden",
-    "LabelSkipIfAudioTrackPresent": "Overslaan als de standaard audio track overeenkomt met de taal van de download",
+    "LabelSkipIfAudioTrackPresent": "Overslaan als het standaard audio spoor overeenkomt met de taal van de download",
     "LabelSkipIfAudioTrackPresentHelp": "Uitvinken om ervoor te zorgen dat alle video's ondertitels krijgen, ongeacht de gesproken taal.",
     "HeaderSendMessage": "Stuur bericht",
     "ButtonSend": "Stuur",
@@ -963,12 +969,12 @@
     "DeviceOnlineWithName": "{0} is verbonden",
     "UserOnlineFromDevice": "{0} is aangemeld met {1}",
     "DeviceOfflineWithName": "{0} is losgekoppeld",
-    "UserOfflineFromDevice": "{0} is losgekoppeld bij {1}",
+    "UserOfflineFromDevice": "{0} is afgemeld bij {1}",
     "SubtitlesDownloadedForItem": "Ondertiteling voor {0} is gedownload",
     "SubtitleDownloadFailureForItem": "Downloaden van ondertiteling voor {0} is mislukt",
     "LabelRunningTimeValue": "Looptijd: {0}",
     "LabelIpAddressValue": "IP adres: {0}",
-    "UserConfigurationUpdatedWithName": "Gebruikersinstellingen voor {0} zijn bijgewerkte",
+    "UserConfigurationUpdatedWithName": "Gebruikersinstellingen voor {0} zijn bijgewerkt",
     "UserCreatedWithName": "Gebruiker {0} is aangemaakt",
     "UserPasswordChangedWithName": "Wachtwoord voor {0} is gewijzigd",
     "UserDeletedWithName": "Gebruiker {0} is verwijderd",
@@ -982,5 +988,17 @@
     "AppDeviceValues": "App: {0}, Apparaat: {1}",
     "ProviderValue": "Aanbieder: {0}",
     "LabelChannelDownloadSizeLimit": "Downloadlimiet (GB): ",
-    "LabelChannelDownloadSizeLimitHelp": "Beperk de grootte van de kanaal download map"
+    "LabelChannelDownloadSizeLimitHelp": "Beperk de grootte van de kanaal download map",
+    "HeaderRecentActivity": "Recente activiteit",
+    "HeaderPeople": "Personen",
+    "HeaderDownloadPeopleMetadataFor": "Download biografie en afbeeldingen voor:",
+    "OptionComposers": "Componisten",
+    "OptionOthers": "Overigen",
+    "HeaderDownloadPeopleMetadataForHelp": "Het inschakelen van extra opties zal meer informatie op het scherm bieden, maar resulteert in tragere bibliotheek scan.",
+    "ViewTypeFolders": "Mappen",
+    "LabelDisplayFoldersView": "Toon een mappenweergave als u gewoon Mediamappen wilt weergeven",
+    "ViewTypeLiveTvRecordingGroups": "Opnamen",
+    "ViewTypeLiveTvChannels": "Kanalen",
+    "LabelAllowLocalAccessWithoutPassword": "Lokale toegang toestaan zonder wachtwoord",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "Als dit ingeschakled is dan kan er in het thuisnetwerk zonder wachtwoord aangemeld worden."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pl.json b/MediaBrowser.Server.Implementations/Localization/Server/pl.json
index 568d26fd25..1a3c180bda 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pl.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pl.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "Wyj\u015b\u0107",
+    "HeaderPassword": "Password",
     "LabelVisitCommunity": "Odwied\u017a spo\u0142eczno\u015b\u0107",
+    "HeaderLocalAccess": "Local Access",
     "LabelGithubWiki": "Wiki Github",
     "LabelSwagger": "Swagger",
     "LabelStandard": "Standardowy",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
     "LabelMaxStaticBitrate": "Max sync bitrate:",
     "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
+    "LabelMusicStaticBitrate": "Music sync bitrate:",
+    "LabelMusicStaticBitrateHelp": "Specify a max bitrate when syncing music",
+    "LabelMusicStreamingTranscodingBitrate": "Music transcoding bitrate:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Specify a max bitrate when streaming music",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -982,5 +988,17 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "ProviderValue": "Provider: {0}",
     "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder",
+    "HeaderRecentActivity": "Recent Activity",
+    "HeaderPeople": "People",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
+    "OptionComposers": "Composers",
+    "OptionOthers": "Others",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "ViewTypeFolders": "Folders",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json b/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
index 6ccd60090c..b252ef6be4 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "Sair",
+    "HeaderPassword": "Password",
     "LabelVisitCommunity": "Visitar a Comunidade",
+    "HeaderLocalAccess": "Local Access",
     "LabelGithubWiki": "Wiki do Github",
     "LabelSwagger": "Swagger",
     "LabelStandard": "Padr\u00e3o",
@@ -137,7 +139,7 @@
     "OptionArtist": "Artista",
     "OptionAlbum": "\u00c1lbum",
     "OptionTrackName": "Nome da Faixa",
-    "OptionCommunityRating": "Classifica\u00e7\u00e3o da Comunidade",
+    "OptionCommunityRating": "Avalia\u00e7\u00e3o da Comunidade",
     "OptionNameSort": "Nome",
     "OptionFolderSort": "Pastas",
     "OptionBudget": "Or\u00e7amento",
@@ -147,7 +149,7 @@
     "OptionTimeline": "Linha do tempo",
     "OptionThumb": "\u00cdcone",
     "OptionBanner": "Banner",
-    "OptionCriticRating": "Classifica\u00e7\u00e3o da Cr\u00edtica",
+    "OptionCriticRating": "Avalia\u00e7\u00e3o da Cr\u00edtica",
     "OptionVideoBitrate": "Taxa do V\u00eddeo",
     "OptionResumable": "Por retomar",
     "ScheduledTasksHelp": "Clique em uma tarefa para ajustar quando ser\u00e1 executada.",
@@ -182,7 +184,7 @@
     "HeaderLatestMovies": "Filmes Recentes",
     "HeaderLatestTrailers": "Trailers Recentes",
     "OptionHasSpecialFeatures": "Caracter\u00edsticas Especiais",
-    "OptionImdbRating": "Classifica\u00e7\u00e3o IMDb",
+    "OptionImdbRating": "Avalia\u00e7\u00e3o IMDb",
     "OptionParentalRating": "Classifica\u00e7\u00e3o Parental",
     "OptionPremiereDate": "Data da Estr\u00e9ia",
     "TabBasic": "B\u00e1sico",
@@ -413,7 +415,7 @@
     "OptionUnairedEpisode": "Epis\u00f3dios Por Estrear",
     "OptionEpisodeSortName": "Nome de Ordena\u00e7\u00e3o do Epis\u00f3dio",
     "OptionSeriesSortName": "Nome da S\u00e9rie",
-    "OptionTvdbRating": "Classifica\u00e7\u00e3o Tvdb",
+    "OptionTvdbRating": "Avalia\u00e7\u00e3o Tvdb",
     "HeaderTranscodingQualityPreference": "Prefer\u00eancia de Qualidade de Transcodifica\u00e7\u00e3o:",
     "OptionAutomaticTranscodingHelp": "O servidor decidir\u00e1 a qualidade e a velocidade",
     "OptionHighSpeedTranscodingHelp": "Qualidade pior, mas codifica\u00e7\u00e3o mais r\u00e1pida",
@@ -527,7 +529,7 @@
     "HeaerServerInformation": "Informa\u00e7\u00f5es do Servidor",
     "ButtonRestartNow": "Reiniciar Agora",
     "ButtonRestart": "Reiniciar",
-    "ButtonShutdown": "Terminar",
+    "ButtonShutdown": "Desligar",
     "ButtonUpdateNow": "Atualizar Agora",
     "PleaseUpdateManually": "Por favor, desligue o servidor e atualize-o manualmente.",
     "NewServerVersionAvailable": "Uma nova vers\u00e3o do Servidor Media Browser est\u00e1 dispon\u00edvel!",
@@ -627,12 +629,12 @@
     "TabNowPlaying": "Reproduzindo Agora",
     "TabNavigation": "Navega\u00e7\u00e3o",
     "TabControls": "Controles",
-    "ButtonFullscreen": "Alternar tela cheia",
+    "ButtonFullscreen": "Alternar para tela cheia",
     "ButtonScenes": "Cenas",
     "ButtonSubtitles": "Legendas",
     "ButtonAudioTracks": "Faixas de \u00e1udio",
-    "ButtonPreviousTrack": "Faixa Anterior",
-    "ButtonNextTrack": "Pr\u00f3xima Faixa",
+    "ButtonPreviousTrack": "Faixa anterior",
+    "ButtonNextTrack": "Pr\u00f3xima faixa",
     "ButtonStop": "Parar",
     "ButtonPause": "Pausar",
     "LabelGroupMoviesIntoCollections": "Agrupar filmes nas cole\u00e7\u00f5es",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "Defina uma taxa m\u00e1xima para fazer streaming.",
     "LabelMaxStaticBitrate": "Taxa m\u00e1xima para sincronizar:",
     "LabelMaxStaticBitrateHelp": "Defina uma taxa m\u00e1xima quando sincronizar conte\u00fado em alta qualidade.",
+    "LabelMusicStaticBitrate": "Taxa de sincroniza\u00e7\u00e3o das m\u00fasicas:",
+    "LabelMusicStaticBitrateHelp": "Defina a taxa m\u00e1xima ao sincronizar m\u00fasicas",
+    "LabelMusicStreamingTranscodingBitrate": "Taxa de transcodifica\u00e7\u00e3o das m\u00fasicas:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Defina a taxa m\u00e1xima ao fazer streaming das m\u00fasicas",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignorar requisi\u00e7\u00f5es de extens\u00e3o do byte de transcodifica\u00e7\u00e3o",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "Se ativadas, estas requisi\u00e7\u00f5es ser\u00e3o honradas mas ir\u00e3o ignorar o cabe\u00e7alho da extens\u00e3o do byte.",
     "LabelFriendlyName": "Nome amig\u00e1vel",
@@ -788,12 +794,12 @@
     "HeaderMetadataManager": "Gerenciador de Metadados",
     "HeaderPreferences": "Prefer\u00eancias",
     "MessageLoadingChannels": "Carregando conte\u00fado do canal...",
-    "MessageLoadingContent": "Loading content...",
+    "MessageLoadingContent": "Carregando conte\u00fado...",
     "ButtonMarkRead": "Marcar com lido",
     "OptionDefaultSort": "Padr\u00e3o",
     "OptionCommunityMostWatchedSort": "Mais Assistidos",
     "TabNextUp": "Pr\u00f3ximos",
-    "MessageNoMovieSuggestionsAvailable": "N\u00e3o existem sugest\u00f5es de filmes dispon\u00edveis atualmente. Comece por assistir e classificar seus filmes e, ent\u00e3o, volte para verificar suas recomenda\u00e7\u00f5es.",
+    "MessageNoMovieSuggestionsAvailable": "N\u00e3o existem sugest\u00f5es de filmes dispon\u00edveis atualmente. Comece por assistir e avaliar seus filmes e, ent\u00e3o, volte para verificar suas recomenda\u00e7\u00f5es.",
     "MessageNoCollectionsAvailable": "Cole\u00e7\u00f5es permitem que voc\u00ea agrupe os Filmes, S\u00e9ries, Livros e Jogos de forma personalizada. Clique no bot\u00e3o Nova para iniciar a cria\u00e7\u00e3o de Cole\u00e7\u00f5es.",
     "MessageNoPlaylistsAvailable": "Listas de reprodu\u00e7\u00e3o permitem criar listas com conte\u00fado para reproduzir consecutivamente, de uma s\u00f3 vez. Para adicionar itens \u00e0s listas de reprodu\u00e7\u00e3o, clique com o bot\u00e3o direito ou toque a tela por alguns segundos, depois selecione Adicionar \u00e0 Lista de Reprodu\u00e7\u00e3o.",
     "MessageNoPlaylistItemsAvailable": "Esta lista de reprodu\u00e7\u00e3o est\u00e1 vazia.",
@@ -865,7 +871,7 @@
     "HeaderLatestMusic": "M\u00fasicas Recentes",
     "HeaderBranding": "Marca",
     "HeaderApiKeys": "Chaves da Api",
-    "HeaderApiKeysHelp": "Aplica\u00e7\u00f5es externas necessitam possuir uma chave da Api para se comunicar com o Media Browser. Chaves s\u00e3o emitidas ao logar com uma conta do Media Browser ou ao conceder manualmente uma chave \u00e0 aplica\u00e7\u00e3o",
+    "HeaderApiKeysHelp": "Aplica\u00e7\u00f5es externas necessitam uma chave da Api para se comunicar com o Media Browser. Chaves s\u00e3o emitidas ao logar com uma conta do Media Browser ou ao conceder manualmente uma chave \u00e0 aplica\u00e7\u00e3o",
     "HeaderApiKey": "Chave da Api",
     "HeaderApp": "App",
     "HeaderDevice": "Dispositivo",
@@ -981,6 +987,18 @@
     "UserStoppedPlayingItemWithValues": "{0} parou de executar {1}",
     "AppDeviceValues": "App: {0}, Dispositivo: {1}",
     "ProviderValue": "Provedor: {0}",
-    "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
+    "LabelChannelDownloadSizeLimit": "Limite do tamanho para download (GB):",
+    "LabelChannelDownloadSizeLimitHelp": "Limite o tamanho da pasta para download do canal",
+    "HeaderRecentActivity": "Atividade Recente",
+    "HeaderPeople": "Pessoas",
+    "HeaderDownloadPeopleMetadataFor": "Fazer download da biografia e imagens para:",
+    "OptionComposers": "Compositores",
+    "OptionOthers": "Outros",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "ViewTypeFolders": "Folders",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
index 31cb033a8c..1f6eaa0f24 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "Sair",
+    "HeaderPassword": "Password",
     "LabelVisitCommunity": "Visitar a Comunidade",
+    "HeaderLocalAccess": "Local Access",
     "LabelGithubWiki": "Wiki do Github",
     "LabelSwagger": "Swagger",
     "LabelStandard": "Padr\u00e3o",
@@ -480,10 +482,10 @@
     "HeaderProgram": "Programa",
     "HeaderClients": "Clientes",
     "LabelCompleted": "Terminado",
-    "LabelFailed": "Falhou",
+    "LabelFailed": "Failed",
     "LabelSkipped": "Ignorado",
     "HeaderEpisodeOrganization": "Organiza\u00e7\u00e3o dos Epis\u00f3dios",
-    "LabelSeries": "S\u00e9rie:",
+    "LabelSeries": "Series:",
     "LabelSeasonNumber": "N\u00famero da temporada",
     "LabelEpisodeNumber": "N\u00famero do epis\u00f3dio",
     "LabelEndingEpisodeNumber": "N\u00famero do epis\u00f3dio final",
@@ -631,8 +633,8 @@
     "ButtonScenes": "Cenas",
     "ButtonSubtitles": "Legendas",
     "ButtonAudioTracks": "Faixas de \u00e1udio",
-    "ButtonPreviousTrack": "Faixa Anterior",
-    "ButtonNextTrack": "Pr\u00f3xima Faixa",
+    "ButtonPreviousTrack": "Previous track",
+    "ButtonNextTrack": "Next track",
     "ButtonStop": "Parar",
     "ButtonPause": "Pausar",
     "LabelGroupMoviesIntoCollections": "Group movies into collections",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
     "LabelMaxStaticBitrate": "Max sync bitrate:",
     "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
+    "LabelMusicStaticBitrate": "Music sync bitrate:",
+    "LabelMusicStaticBitrateHelp": "Specify a max bitrate when syncing music",
+    "LabelMusicStreamingTranscodingBitrate": "Music transcoding bitrate:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Specify a max bitrate when streaming music",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Nome amig\u00e1vel",
@@ -982,5 +988,17 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "ProviderValue": "Provider: {0}",
     "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder",
+    "HeaderRecentActivity": "Recent Activity",
+    "HeaderPeople": "People",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
+    "OptionComposers": "Composers",
+    "OptionOthers": "Others",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "ViewTypeFolders": "Folders",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ru.json b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
index da8b6364d6..afd3cf5bb4 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ru.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "\u0412\u044b\u0445\u043e\u0434",
+    "HeaderPassword": "\u041f\u0430\u0440\u043e\u043b\u044c",
     "LabelVisitCommunity": "\u041f\u043e\u0441\u0435\u0449\u0435\u043d\u0438\u0435 \u0421\u043e\u043e\u0431\u0449\u0435\u0441\u0442\u0432\u0430",
+    "HeaderLocalAccess": "\u041b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0439 \u0434\u043e\u0441\u0442\u0443\u043f",
     "LabelGithubWiki": "\u0412\u0438\u043a\u0438 \u043d\u0430 Github",
     "LabelSwagger": "\u0418\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441 Swagger",
     "LabelStandard": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442",
@@ -20,7 +22,7 @@
     "TellUsAboutYourself": "\u0420\u0430\u0441\u0441\u043a\u0430\u0436\u0438\u0442\u0435 \u043e \u0441\u0435\u0431\u0435",
     "LabelYourFirstName": "\u0412\u0430\u0448\u0435 \u0438\u043c\u044f:",
     "MoreUsersCanBeAddedLater": "\u041f\u043e\u0442\u043e\u043c \u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0435\u0449\u0451 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 \u0447\u0435\u0440\u0435\u0437 \u0418\u043d\u0444\u043e\u043f\u0430\u043d\u0435\u043b\u044c.",
-    "UserProfilesIntro": "\u0412 Media Browser \u0432\u0441\u0442\u0440\u043e\u0435\u043d\u0430 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0430 \u043f\u0440\u043e\u0444\u0438\u043b\u0435\u0439 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439, \u0447\u0442\u043e \u043f\u043e\u0437\u0432\u043e\u043b\u044f\u0435\u0442 \u043a\u0430\u0436\u0434\u043e\u043c\u0443 \u0438\u0437 \u043d\u0438\u0445 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u0441\u0432\u043e\u0438\u043c\u0438 \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u044b\u043c\u0438 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430\u043c\u0438 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f, \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u044f\u043c\u0438 \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u0438 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435\u043c \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435\u043c.",
+    "UserProfilesIntro": "\u0412 Media Browser \u0432\u0441\u0442\u0440\u043e\u0435\u043d\u0430 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0430 \u043f\u0440\u043e\u0444\u0438\u043b\u0435\u0439 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439, \u043f\u043e\u0437\u0432\u043e\u043b\u044f\u044e\u0449\u0430\u044f \u043a\u0430\u0436\u0434\u043e\u043c\u0443 \u0438\u0437 \u043d\u0438\u0445 \u0438\u043c\u0435\u0442\u044c \u0441\u0432\u043e\u0438 \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u044b\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f, \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u044f \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u0438 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435\u043c.",
     "LabelWindowsService": "\u0421\u043b\u0443\u0436\u0431\u0430 Windows",
     "AWindowsServiceHasBeenInstalled": "\u0421\u043b\u0443\u0436\u0431\u0430 Windows \u0431\u044b\u043b\u0430 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0430.",
     "WindowsServiceIntro1": "\u041e\u0431\u044b\u0447\u043d\u043e Media Browser Server \u0438\u0441\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f \u043a\u0430\u043a \u043d\u0430\u0441\u0442\u043e\u043b\u044c\u043d\u043e\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0441\u043e \u0437\u043d\u0430\u0447\u043a\u043e\u043c \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u043e\u043c \u043b\u043e\u0442\u043a\u0435, \u043d\u043e \u043f\u0440\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0435 \u0440\u0430\u0431\u043e\u0442\u044b \u0432 \u0444\u043e\u043d\u043e\u0432\u043e\u043c \u0440\u0435\u0436\u0438\u043c\u0435, \u0432\u043c\u0435\u0441\u0442\u043e \u044d\u0442\u043e\u0433\u043e \u043c\u043e\u0436\u043d\u043e \u0437\u0430\u043f\u0443\u0441\u043a\u0430\u0442\u044c \u0435\u0433\u043e \u0438\u0437 \u043a\u043e\u043d\u0441\u043e\u043b\u0438 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0441\u043b\u0443\u0436\u0431\u0430\u043c\u0438 Windows.",
@@ -396,7 +398,7 @@
     "HeaderSpecialFeatures": "\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u043c\u0430\u0442\u0435\u0440\u0438\u0430\u043b\u044b",
     "HeaderCastCrew": "\u0423\u0447\u0430\u0441\u0442\u043d\u0438\u043a\u0438 \u0441\u044a\u0451\u043c\u043e\u043a",
     "HeaderAdditionalParts": "\u0421\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u0447\u0430\u0441\u0442\u0438",
-    "ButtonSplitVersionsApart": "\u0420\u0430\u0441\u0449\u0435\u043f\u0438\u0442\u044c \u0432\u0435\u0440\u0441\u0438\u0438 \u043f\u043e \u043e\u0442\u0434\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u0438",
+    "ButtonSplitVersionsApart": "\u0420\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u044c \u0432\u0435\u0440\u0441\u0438\u0438 \u043f\u043e \u043e\u0442\u0434\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u0438",
     "ButtonPlayTrailer": "\u0422\u0440\u0435\u0439\u043b\u0435\u0440",
     "LabelMissing": "\u041f\u0440\u043e\u043f\u0443\u0449\u0435\u043d\u043e",
     "LabelOffline": "\u0410\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u043e",
@@ -449,7 +451,7 @@
     "LabelFriendlyServerName": "\u041f\u043e\u043d\u044f\u0442\u043d\u043e\u0435 \u0438\u043c\u044f \u0441\u0435\u0440\u0432\u0435\u0440\u0430:",
     "LabelFriendlyServerNameHelp": "\u042d\u0442\u043e \u0438\u043c\u044f \u043f\u0440\u0435\u0434\u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043e \u0434\u043b\u044f \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438 \u0434\u0430\u043d\u043d\u043e\u0433\u043e \u0441\u0435\u0440\u0432\u0435\u0440\u0430. \u0415\u0441\u043b\u0438 \u043e\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u043f\u043e\u043b\u0435 \u043f\u0443\u0441\u0442\u044b\u043c, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0438\u043c\u044f \u043a\u043e\u043c\u043f\u044c\u044e\u0442\u0435\u0440\u0430.",
     "LabelPreferredDisplayLanguage": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0435\u043c\u043e\u0433\u043e \u044f\u0437\u044b\u043a\u0430",
-    "LabelPreferredDisplayLanguageHelp": "\u041f\u0440\u043e\u0435\u043a\u0442 \u043f\u0435\u0440\u0435\u0432\u043e\u0434\u0430 Media Browser \u043d\u0430\u0445\u043e\u0434\u0438\u0442\u0441\u044f \u0432 \u0440\u0430\u0437\u0432\u0438\u0442\u0438\u0438 \u0438 \u0432\u0441\u0451 \u0435\u0449\u0451 \u043d\u0435 \u0437\u0430\u0432\u0435\u0440\u0448\u0451\u043d.",
+    "LabelPreferredDisplayLanguageHelp": "\u041f\u0440\u043e\u0435\u043a\u0442 \u043f\u0435\u0440\u0435\u0432\u043e\u0434\u0430 Media Browser \u0440\u0430\u0437\u0432\u0438\u0432\u0430\u0435\u0442\u0441\u044f \u0438 \u0435\u0449\u0451 \u043d\u0435 \u0437\u0430\u0432\u0435\u0440\u0448\u0451\u043d.",
     "LabelReadHowYouCanContribute": "\u0427\u0438\u0442\u0430\u0439\u0442\u0435 \u043e \u0442\u043e\u043c, \u043a\u0430\u043a \u043c\u043e\u0436\u043d\u043e \u0432\u043d\u0435\u0441\u0442\u0438 \u0441\u0432\u043e\u0439 \u0432\u043a\u043b\u0430\u0434.",
     "HeaderNewCollection": "\u041d\u043e\u0432\u0430\u044f \u043a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u044f",
     "HeaderAddToCollection": "\u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0432 \u043a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u044e",
@@ -480,7 +482,7 @@
     "HeaderProgram": "\u041f\u0435\u0440\u0435\u0434\u0430\u0447\u0430",
     "HeaderClients": "\u041a\u043b\u0438\u0435\u043d\u0442\u044b",
     "LabelCompleted": "\u0412\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u043e",
-    "LabelFailed": "\u041d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u043e",
+    "LabelFailed": "\u041d\u0435\u0443\u0434\u0430\u0447\u043d\u043e",
     "LabelSkipped": "\u041e\u0442\u043b\u043e\u0436\u0435\u043d\u043e",
     "HeaderEpisodeOrganization": "\u0420\u0435\u043e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u044f \u044d\u043f\u0438\u0437\u043e\u0434\u0430",
     "LabelSeries": "\u0421\u0435\u0440\u0438\u0430\u043b:",
@@ -630,7 +632,7 @@
     "ButtonFullscreen": "\u041f\u043e\u043b\u043d\u044b\u0439 \u044d\u043a\u0440\u0430\u043d",
     "ButtonScenes": "\u0421\u0446\u0435\u043d\u044b",
     "ButtonSubtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044b",
-    "ButtonAudioTracks": "\u0410\u0443\u0434\u0438\u043e\u0434\u043e\u0440\u043e\u0436\u043a\u0438",
+    "ButtonAudioTracks": "\u0410\u0443\u0434\u0438\u043e \u0434\u043e\u0440\u043e\u0436\u043a\u0438",
     "ButtonPreviousTrack": "\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0430\u044f \u0434\u043e\u0440\u043e\u0436\u043a\u0430",
     "ButtonNextTrack": "\u0421\u043b\u0435\u0434\u0443\u044e\u0449\u0430\u044f \u0434\u043e\u0440\u043e\u0436\u043a\u0430",
     "ButtonStop": "\u041e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c",
@@ -664,9 +666,9 @@
     "OptionProfilePhoto": "\u0424\u043e\u0442\u043e",
     "LabelUserLibrary": "\u041c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0430 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f:",
     "LabelUserLibraryHelp": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435, \u0447\u044c\u044e \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0443 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c \u043d\u0430 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0435. \u041e\u0441\u0442\u0430\u0432\u044c\u0442\u0435 \u043f\u0443\u0441\u0442\u044b\u043c \u0434\u043b\u044f \u043d\u0430\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u043d\u0438\u044f \u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u043e\u0433\u043e \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430.",
-    "OptionPlainStorageFolders": "\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c \u0432\u0441\u0435 \u043f\u0430\u043f\u043a\u0438, \u043a\u0430\u043a \u043f\u0440\u043e\u0441\u0442\u044b\u0435 \u043f\u0430\u043f\u043a\u0438 \u0445\u0440\u0430\u043d\u0438\u0435\u043d\u0438\u044f",
+    "OptionPlainStorageFolders": "\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c \u0432\u0441\u0435 \u043f\u0430\u043f\u043a\u0438, \u043a\u0430\u043a \u043e\u0431\u044b\u0447\u043d\u044b\u0435 \u043f\u0430\u043f\u043a\u0438 \u0445\u0440\u0430\u043d\u0438\u0435\u043d\u0438\u044f",
     "OptionPlainStorageFoldersHelp": "\u041f\u0440\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438, \u0432\u0441\u0435 \u043f\u0430\u043f\u043a\u0438 \u0431\u0443\u0434\u0443\u0442 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u044b \u0432 DIDL \u043a\u0430\u043a \"object.container.storageFolder\", \u0432\u043c\u0435\u0441\u0442\u043e \u0431\u043e\u043b\u0435\u0435 \u0441\u043f\u0435\u0446\u0438\u0444\u0438\u0447\u043d\u043e\u0433\u043e \u0442\u0438\u043f\u0430, \u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, \"object.container.person.musicArtist\".",
-    "OptionPlainVideoItems": "\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c \u0432\u0441\u0435 \u0432\u0438\u0434\u0435\u043e\u0444\u0430\u0439\u043b\u044b, \u043a\u0430\u043a \u043f\u0440\u043e\u0441\u0442\u044b\u0435 \u0432\u0438\u0434\u0435\u043e \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u044b",
+    "OptionPlainVideoItems": "\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c \u0432\u0441\u0435 \u0432\u0438\u0434\u0435\u043e\u0444\u0430\u0439\u043b\u044b, \u043a\u0430\u043a \u043e\u0431\u044b\u0447\u043d\u044b\u0435 \u0432\u0438\u0434\u0435\u043e \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u044b",
     "OptionPlainVideoItemsHelp": "\u041f\u0440\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438, \u0432\u0441\u0435 \u0432\u0438\u0434\u0435\u043e\u0444\u0430\u0439\u043b\u044b \u0431\u0443\u0434\u0443\u0442 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u044b \u0432 DIDL \u043a\u0430\u043a \"object.item.videoItem\", \u0432\u043c\u0435\u0441\u0442\u043e \u0431\u043e\u043b\u0435\u0435 \u0441\u043f\u0435\u0446\u0438\u0444\u0438\u0447\u043d\u043e\u0433\u043e \u0442\u0438\u043f\u0430, \u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, \"object.item.videoItem.movie\".",
     "LabelSupportedMediaTypes": "\u041f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u043c\u044b\u0435 \u0442\u0438\u043f\u044b \u043d\u043e\u0441\u0438\u0442\u0435\u043b\u0435\u0439:",
     "TabIdentification": "\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f",
@@ -692,9 +694,13 @@
     "LabelMaxBitrate": "\u041c\u0430\u043a\u0441. \u043f\u043e\u0442\u043e\u043a\u043e\u0432\u0430\u044f \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c:",
     "LabelMaxBitrateHelp": "\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u0443\u044e \u043f\u043e\u0442\u043e\u043a\u043e\u0432\u0443\u044e \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c \u0432 \u0441\u0440\u0435\u0434\u0430\u0445 \u0441 \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u043d\u043e\u0439 \u043f\u0440\u043e\u043f\u0443\u0441\u043a\u043d\u043e\u0439 \u0441\u043f\u043e\u0441\u043e\u0431\u043d\u043e\u0441\u0442\u044c\u044e, \u043b\u0438\u0431\u043e, \u0435\u0441\u043b\u0438 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0442\u0440\u0435\u0431\u0443\u0435\u0442 - \u0435\u0433\u043e \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u0435 \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u0435.",
     "LabelMaxStreamingBitrate": "\u041c\u0430\u043a\u0441. \u043f\u043e\u0442\u043e\u043a\u043e\u0432\u0430\u044f \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c:",
-    "LabelMaxStreamingBitrateHelp": "\u0423\u043a\u0430\u0437\u0430\u0442\u044c \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u0443\u044e \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c \u043f\u0440\u0438 \u043f\u043e\u0442\u043e\u043a\u043e\u0432\u043e\u0439 \u043f\u0435\u0440\u0435\u0434\u0430\u0447\u0435.",
+    "LabelMaxStreamingBitrateHelp": "\u0423\u043a\u0430\u0437\u0430\u0442\u044c \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u0443\u044e \u043f\u043e\u0442\u043e\u043a\u043e\u0432\u0443\u044e \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c \u043f\u0440\u0438 \u043f\u043e\u0442\u043e\u043a\u043e\u0432\u043e\u0439 \u043f\u0435\u0440\u0435\u0434\u0430\u0447\u0435.",
     "LabelMaxStaticBitrate": "\u041c\u0430\u043a\u0441. \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c \u0441\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u0438:",
-    "LabelMaxStaticBitrateHelp": "\u0423\u043a\u0430\u0437\u0430\u0442\u044c \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u0443\u044e \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c \u043f\u0440\u0438 \u0441\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u0438 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u044f \u0432\u043e \u0432\u044b\u0441\u043e\u043a\u043e\u043c \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u0435.",
+    "LabelMaxStaticBitrateHelp": "\u0423\u043a\u0430\u0437\u0430\u0442\u044c \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u0443\u044e \u043f\u043e\u0442\u043e\u043a\u043e\u0432\u0443\u044e \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c \u043f\u0440\u0438 \u0441\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u0438 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u044f \u0432\u043e \u0432\u044b\u0441\u043e\u043a\u043e\u043c \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u0435.",
+    "LabelMusicStaticBitrate": "\u041f\u043e\u0442\u043e\u043a\u043e\u0432\u0430\u044f \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c \u0441\u0438\u043d\u0445\u0440-\u0438\u0438 \u043c\u0443\u0437\u044b\u043a\u0438:",
+    "LabelMusicStaticBitrateHelp": "\u0423\u043a\u0430\u0437\u0430\u0442\u044c \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u0443\u044e \u043f\u043e\u0442\u043e\u043a\u043e\u0432\u0443\u044e \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c \u043f\u0440\u0438 \u0441\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u0438 \u043c\u0443\u0437\u044b\u043a\u0438",
+    "LabelMusicStreamingTranscodingBitrate": "\u041f\u043e\u0442\u043e\u043a\u043e\u0432\u0430\u044f \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c \u043f\u0435\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u043e\u0432\u043a\u0438 \u043c\u0443\u0437\u044b\u043a\u0438:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "\u0423\u043a\u0430\u0437\u0430\u0442\u044c \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u0443\u044e \u043f\u043e\u0442\u043e\u043a\u043e\u0432\u0443\u044e \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u044c \u043f\u0440\u0438 \u043f\u043e\u0442\u043e\u043a\u043e\u0432\u043e\u0439 \u043f\u0435\u0440\u0435\u0434\u0430\u0447\u0435 \u043c\u0443\u0437\u044b\u043a\u0438",
     "OptionIgnoreTranscodeByteRangeRequests": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0437\u0430\u043f\u0440\u043e\u0441\u044b \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d\u0430 \u0431\u0430\u0439\u0442\u043e\u0432 \u043f\u0435\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u043e\u0432\u043a\u0438",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "\u041f\u0440\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438, \u044d\u0442\u0438 \u0437\u0430\u043f\u0440\u043e\u0441\u044b \u0431\u0443\u0434\u0443\u0442 \u0443\u0447\u0442\u0435\u043d\u044b, \u043d\u043e \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d\u0430 \u0431\u0430\u0439\u0442\u043e\u0432 \u0431\u0443\u0434\u0435\u0442 \u043f\u0440\u043e\u0438\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u043d.",
     "LabelFriendlyName": "\u041f\u043e\u043d\u044f\u0442\u043d\u043e\u0435 \u0438\u043c\u044f",
@@ -777,9 +783,9 @@
     "LabelHomePageSection4": "\u0413\u043b\u0430\u0432\u043d\u0430\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 - \u0440\u0430\u0437\u0434\u0435\u043b 4:",
     "OptionMyViewsButtons": "\u041c\u043e\u0438 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f (\u043a\u043d\u043e\u043f\u043a\u0438)",
     "OptionMyViews": "\u041c\u043e\u0438 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f",
-    "OptionMyViewsSmall": "\u041c\u043e\u0438 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f (\u043a\u043e\u043c\u043f\u0430\u043a\u0442\u043d\u044b\u0435)",
+    "OptionMyViewsSmall": "\u041c\u043e\u0438 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f (\u043a\u043e\u043c\u043f\u0430\u043a\u0442\u043d\u043e)",
     "OptionResumablemedia": "\u0412\u043e\u0437\u043e\u0431\u043d\u043e\u0432\u0438\u043c\u044b\u0435",
-    "OptionLatestMedia": "\u041d\u043e\u0432\u0438\u043d\u043a\u0438 \u043d\u043e\u0441\u0438\u0442\u0435\u043b\u0435\u0439",
+    "OptionLatestMedia": "\u041d\u043e\u0432\u0438\u043d\u043a\u0438 \u043c\u0435\u0434\u0438\u0430\u0444\u0430\u0439\u043b\u043e\u0432",
     "OptionLatestChannelMedia": "\u041d\u043e\u0432\u0438\u043d\u043a\u0438 \u043a\u0430\u043d\u0430\u043b\u043e\u0432",
     "HeaderLatestChannelItems": "\u041d\u043e\u0432\u0438\u043d\u043a\u0438 \u043a\u0430\u043d\u0430\u043b\u043e\u0432",
     "OptionNone": "\u041d\u0438\u0447\u0435\u0433\u043e",
@@ -957,30 +963,42 @@
     "PluginInstalledWithName": "{0} - \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e",
     "PluginUpdatedWithName": "{0} - \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u043e",
     "PluginUninstalledWithName": "{0} - \u0443\u0434\u0430\u043b\u0435\u043d\u043e",
-    "ScheduledTaskFailedWithName": "{0} - \u043d\u0435\u0443\u0434\u0430\u0447\u043d\u043e",
+    "ScheduledTaskFailedWithName": "{0} - \u0431\u044b\u043b\u043e \u043d\u0435\u0443\u0434\u0430\u0447\u043d\u043e",
     "ItemAddedWithName": "{0} (\u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0443)",
     "ItemRemovedWithName": "{0} ( \u0438\u0437\u044a\u044f\u0442\u043e \u0438\u0437 \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438)",
     "DeviceOnlineWithName": "{0} - \u0432 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u043d\u043d\u043e\u043c \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0438",
-    "UserOnlineFromDevice": "{0} - \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0447\u0435\u0440\u0435\u0437 {1}",
+    "UserOnlineFromDevice": "{0} - \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0447\u0435\u0440\u0435\u0437 {1}",
     "DeviceOfflineWithName": "{0} - \u043f\u0440\u0435\u0440\u0432\u0430\u043d\u043e \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435",
     "UserOfflineFromDevice": "{0} - \u043f\u0440\u0435\u0440\u0432\u0430\u043d\u043e \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0447\u0435\u0440\u0435\u0437 {1}",
     "SubtitlesDownloadedForItem": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044b \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043d\u044b \u0434\u043b\u044f {0}",
     "SubtitleDownloadFailureForItem": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044b \u0434\u043b\u044f {0} - \u043d\u0435\u0443\u0434\u0430\u0447\u043d\u0430\u044f \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0430",
     "LabelRunningTimeValue": "\u0412\u0440\u0435\u043c\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f: {0}",
     "LabelIpAddressValue": "IP \u0430\u0434\u0440\u0435\u0441: {0}",
-    "UserConfigurationUpdatedWithName": "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0430 \u0434\u043b\u044f {0}",
+    "UserConfigurationUpdatedWithName": "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0431\u044b\u043b\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0430 \u0434\u043b\u044f {0}",
     "UserCreatedWithName": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c {0} \u0431\u044b\u043b \u0441\u043e\u0437\u0434\u0430\u043d",
-    "UserPasswordChangedWithName": "\u041f\u0430\u0440\u043e\u043b\u044c \u0431\u044b\u043b \u0438\u0437\u043c\u0435\u043d\u0451\u043d \u0434\u043b\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f {0}",
+    "UserPasswordChangedWithName": "\u041f\u0430\u0440\u043e\u043b\u044c \u0438\u0437\u043c\u0435\u043d\u0451\u043d \u0434\u043b\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f {0}",
     "UserDeletedWithName": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c {0} \u0431\u044b\u043b \u0443\u0434\u0430\u043b\u0451\u043d",
     "MessageServerConfigurationUpdated": "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0431\u044b\u043b\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0430",
     "MessageNamedServerConfigurationUpdatedWithValue": "\u0420\u0430\u0437\u0434\u0435\u043b {0} \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0431\u044b\u043b \u043e\u0431\u043d\u043e\u0432\u043b\u0451\u043d",
     "MessageApplicationUpdated": "Media Browser Server \u0431\u044b\u043b \u043e\u0431\u043d\u043e\u0432\u043b\u0451\u043d",
-    "AuthenticationSucceededWithUserName": "{0} \u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u043d",
+    "AuthenticationSucceededWithUserName": "{0} - \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u044f \u0443\u0441\u043f\u0435\u0448\u043d\u0430",
     "FailedLoginAttemptWithUserName": "\u041d\u0435\u0443\u0434\u0430\u0447\u043d\u0430\u044f \u043f\u043e\u043f\u044b\u0442\u043a\u0430 \u0432\u0445\u043e\u0434\u0430 \u0447\u0435\u0440\u0435\u0437 {0}",
     "UserStartedPlayingItemWithValues": "{0} - \u0437\u0430\u043f\u0443\u0449\u0435\u043d\u043e \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u0435 {1}",
     "UserStoppedPlayingItemWithValues": "{0} - \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u0435 {1}",
     "AppDeviceValues": "\u041f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435: {0}, \u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e: {1}",
     "ProviderValue": "\u041f\u043e\u0441\u0442\u0430\u0432\u0449\u0438\u043a: {0}",
     "LabelChannelDownloadSizeLimit": "\u041e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u0435 \u0440\u0430\u0437\u043c\u0435\u0440\u0430 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "\u041e\u0433\u0440\u0430\u043d\u0438\u0447\u0438\u0432\u0430\u0435\u0442 \u0440\u0430\u0437\u043c\u0435\u0440 \u043f\u0430\u043f\u043a\u0438 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u043a\u0430\u043d\u0430\u043b\u043e\u0432"
+    "LabelChannelDownloadSizeLimitHelp": "\u041e\u0433\u0440\u0430\u043d\u0438\u0447\u0438\u0432\u0430\u0435\u0442 \u0440\u0430\u0437\u043c\u0435\u0440 \u043f\u0430\u043f\u043a\u0438 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u043a\u0430\u043d\u0430\u043b\u043e\u0432",
+    "HeaderRecentActivity": "\u041d\u0435\u0434\u0430\u0432\u043d\u0438\u0435 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u044f",
+    "HeaderPeople": "\u041b\u044e\u0434\u0438",
+    "HeaderDownloadPeopleMetadataFor": "\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0431\u0438\u043e\u0433\u0440\u0430\u0444\u0438\u0439 \u0438 \u0440\u0438\u0441\u0443\u043d\u043a\u043e\u0432 \u0434\u043b\u044f:",
+    "OptionComposers": "\u041a\u043e\u043c\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u044b",
+    "OptionOthers": "\u0414\u0440\u0443\u0433\u0438\u0435",
+    "HeaderDownloadPeopleMetadataForHelp": "\u0412\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0445 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432 \u043e\u0431\u043e\u0433\u0430\u0449\u0430\u0435\u0442 \u044d\u043a\u0440\u0430\u043d\u043d\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e, \u043d\u043e \u0432 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u0435, \u0441\u043a\u0430\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438 \u0437\u0430\u043c\u0435\u0434\u043b\u0438\u0442\u0441\u044f.",
+    "ViewTypeFolders": "\u041f\u0430\u043f\u043a\u0438",
+    "LabelDisplayFoldersView": "\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u0430\u043f\u043e\u043a, \u0447\u0442\u043e\u0431\u044b \u043f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0442\u044c \u043e\u0431\u044b\u0447\u043d\u044b\u0435 \u043c\u0435\u0434\u0438\u0430\u043f\u0430\u043f\u043a\u0438",
+    "ViewTypeLiveTvRecordingGroups": "\u0417\u0430\u043f\u0438\u0441\u0438",
+    "ViewTypeLiveTvChannels": "\u041a\u0430\u043d\u0430\u043b\u044b",
+    "LabelAllowLocalAccessWithoutPassword": "\u0420\u0430\u0437\u0440\u0435\u0448\u0438\u0442\u044c \u043b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0439 \u0434\u043e\u0441\u0442\u0443\u043f \u0431\u0435\u0437 \u043f\u0430\u0440\u043e\u043b\u044f",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "\u041f\u0440\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438, \u043f\u0430\u0440\u043e\u043b\u044c \u043d\u0435 \u043f\u043e\u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u043f\u0440\u0438 \u0432\u0445\u043e\u0434\u0435 \u0438\u0437\u043d\u0443\u0442\u0440\u0438 \u0432\u0430\u0448\u0435\u0439 \u0434\u043e\u043c\u0430\u0448\u043d\u0435\u0439 \u0441\u0435\u0442\u0438."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index d09548bab3..c790b7b0fb 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -1014,5 +1014,9 @@
     "ViewTypeFolders": "Folders",
     "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "ViewTypeLiveTvRecordingGroups":  "Recordings",
-    "ViewTypeLiveTvChannels":  "Channels"
+    "ViewTypeLiveTvChannels": "Channels",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
+    "HeaderPassword": "Password",
+    "HeaderLocalAccess":  "Local Access"
 }
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/sv.json b/MediaBrowser.Server.Implementations/Localization/Server/sv.json
index e06a5d94ab..6fb0398fc9 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/sv.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/sv.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "Avsluta",
+    "HeaderPassword": "Password",
     "LabelVisitCommunity": "Bes\u00f6k v\u00e5rt diskussionsforum",
+    "HeaderLocalAccess": "Local Access",
     "LabelGithubWiki": "Github Wiki",
     "LabelSwagger": "Swagger",
     "LabelStandard": "F\u00f6rval",
@@ -480,10 +482,10 @@
     "HeaderProgram": "Program",
     "HeaderClients": "Klienter",
     "LabelCompleted": "Klar",
-    "LabelFailed": "Misslyckades",
+    "LabelFailed": "Failed",
     "LabelSkipped": "Hoppades \u00f6ver",
     "HeaderEpisodeOrganization": "Katalogisering av avsnitt",
-    "LabelSeries": "Serie:",
+    "LabelSeries": "Series:",
     "LabelSeasonNumber": "S\u00e4songsnummer:",
     "LabelEpisodeNumber": "Avsnittsnummer:",
     "LabelEndingEpisodeNumber": "Avslutande avsnittsnummer:",
@@ -631,8 +633,8 @@
     "ButtonScenes": "Scener",
     "ButtonSubtitles": "Undertexter",
     "ButtonAudioTracks": "Ljudsp\u00e5r",
-    "ButtonPreviousTrack": "F\u00f6reg\u00e5ende sp\u00e5r",
-    "ButtonNextTrack": "N\u00e4sta sp\u00e5r",
+    "ButtonPreviousTrack": "Previous track",
+    "ButtonNextTrack": "Next track",
     "ButtonStop": "Stopp",
     "ButtonPause": "Paus",
     "LabelGroupMoviesIntoCollections": "Gruppera filmer i samlingsboxar",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "Ange h\u00f6gsta bithastighet f\u00f6r str\u00f6mning.",
     "LabelMaxStaticBitrate": "Max bithastighet vid synkronisering:",
     "LabelMaxStaticBitrateHelp": "Ange h\u00f6gsta bithastighet vid synkronisering.",
+    "LabelMusicStaticBitrate": "Music sync bitrate:",
+    "LabelMusicStaticBitrateHelp": "Specify a max bitrate when syncing music",
+    "LabelMusicStreamingTranscodingBitrate": "Music transcoding bitrate:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Specify a max bitrate when streaming music",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignorera beg\u00e4ran om \"byte range\" vid omkodning",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "Om aktiverad kommer beg\u00e4ran att uppfyllas, men \"byte range\"-rubriken ignoreras.",
     "LabelFriendlyName": "\u00d6nskat namn",
@@ -982,5 +988,17 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "ProviderValue": "Provider: {0}",
     "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder",
+    "HeaderRecentActivity": "Recent Activity",
+    "HeaderPeople": "People",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
+    "OptionComposers": "Composers",
+    "OptionOthers": "Others",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "ViewTypeFolders": "Folders",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/tr.json b/MediaBrowser.Server.Implementations/Localization/Server/tr.json
index 98218bb772..8a78ef9190 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/tr.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/tr.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "Cikis",
+    "HeaderPassword": "Password",
     "LabelVisitCommunity": "Bizi Ziyaret Edin",
+    "HeaderLocalAccess": "Local Access",
     "LabelGithubWiki": "Github Wiki",
     "LabelSwagger": "Swagger",
     "LabelStandard": "Standart",
@@ -631,8 +633,8 @@
     "ButtonScenes": "Sahneler",
     "ButtonSubtitles": "Altyaz\u0131lar",
     "ButtonAudioTracks": "Audio tracks",
-    "ButtonPreviousTrack": "\u00d6nceki Par\u00e7a",
-    "ButtonNextTrack": "Sonraki Par\u00e7a",
+    "ButtonPreviousTrack": "Previous track",
+    "ButtonNextTrack": "Next track",
     "ButtonStop": "Durdur",
     "ButtonPause": "Duraklat",
     "LabelGroupMoviesIntoCollections": "Group movies into collections",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
     "LabelMaxStaticBitrate": "Max sync bitrate:",
     "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
+    "LabelMusicStaticBitrate": "Music sync bitrate:",
+    "LabelMusicStaticBitrateHelp": "Specify a max bitrate when syncing music",
+    "LabelMusicStreamingTranscodingBitrate": "Music transcoding bitrate:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Specify a max bitrate when streaming music",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -982,5 +988,17 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "ProviderValue": "Provider: {0}",
     "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder",
+    "HeaderRecentActivity": "Recent Activity",
+    "HeaderPeople": "People",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
+    "OptionComposers": "Composers",
+    "OptionOthers": "Others",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "ViewTypeFolders": "Folders",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/vi.json b/MediaBrowser.Server.Implementations/Localization/Server/vi.json
index ef9f681b58..acb8bb0d0a 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/vi.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/vi.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "Tho\u00e1t",
+    "HeaderPassword": "Password",
     "LabelVisitCommunity": "Gh\u00e9 th\u0103m trang C\u1ed9ng \u0111\u1ed3ng",
+    "HeaderLocalAccess": "Local Access",
     "LabelGithubWiki": "Github Wiki",
     "LabelSwagger": "Swagger",
     "LabelStandard": "Ti\u00eau chu\u1ea9n",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
     "LabelMaxStaticBitrate": "Max sync bitrate:",
     "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
+    "LabelMusicStaticBitrate": "Music sync bitrate:",
+    "LabelMusicStaticBitrateHelp": "Specify a max bitrate when syncing music",
+    "LabelMusicStreamingTranscodingBitrate": "Music transcoding bitrate:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Specify a max bitrate when streaming music",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -982,5 +988,17 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "ProviderValue": "Provider: {0}",
     "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder",
+    "HeaderRecentActivity": "Recent Activity",
+    "HeaderPeople": "People",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
+    "OptionComposers": "Composers",
+    "OptionOthers": "Others",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "ViewTypeFolders": "Folders",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json b/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
index c541c80bd3..784a96f18c 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
@@ -1,6 +1,8 @@
 {
     "LabelExit": "\u96e2\u958b",
+    "HeaderPassword": "Password",
     "LabelVisitCommunity": "\u8a2a\u554f\u793e\u5340",
+    "HeaderLocalAccess": "Local Access",
     "LabelGithubWiki": "Github \u7ef4\u57fa",
     "LabelSwagger": "Swagger",
     "LabelStandard": "\u6a19\u6dee",
@@ -397,7 +399,7 @@
     "HeaderCastCrew": "\u62cd\u651d\u4eba\u54e1\u53ca\u6f14\u54e1",
     "HeaderAdditionalParts": "\u9644\u52a0\u90e8\u4efd",
     "ButtonSplitVersionsApart": "Split Versions Apart",
-    "ButtonPlayTrailer": "\u9810\u544a",
+    "ButtonPlayTrailer": "Trailer",
     "LabelMissing": "\u7f3a\u5c11",
     "LabelOffline": "\u96e2\u7dda",
     "PathSubstitutionHelp": "Path substitutions are used for mapping a path on the server to a path that clients are able to access. By allowing clients direct access to media on the server they may be able to play them directly over the network and avoid using server resources to stream and transcode them.",
@@ -695,6 +697,10 @@
     "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.",
     "LabelMaxStaticBitrate": "Max sync bitrate:",
     "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.",
+    "LabelMusicStaticBitrate": "Music sync bitrate:",
+    "LabelMusicStaticBitrateHelp": "Specify a max bitrate when syncing music",
+    "LabelMusicStreamingTranscodingBitrate": "Music transcoding bitrate:",
+    "LabelMusicStreamingTranscodingBitrateHelp": "Specify a max bitrate when streaming music",
     "OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
     "OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
     "LabelFriendlyName": "Friendly name",
@@ -982,5 +988,17 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "ProviderValue": "Provider: {0}",
     "LabelChannelDownloadSizeLimit": "Download size limit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder",
+    "HeaderRecentActivity": "Recent Activity",
+    "HeaderPeople": "People",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
+    "OptionComposers": "Composers",
+    "OptionOthers": "Others",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "ViewTypeFolders": "Folders",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "ViewTypeLiveTvChannels": "Channels",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 7db6d01919..d55d26e440 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -1211,7 +1211,7 @@ namespace MediaBrowser.Server.Implementations.Session
             bool isLocal)
         {
             var result = (isLocal && string.Equals(request.App, "Dashboard", StringComparison.OrdinalIgnoreCase)) ||
-                await _userManager.AuthenticateUser(request.Username, request.Password).ConfigureAwait(false);
+                await _userManager.AuthenticateUser(request.Username, request.Password, request.RemoteEndPoint).ConfigureAwait(false);
 
             if (!result)
             {
@@ -1234,10 +1234,10 @@ namespace MediaBrowser.Server.Implementations.Session
                 request.RemoteEndPoint,
                 user)
                 .ConfigureAwait(false);
-
+            
             return new AuthenticationResult
             {
-                User = _dtoService.GetUserDto(user),
+                User = _userManager.GetUserDto(user, request.RemoteEndPoint),
                 SessionInfo = GetSessionInfoDto(session),
                 AccessToken = token,
                 ServerId = _appHost.ServerId
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index f28b027d28..9f9cd8e753 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -555,7 +555,7 @@ namespace MediaBrowser.ServerApplication
             //SyncRepository = await GetSyncRepository().ConfigureAwait(false);
             //RegisterSingleInstance(SyncRepository);
 
-            UserManager = new UserManager(LogManager.GetLogger("UserManager"), ServerConfigurationManager, UserRepository, XmlSerializer);
+            UserManager = new UserManager(LogManager.GetLogger("UserManager"), ServerConfigurationManager, UserRepository, XmlSerializer, NetworkManager, () => ImageProcessor, () => DtoService);
             RegisterSingleInstance(UserManager);
 
             LibraryManager = new LibraryManager(Logger, TaskManager, UserManager, ServerConfigurationManager, UserDataManager, () => LibraryMonitor, FileSystemManager, () => ProviderManager);
@@ -626,7 +626,7 @@ namespace MediaBrowser.ServerApplication
             var playlistManager = new PlaylistManager(LibraryManager, FileSystemManager, LibraryMonitor, LogManager.GetLogger("PlaylistManager"), UserManager);
             RegisterSingleInstance<IPlaylistManager>(playlistManager);
 
-            LiveTvManager = new LiveTvManager(ServerConfigurationManager, FileSystemManager, Logger, ItemRepository, ImageProcessor, UserDataManager, DtoService, UserManager, LibraryManager, TaskManager, LocalizationManager);
+            LiveTvManager = new LiveTvManager(ServerConfigurationManager, FileSystemManager, Logger, ItemRepository, ImageProcessor, UserDataManager, DtoService, UserManager, LibraryManager, TaskManager, LocalizationManager, JsonSerializer);
             RegisterSingleInstance(LiveTvManager);
 
             UserViewManager = new UserViewManager(LibraryManager, LocalizationManager, FileSystemManager, UserManager, ChannelManager, LiveTvManager, ApplicationPaths, playlistManager);
diff --git a/MediaBrowser.ServerApplication/Networking/NetworkManager.cs b/MediaBrowser.ServerApplication/Networking/NetworkManager.cs
index e80c8ff3f4..7a2e184b6c 100644
--- a/MediaBrowser.ServerApplication/Networking/NetworkManager.cs
+++ b/MediaBrowser.ServerApplication/Networking/NetworkManager.cs
@@ -1,12 +1,13 @@
-using System.Globalization;
-using System.IO;
-using MediaBrowser.Common.Implementations.Networking;
+using MediaBrowser.Common.Implementations.Networking;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Net;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
 using System.Linq;
+using System.Net;
 using System.Runtime.InteropServices;
 
 namespace MediaBrowser.ServerApplication.Networking
@@ -43,6 +44,46 @@ namespace MediaBrowser.ServerApplication.Networking
             };
         }
 
+        public bool IsInLocalNetwork(string endpoint)
+        {
+            if (string.IsNullOrWhiteSpace(endpoint))
+            {
+                throw new ArgumentNullException("endpoint");
+            }
+
+            IPAddress address;
+            if (!IPAddress.TryParse(endpoint, out address))
+            {
+                return true;
+            }
+
+            const int lengthMatch = 4;
+
+            if (endpoint.Length >= lengthMatch)
+            {
+                var prefix = endpoint.Substring(0, lengthMatch);
+
+                if (GetLocalIpAddresses()
+                    .Any(i => i.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)))
+                {
+                    return true;
+                }
+            }
+
+            // Private address space:
+            // http://en.wikipedia.org/wiki/Private_network
+
+            return
+
+                // If url was requested with computer name, we may see this
+                endpoint.IndexOf("::", StringComparison.OrdinalIgnoreCase) != -1 ||
+
+                endpoint.StartsWith("10.", StringComparison.OrdinalIgnoreCase) ||
+                endpoint.StartsWith("192.", StringComparison.OrdinalIgnoreCase) ||
+                endpoint.StartsWith("172.", StringComparison.OrdinalIgnoreCase) ||
+                endpoint.StartsWith("169.", StringComparison.OrdinalIgnoreCase);
+        }
+
         /// <summary>
         /// To the type of the network share.
         /// </summary>
-- 
cgit v1.2.3