From 22fc0b442ac093e55058723782adf845f4465925 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 25 Jun 2014 11:12:39 -0400
Subject: add short overview

---
 .../Library/Resolvers/Audio/MusicAlbumResolver.cs  | 49 +++++++++-------------
 1 file changed, 20 insertions(+), 29 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
index 28d476971..034894670 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
@@ -67,32 +67,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
         /// <returns><c>true</c> if [is music album] [the specified data]; otherwise, <c>false</c>.</returns>
         public static bool IsMusicAlbum(string path, IDirectoryService directoryService)
         {
-            // If list contains at least 2 audio files or at least one and no video files consider it to contain music
-            var foundAudio = 0;
-
-            foreach (var file in directoryService.GetFiles(path))
-            {
-                var fullName = file.FullName;
-
-                if (EntityResolutionHelper.IsAudioFile(fullName))
-                {
-                    // Don't resolve these into audio files
-                    if (string.Equals(Path.GetFileNameWithoutExtension(fullName), BaseItem.ThemeSongFilename) && EntityResolutionHelper.IsAudioFile(fullName))
-                    {
-                        continue;
-                    }
-
-                    foundAudio++;
-                }
-                if (foundAudio >= 2)
-                {
-                    return true;
-                }
-                if (EntityResolutionHelper.IsVideoFile(fullName)) return false;
-            }
-
-            //  or a single audio file and no video files
-            return foundAudio > 0;
+            return ContainsMusic(directoryService.GetFileSystemEntries(path));
         }
 
         /// <summary>
@@ -122,15 +97,31 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
             // If list contains at least 2 audio files or at least one and no video files consider it to contain music
             var foundAudio = 0;
 
-            foreach (var file in list)
+            foreach (var fileSystemInfo in list)
             {
-                var fullName = file.FullName;
+                // TODO: Support disc 1, disc 2, etc
+                if ((fileSystemInfo.Attributes & FileAttributes.Directory) == FileAttributes.Directory)
+                {
+                    continue;
+                }
+
+                var fullName = fileSystemInfo.FullName;
 
-                if (EntityResolutionHelper.IsAudioFile(fullName)) foundAudio++;
+                if (EntityResolutionHelper.IsAudioFile(fullName))
+                {
+                    // Don't resolve these into audio files
+                    if (string.Equals(Path.GetFileNameWithoutExtension(fullName), BaseItem.ThemeSongFilename) && EntityResolutionHelper.IsAudioFile(fullName))
+                    {
+                        continue;
+                    }
+
+                    foundAudio++;
+                }
                 if (foundAudio >= 2)
                 {
                     return true;
                 }
+
                 if (EntityResolutionHelper.IsVideoFile(fullName)) return false;
                 if (EntityResolutionHelper.IsVideoPlaceHolder(fullName)) return false;
             }
-- 
cgit v1.2.3


From b87f759460490792b7ceaf0513ab0d87a869e73b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 29 Jun 2014 13:58:04 -0400
Subject: fixes #857 - Support album subfolders

---
 .../Entities/Audio/MusicAlbum.cs                   | 17 ++++++++
 .../Library/Resolvers/Audio/MusicAlbumResolver.cs  | 45 ++++++++++++++++++----
 2 files changed, 55 insertions(+), 7 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
index a4d9278e5..eef2c8432 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -71,6 +71,23 @@ namespace MediaBrowser.Controller.Entities.Audio
         /// <value>The tags.</value>
         public List<string> Tags { get; set; }
 
+        /// <summary>
+        /// Gets the tracks.
+        /// </summary>
+        /// <value>The tracks.</value>
+        public IEnumerable<Audio> Tracks
+        {
+            get
+            {
+                return RecursiveChildren.OfType<Audio>();
+            }
+        }
+
+        protected override IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
+        {
+            return Tracks;
+        }
+
         /// <summary>
         /// Songs will group into us so don't also include us in the index
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
index 034894670..24c9b111a 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
@@ -45,7 +45,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
             {
                 return null;
             }
-            
+
             var collectionType = args.GetCollectionType();
 
             // If there's a collection type and it's not music, don't allow it.
@@ -54,7 +54,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
             {
                 return null;
             }
-            
+
             return IsMusicAlbum(args) ? new MusicAlbum() : null;
         }
 
@@ -67,7 +67,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
         /// <returns><c>true</c> if [is music album] [the specified data]; otherwise, <c>false</c>.</returns>
         public static bool IsMusicAlbum(string path, IDirectoryService directoryService)
         {
-            return ContainsMusic(directoryService.GetFileSystemEntries(path));
+            return ContainsMusic(directoryService.GetFileSystemEntries(path), true, directoryService);
         }
 
         /// <summary>
@@ -81,7 +81,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
             if (args.IsDirectory)
             {
                 //if (args.Parent is MusicArtist) return true;  //saves us from testing children twice
-                if (ContainsMusic(args.FileSystemChildren)) return true;
+                if (ContainsMusic(args.FileSystemChildren, true, args.DirectoryService)) return true;
             }
 
             return false;
@@ -91,18 +91,26 @@ 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="allowSubfolders">if set to <c>true</c> [allow subfolders].</param>
+        /// <param name="directoryService">The directory service.</param>
         /// <returns><c>true</c> if the specified list contains music; otherwise, <c>false</c>.</returns>
-        private static bool ContainsMusic(IEnumerable<FileSystemInfo> list)
+        private static bool ContainsMusic(IEnumerable<FileSystemInfo> list, bool allowSubfolders, IDirectoryService directoryService)
         {
             // If list contains at least 2 audio files or at least one and no video files consider it to contain music
             var foundAudio = 0;
 
             foreach (var fileSystemInfo in list)
             {
-                // TODO: Support disc 1, disc 2, etc
                 if ((fileSystemInfo.Attributes & FileAttributes.Directory) == FileAttributes.Directory)
                 {
-                    continue;
+                    if (allowSubfolders && IsAlbumSubfolder(fileSystemInfo, directoryService))
+                    {
+                        return true;
+                    }
+                    if (!IsAdditionalSubfolderAllowed(fileSystemInfo))
+                    {
+                        return false;
+                    }
                 }
 
                 var fullName = fileSystemInfo.FullName;
@@ -129,5 +137,28 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
             //  or a single audio file and no video files
             return foundAudio > 0;
         }
+
+        private static bool IsAlbumSubfolder(FileSystemInfo directory, IDirectoryService directoryService)
+        {
+            var path = directory.FullName;
+
+            if (IsMultiDiscFolder(path))
+            {
+                return ContainsMusic(directoryService.GetFileSystemEntries(path), false, directoryService);
+            }
+
+            return false;
+        }
+
+        private static bool IsMultiDiscFolder(string path)
+        {
+            return EntityResolutionHelper.IsMultiPartFolder(path);
+        }
+
+        private static bool IsAdditionalSubfolderAllowed(FileSystemInfo directory)
+        {
+            // TOOD: allow some metadata folders like extrafanart, extrathumbs
+            return false;
+        }
     }
 }
-- 
cgit v1.2.3


From 1a5a75854bd3ec4cdd771c9afdaefe0acb62c03c Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 29 Jun 2014 15:59:52 -0400
Subject: update translations

---
 .../Updates/InstallationManager.cs                 |  24 +-
 .../Entities/Audio/MusicAlbum.cs                   |   1 +
 MediaBrowser.Dlna/Didl/Filter.cs                   |  35 +
 MediaBrowser.Dlna/Eventing/EventSubscription.cs    |  34 +
 MediaBrowser.Dlna/MediaBrowser.Dlna.csproj         |   2 +
 .../MediaBrowser.Model.Portable.csproj             |   9 +-
 .../MediaBrowser.Model.net35.csproj                |   9 +-
 .../Configuration/ServerConfiguration.cs           |   6 +-
 MediaBrowser.Model/Dlna/ConditionProcessor.cs      |  29 +
 MediaBrowser.Model/Dlna/EventSubscription.cs       |  34 -
 MediaBrowser.Model/Dlna/Filter.cs                  |  35 -
 MediaBrowser.Model/Dto/BaseItemDto.cs              |   8 +-
 MediaBrowser.Model/Dto/BaseItemPerson.cs           |   3 +-
 MediaBrowser.Model/Dto/ChapterInfoDto.cs           |   3 +-
 MediaBrowser.Model/Dto/UserDto.cs                  |   3 +-
 MediaBrowser.Model/Dto/UserItemDataDto.cs          |   3 +-
 MediaBrowser.Model/Entities/DisplayPreferences.cs  |   3 +-
 MediaBrowser.Model/Entities/MediaStream.cs         |   2 +-
 .../Extensions/IHasPropertyChangedEvent.cs         |   8 +
 MediaBrowser.Model/Extensions/ListHelper.cs        |  11 +-
 MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs      |   3 +-
 MediaBrowser.Model/LiveTv/ChannelInfoDto.cs        |   3 +-
 MediaBrowser.Model/LiveTv/ProgramInfoDto.cs        |   3 +-
 MediaBrowser.Model/LiveTv/RecordingGroupDto.cs     |   3 +-
 MediaBrowser.Model/LiveTv/RecordingInfoDto.cs      |   3 +-
 MediaBrowser.Model/MediaBrowser.Model.csproj       |   3 +-
 .../Notifications/NotificationRequest.cs           |   6 +-
 MediaBrowser.Model/Session/GeneralCommand.cs       |   5 +-
 MediaBrowser.Model/Session/SessionInfoDto.cs       |   3 +-
 MediaBrowser.Model/Themes/AppTheme.cs              |   5 +-
 MediaBrowser.Model/Updates/CheckForUpdateResult.cs |   7 +-
 MediaBrowser.Model/Updates/PackageVersionInfo.cs   |  30 +-
 .../Library/Resolvers/Audio/MusicAlbumResolver.cs  |   4 +-
 .../Localization/JavaScript/de.json                |  20 +-
 .../Localization/JavaScript/es.json                |  26 +-
 .../Localization/JavaScript/es_MX.json             |  10 +-
 .../Localization/JavaScript/fr.json                |   8 +-
 .../Localization/JavaScript/pl.json                | 198 +++++
 .../Localization/JavaScript/pt_BR.json             |  10 +-
 .../Localization/JavaScript/ru.json                |   4 +-
 .../Localization/JavaScript/sv.json                |  10 +-
 .../Localization/LocalizationManager.cs            |   1 +
 .../Localization/Server/de.json                    |  64 +-
 .../Localization/Server/es.json                    |  22 +-
 .../Localization/Server/es_MX.json                 |  12 +-
 .../Localization/Server/fr.json                    |   6 +-
 .../Localization/Server/pl.json                    | 825 +++++++++++++++++++++
 .../Localization/Server/pt_BR.json                 |  12 +-
 .../Localization/Server/ru.json                    |  18 +-
 .../Localization/Server/sv.json                    |  10 +-
 .../MediaBrowser.Server.Implementations.csproj     |   2 +
 MediaBrowser.ServerApplication/ApplicationHost.cs  |  18 +-
 52 files changed, 1340 insertions(+), 276 deletions(-)
 create mode 100644 MediaBrowser.Dlna/Didl/Filter.cs
 create mode 100644 MediaBrowser.Dlna/Eventing/EventSubscription.cs
 delete mode 100644 MediaBrowser.Model/Dlna/EventSubscription.cs
 delete mode 100644 MediaBrowser.Model/Dlna/Filter.cs
 create mode 100644 MediaBrowser.Model/Extensions/IHasPropertyChangedEvent.cs
 create mode 100644 MediaBrowser.Server.Implementations/Localization/JavaScript/pl.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/Server/pl.json

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs b/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs
index 895c43076..751ff55a5 100644
--- a/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs
+++ b/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs
@@ -68,7 +68,7 @@ namespace MediaBrowser.Common.Implementations.Updates
         /// <param name="newVersion">The new version.</param>
         private void OnPluginUpdated(IPlugin plugin, PackageVersionInfo newVersion)
         {
-            _logger.Info("Plugin updated: {0} {1} {2}", newVersion.name, newVersion.version, newVersion.classification);
+            _logger.Info("Plugin updated: {0} {1} {2}", newVersion.name, newVersion.versionStr ?? string.Empty, newVersion.classification);
 
             EventHelper.FireEventIfNotNull(PluginUpdated, this, new GenericEventArgs<Tuple<IPlugin, PackageVersionInfo>> { Argument = new Tuple<IPlugin, PackageVersionInfo>(plugin, newVersion) }, _logger);
 
@@ -87,7 +87,7 @@ namespace MediaBrowser.Common.Implementations.Updates
         /// <param name="package">The package.</param>
         private void OnPluginInstalled(PackageVersionInfo package)
         {
-            _logger.Info("New plugin installed: {0} {1} {2}", package.name, package.version, package.classification);
+            _logger.Info("New plugin installed: {0} {1} {2}", package.name, package.versionStr ?? string.Empty, package.classification);
 
             EventHelper.FireEventIfNotNull(PluginInstalled, this, new GenericEventArgs<PackageVersionInfo> { Argument = package }, _logger);
 
@@ -133,6 +133,16 @@ namespace MediaBrowser.Common.Implementations.Updates
             _logger = logger;
         }
 
+        private Version GetPackageVersion(PackageVersionInfo version)
+        {
+            return new Version(ValueOrDefault(version.versionStr, "0.0.0.1"));
+        }
+
+        private static string ValueOrDefault(string str, string def)
+        {
+            return string.IsNullOrEmpty(str) ? def : str;
+        }
+
         /// <summary>
         /// Gets all available packages.
         /// </summary>
@@ -197,7 +207,7 @@ namespace MediaBrowser.Common.Implementations.Updates
             foreach (var package in packages)
             {
                 package.versions = package.versions.Where(v => !string.IsNullOrWhiteSpace(v.sourceUrl))
-                    .OrderByDescending(v => v.version).ToList();
+                    .OrderByDescending(GetPackageVersion).ToList();
             }
 
             // Remove packages with no versions
@@ -211,7 +221,7 @@ namespace MediaBrowser.Common.Implementations.Updates
             foreach (var package in packages)
             {
                 package.versions = package.versions.Where(v => !string.IsNullOrWhiteSpace(v.sourceUrl))
-                    .OrderByDescending(v => v.version).ToList();
+                    .OrderByDescending(GetPackageVersion).ToList();
             }
 
             if (packageType.HasValue)
@@ -272,7 +282,7 @@ namespace MediaBrowser.Common.Implementations.Updates
                 return null;
             }
 
-            return package.versions.FirstOrDefault(v => v.version.Equals(version) && v.classification == classification);
+            return package.versions.FirstOrDefault(v => GetPackageVersion(v).Equals(version) && v.classification == classification);
         }
 
         /// <summary>
@@ -309,7 +319,7 @@ namespace MediaBrowser.Common.Implementations.Updates
             }
 
             return package.versions
-                .OrderByDescending(v => v.version)
+                .OrderByDescending(GetPackageVersion)
                 .FirstOrDefault(v => v.classification <= classification && IsPackageVersionUpToDate(v, currentServerVersion));
         }
 
@@ -338,7 +348,7 @@ namespace MediaBrowser.Common.Implementations.Updates
             {
                 var latestPluginInfo = GetLatestCompatibleVersion(catalog, p.Name, p.Id.ToString(), applicationVersion, _config.CommonConfiguration.SystemUpdateLevel);
 
-                return latestPluginInfo != null && latestPluginInfo.version != null && latestPluginInfo.version > p.Version ? latestPluginInfo : null;
+                return latestPluginInfo != null && GetPackageVersion(latestPluginInfo) > p.Version ? latestPluginInfo : null;
 
             }).Where(i => i != null).ToList();
 
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
index eef2c8432..9ddd10f4a 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -194,6 +194,7 @@ namespace MediaBrowser.Controller.Entities.Audio
         }
     }
 
+    [Obsolete]
     public class MusicAlbumDisc : Folder
     {
 
diff --git a/MediaBrowser.Dlna/Didl/Filter.cs b/MediaBrowser.Dlna/Didl/Filter.cs
new file mode 100644
index 000000000..c980a2a2e
--- /dev/null
+++ b/MediaBrowser.Dlna/Didl/Filter.cs
@@ -0,0 +1,35 @@
+using MediaBrowser.Model.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace MediaBrowser.Dlna.Didl
+{
+    public class Filter
+    {
+        private readonly List<string> _fields;
+        private readonly bool _all;
+
+        public Filter()
+            : this("*")
+        {
+
+        }
+
+        public Filter(string filter)
+        {
+            _all = StringHelper.EqualsIgnoreCase(filter, "*");
+
+            var list = (filter ?? string.Empty).Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries).ToList();
+
+            _fields = list;
+        }
+
+        public bool Contains(string field)
+        {
+            // Don't bother with this. Some clients (media monkey) use the filter and then don't display very well when very little data comes back.
+            return true;
+            //return _all || ListHelper.ContainsIgnoreCase(_fields, field);
+        }
+    }
+}
diff --git a/MediaBrowser.Dlna/Eventing/EventSubscription.cs b/MediaBrowser.Dlna/Eventing/EventSubscription.cs
new file mode 100644
index 000000000..bd4cbdd55
--- /dev/null
+++ b/MediaBrowser.Dlna/Eventing/EventSubscription.cs
@@ -0,0 +1,34 @@
+using System;
+
+namespace MediaBrowser.Dlna.Eventing
+{
+    public class EventSubscription
+    {
+        public string Id { get; set; }
+        public string CallbackUrl { get; set; }
+        public string NotificationType { get; set; }
+
+        public DateTime SubscriptionTime { get; set; }
+        public int TimeoutSeconds { get; set; }
+
+        public long TriggerCount { get; set; }
+
+        public void IncrementTriggerCount()
+        {
+            if (TriggerCount == long.MaxValue)
+            {
+                TriggerCount = 0;
+            }
+
+            TriggerCount++;
+        }
+
+        public bool IsExpired
+        {
+            get
+            {
+                return SubscriptionTime.AddSeconds(TimeoutSeconds) >= DateTime.UtcNow;
+            }
+        }
+    }
+}
diff --git a/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj b/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj
index 1d51fc60f..94f9c0391 100644
--- a/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj
+++ b/MediaBrowser.Dlna/MediaBrowser.Dlna.csproj
@@ -56,9 +56,11 @@
     <Compile Include="ConnectionManager\ConnectionManagerXmlBuilder.cs" />
     <Compile Include="ConnectionManager\ControlHandler.cs" />
     <Compile Include="ConnectionManager\ServiceActionListBuilder.cs" />
+    <Compile Include="Didl\Filter.cs" />
     <Compile Include="DlnaManager.cs" />
     <Compile Include="Common\Argument.cs" />
     <Compile Include="Eventing\EventManager.cs" />
+    <Compile Include="Eventing\EventSubscription.cs" />
     <Compile Include="Main\DlnaEntryPoint.cs" />
     <Compile Include="PlayTo\CurrentIdEventArgs.cs" />
     <Compile Include="PlayTo\Device.cs">
diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
index 3c34652c3..4237c2974 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -212,12 +212,6 @@
     <Compile Include="..\MediaBrowser.Model\Dlna\DlnaProfileType.cs">
       <Link>Dlna\DlnaProfileType.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Dlna\EventSubscription.cs">
-      <Link>Dlna\EventSubscription.cs</Link>
-    </Compile>
-    <Compile Include="..\MediaBrowser.Model\Dlna\Filter.cs">
-      <Link>Dlna\Filter.cs</Link>
-    </Compile>
     <Compile Include="..\MediaBrowser.Model\Dlna\HeaderMatchType.cs">
       <Link>Dlna\HeaderMatchType.cs</Link>
     </Compile>
@@ -443,6 +437,9 @@
     <Compile Include="..\MediaBrowser.Model\Extensions\DoubleHelper.cs">
       <Link>Extensions\DoubleHelper.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Extensions\IHasPropertyChangedEvent.cs">
+      <Link>Extensions\IHasPropertyChangedEvent.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Extensions\IntHelper.cs">
       <Link>Extensions\IntHelper.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
index 9e3df382e..262ad6267 100644
--- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
+++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
@@ -199,12 +199,6 @@
     <Compile Include="..\MediaBrowser.Model\Dlna\DlnaProfileType.cs">
       <Link>Dlna\DlnaProfileType.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Dlna\EventSubscription.cs">
-      <Link>Dlna\EventSubscription.cs</Link>
-    </Compile>
-    <Compile Include="..\MediaBrowser.Model\Dlna\Filter.cs">
-      <Link>Dlna\Filter.cs</Link>
-    </Compile>
     <Compile Include="..\MediaBrowser.Model\Dlna\HeaderMatchType.cs">
       <Link>Dlna\HeaderMatchType.cs</Link>
     </Compile>
@@ -430,6 +424,9 @@
     <Compile Include="..\MediaBrowser.Model\Extensions\DoubleHelper.cs">
       <Link>Extensions\DoubleHelper.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Extensions\IHasPropertyChangedEvent.cs">
+      <Link>Extensions\IHasPropertyChangedEvent.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Extensions\IntHelper.cs">
       <Link>Extensions\IntHelper.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 3d5e0a9c9..542020483 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -1,6 +1,5 @@
 using MediaBrowser.Model.Weather;
 using System;
-using System.Collections.Generic;
 
 namespace MediaBrowser.Model.Configuration
 {
@@ -275,14 +274,13 @@ namespace MediaBrowser.Model.Configuration
 
             UICulture = "en-us";
 
-            MetadataOptions = new List<MetadataOptions>
+            MetadataOptions = new[]
             {
                 new MetadataOptions(1, 1280) {ItemType = "Book"},
                 new MetadataOptions(1, 1280) {ItemType = "MusicAlbum"},
                 new MetadataOptions(1, 1280) {ItemType = "MusicArtist"},
                 new MetadataOptions(0, 1280) {ItemType = "Season"}
-
-            }.ToArray();
+            };
 
             NotificationOptions = new NotificationOptions();
 
diff --git a/MediaBrowser.Model/Dlna/ConditionProcessor.cs b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
index 66c3e0b19..89b844ae5 100644
--- a/MediaBrowser.Model/Dlna/ConditionProcessor.cs
+++ b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
@@ -175,6 +175,35 @@ namespace MediaBrowser.Model.Dlna
 
             return false;
         }
+
+        private bool IsConditionSatisfied(ProfileCondition condition, float? currentValue)
+        {
+            if (!currentValue.HasValue)
+            {
+                // If the value is unknown, it satisfies if not marked as required
+                return !condition.IsRequired;
+            }
+
+            float expected;
+            if (FloatHelper.TryParseCultureInvariant(condition.Value, out expected))
+            {
+                switch (condition.Condition)
+                {
+                    case ProfileConditionType.Equals:
+                        return currentValue.Value.Equals(expected);
+                    case ProfileConditionType.GreaterThanEqual:
+                        return currentValue.Value >= expected;
+                    case ProfileConditionType.LessThanEqual:
+                        return currentValue.Value <= expected;
+                    case ProfileConditionType.NotEquals:
+                        return !currentValue.Value.Equals(expected);
+                    default:
+                        throw new InvalidOperationException("Unexpected ProfileConditionType");
+                }
+            }
+
+            return false;
+        }
         
         private bool IsConditionSatisfied(ProfileCondition condition, double? currentValue)
         {
diff --git a/MediaBrowser.Model/Dlna/EventSubscription.cs b/MediaBrowser.Model/Dlna/EventSubscription.cs
deleted file mode 100644
index 863ea508a..000000000
--- a/MediaBrowser.Model/Dlna/EventSubscription.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-
-namespace MediaBrowser.Model.Dlna
-{
-    public class EventSubscription
-    {
-        public string Id { get; set; }
-        public string CallbackUrl { get; set; }
-        public string NotificationType { get; set; }
-
-        public DateTime SubscriptionTime { get; set; }
-        public int TimeoutSeconds { get; set; }
-
-        public long TriggerCount { get; set; }
-
-        public void IncrementTriggerCount()
-        {
-            if (TriggerCount == long.MaxValue)
-            {
-                TriggerCount = 0;
-            }
-
-            TriggerCount++;
-        }
-
-        public bool IsExpired
-        {
-            get
-            {
-                return SubscriptionTime.AddSeconds(TimeoutSeconds) >= DateTime.UtcNow;
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.Model/Dlna/Filter.cs b/MediaBrowser.Model/Dlna/Filter.cs
deleted file mode 100644
index a41997010..000000000
--- a/MediaBrowser.Model/Dlna/Filter.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using MediaBrowser.Model.Extensions;
-using System;
-using System.Collections.Generic;
-
-namespace MediaBrowser.Model.Dlna
-{
-    public class Filter
-    {
-        private readonly List<string> _fields;
-        private readonly bool _all;
-
-        public Filter()
-            : this("*")
-        {
-
-        }
-
-        public Filter(string filter)
-        {
-            _all = StringHelper.EqualsIgnoreCase(filter, "*");
-
-            List<string> list = new List<string>();
-            foreach (string s in (filter ?? string.Empty).Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries))
-                list.Add(s);
-            _fields = list;
-        }
-
-        public bool Contains(string field)
-        {
-            // Don't bother with this. Some clients (media monkey) use the filter and then don't display very well when very little data comes back.
-            return true;
-            //return _all || ListHelper.ContainsIgnoreCase(_fields, field);
-        }
-    }
-}
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index 1d20080dd..7f7a4b8f0 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -15,7 +15,7 @@ namespace MediaBrowser.Model.Dto
     /// This holds information about a BaseItem in a format that is convenient for the client.
     /// </summary>
     [DebuggerDisplay("Name = {Name}, ID = {Id}, Type = {Type}")]
-    public class BaseItemDto : IHasProviderIds, INotifyPropertyChanged, IItemDto
+    public class BaseItemDto : IHasProviderIds, IHasPropertyChangedEvent, IItemDto
     {
         /// <summary>
         /// Gets or sets the name.
@@ -844,7 +844,7 @@ namespace MediaBrowser.Model.Dto
         [IgnoreDataMember]
         public bool IsVideo
         {
-            get { return StringHelper.EqualsIgnoreCase(MediaType, Entities.MediaType.Video); }
+            get { return StringHelper.EqualsIgnoreCase(MediaType, MediaBrowser.Model.Entities.MediaType.Video); }
         }
 
         /// <summary>
@@ -854,7 +854,7 @@ namespace MediaBrowser.Model.Dto
         [IgnoreDataMember]
         public bool IsAudio
         {
-            get { return StringHelper.EqualsIgnoreCase(MediaType, Entities.MediaType.Audio); }
+            get { return StringHelper.EqualsIgnoreCase(MediaType, MediaBrowser.Model.Entities.MediaType.Audio); }
         }
 
         /// <summary>
@@ -864,7 +864,7 @@ namespace MediaBrowser.Model.Dto
         [IgnoreDataMember]
         public bool IsGame
         {
-            get { return StringHelper.EqualsIgnoreCase(MediaType, Entities.MediaType.Game); }
+            get { return StringHelper.EqualsIgnoreCase(MediaType, MediaBrowser.Model.Entities.MediaType.Game); }
         }
 
         /// <summary>
diff --git a/MediaBrowser.Model/Dto/BaseItemPerson.cs b/MediaBrowser.Model/Dto/BaseItemPerson.cs
index b8393f444..46485316e 100644
--- a/MediaBrowser.Model/Dto/BaseItemPerson.cs
+++ b/MediaBrowser.Model/Dto/BaseItemPerson.cs
@@ -1,6 +1,7 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Runtime.Serialization;
+using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.Dto
 {
@@ -8,7 +9,7 @@ namespace MediaBrowser.Model.Dto
     /// This is used by the api to get information about a Person within a BaseItem
     /// </summary>
     [DebuggerDisplay("Name = {Name}, Role = {Role}, Type = {Type}")]
-    public class BaseItemPerson : INotifyPropertyChanged
+    public class BaseItemPerson : IHasPropertyChangedEvent
     {
         /// <summary>
         /// Gets or sets the name.
diff --git a/MediaBrowser.Model/Dto/ChapterInfoDto.cs b/MediaBrowser.Model/Dto/ChapterInfoDto.cs
index 1ec425169..62b1839d4 100644
--- a/MediaBrowser.Model/Dto/ChapterInfoDto.cs
+++ b/MediaBrowser.Model/Dto/ChapterInfoDto.cs
@@ -1,6 +1,7 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Runtime.Serialization;
+using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.Dto
 {
@@ -8,7 +9,7 @@ namespace MediaBrowser.Model.Dto
     /// Class ChapterInfo
     /// </summary>
     [DebuggerDisplay("Name = {Name}")]
-    public class ChapterInfoDto : INotifyPropertyChanged
+    public class ChapterInfoDto : IHasPropertyChangedEvent
     {
         /// <summary>
         /// Gets or sets the start position ticks.
diff --git a/MediaBrowser.Model/Dto/UserDto.cs b/MediaBrowser.Model/Dto/UserDto.cs
index c4a43c512..fec22e11c 100644
--- a/MediaBrowser.Model/Dto/UserDto.cs
+++ b/MediaBrowser.Model/Dto/UserDto.cs
@@ -3,6 +3,7 @@ using System;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Runtime.Serialization;
+using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.Dto
 {
@@ -10,7 +11,7 @@ namespace MediaBrowser.Model.Dto
     /// Class UserDto
     /// </summary>
     [DebuggerDisplay("Name = {Name}, ID = {Id}, HasPassword = {HasPassword}")]
-    public class UserDto : INotifyPropertyChanged, IItemDto
+    public class UserDto : IHasPropertyChangedEvent, IItemDto
     {
         /// <summary>
         /// Gets or sets the name.
diff --git a/MediaBrowser.Model/Dto/UserItemDataDto.cs b/MediaBrowser.Model/Dto/UserItemDataDto.cs
index 8e8e7adbe..26b0e9d9e 100644
--- a/MediaBrowser.Model/Dto/UserItemDataDto.cs
+++ b/MediaBrowser.Model/Dto/UserItemDataDto.cs
@@ -1,12 +1,13 @@
 using System;
 using System.ComponentModel;
+using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.Dto
 {
     /// <summary>
     /// Class UserItemDataDto
     /// </summary>
-    public class UserItemDataDto : INotifyPropertyChanged
+    public class UserItemDataDto : IHasPropertyChangedEvent
     {
         /// <summary>
         /// Gets or sets the rating.
diff --git a/MediaBrowser.Model/Entities/DisplayPreferences.cs b/MediaBrowser.Model/Entities/DisplayPreferences.cs
index 56a2c6194..cac703c91 100644
--- a/MediaBrowser.Model/Entities/DisplayPreferences.cs
+++ b/MediaBrowser.Model/Entities/DisplayPreferences.cs
@@ -2,13 +2,14 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
     /// Defines the display preferences for any item that supports them (usually Folders)
     /// </summary>
-    public class DisplayPreferences : INotifyPropertyChanged
+    public class DisplayPreferences : IHasPropertyChangedEvent
     {
         /// <summary>
         /// Occurs when [property changed].
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index 7be8a64b7..fe05483e7 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -136,7 +136,7 @@ namespace MediaBrowser.Model.Entities
             {
                 if (Type != MediaStreamType.Subtitle) return false;
 
-                var codec = Codec ?? string.Empty;
+                string codec = Codec ?? string.Empty;
 
                 return StringHelper.IndexOfIgnoreCase(codec, "pgs") == -1 &&
                        StringHelper.IndexOfIgnoreCase(codec, "dvd") == -1;
diff --git a/MediaBrowser.Model/Extensions/IHasPropertyChangedEvent.cs b/MediaBrowser.Model/Extensions/IHasPropertyChangedEvent.cs
new file mode 100644
index 000000000..c87550620
--- /dev/null
+++ b/MediaBrowser.Model/Extensions/IHasPropertyChangedEvent.cs
@@ -0,0 +1,8 @@
+using System.ComponentModel;
+
+namespace MediaBrowser.Model.Extensions
+{
+    public interface IHasPropertyChangedEvent : INotifyPropertyChanged
+    {
+    }
+}
diff --git a/MediaBrowser.Model/Extensions/ListHelper.cs b/MediaBrowser.Model/Extensions/ListHelper.cs
index 6c5d471c0..d929866bd 100644
--- a/MediaBrowser.Model/Extensions/ListHelper.cs
+++ b/MediaBrowser.Model/Extensions/ListHelper.cs
@@ -6,7 +6,16 @@ namespace MediaBrowser.Model.Extensions
 {
     public static class ListHelper
     {
-        public static bool ContainsIgnoreCase(IEnumerable<string> list, string value)
+        public static bool ContainsIgnoreCase(List<string> list, string value)
+        {
+            if (value == null)
+            {
+                throw new ArgumentNullException("value");
+            }
+
+            return list.Contains(value, StringComparer.OrdinalIgnoreCase);
+        }
+        public static bool ContainsIgnoreCase(string[] list, string value)
         {
             if (value == null)
             {
diff --git a/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs b/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs
index 2d88215bb..27001f721 100644
--- a/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs
@@ -1,9 +1,10 @@
 using System;
 using System.ComponentModel;
+using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.LiveTv
 {
-    public class BaseTimerInfoDto : INotifyPropertyChanged
+    public class BaseTimerInfoDto : IHasPropertyChangedEvent
     {
         /// <summary>
         /// Occurs when a property value changes.
diff --git a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
index a48006755..351378eea 100644
--- a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.Library;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -12,7 +13,7 @@ namespace MediaBrowser.Model.LiveTv
     /// Class ChannelInfoDto
     /// </summary>
     [DebuggerDisplay("Name = {Name}, Number = {Number}")]
-    public class ChannelInfoDto : INotifyPropertyChanged, IItemDto
+    public class ChannelInfoDto : IHasPropertyChangedEvent, IItemDto
     {
         /// <summary>
         /// Gets or sets the name.
diff --git a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
index 644af027d..50881f72f 100644
--- a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
@@ -5,12 +5,13 @@ using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using System;
 using System.Collections.Generic;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.Library;
 
 namespace MediaBrowser.Model.LiveTv
 {
     [DebuggerDisplay("Name = {Name}, StartTime = {StartDate}, EndTime = {EndDate}")]
-    public class ProgramInfoDto : INotifyPropertyChanged, IItemDto
+    public class ProgramInfoDto : IHasPropertyChangedEvent, IItemDto
     {
         /// <summary>
         /// Id of the program.
diff --git a/MediaBrowser.Model/LiveTv/RecordingGroupDto.cs b/MediaBrowser.Model/LiveTv/RecordingGroupDto.cs
index db96d56b4..07c5ac32f 100644
--- a/MediaBrowser.Model/LiveTv/RecordingGroupDto.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingGroupDto.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using System.Diagnostics;
+using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.LiveTv
 {
@@ -7,7 +8,7 @@ namespace MediaBrowser.Model.LiveTv
     /// Class RecordingGroupDto.
     /// </summary>
     [DebuggerDisplay("Name = {Name}, Count = {RecordingCount}")]
-    public class RecordingGroupDto : INotifyPropertyChanged
+    public class RecordingGroupDto : IHasPropertyChangedEvent
     {
         /// <summary>
         /// Gets or sets the name.
diff --git a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
index 58bca06bd..43ae9681e 100644
--- a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.Library;
 using System;
 using System.Collections.Generic;
@@ -10,7 +11,7 @@ using System.Runtime.Serialization;
 namespace MediaBrowser.Model.LiveTv
 {
     [DebuggerDisplay("Name = {Name}, ChannelName = {ChannelName}")]
-    public class RecordingInfoDto : INotifyPropertyChanged, IItemDto
+    public class RecordingInfoDto : IHasPropertyChangedEvent, IItemDto
     {
         /// <summary>
         /// Id of the recording.
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 5d753f9c2..fc79b7e75 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -109,8 +109,6 @@
     <Compile Include="Dlna\DlnaFlags.cs" />
     <Compile Include="Dlna\DlnaMaps.cs" />
     <Compile Include="Dlna\DlnaProfileType.cs" />
-    <Compile Include="Dlna\EventSubscription.cs" />
-    <Compile Include="Dlna\Filter.cs" />
     <Compile Include="Dlna\HeaderMatchType.cs" />
     <Compile Include="Dlna\HttpHeaderInfo.cs" />
     <Compile Include="Dlna\MediaFormatProfile.cs" />
@@ -155,6 +153,7 @@
     <Compile Include="Entities\VideoSize.cs" />
     <Compile Include="Events\GenericEventArgs.cs" />
     <Compile Include="Extensions\DoubleHelper.cs" />
+    <Compile Include="Extensions\IHasPropertyChangedEvent.cs" />
     <Compile Include="Extensions\IntHelper.cs" />
     <Compile Include="Extensions\ListHelper.cs" />
     <Compile Include="Extensions\StringHelper.cs" />
diff --git a/MediaBrowser.Model/Notifications/NotificationRequest.cs b/MediaBrowser.Model/Notifications/NotificationRequest.cs
index d47e9c4f2..f511d41a9 100644
--- a/MediaBrowser.Model/Notifications/NotificationRequest.cs
+++ b/MediaBrowser.Model/Notifications/NotificationRequest.cs
@@ -1,6 +1,6 @@
-using System;
+using MediaBrowser.Model.Configuration;
+using System;
 using System.Collections.Generic;
-using MediaBrowser.Model.Configuration;
 
 namespace MediaBrowser.Model.Notifications
 {
@@ -34,7 +34,7 @@ namespace MediaBrowser.Model.Notifications
             UserIds = new List<string>();
             Date = DateTime.UtcNow;
 
-            Variables = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            Variables = new Dictionary<string, string>();
 
             ExcludeUserIds = new List<string>();
         }
diff --git a/MediaBrowser.Model/Session/GeneralCommand.cs b/MediaBrowser.Model/Session/GeneralCommand.cs
index 7e818245d..ae9ab3adc 100644
--- a/MediaBrowser.Model/Session/GeneralCommand.cs
+++ b/MediaBrowser.Model/Session/GeneralCommand.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace MediaBrowser.Model.Session
 {
@@ -13,7 +12,7 @@ namespace MediaBrowser.Model.Session
 
         public GeneralCommand()
         {
-            Arguments = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            Arguments = new Dictionary<string, string>();
         }
     }
 }
diff --git a/MediaBrowser.Model/Session/SessionInfoDto.cs b/MediaBrowser.Model/Session/SessionInfoDto.cs
index 7217e28f4..40723eff8 100644
--- a/MediaBrowser.Model/Session/SessionInfoDto.cs
+++ b/MediaBrowser.Model/Session/SessionInfoDto.cs
@@ -3,11 +3,12 @@ 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 : INotifyPropertyChanged
+    public class SessionInfoDto : IHasPropertyChangedEvent
     {
         /// <summary>
         /// Gets or sets a value indicating whether this instance can seek.
diff --git a/MediaBrowser.Model/Themes/AppTheme.cs b/MediaBrowser.Model/Themes/AppTheme.cs
index 40a729963..527f1de72 100644
--- a/MediaBrowser.Model/Themes/AppTheme.cs
+++ b/MediaBrowser.Model/Themes/AppTheme.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace MediaBrowser.Model.Themes
 {
@@ -15,7 +14,7 @@ namespace MediaBrowser.Model.Themes
 
         public AppTheme()
         {
-            Options = new Dictionary<string, string>(StringComparer.Ordinal);
+            Options = new Dictionary<string, string>();
 
             Images = new List<ThemeImage>();
         }
diff --git a/MediaBrowser.Model/Updates/CheckForUpdateResult.cs b/MediaBrowser.Model/Updates/CheckForUpdateResult.cs
index c9bc2d6b9..ff0bba197 100644
--- a/MediaBrowser.Model/Updates/CheckForUpdateResult.cs
+++ b/MediaBrowser.Model/Updates/CheckForUpdateResult.cs
@@ -1,5 +1,4 @@
-using System;
-
+
 namespace MediaBrowser.Model.Updates
 {
     /// <summary>
@@ -17,9 +16,9 @@ namespace MediaBrowser.Model.Updates
         /// Gets or sets the available version.
         /// </summary>
         /// <value>The available version.</value>
-        public Version AvailableVersion
+        public string AvailableVersion
         {
-            get { return Package != null ? Package.version : new Version(0, 0); }
+            get { return Package != null ? Package.versionStr : "0.0.0.1"; }
             set { } // need this for the serializer
         }
 
diff --git a/MediaBrowser.Model/Updates/PackageVersionInfo.cs b/MediaBrowser.Model/Updates/PackageVersionInfo.cs
index b3d297e8e..de8f4e8b8 100644
--- a/MediaBrowser.Model/Updates/PackageVersionInfo.cs
+++ b/MediaBrowser.Model/Updates/PackageVersionInfo.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Runtime.Serialization;
-
+
 namespace MediaBrowser.Model.Updates
 {
     /// <summary>
@@ -26,32 +24,6 @@ namespace MediaBrowser.Model.Updates
         /// <value>The version STR.</value>
         public string versionStr { get; set; }
 
-        /// <summary>
-        /// The _version
-        /// </summary>
-        private Version _version;
-        /// <summary>
-        /// Gets or sets the version.
-        /// Had to make this an interpreted property since Protobuf can't handle Version
-        /// </summary>
-        /// <value>The version.</value>
-        [IgnoreDataMember]
-        public Version version
-        {
-            get { return _version ?? (_version = new Version(ValueOrDefault(versionStr, "0.0.0.1"))); }
-        }
-
-        /// <summary>
-        /// Values the or default.
-        /// </summary>
-        /// <param name="str">The STR.</param>
-        /// <param name="def">The def.</param>
-        /// <returns>System.String.</returns>
-        private static string ValueOrDefault(string str, string def)
-        {
-            return string.IsNullOrEmpty(str) ? def : str;
-        }
-
         /// <summary>
         /// Gets or sets the classification.
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
index 24c9b111a..64d2db2e4 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
@@ -157,8 +157,8 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
 
         private static bool IsAdditionalSubfolderAllowed(FileSystemInfo directory)
         {
-            // TOOD: allow some metadata folders like extrafanart, extrathumbs
-            return false;
+            // Resolver will ignore them based on rules engine
+            return true;
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
index e48b788b0..9fa6b0ca2 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
@@ -55,22 +55,22 @@
     "LabelDefaultStream": "(Default)",
     "LabelForcedStream": "(Forced)",
     "LabelDefaultForcedStream": "(Default\/Forced)",
-    "LabelUnknownLanguage": "Unknown language",
+    "LabelUnknownLanguage": "Unbekannte Sprache",
     "ButtonMute": "Stumm",
     "ButtonUnmute": "Unmute",
     "ButtonNextTrack": "N\u00e4chster Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Abspielen",
     "ButtonEdit": "Bearbeiten",
-    "ButtonQueue": "Queue",
+    "ButtonQueue": "Warteschlange",
     "ButtonPlayTrailer": "Spiele Trailer",
     "ButtonPlaylist": "Playlist",
     "ButtonPreviousTrack": "Vorheriger Track",
-    "LabelEnabled": "Enabled",
-    "LabelDisabled": "Disabled",
-    "ButtonMoreInformation": "More Information",
-    "LabelNoUnreadNotifications": "No unread notifications.",
-    "ButtonViewNotifications": "View notifications",
+    "LabelEnabled": "Aktivieren",
+    "LabelDisabled": "Deaktivieren",
+    "ButtonMoreInformation": "mehr Informationen",
+    "LabelNoUnreadNotifications": "keine ungelesenen Benachrichtigungen",
+    "ButtonViewNotifications": "Benachrichtigungen anschauen",
     "ButtonMarkTheseRead": "Mark these read",
     "ButtonClose": "Close",
     "LabelAllPlaysSentToPlayer": "All plays will be sent to the selected player.",
@@ -100,7 +100,7 @@
     "OptionSaturday": "Samstag",
     "HeaderConfirmDeletion": "Confirm Deletion",
     "MessageConfirmPathSubstitutionDeletion": "Are you sure you wish to delete this path substitution?",
-    "LiveTvUpdateAvailable": "(Update available)",
+    "LiveTvUpdateAvailable": "(Update verf\u00fcgbar)",
     "LabelVersionUpToDate": "Auf dem neuesten Stand!",
     "ButtonResetTuner": "Tuner zur\u00fccksetzen",
     "HeaderResetTuner": "Tuner zur\u00fccksetzen",
@@ -109,8 +109,8 @@
     "LabelAllChannels": "Alle Channel",
     "HeaderSeriesRecordings": "Series Recordings",
     "LabelAnytime": "Jederzeit",
-    "StatusRecording": "Recording",
-    "StatusWatching": "Watching",
+    "StatusRecording": "Aufnehmen",
+    "StatusWatching": "Anschauing",
     "StatusRecordingProgram": "Recording {0}",
     "StatusWatchingProgram": "Watching {0}",
     "HeaderSplitMedia": "Trenne Medien ab",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json
index f4f126422..3873a10fc 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json
@@ -121,7 +121,7 @@
     "MessageTheFollowingItemsWillBeGrouped": "Los siguientes t\u00edtulos se agrupar\u00e1n en un elemento.",
     "MessageConfirmItemGrouping": "Los clientes de Media Browser elegir\u00e1n autom\u00e1ticamente la mejor forma de reproduccion sobre la base de dispositivo y rendimiento de la red. \u00bfEst\u00e1 seguro que desea continuar?",
     "HeaderResume": "Continuar",
-    "HeaderMyViews": "My Views",
+    "HeaderMyViews": "Mis vistas",
     "HeaderLibraryFolders": "Vista de carpeta",
     "HeaderLatestMedia": "\u00daltimos medios",
     "ButtonMore": "M\u00e1s...",
@@ -181,18 +181,18 @@
     "LabelRunningOnPort": "Ejecut\u00e1ndose en el puerto {0}.",
     "LabelRunningOnPorts": "Ejecut\u00e1ndose en los puertos {0} y {1}.",
     "HeaderLatestFromChannel": "Lo \u00faltimo de {0}",
-    "ButtonDownload": "Download",
-    "LabelUnknownLanaguage": "Unknown language",
-    "HeaderCurrentSubtitles": "Current Subtitles",
-    "MessageDownloadQueued": "The download has been queued.",
-    "MessageAreYouSureDeleteSubtitles": "Are you sure you wish to delete this subtitle file?",
-    "ButtonRemoteControl": "Remote Control",
-    "HeaderLatestTvRecordings": "Latest Recordings",
+    "ButtonDownload": "Descargar",
+    "LabelUnknownLanaguage": "Idioma desconocido",
+    "HeaderCurrentSubtitles": "Subt\u00edtulos actuales",
+    "MessageDownloadQueued": "La descarga se ha a\u00f1adido a la cola",
+    "MessageAreYouSureDeleteSubtitles": "\u00bfEst\u00e1 seguro que desea eliminar este archivo de subt\u00edtulos?",
+    "ButtonRemoteControl": "Control remoto",
+    "HeaderLatestTvRecordings": "\u00daltimas grabaciones",
     "ButtonOk": "OK",
     "ButtonCancel": "Cancelar",
-    "ButtonRefresh": "Refresh",
-    "LabelCurrentPath": "Current path:",
-    "HeaderSelectMediaPath": "Select Media Path",
-    "ButtonNetwork": "Network",
-    "MessageDirectoryPickerInstruction": "Network paths can be entered manually in the event the Network button fails to locate your devices. For example, {0} or {1}."
+    "ButtonRefresh": "Refrescar",
+    "LabelCurrentPath": "Ruta actual:",
+    "HeaderSelectMediaPath": "Seleccionar la ruta para Medios",
+    "ButtonNetwork": "Red",
+    "MessageDirectoryPickerInstruction": "Rutas de red pueden ser introducidas manualmente en el caso de que el bot\u00f3n de la red no pueda localizar sus dispositivos. Por ejemplo, {0} o {1}."
 }
\ 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 6b609dde1..d72c295e3 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json
@@ -190,9 +190,9 @@
     "HeaderLatestTvRecordings": "\u00daltimas Grabaciones",
     "ButtonOk": "Ok",
     "ButtonCancel": "Cancelar",
-    "ButtonRefresh": "Refresh",
-    "LabelCurrentPath": "Current path:",
-    "HeaderSelectMediaPath": "Select Media Path",
-    "ButtonNetwork": "Network",
-    "MessageDirectoryPickerInstruction": "Network paths can be entered manually in the event the Network button fails to locate your devices. For example, {0} or {1}."
+    "ButtonRefresh": "Refrescar",
+    "LabelCurrentPath": "Trayectoria actual:",
+    "HeaderSelectMediaPath": "Seleccionar trayectoria a medios",
+    "ButtonNetwork": "Red",
+    "MessageDirectoryPickerInstruction": "Las trayectorias de red pueden ser ingresadas manualmente en caso de que el bot\u00f3n de Red no pueda localizar sus dispositivos. Por ejemplo, {0} or {1}."
 }
\ 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 4ba25ce7a..a452eb02d 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
@@ -136,7 +136,7 @@
     "HeaderSelectTranscodingPath": "S\u00e9lectionner le chemin d'acc\u00e8s du transcodage temporaire",
     "HeaderSelectImagesByNamePath": "S\u00e9lectionner le chemin d'acc\u00e8s du \"Images By Name\"",
     "HeaderSelectMetadataPath": "S\u00e9lectionner le chemin d'acc\u00e8s des m\u00e9tadonn\u00e9es",
-    "HeaderSelectServerCachePathHelp": "Browse or enter the path to use for server cache files. The folder must be writeable. The location of this folder will directly impact server performance and should ideally be placed on a solid state drive.",
+    "HeaderSelectServerCachePathHelp": "Parcourez ou entrez le chemin \u00e0 utiliser pour les fichiers caches du serveur. Le dossier doit \u00eatre accessible en \u00e9criture. L'emplacement de ce fichier aura un impact direct sur les performances du serveur et devrait \u00eatre plac\u00e9 id\u00e9alement sur un SSD.",
     "HeaderSelectTranscodingPathHelp": "Browse or enter the path to use for transcoding temporary files. The folder must be writeable.",
     "HeaderSelectImagesByNamePathHelp": "Browse or enter the path to your items by name folder. The folder must be writeable.",
     "HeaderSelectMetadataPathHelp": "Browse or enter the path you'd like to store metadata within. The folder must be writeable.",
@@ -190,9 +190,9 @@
     "HeaderLatestTvRecordings": "Les plus r\u00e9cents enregistrements",
     "ButtonOk": "Ok",
     "ButtonCancel": "Annuler",
-    "ButtonRefresh": "Refresh",
-    "LabelCurrentPath": "Current path:",
+    "ButtonRefresh": "Actualiser",
+    "LabelCurrentPath": "Chemin actuel:",
     "HeaderSelectMediaPath": "Select Media Path",
-    "ButtonNetwork": "Network",
+    "ButtonNetwork": "R\u00e9seau",
     "MessageDirectoryPickerInstruction": "Network paths can be entered manually in the event the Network button fails to locate your devices. For example, {0} or {1}."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/pl.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/pl.json
new file mode 100644
index 000000000..b3ab8d3b9
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pl.json
@@ -0,0 +1,198 @@
+{
+    "SettingsSaved": "Ustawienia zapisane.",
+    "AddUser": "Dodaj u\u017cytkownika",
+    "Users": "U\u017cytkownicy",
+    "Delete": "Usu\u0144",
+    "Administrator": "Administrator",
+    "Password": "Has\u0142o",
+    "DeleteImage": "Usu\u0144 zdj\u0119cie",
+    "DeleteImageConfirmation": "Jeste\u015b pewien \u017ce chcesz usun\u0105\u0107 to zdj\u0119cie?",
+    "FileReadCancelled": "Odczytywanie pliku zosta\u0142o anulowane.",
+    "FileNotFound": "Plik nie znaleziony.",
+    "FileReadError": "Wyst\u0105pi\u0142 b\u0142\u0105d podczas odczytywania pliku.",
+    "DeleteUser": "Usu\u0144 u\u017cytkownika",
+    "DeleteUserConfirmation": "Jeste\u015b pewien \u017ce chcesz usun\u0105\u0107 {0}?",
+    "PasswordResetHeader": "Zresetuj has\u0142o",
+    "PasswordResetComplete": "Has\u0142o zosta\u0142o zresetowane.",
+    "PasswordResetConfirmation": "Jeste\u015b pewien \u017ce chcesz zresetowa\u0107 has\u0142o?",
+    "PasswordSaved": "Has\u0142o zapisane.",
+    "PasswordMatchError": "Has\u0142o i potwierdzenie has\u0142a musz\u0105 si\u0119 zgadza\u0107.",
+    "OptionRelease": "Oficjalne wydanie",
+    "OptionBeta": "Beta",
+    "OptionDev": "Dev (Niestabilne)",
+    "UninstallPluginHeader": "Usu\u0144 wtyczk\u0119",
+    "UninstallPluginConfirmation": "Czy na pewno chcesz usun\u0105\u0107 {0}?",
+    "NoPluginConfigurationMessage": "Ta wtyczka nie ma \u017cadnych ustawie\u0144.",
+    "NoPluginsInstalledMessage": "Nie masz \u017cadnych wtyczek zainstalowanych.",
+    "BrowsePluginCatalogMessage": "Przejrzyj nasz katalog wtyczek \u017ceby zobaczy\u0107 dost\u0119pne wtyczki.",
+    "MessageKeyEmailedTo": "Key emailed to {0}.",
+    "MessageKeysLinked": "Keys linked.",
+    "HeaderConfirmation": "Confirmation",
+    "MessageKeyUpdated": "Thank you. Your supporter key has been updated.",
+    "MessageKeyRemoved": "Thank you. Your supporter key has been removed.",
+    "ErrorLaunchingChromecast": "There was an error launching chromecast. Please ensure your device is connected to your wireless network.",
+    "HeaderSearch": "Search",
+    "LabelArtist": "Artist",
+    "LabelMovie": "Movie",
+    "LabelMusicVideo": "Music Video",
+    "LabelEpisode": "Episode",
+    "LabelSeries": "Series",
+    "LabelStopping": "Stopping",
+    "ButtonStop": "Stop",
+    "LabelCancelled": "(cancelled)",
+    "LabelFailed": "(failed)",
+    "LabelAbortedByServerShutdown": "(Aborted by server shutdown)",
+    "LabelScheduledTaskLastRan": "Last ran {0}, taking {1}.",
+    "HeaderDeleteTaskTrigger": "Delete Task Trigger",
+    "HeaderTaskTriggers": "Task Triggers",
+    "MessageDeleteTaskTrigger": "Are you sure you wish to delete this task trigger?",
+    "MessageNoPluginsInstalled": "You have no plugins installed.",
+    "LabelVersionInstalled": "{0} installed",
+    "LabelNumberReviews": "{0} Reviews",
+    "LabelFree": "Free",
+    "HeaderSelectAudio": "Select Audio",
+    "HeaderSelectSubtitles": "Select Subtitles",
+    "LabelDefaultStream": "(Default)",
+    "LabelForcedStream": "(Forced)",
+    "LabelDefaultForcedStream": "(Default\/Forced)",
+    "LabelUnknownLanguage": "Unknown language",
+    "ButtonMute": "Mute",
+    "ButtonUnmute": "Unmute",
+    "ButtonNextTrack": "Next track",
+    "ButtonPause": "Pause",
+    "ButtonPlay": "Play",
+    "ButtonEdit": "Edit",
+    "ButtonQueue": "Queue",
+    "ButtonPlayTrailer": "PlayTrailer",
+    "ButtonPlaylist": "Playlist",
+    "ButtonPreviousTrack": "Previous track",
+    "LabelEnabled": "Enabled",
+    "LabelDisabled": "Disabled",
+    "ButtonMoreInformation": "More Information",
+    "LabelNoUnreadNotifications": "No unread notifications.",
+    "ButtonViewNotifications": "View notifications",
+    "ButtonMarkTheseRead": "Mark these read",
+    "ButtonClose": "Close",
+    "LabelAllPlaysSentToPlayer": "All plays will be sent to the selected player.",
+    "MessageInvalidUser": "Invalid user or password.",
+    "HeaderAllRecordings": "All Recordings",
+    "RecommendationBecauseYouLike": "Because you like {0}",
+    "RecommendationBecauseYouWatched": "Because you watched {0}",
+    "RecommendationDirectedBy": "Directed by {0}",
+    "RecommendationStarring": "Starring {0}",
+    "HeaderConfirmRecordingCancellation": "Confirm Recording Cancellation",
+    "MessageConfirmRecordingCancellation": "Are you sure you wish to cancel this recording?",
+    "MessageRecordingCancelled": "Recording cancelled.",
+    "HeaderConfirmSeriesCancellation": "Confirm Series Cancellation",
+    "MessageConfirmSeriesCancellation": "Are you sure you wish to cancel this series?",
+    "MessageSeriesCancelled": "Series cancelled.",
+    "HeaderConfirmRecordingDeletion": "Confirm Recording Deletion",
+    "MessageConfirmRecordingDeletion": "Are you sure you wish to delete this recording?",
+    "MessageRecordingDeleted": "Recording deleted.",
+    "ButonCancelRecording": "Cancel Recording",
+    "MessageRecordingSaved": "Recording saved.",
+    "OptionSunday": "Niedziela",
+    "OptionMonday": "Poniedzia\u0142ek",
+    "OptionTuesday": "Wtorek",
+    "OptionWednesday": "\u015aroda",
+    "OptionThursday": "Czwartek",
+    "OptionFriday": "Pi\u0105tek",
+    "OptionSaturday": "Sobota",
+    "HeaderConfirmDeletion": "Confirm Deletion",
+    "MessageConfirmPathSubstitutionDeletion": "Are you sure you wish to delete this path substitution?",
+    "LiveTvUpdateAvailable": "(Update available)",
+    "LabelVersionUpToDate": "Up to date!",
+    "ButtonResetTuner": "Reset tuner",
+    "HeaderResetTuner": "Reset Tuner",
+    "MessageConfirmResetTuner": "Are you sure you wish to reset this tuner? Any active players or recordings will be abruptly stopped.",
+    "ButtonCancelSeries": "Cancel Series",
+    "LabelAllChannels": "All channels",
+    "HeaderSeriesRecordings": "Series Recordings",
+    "LabelAnytime": "Any time",
+    "StatusRecording": "Recording",
+    "StatusWatching": "Watching",
+    "StatusRecordingProgram": "Recording {0}",
+    "StatusWatchingProgram": "Watching {0}",
+    "HeaderSplitMedia": "Split Media Apart",
+    "MessageConfirmSplitMedia": "Are you sure you wish to split the media sources into separate items?",
+    "HeaderError": "Error",
+    "MessagePleaseSelectOneItem": "Please select at least one item.",
+    "MessagePleaseSelectTwoItems": "Please select at least two items.",
+    "MessageTheFollowingItemsWillBeGrouped": "The following titles will be grouped into one item:",
+    "MessageConfirmItemGrouping": "Media Browser clients will automatically choose the optimal version to play based on device and network performance. Are you sure you wish to continue?",
+    "HeaderResume": "Wzn\u00f3w",
+    "HeaderMyViews": "My Views",
+    "HeaderLibraryFolders": "Media Folders",
+    "HeaderLatestMedia": "Latest Media",
+    "ButtonMore": "More...",
+    "HeaderFavoriteMovies": "Favorite Movies",
+    "HeaderFavoriteShows": "Favorite Shows",
+    "HeaderFavoriteEpisodes": "Favorite Episodes",
+    "HeaderFavoriteGames": "Favorite Games",
+    "HeaderRatingsDownloads": "Rating \/ Downloads",
+    "HeaderConfirmProfileDeletion": "Confirm Profile Deletion",
+    "MessageConfirmProfileDeletion": "Are you sure you wish to delete this profile?",
+    "HeaderSelectServerCachePath": "Select Server Cache Path",
+    "HeaderSelectTranscodingPath": "Select Transcoding Temporary Path",
+    "HeaderSelectImagesByNamePath": "Select Images By Name Path",
+    "HeaderSelectMetadataPath": "Select Metadata Path",
+    "HeaderSelectServerCachePathHelp": "Browse or enter the path to use for server cache files. The folder must be writeable. The location of this folder will directly impact server performance and should ideally be placed on a solid state drive.",
+    "HeaderSelectTranscodingPathHelp": "Browse or enter the path to use for transcoding temporary files. The folder must be writeable.",
+    "HeaderSelectImagesByNamePathHelp": "Browse or enter the path to your items by name folder. The folder must be writeable.",
+    "HeaderSelectMetadataPathHelp": "Browse or enter the path you'd like to store metadata within. The folder must be writeable.",
+    "HeaderSelectChannelDownloadPath": "Select Channel Download Path",
+    "HeaderSelectChannelDownloadPathHelp": "Browse or enter the path to use for storing channel cache files. The folder must be writeable.",
+    "OptionNewCollection": "New...",
+    "ButtonAdd": "Add",
+    "ButtonRemove": "Remove",
+    "LabelChapterDownloaders": "Chapter downloaders:",
+    "LabelChapterDownloadersHelp": "Enable and rank your preferred chapter downloaders in order of priority. Lower priority downloaders will only be used to fill in missing information.",
+    "HeaderFavoriteAlbums": "Favorite Albums",
+    "HeaderLatestChannelMedia": "Latest Channel Items",
+    "ButtonOrganizeFile": "Organize File",
+    "ButtonDeleteFile": "Delete File",
+    "HeaderOrganizeFile": "Organize File",
+    "HeaderDeleteFile": "Delete File",
+    "StatusSkipped": "Skipped",
+    "StatusFailed": "Failed",
+    "StatusSuccess": "Success",
+    "MessageFileWillBeDeleted": "The following file will be deleted:",
+    "MessageSureYouWishToProceed": "Are you sure you wish to proceed?",
+    "MessageDuplicatesWillBeDeleted": "In addition the following dupliates will be deleted:",
+    "MessageFollowingFileWillBeMovedFrom": "The following file will be moved from:",
+    "MessageDestinationTo": "to:",
+    "HeaderSelectWatchFolder": "Select Watch Folder",
+    "HeaderSelectWatchFolderHelp": "Browse or enter the path to your watch folder. The folder must be writeable.",
+    "OrganizePatternResult": "Result: {0}",
+    "HeaderRestart": "Restart",
+    "HeaderShutdown": "Shutdown",
+    "MessageConfirmRestart": "Are you sure you wish to restart Media Browser Server?",
+    "MessageConfirmShutdown": "Are you sure you wish to shutdown Media Browser Server?",
+    "ButtonUpdateNow": "Update Now",
+    "NewVersionOfSomethingAvailable": "A new version of {0} is available!",
+    "VersionXIsAvailableForDownload": "Version {0} is now available for download.",
+    "LabelVersionNumber": "Version {0}",
+    "LabelPlayMethodTranscoding": "Transcoding",
+    "LabelPlayMethodDirectStream": "Direct Streaming",
+    "LabelPlayMethodDirectPlay": "Direct Playing",
+    "LabelAudioCodec": "Audio: {0}",
+    "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",
+    "HeaderCurrentSubtitles": "Current Subtitles",
+    "MessageDownloadQueued": "The download has been queued.",
+    "MessageAreYouSureDeleteSubtitles": "Are you sure you wish to delete this subtitle file?",
+    "ButtonRemoteControl": "Remote Control",
+    "HeaderLatestTvRecordings": "Latest Recordings",
+    "ButtonOk": "Ok",
+    "ButtonCancel": "Anuluj",
+    "ButtonRefresh": "Refresh",
+    "LabelCurrentPath": "Current path:",
+    "HeaderSelectMediaPath": "Select Media Path",
+    "ButtonNetwork": "Network",
+    "MessageDirectoryPickerInstruction": "Network paths can be entered manually in the event the Network button fails to locate your devices. For example, {0} or {1}."
+}
\ 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 5b1667db6..5443451d6 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json
@@ -190,9 +190,9 @@
     "HeaderLatestTvRecordings": "\u00daltimas Grava\u00e7\u00f5es",
     "ButtonOk": "Ok",
     "ButtonCancel": "Cancelar",
-    "ButtonRefresh": "Refresh",
-    "LabelCurrentPath": "Current path:",
-    "HeaderSelectMediaPath": "Select Media Path",
-    "ButtonNetwork": "Network",
-    "MessageDirectoryPickerInstruction": "Network paths can be entered manually in the event the Network button fails to locate your devices. For example, {0} or {1}."
+    "ButtonRefresh": "Atualizar",
+    "LabelCurrentPath": "Caminho atual:",
+    "HeaderSelectMediaPath": "Selecionar o Caminho da M\u00eddia",
+    "ButtonNetwork": "Rede",
+    "MessageDirectoryPickerInstruction": "Os caminhos da rede podem ser digitados manualmente caso o bot\u00e3o de Rede n\u00e3o consiga localizar seus dispositivos. Por exemplo, {0} ou {1}."
 }
\ 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 3661e5f60..afabb17e7 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
@@ -25,7 +25,7 @@
     "NoPluginConfigurationMessage": "\u041d\u0435 \u0438\u043c\u0435\u0435\u0442\u0441\u044f \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0434\u043b\u044f \u0434\u0430\u043d\u043d\u043e\u0433\u043e \u043f\u043b\u0430\u0433\u0438\u043d\u0430.",
     "NoPluginsInstalledMessage": "\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.",
     "BrowsePluginCatalogMessage": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0438\u0442\u0435 \u043a\u0430\u0442\u0430\u043b\u043e\u0433, \u0447\u0442\u043e\u0431\u044b \u043e\u0437\u043d\u0430\u043a\u043e\u043c\u0438\u0442\u044c\u0441\u044f \u0441 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u043c\u0438 \u043f\u043b\u0430\u0433\u0438\u043d\u0430\u043c\u0438.",
-    "MessageKeyEmailedTo": "\u041a\u043b\u044e\u0447 \u043e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u043e\u044e \u0434\u043b\u044f {0}.",
+    "MessageKeyEmailedTo": "\u041a\u043b\u044e\u0447 \u043e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d \u042d-\u043f\u043e\u0447\u0442\u043e\u044e \u0434\u043b\u044f {0}.",
     "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.",
@@ -73,7 +73,7 @@
     "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",
     "ButtonClose": "\u0417\u0430\u043a\u0440\u044b\u0442\u044c",
-    "LabelAllPlaysSentToPlayer": "\u0412\u0441\u0451 \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u043e\u0434\u0438\u043c\u043e\u0435 \u0431\u0443\u0434\u0435\u0442 \u043e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u043e \u043d\u0430 \u0432\u044b\u0434\u0435\u043b\u0435\u043d\u043d\u044b\u0439 \u043f\u043b\u0435\u0439\u0435\u0440",
+    "LabelAllPlaysSentToPlayer": "\u0412\u0441\u0451 \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u043e\u0434\u0438\u043c\u043e\u0435 \u0431\u0443\u0434\u0435\u0442 \u043e\u0442\u043f\u0440\u0430\u0432\u043b\u044f\u0442\u044c\u0441\u044f \u043d\u0430 \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u044b\u0439 \u043f\u043b\u0435\u0439\u0435\u0440",
     "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": "\u0422\u0430\u043a \u043a\u0430\u043a \u0432\u0430\u043c \u043d\u0440\u0430\u0432\u0438\u0442\u0441\u044f {0}",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/sv.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/sv.json
index 7bb4f5409..b41dba810 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/sv.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/sv.json
@@ -190,9 +190,9 @@
     "HeaderLatestTvRecordings": "Senaste inspelningar",
     "ButtonOk": "OK",
     "ButtonCancel": "Avbryt",
-    "ButtonRefresh": "Refresh",
-    "LabelCurrentPath": "Current path:",
-    "HeaderSelectMediaPath": "Select Media Path",
-    "ButtonNetwork": "Network",
-    "MessageDirectoryPickerInstruction": "Network paths can be entered manually in the event the Network button fails to locate your devices. For example, {0} or {1}."
+    "ButtonRefresh": "Uppdatera",
+    "LabelCurrentPath": "Aktuell s\u00f6kv\u00e4g:",
+    "HeaderSelectMediaPath": "V\u00e4lj s\u00f6kv\u00e4g till media",
+    "ButtonNetwork": "N\u00e4tverk",
+    "MessageDirectoryPickerInstruction": "N\u00e4tverkss\u00f6kv\u00e4gar kan anges manuellt om \"N\u00e4tverk\" inte hittar dina enheter. T ex {0} eller {1}."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs b/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
index e1f5bcfdc..c21c9fa17 100644
--- a/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
+++ b/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
@@ -371,6 +371,7 @@ namespace MediaBrowser.Server.Implementations.Localization
                 new LocalizatonOption{ Name="Italian", Value="it"},
                 new LocalizatonOption{ Name="Kazakh", Value="kk"},
                 new LocalizatonOption{ Name="Norwegian Bokmål", Value="nb"},
+                new LocalizatonOption{ Name="Polish", Value="pl"},
                 new LocalizatonOption{ Name="Portuguese (Brazil)", Value="pt-BR"},
                 new LocalizatonOption{ Name="Portuguese (Portugal)", Value="pt-PT"},
                 new LocalizatonOption{ Name="Russian", Value="ru"},
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/de.json b/MediaBrowser.Server.Implementations/Localization/Server/de.json
index c5fc62bed..05e6e7202 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/de.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/de.json
@@ -63,14 +63,14 @@
     "HeaderPlaybackSettings": "Wiedergabe Einstellungen",
     "LabelAudioLanguagePreference": "Audiosprache Einstellungen:",
     "LabelSubtitleLanguagePreference": "Untertitelsprache Einstellungen:",
-    "OptionDefaultSubtitles": "Default",
+    "OptionDefaultSubtitles": "Standard",
     "OptionOnlyForcedSubtitles": "Only forced subtitles",
-    "OptionAlwaysPlaySubtitles": "Always play subtitles",
+    "OptionAlwaysPlaySubtitles": "Untertitel immer anzeigen",
     "OptionNoSubtitles": "Keine Untertitel",
     "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.",
+    "OptionNoSubtitlesHelp": "Untertitel wird standardm\u00e4\u00dfig nicht geladen.",
     "TabProfiles": "Profile",
     "TabSecurity": "Sicherheit",
     "ButtonAddUser": "User hinzuf\u00fcgen",
@@ -295,13 +295,13 @@
     "PasswordLocalhostMessage": "Passw\u00f6rter werden nich gebraucht, wenn Sie sich vom Localhost aus einloggen.",
     "TabGuide": "Programm",
     "TabChannels": "Kan\u00e4le",
-    "TabCollections": "Collections",
+    "TabCollections": "Sammlungen",
     "HeaderChannels": "Kan\u00e4le",
     "TabRecordings": "Aufnahmen",
     "TabScheduled": "Geplant",
     "TabSeries": "Serie",
-    "TabFavorites": "Favorites",
-    "TabMyLibrary": "My Library",
+    "TabFavorites": "Favoriten",
+    "TabMyLibrary": "Meine Bibliothek",
     "ButtonCancelRecording": "Aufnahme abbrechen",
     "HeaderPrePostPadding": "Pufferzeit vor\/nach der Aufnahme",
     "LabelPrePaddingMinutes": "Minuten vor der Aufnahme",
@@ -470,7 +470,7 @@
     "LabelMinResumePercentageHelp": "Titel werden als nicht abgespielt angenommen, wenn sie vor dieser Zeit gestoppt werden",
     "LabelMaxResumePercentageHelp": "Titel werden als komplett abgespielt angenommen, wenn sie nach dieser Zeit gestoppt werden",
     "LabelMinResumeDurationHelp": "Titel k\u00fcrzer als dies werden nicht fortsetzbar sein",
-    "TitleAutoOrganize": "Auto-Organize",
+    "TitleAutoOrganize": "automatische Sortierung",
     "TabActivityLog": "Aktivit\u00e4tsverlauf",
     "HeaderName": "Name",
     "HeaderDate": "Datum",
@@ -481,7 +481,7 @@
     "LabelCompleted": "Fertiggestellt",
     "LabelFailed": "Gescheitert",
     "LabelSkipped": "\u00dcbersprungen",
-    "HeaderEpisodeOrganization": "Episode Organization",
+    "HeaderEpisodeOrganization": "Episodensortierung",
     "LabelSeries": "Serien:",
     "LabelSeasonNumber": "Staffelnummer",
     "LabelEpisodeNumber": "Episodennummer",
@@ -494,7 +494,7 @@
     "DonationNextStep": "Sobald abgeschlossen, kehren Sie bitte hierher zur\u00fcck und tragen Sie den Unterst\u00fctzerschl\u00fcssel ein, den Sie per E-Mail erhalten haben.",
     "AutoOrganizeHelp": "Auto-organize monitors your download folders for new files and moves them to your media directories.",
     "AutoOrganizeTvHelp": "TV Dateien Organisation wird nur Episoden zu bereits vorhandenen Serien hinzuf\u00fcgen. Es werden keine neuen Serien angelegt.",
-    "OptionEnableEpisodeOrganization": "Enable new episode organization",
+    "OptionEnableEpisodeOrganization": "Aktiviere die Sortierung neuer Episoden",
     "LabelWatchFolder": "\u00dcberwachungsordner:",
     "LabelWatchFolderHelp": "Der Server wird diesen Ordner, w\u00e4hrend des geplanten Tasks \"Organisiere neue Mediendateien\", abfragen.",
     "ButtonViewScheduledTasks": "Zeige Geplante Aufgaben",
@@ -573,7 +573,7 @@
     "HeaderRequireManualLoginHelp": "Wenn deaktiviert k\u00f6nnen Clients einen Loginbildschirm mit einer visuellen Auswahl der User anzeigen.",
     "OptionOtherApps": "Andere Apps",
     "OptionMobileApps": "Mobile Apps",
-    "HeaderNotificationList": "Click on a notification to configure it's sending options.",
+    "HeaderNotificationList": "Klicke auf eine Benachrichtigung um die Benachrichtigungseinstellungen zu bearbeiten",
     "NotificationOptionApplicationUpdateAvailable": "Anwendungsaktualisierung verf\u00fcgbar",
     "NotificationOptionApplicationUpdateInstalled": "Anwendungsaktualisierung installiert",
     "NotificationOptionPluginUpdateInstalled": "Pluginaktualisierung installiert",
@@ -588,7 +588,7 @@
     "NotificationOptionTaskFailed": "Scheduled task failure",
     "NotificationOptionInstallationFailed": "Installationsfehler",
     "NotificationOptionNewLibraryContent": "Neuer Inhalt hinzugef\u00fcgt",
-    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "NotificationOptionNewLibraryContentMultiple": "Neuen Inhalte hinzugef\u00fcgt (mehrere)",
     "SendNotificationHelp": "By default, notifications are delivered to the dashboard inbox. Browse the plugin catalog to install additional notification options.",
     "NotificationOptionServerRestartRequired": "Serverneustart notwendig",
     "LabelNotificationEnabled": "Aktiviere diese Benachrichtigung",
@@ -721,11 +721,11 @@
     "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:",
+    "HeaderDownloadSubtitlesFor": "Lade Untertitel runter f\u00fcr",
     "MessageNoChapterProviders": "Install a chapter provider plugin such as ChapterDb to enable additional chapter options.",
-    "LabelSkipIfGraphicalSubsPresent": "Skip if the video already contains graphical subtitles",
+    "LabelSkipIfGraphicalSubsPresent": "\u00dcberspringen, falls das Video bereits grafische Untertitel enth\u00e4lt",
     "LabelSkipIfGraphicalSubsPresentHelp": "Keeping text versions of subtitles will result in more efficient delivery to mobile clients.",
-    "TabSubtitles": "Subtitles",
+    "TabSubtitles": "Untertitel",
     "TabChapters": "Chapters",
     "HeaderDownloadChaptersFor": "Download chapter names for:",
     "LabelOpenSubtitlesUsername": "Open Subtitles username:",
@@ -734,33 +734,33 @@
     "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",
+    "ButtonRegister": "Registrierung",
+    "LabelSkipIfAudioTrackPresent": "\u00dcberspringen, falls der Ton bereits der herunterladbaren Sprache entspricht",
     "LabelSkipIfAudioTrackPresentHelp": "Uncheck this to ensure all videos have subtitles, regardless of audio language.",
-    "HeaderSendMessage": "Send Message",
-    "ButtonSend": "Send",
-    "LabelMessageText": "Message text:",
-    "MessageNoAvailablePlugins": "No available plugins.",
+    "HeaderSendMessage": "sende Nachricht",
+    "ButtonSend": "senden",
+    "LabelMessageText": "Inhalt der Nachricht",
+    "MessageNoAvailablePlugins": "Keine verf\u00fcgbaren Erweiterungen.",
     "LabelDisplayPluginsFor": "Display plugins for:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "TabOtherPlugins": "Others",
-    "LabelEpisodeName": "Episode name",
-    "LabelSeriesName": "Series name",
+    "TabOtherPlugins": "Andere",
+    "LabelEpisodeName": "Episodentitel",
+    "LabelSeriesName": "Serientitel",
     "ValueSeriesNamePeriod": "Series.name",
     "ValueSeriesNameUnderscore": "Series_name",
-    "ValueEpisodeNamePeriod": "Episode.name",
+    "ValueEpisodeNamePeriod": "Episodentitel",
     "ValueEpisodeNameUnderscore": "Episode_name",
     "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",
+    "TabDisplay": "Anzeige",
+    "TabLanguages": "Sprachen",
+    "TabWebClient": "Webclient",
+    "LabelEnableThemeSongs": "Aktiviere Titelmelodie",
     "LabelEnableBackdrops": "Aktiviere Backdrops",
-    "LabelEnableThemeSongsHelp": "If enabled, theme songs will be played in the background while browsing the library.",
+    "LabelEnableThemeSongsHelp": "Wenn aktiviert, wird die Titelmusik w\u00e4hrend dem Durchsuchen durch die Bibliothek im Hintergrund abgespielt",
     "LabelEnableBackdropsHelp": "If enabled, backdrops will be displayed in the background of some pages while browsing the library.",
     "HeaderHomePage": "Home Page",
     "HeaderSettingsForThisDevice": "Einstellungen f\u00fcr dieses Ger\u00e4t",
@@ -775,13 +775,13 @@
     "OptionMyViews": "My views",
     "OptionMyViewsSmall": "My views (small)",
     "OptionResumablemedia": "Resume",
-    "OptionLatestMedia": "Latest media",
+    "OptionLatestMedia": "Neuste Medien",
     "OptionLatestChannelMedia": "Latest channel items",
     "HeaderLatestChannelItems": "Latest Channel Items",
     "OptionNone": "None",
-    "HeaderLiveTv": "Live TV",
+    "HeaderLiveTv": "Live Fernsehn",
     "HeaderReports": "Meldungen",
-    "HeaderMetadataManager": "Metadata Manager",
+    "HeaderMetadataManager": "Metadaten-Manager",
     "HeaderPreferences": "Einstellungen",
     "MessageLoadingChannels": "Lade Channel Inhalt...",
     "ButtonMarkRead": "Als gelesen markieren",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/es.json b/MediaBrowser.Server.Implementations/Localization/Server/es.json
index 9811cb951..125693f34 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/es.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es.json
@@ -770,14 +770,14 @@
     "LabelHomePageSection1": "Secci\u00f3n uno de la p\u00e1gina de inicio:",
     "LabelHomePageSection2": "Secci\u00f3n dos de la p\u00e1gina de inicio:",
     "LabelHomePageSection3": "Secci\u00f3n tres de la p\u00e1gina de inicio:",
-    "LabelHomePageSection4": "Home page section four:",
-    "OptionMyViewsButtons": "My views (buttons)",
-    "OptionMyViews": "My views",
-    "OptionMyViewsSmall": "My views (small)",
+    "LabelHomePageSection4": "Secci\u00f3n cuarta de la p\u00e1gina de inicio",
+    "OptionMyViewsButtons": "Mis vistas (botones)",
+    "OptionMyViews": "Mis vistas",
+    "OptionMyViewsSmall": "Mis vistas (peque\u00f1o)",
     "OptionResumablemedia": "Continuar",
     "OptionLatestMedia": "\u00daltimos medios",
-    "OptionLatestChannelMedia": "Latest channel items",
-    "HeaderLatestChannelItems": "Latest Channel Items",
+    "OptionLatestChannelMedia": "Ultimos elementos de canales",
+    "HeaderLatestChannelItems": "Ultimos elementos de canales",
     "OptionNone": "Nada",
     "HeaderLiveTv": "TV en vivo",
     "HeaderReports": "Informes",
@@ -813,13 +813,13 @@
     "ViewTypeChannels": "Canales",
     "ViewTypeLiveTV": "Tv en vivo",
     "HeaderOtherDisplaySettings": "Configuraci\u00f3n de pantalla",
-    "HeaderMyViews": "My Views",
+    "HeaderMyViews": "Mis vistas",
     "LabelSelectFolderGroups": "Agrupar autom\u00e1ticamente las siguientes carpetas  en vistas tales como pel\u00edculas, m\u00fasica y televisi\u00f3n",
     "LabelSelectFolderGroupsHelp": "Las carpetas que no est\u00e9n marcadas se mostrar\u00e1n por s\u00ed mismas en su propia secci\u00f3n.",
     "OptionDisplayAdultContent": "Mostrar contenido para adultos",
     "OptionLibraryFolders": "Vista de carpeta",
-    "TitleRemoteControl": "Remote Control",
-    "OptionLatestTvRecordings": "Latest recordings",
-    "LabelProtocolInfo": "Protocol info:",
-    "LabelProtocolInfoHelp": "The value that will be used when responding to GetProtocolInfo requests from the device."
+    "TitleRemoteControl": "Control remoto",
+    "OptionLatestTvRecordings": "\u00daltimas grabaciones",
+    "LabelProtocolInfo": "Informaci\u00f3n de protocolo:",
+    "LabelProtocolInfoHelp": "El valor que se utilizar\u00e1 cuando se responde a una solicitud GetProtocolInfo desde el dispositivo."
 }
\ 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 407cd6ace..7ddd4c987 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
@@ -94,7 +94,7 @@
     "MessagePleaseEnsureInternetMetadata": "Por favor aseg\u00farese que la descarga de metadatos de internet esta habilitada.",
     "TabSuggested": "Sugerencias",
     "TabLatest": "Recientes",
-    "TabUpcoming": "Pr\u00f3ximo Estreno",
+    "TabUpcoming": "Por Estrenar",
     "TabShows": "Programas",
     "TabEpisodes": "Episodios",
     "TabGenres": "G\u00e9neros",
@@ -771,9 +771,9 @@
     "LabelHomePageSection2": "Pagina principal secci\u00f3n dos:",
     "LabelHomePageSection3": "Pagina principal secci\u00f3n tres:",
     "LabelHomePageSection4": "Pagina principal secci\u00f3n cuatro:",
-    "OptionMyViewsButtons": "My views (buttons)",
-    "OptionMyViews": "My views",
-    "OptionMyViewsSmall": "My views (small)",
+    "OptionMyViewsButtons": "Mis vistas (botones)",
+    "OptionMyViews": "Mis vistas",
+    "OptionMyViewsSmall": "Mis vistas (peque\u00f1o)",
     "OptionResumablemedia": "Reanudar",
     "OptionLatestMedia": "Agregados recientemente",
     "OptionLatestChannelMedia": "Elementos recientes de canales",
@@ -820,6 +820,6 @@
     "OptionLibraryFolders": "Carpetas de medios",
     "TitleRemoteControl": "Control Remoto",
     "OptionLatestTvRecordings": "\u00daltimas grabaciones",
-    "LabelProtocolInfo": "Protocol info:",
-    "LabelProtocolInfoHelp": "The value that will be used when responding to GetProtocolInfo requests from the device."
+    "LabelProtocolInfo": "Informaci\u00f3n del protocolo:",
+    "LabelProtocolInfoHelp": "El valor que ser\u00e1 utilizado cuando se responde a solicitudes GetProtocolInfo desde el dispositivo."
 }
\ 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 299868a54..69f75dd94 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/fr.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
@@ -772,8 +772,8 @@
     "LabelHomePageSection3": "Section 3 de la page de d\u00e9marrage:",
     "LabelHomePageSection4": "Section 4 de la page de d\u00e9marrage:",
     "OptionMyViewsButtons": "My views (buttons)",
-    "OptionMyViews": "My views",
-    "OptionMyViewsSmall": "My views (small)",
+    "OptionMyViews": "Mes vues",
+    "OptionMyViewsSmall": "Mes vues (petit)",
     "OptionResumablemedia": "Reprendre",
     "OptionLatestMedia": "Les plus r\u00e9cents",
     "OptionLatestChannelMedia": "Items de cha\u00eene les plus r\u00e9cents",
@@ -820,6 +820,6 @@
     "OptionLibraryFolders": "R\u00e9pertoires de m\u00e9dias",
     "TitleRemoteControl": "Acc\u00e8s \u00e0 distance",
     "OptionLatestTvRecordings": "Les plus r\u00e9cents enregistrements",
-    "LabelProtocolInfo": "Protocol info:",
+    "LabelProtocolInfo": "Infos sur le protocol:",
     "LabelProtocolInfoHelp": "The value that will be used when responding to GetProtocolInfo requests from the device."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pl.json b/MediaBrowser.Server.Implementations/Localization/Server/pl.json
new file mode 100644
index 000000000..4970fdccc
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pl.json
@@ -0,0 +1,825 @@
+{
+    "LabelExit": "Wyj\u015b\u0107",
+    "LabelVisitCommunity": "Odwied\u017a spo\u0142eczno\u015b\u0107",
+    "LabelGithubWiki": "Wiki Github",
+    "LabelSwagger": "Swagger",
+    "LabelStandard": "Standardowy",
+    "LabelViewApiDocumentation": "Zobacz dokumentacj\u0119 Api",
+    "LabelBrowseLibrary": "Przejrzyj bibliotek\u0119",
+    "LabelConfigureMediaBrowser": "Skonfiguruj Media Browser",
+    "LabelOpenLibraryViewer": "Otw\u00f3rz przegl\u0105dark\u0119 biblioteki",
+    "LabelRestartServer": "Uruchom serwer ponownie",
+    "LabelShowLogWindow": "Show Log Window",
+    "LabelPrevious": "Wstecz",
+    "LabelFinish": "Koniec",
+    "LabelNext": "Dalej",
+    "LabelYoureDone": "Sko\u0144czy\u0142e\u015b!",
+    "WelcomeToMediaBrowser": "Witaj w Media Browser!",
+    "TitleMediaBrowser": "Media Browser",
+    "ThisWizardWillGuideYou": "Asystent pomo\u017ce Ci podczas instalacji. Na pocz\u0105tku, wybierz tw\u00f3j preferowany j\u0119zyk.",
+    "TellUsAboutYourself": "Opowiedz nam o sobie",
+    "LabelYourFirstName": "Twoje imi\u0119:",
+    "MoreUsersCanBeAddedLater": "Mo\u017cesz doda\u0107 wi\u0119cej u\u017cytkownik\u00f3w p\u00f3\u017aniej przez tablic\u0119 rozdzielcz\u0105.",
+    "UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
+    "LabelWindowsService": "Serwis Windows",
+    "AWindowsServiceHasBeenInstalled": "Serwis Windows zosta\u0142 zainstalowany.",
+    "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": "To wszystko na teraz. Media Browser zacz\u0105\u0142 zbiera\u0107 informacje o twojej bibliotece. Zapoznaj si\u0119 z aplikacjami po czym kliknij <b>Koniec<\/b> \u017ceby zobaczy\u0107 <b>Tablic\u0119 rozdzielcz\u0105<\/b>.",
+    "LabelConfigureSettings": "Skonfiguruj ustawienia",
+    "LabelEnableVideoImageExtraction": "Enable video image extraction",
+    "VideoImageExtractionHelp": "Dla filmik\u00f3w kt\u00f3re nie maj\u0105 jeszcze obraz\u00f3w i dla kt\u00f3rych nie mo\u017cemy \u017cadnych znale\u017a\u0107 na internecie. Zwi\u0119kszy to czas wst\u0119pnego skanowania biblioteki ale wynikiem b\u0119dzie \u0142adniejsza prezentacja.",
+    "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": "Anuluj",
+    "ButtonNew": "New",
+    "HeaderSetupLibrary": "Ustaw swoj\u0105 bibliotek\u0119",
+    "ButtonAddMediaFolder": "Dodaj folder",
+    "LabelFolderType": "Typ folderu:",
+    "MediaFolderHelpPluginRequired": "* Wymaga u\u017cycia wtyczki tak jak GameBrowser lub MB Bookshelf.",
+    "ReferToMediaLibraryWiki": "Odnie\u015b si\u0119 do wiki biblioteki.",
+    "LabelCountry": "Kraj:",
+    "LabelLanguage": "J\u0119zyk:",
+    "HeaderPreferredMetadataLanguage": "Preferowany j\u0119zyk metadanych:",
+    "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": "Preferencje",
+    "TabPassword": "Has\u0142o",
+    "TabLibraryAccess": "Dost\u0119p do biblioteki",
+    "TabImage": "Obraz",
+    "TabProfile": "Profil",
+    "TabMetadata": "Metadata",
+    "TabImages": "Images",
+    "TabNotifications": "Notifications",
+    "TabCollectionTitles": "Titles",
+    "LabelDisplayMissingEpisodesWithinSeasons": "Wy\u015bwietl brakuj\u0105ce odcinki w sezonach",
+    "LabelUnairedMissingEpisodesWithinSeasons": "Wy\u015bwietl nie wydanie odcinki w sezonach",
+    "HeaderVideoPlaybackSettings": "Ustawienia odtwarzania wideo",
+    "HeaderPlaybackSettings": "Playback Settings",
+    "LabelAudioLanguagePreference": "Preferencje j\u0119zyka audio:",
+    "LabelSubtitleLanguagePreference": "Preferencje j\u0119zyka napis\u00f3w:",
+    "OptionDefaultSubtitles": "Default",
+    "OptionOnlyForcedSubtitles": "Only forced subtitles",
+    "OptionAlwaysPlaySubtitles": "Always play subtitles",
+    "OptionNoSubtitles": "No Subtitles",
+    "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": "Profile",
+    "TabSecurity": "Zabezpieczenie",
+    "ButtonAddUser": "Dodaj u\u017cytkownika",
+    "ButtonSave": "Zapisz",
+    "ButtonResetPassword": "Zresetuj has\u0142o",
+    "LabelNewPassword": "Nowe has\u0142o:",
+    "LabelNewPasswordConfirm": "Potwierd\u017a nowe has\u0142o:",
+    "HeaderCreatePassword": "Stw\u00f3rz has\u0142o:",
+    "LabelCurrentPassword": "Bie\u017c\u0105ce has\u0142o:",
+    "LabelMaxParentalRating": "Maksymalna dozwolona ocena rodzicielska:",
+    "MaxParentalRatingHelp": "Zawarto\u015b\u0107 z wy\u017csz\u0105 ocen\u0105 b\u0119dzie schowana dla tego u\u017cytkownika.",
+    "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": "Usu\u0144 obrazek",
+    "LabelSelectUsers": "Select users:",
+    "ButtonUpload": "Wy\u015blij",
+    "HeaderUploadNewImage": "Wy\u015blij nowy obrazek",
+    "LabelDropImageHere": "Wrzu\u0107 obrazek tutaj",
+    "ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG\/PNG only.",
+    "MessageNothingHere": "Nic tutaj nie ma.",
+    "MessagePleaseEnsureInternetMetadata": "Upewnij si\u0119 \u017ce pobieranie metadanych z internetu jest w\u0142\u0105czone.",
+    "TabSuggested": "Sugerowane",
+    "TabLatest": "Ostatnie",
+    "TabUpcoming": "Upcoming",
+    "TabShows": "Seriale",
+    "TabEpisodes": "Odcinki",
+    "TabGenres": "Rodzaje",
+    "TabPeople": "Osoby",
+    "TabNetworks": "Sieci",
+    "HeaderUsers": "U\u017cytkownicy",
+    "HeaderFilters": "Filtry:",
+    "ButtonFilter": "Filtr",
+    "OptionFavorite": "Ulubione",
+    "OptionLikes": "Likes",
+    "OptionDislikes": "Dislikes",
+    "OptionActors": "Aktorzy",
+    "OptionGuestStars": "Guest Stars",
+    "OptionDirectors": "Dyrektorzy",
+    "OptionWriters": "Pisarze",
+    "OptionProducers": "Producenci",
+    "HeaderResume": "Wzn\u00f3w",
+    "HeaderNextUp": "Next Up",
+    "NoNextUpItemsMessage": "Nie znaleziono \u017cadnego. Zacznij ogl\u0105da\u0107 Twoje seriale!",
+    "HeaderLatestEpisodes": "Ostanie odcinki",
+    "HeaderPersonTypes": "Person Types:",
+    "TabSongs": "Utwory",
+    "TabAlbums": "Albumy",
+    "TabArtists": "Arty\u015bci",
+    "TabAlbumArtists": "Arty\u015bci albumu",
+    "TabMusicVideos": "Teledyski",
+    "ButtonSort": "Sortuj",
+    "HeaderSortBy": "Sortuj wed\u0142ug:",
+    "HeaderSortOrder": "Kolejno\u015b\u0107 sortowania:",
+    "OptionPlayed": "Played",
+    "OptionUnplayed": "Unplayed",
+    "OptionAscending": "Rosn\u0105co",
+    "OptionDescending": "Malej\u0105co",
+    "OptionRuntime": "D\u0142ugo\u015b\u0107 filmu",
+    "OptionReleaseDate": "Data wydania",
+    "OptionPlayCount": "Ilo\u015b\u0107 odtworze\u0144",
+    "OptionDatePlayed": "Data odtworzenia",
+    "OptionDateAdded": "Data dodania",
+    "OptionAlbumArtist": "Artysta albumu",
+    "OptionArtist": "Artysta",
+    "OptionAlbum": "Album",
+    "OptionTrackName": "Nazwa utworu",
+    "OptionCommunityRating": "Ocena spo\u0142eczno\u015bci",
+    "OptionNameSort": "Nazwa",
+    "OptionFolderSort": "Folders",
+    "OptionBudget": "Bud\u017cet",
+    "OptionRevenue": "Doch\u00f3d",
+    "OptionPoster": "Plakat",
+    "OptionBackdrop": "Backdrop",
+    "OptionTimeline": "Timeline",
+    "OptionThumb": "Thumb",
+    "OptionBanner": "Banner",
+    "OptionCriticRating": "Ocena krytyk\u00f3w",
+    "OptionVideoBitrate": "Video Bitrate",
+    "OptionResumable": "Resumable",
+    "ScheduledTasksHelp": "Click a task to adjust its schedule.",
+    "ScheduledTasksTitle": "Zaplanowane zadania",
+    "TabMyPlugins": "Moje wtyczki",
+    "TabCatalog": "Katalog",
+    "PluginsTitle": "Wtyczki",
+    "HeaderAutomaticUpdates": "Automatyczne aktualizacje",
+    "HeaderNowPlaying": "Now Playing",
+    "HeaderLatestAlbums": "Ostatnie albumy",
+    "HeaderLatestSongs": "Ostatnie utwory",
+    "HeaderRecentlyPlayed": "Ostatnio grane",
+    "HeaderFrequentlyPlayed": "Cz\u0119sto grane",
+    "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": "Type widea",
+    "OptionBluray": "Bluray",
+    "OptionDvd": "Dvd",
+    "OptionIso": "Iso",
+    "Option3D": "3D",
+    "LabelFeatures": "W\u0142a\u015bciwo\u015bci",
+    "LabelService": "Service:",
+    "LabelStatus": "Status:",
+    "LabelVersion": "Version:",
+    "LabelLastResult": "Last result:",
+    "OptionHasSubtitles": "Napisy",
+    "OptionHasTrailer": "Zwiastun",
+    "OptionHasThemeSong": "Theme Song",
+    "OptionHasThemeVideo": "Theme Video",
+    "TabMovies": "Filmy",
+    "TabStudios": "Studia",
+    "TabTrailers": "Zwiastuny",
+    "HeaderLatestMovies": "Ostatnie filmy",
+    "HeaderLatestTrailers": "Ostatnie zwiastuny",
+    "OptionHasSpecialFeatures": "Special Features",
+    "OptionImdbRating": "Ocena IMDb",
+    "OptionParentalRating": "Ocena rodzicielska",
+    "OptionPremiereDate": "Data premiery",
+    "TabBasic": "Podstawowe",
+    "TabAdvanced": "Zaawansowane",
+    "HeaderStatus": "Status",
+    "OptionContinuing": "Continuing",
+    "OptionEnded": "Ended",
+    "HeaderAirDays": "Air Days:",
+    "OptionSunday": "Niedziela",
+    "OptionMonday": "Poniedzia\u0142ek",
+    "OptionTuesday": "Wtorek",
+    "OptionWednesday": "\u015aroda",
+    "OptionThursday": "Czwartek",
+    "OptionFriday": "Pi\u0105tek",
+    "OptionSaturday": "Sobota",
+    "HeaderManagement": "Management:",
+    "OptionMissingImdbId": "Brakuje Id IMDb",
+    "OptionMissingTvdbId": "Brakuje Id TheTVDB",
+    "OptionMissingOverview": "Missing Overview",
+    "OptionFileMetadataYearMismatch": "File\/Metadata Years Mismatched",
+    "TabGeneral": "Og\u00f3lne",
+    "TitleSupport": "Wesprzyj",
+    "TabLog": "Log",
+    "TabAbout": "A propos",
+    "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": "Odwied\u017a spo\u0142eczno\u015b\u0107",
+    "VisitMediaBrowserWebsite": "Odwied\u017a stron\u0119 Media Browser",
+    "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": "Oficjalne wydanie",
+    "OptionBeta": "Beta",
+    "OptionDev": "Dev (Niestabilne)",
+    "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 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.",
+    "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 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.",
+    "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\/Plex\/Xbmc",
+    "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",
+    "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.",
+    "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:",
+    "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",
+    "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",
+    "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",
+    "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",
+    "OptionSpecialFeatures": "Special Features",
+    "HeaderCollections": "Collections",
+    "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": "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.",
+    "HeaderContainerProfile": "Container Profile",
+    "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.",
+    "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.",
+    "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:",
+    "MessageNoAvailablePlugins": "No available plugins.",
+    "LabelDisplayPluginsFor": "Display plugins for:",
+    "PluginTabMediaBrowserClassic": "MB Classic",
+    "PluginTabMediaBrowserTheater": "MB Theater",
+    "TabOtherPlugins": "Others",
+    "LabelEpisodeName": "Episode name",
+    "LabelSeriesName": "Series name",
+    "ValueSeriesNamePeriod": "Series.name",
+    "ValueSeriesNameUnderscore": "Series_name",
+    "ValueEpisodeNamePeriod": "Episode.name",
+    "ValueEpisodeNameUnderscore": "Episode_name",
+    "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."
+}
\ 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 31282dfee..9dbd946fe 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
@@ -770,10 +770,10 @@
     "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 inicio",
-    "OptionMyViewsButtons": "My views (buttons)",
-    "OptionMyViews": "My views",
-    "OptionMyViewsSmall": "My views (small)",
+    "LabelHomePageSection4": "Se\u00e7\u00e3o quatro da tela de in\u00edcio",
+    "OptionMyViewsButtons": "Minhas visualiza\u00e7\u00f5es (bot\u00f5es)",
+    "OptionMyViews": "Minhas visualiza\u00e7\u00f5es",
+    "OptionMyViewsSmall": "Minhas visualiza\u00e7\u00f5es (pequeno)",
     "OptionResumablemedia": "Retomar",
     "OptionLatestMedia": "M\u00eddias recentes",
     "OptionLatestChannelMedia": "Itens recentes de canal",
@@ -820,6 +820,6 @@
     "OptionLibraryFolders": "Pastas de m\u00eddias",
     "TitleRemoteControl": "Controle Remoto",
     "OptionLatestTvRecordings": "\u00daltimas grava\u00e7\u00f5es",
-    "LabelProtocolInfo": "Protocol info:",
-    "LabelProtocolInfoHelp": "The value that will be used when responding to GetProtocolInfo requests from the device."
+    "LabelProtocolInfo": "Informa\u00e7\u00e3o do protocolo:",
+    "LabelProtocolInfoHelp": "O valor que ser\u00e1 usado ao responder os pedidos GetProtocolInfo do dispositivo."
 }
\ 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 203454e3f..e92a23417 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ru.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
@@ -491,7 +491,7 @@
     "LabelSupportAmount": "\u0421\u0443\u043c\u043c\u0430 (USD)",
     "HeaderSupportTheTeamHelp": "\u041f\u043e\u043c\u043e\u0433\u0438\u0442\u0435 \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0438\u0442\u044c \u0434\u0430\u043b\u044c\u043d\u0435\u0439\u0448\u0435\u0435 \u0440\u0430\u0437\u0432\u0438\u0442\u0438\u0435 \u044d\u0442\u043e\u0433\u043e \u043f\u0440\u043e\u0435\u043a\u0442\u0430 \u043f\u0443\u0442\u0451\u043c \u0434\u0430\u0440\u0435\u043d\u0438\u044f. \u041d\u0435\u043a\u043e\u0442\u043e\u0440\u0430\u044f \u0447\u0430\u0441\u0442\u044c \u0432\u0441\u0435\u0445 \u043f\u043e\u0436\u0435\u0440\u0442\u0432\u043e\u0432\u0430\u043d\u0438\u0439 \u0431\u0443\u0434\u0435\u0442 \u0432\u043b\u043e\u0436\u0435\u043d\u0430 \u0432 \u0434\u0440\u0443\u0433\u043e\u0435 \u043e\u0442\u043a\u0440\u044b\u0442\u043e\u0435 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u043d\u043e\u0435 \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0435\u043d\u0438\u0435, \u043a\u043e\u0442\u043e\u0440\u043e\u0435 \u043d\u0430\u043c \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e.",
     "ButtonEnterSupporterKey": "\u0412\u0432\u0435\u0441\u0442\u0438 \u043a\u043b\u044e\u0447 \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u0430",
-    "DonationNextStep": "\u041f\u043e\u0441\u043b\u0435 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u0438\u044f \u0432\u0435\u0440\u043d\u0438\u0442\u0435\u0441\u044c, \u0438 \u0432\u0432\u0435\u0434\u0438\u0442\u0435 \u043a\u043b\u044e\u0447 \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u0430, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u0435 \u043f\u043e \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u0435.",
+    "DonationNextStep": "\u041f\u043e\u0441\u043b\u0435 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u0438\u044f \u0432\u0435\u0440\u043d\u0438\u0442\u0435\u0441\u044c, \u0438 \u0432\u0432\u0435\u0434\u0438\u0442\u0435 \u043a\u043b\u044e\u0447 \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u0430, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u0435 \u043f\u043e \u042d-\u043f\u043e\u0447\u0442\u0435.",
     "AutoOrganizeHelp": "\u041f\u0440\u0438 \u0430\u0432\u0442\u043e\u0440\u0435\u043e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u0438 \u043e\u0442\u0441\u043b\u0435\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f \u043f\u0430\u043f\u043a\u0430, \u043a\u0443\u0434\u0430 \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u044e\u0442\u0441\u044f \u043d\u043e\u0432\u044b\u0435 \u0444\u0430\u0439\u043b\u044b, \u0430 \u0437\u0430\u0442\u0435\u043c \u0442\u0435 \u0431\u0443\u0434\u0443\u0442 \u043f\u0435\u0440\u0435\u043d\u0435\u0441\u0435\u043d\u044b \u0432 \u0432\u0430\u0448\u0438 \u043c\u0435\u0434\u0438\u0430\u043f\u0430\u043f\u043a\u0438.",
     "AutoOrganizeTvHelp": "\u041f\u0440\u0438 \u0440\u0435\u043e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u0438 \u0422\u0412 \u0444\u0430\u0439\u043b\u043e\u0432 \u044d\u043f\u0438\u0437\u043e\u0434\u044b \u0431\u0443\u0434\u0443\u0442 \u0434\u043e\u0431\u0430\u0432\u043b\u044f\u0442\u044c\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e \u0432 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0435 \u0441\u0435\u0440\u0438\u0430\u043b\u044b. \u041d\u043e\u0432\u044b\u0435 \u043f\u0430\u043f\u043a\u0438 \u0441\u0435\u0440\u0438\u0430\u043b\u043e\u0432 \u043d\u0435 \u0431\u0443\u0434\u0443\u0442 \u0441\u043e\u0437\u0434\u0430\u043d\u044b.",
     "OptionEnableEpisodeOrganization": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0440\u0435\u043e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u044e \u043d\u043e\u0432\u044b\u0445 \u044d\u043f\u0438\u0437\u043e\u0434\u043e\u0432",
@@ -532,7 +532,7 @@
     "NewServerVersionAvailable": "\u0414\u043e\u0441\u0442\u0443\u043f\u043d\u0430 \u043d\u043e\u0432\u0430\u044f \u0432\u0435\u0440\u0441\u0438\u044f Media Browser Server!",
     "ServerUpToDate": "Media Browser Server - \u043e\u0431\u043d\u043e\u0432\u043b\u0451\u043d",
     "ErrorConnectingToMediaBrowserRepository": "\u041f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430 \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f \u043a \u0443\u0434\u0430\u043b\u0451\u043d\u043d\u043e\u043c\u0443 \u0440\u0435\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u0438\u044e Media Browser.",
-    "LabelComponentsUpdated": "\u0411\u044b\u043b\u0438 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u044b \u0438\u043b\u0438 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u044b \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u044b :",
+    "LabelComponentsUpdated": "\u0411\u044b\u043b\u0438 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u044b \u0438\u043b\u0438 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u044b \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u044b:",
     "MessagePleaseRestartServerToFinishUpdating": "\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u0435 \u0441\u0435\u0440\u0432\u0435\u0440, \u0447\u0442\u043e\u0431\u044b \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c \u043f\u0440\u0438\u043c\u0435\u043d\u0435\u043d\u0438\u0435 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0439.",
     "LabelDownMixAudioScale": "\u0423\u0441\u0438\u043b\u0435\u043d\u0438\u0435 \u043f\u0440\u0438 \u043f\u043e\u043d\u0438\u0436\u0430\u044e\u0449\u0435\u043c \u043c\u0438\u043a\u0448\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0438:",
     "LabelDownMixAudioScaleHelp": "\u0423\u0441\u0438\u043b\u0435\u043d\u0438\u0435 \u0437\u0432\u0443\u043a\u0430 \u043f\u0440\u0438 \u043f\u043e\u043d\u0438\u0436\u0430\u044e\u0449\u0435\u043c \u043c\u0438\u043a\u0448\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0438. \u0412\u0432\u0435\u0434\u0438\u0442\u0435 1, \u0447\u0442\u043e\u0431\u044b \u0441\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u043e\u0440\u0438\u0433\u0438\u043d\u0430\u043b\u044c\u043d\u043e\u0433\u043e \u0443\u0440\u043e\u0432\u043d\u044f.",
@@ -541,13 +541,13 @@
     "LabelNewSupporterKey": "\u041d\u043e\u0432\u044b\u0439 \u043a\u043b\u044e\u0447 \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u0430",
     "HeaderMultipleKeyLinking": "\u0421\u0432\u044f\u0437\u044b\u0432\u0430\u043d\u0438\u0435 \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u0438\u0445 \u043a\u043b\u044e\u0447\u0435\u0439",
     "MultipleKeyLinkingHelp": "\u0415\u0441\u043b\u0438 \u0438\u043c\u0435\u0435\u0442\u0441\u044f \u0431\u043e\u043b\u0435\u0435 \u0447\u0435\u043c \u043e\u0434\u0438\u043d \u043a\u043b\u044e\u0447 \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u0430, \u0432\u043e\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435\u0441\u044c \u044d\u0442\u043e\u0439 \u0444\u043e\u0440\u043c\u043e\u0439, \u0447\u0442\u043e\u0431\u044b \u0441\u0432\u044f\u0437\u0430\u0442\u044c \u0441\u0442\u0430\u0440\u044b\u0435 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u043a\u043b\u044e\u0447\u0435\u0439 \u0441 \u043d\u043e\u0432\u043e\u0439.",
-    "LabelCurrentEmailAddress": "\u0422\u0435\u043a\u0443\u0449\u0438\u0439 \u0430\u0434\u0440\u0435\u0441 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b",
-    "LabelCurrentEmailAddressHelp": "\u0422\u0435\u043a\u0443\u0449\u0438\u0439 \u0430\u0434\u0440\u0435\u0441 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b, \u043d\u0430 \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0431\u044b\u043b \u043e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d \u043d\u043e\u0432\u044b\u0439 \u043a\u043b\u044e\u0447.",
+    "LabelCurrentEmailAddress": "\u0422\u0435\u043a\u0443\u0449\u0438\u0439 \u0430\u0434\u0440\u0435\u0441 \u042d-\u043f\u043e\u0447\u0442\u044b",
+    "LabelCurrentEmailAddressHelp": "\u0422\u0435\u043a\u0443\u0449\u0438\u0439 \u0430\u0434\u0440\u0435\u0441 \u042d-\u043f\u043e\u0447\u0442\u044b, \u043d\u0430 \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0431\u044b\u043b \u043e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d \u043d\u043e\u0432\u044b\u0439 \u043a\u043b\u044e\u0447.",
     "HeaderForgotKey": "\u041a\u043b\u044e\u0447 \u0431\u044b\u043b \u0437\u0430\u0431\u044b\u0442",
-    "LabelEmailAddress": "\u0410\u0434\u0440\u0435\u0441 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b",
-    "LabelSupporterEmailAddress": "\u0410\u0434\u0440\u0435\u0441 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0431\u044b\u043b \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d \u0434\u043b\u044f \u043f\u0440\u0438\u043e\u0431\u0440\u0435\u0442\u0435\u043d\u0438\u044f \u043a\u043b\u044e\u0447\u0430.",
+    "LabelEmailAddress": "\u0410\u0434\u0440\u0435\u0441 \u042d-\u043f\u043e\u0447\u0442\u044b",
+    "LabelSupporterEmailAddress": "\u0410\u0434\u0440\u0435\u0441 \u042d-\u043f\u043e\u0447\u0442\u044b, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0431\u044b\u043b \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d \u0434\u043b\u044f \u043f\u0440\u0438\u043e\u0431\u0440\u0435\u0442\u0435\u043d\u0438\u044f \u043a\u043b\u044e\u0447\u0430.",
     "ButtonRetrieveKey": "\u0412\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u043a\u043b\u044e\u0447",
-    "LabelSupporterKey": "\u041a\u043b\u044e\u0447 \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u0430 (\u0432\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0438\u0437 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b)",
+    "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.",
@@ -589,7 +589,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\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 \u0441\u0440\u0435\u0434\u0441\u0442\u0432\u0430 \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f.",
+    "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.",
     "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:",
@@ -778,7 +778,7 @@
     "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",
     "HeaderLatestChannelItems": "\u041d\u043e\u0432\u0438\u043d\u043a\u0438 \u043a\u0430\u043d\u0430\u043b\u043e\u0432",
-    "OptionNone": "\u041d\u0438\u043a\u0430\u043a\u043e\u0435",
+    "OptionNone": "\u041d\u0438\u0447\u0435\u0433\u043e",
     "HeaderLiveTv": "\u0422\u0412 \u044d\u0444\u0438\u0440",
     "HeaderReports": "\u041e\u0442\u0447\u0451\u0442\u044b",
     "HeaderMetadataManager": "\u0414\u0438\u0441\u043f\u0435\u0442\u0447\u0435\u0440 \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/sv.json b/MediaBrowser.Server.Implementations/Localization/Server/sv.json
index 8d14dbf8e..79f1f5826 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/sv.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/sv.json
@@ -771,9 +771,9 @@
     "LabelHomePageSection2": "Hemsk\u00e4rmens del 2:",
     "LabelHomePageSection3": "Hemsk\u00e4rmens del 3:",
     "LabelHomePageSection4": "Hemsidans del 4:",
-    "OptionMyViewsButtons": "My views (buttons)",
-    "OptionMyViews": "My views",
-    "OptionMyViewsSmall": "My views (small)",
+    "OptionMyViewsButtons": "Mina vyer (knappar)",
+    "OptionMyViews": "Mina vyer",
+    "OptionMyViewsSmall": "Mina vyer (liten)",
     "OptionResumablemedia": "\u00c5teruppta",
     "OptionLatestMedia": "Nytillkommet",
     "OptionLatestChannelMedia": "Senaste objekten i Kanaler",
@@ -820,6 +820,6 @@
     "OptionLibraryFolders": "Mappvy",
     "TitleRemoteControl": "Fj\u00e4rrkontroll",
     "OptionLatestTvRecordings": "Senaste inspelningar",
-    "LabelProtocolInfo": "Protocol info:",
-    "LabelProtocolInfoHelp": "The value that will be used when responding to GetProtocolInfo requests from the device."
+    "LabelProtocolInfo": "Protokollinfo:",
+    "LabelProtocolInfoHelp": "V\u00e4rde att anv\u00e4nda vid svar p\u00e5 GetProtocolInfo-beg\u00e4ran fr\u00e5n enheter."
 }
\ 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 c6a105e22..7410f6377 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -344,6 +344,8 @@
     <EmbeddedResource Include="Localization\JavaScript\vi.json" />
     <EmbeddedResource Include="Localization\Server\da.json" />
     <EmbeddedResource Include="Localization\Server\vi.json" />
+    <EmbeddedResource Include="Localization\JavaScript\pl.json" />
+    <EmbeddedResource Include="Localization\Server\pl.json" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 8007e0506..470786ba2 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -41,7 +41,6 @@ using MediaBrowser.Dlna.Main;
 using MediaBrowser.MediaEncoding.BdInfo;
 using MediaBrowser.MediaEncoding.Encoder;
 using MediaBrowser.MediaEncoding.Subtitles;
-using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.System;
@@ -288,17 +287,24 @@ namespace MediaBrowser.ServerApplication
 
         private void MigrateModularConfigurations()
         {
+            var saveConfig = false;
+
             if (ServerConfigurationManager.Configuration.DlnaOptions != null)
             {
                 ServerConfigurationManager.SaveConfiguration("dlna", ServerConfigurationManager.Configuration.DlnaOptions);
                 ServerConfigurationManager.Configuration.DlnaOptions = null;
-                ServerConfigurationManager.SaveConfiguration();
+                saveConfig = true;
             }
 
             if (ServerConfigurationManager.Configuration.ChapterOptions != null)
             {
                 ServerConfigurationManager.SaveConfiguration("chapters", ServerConfigurationManager.Configuration.ChapterOptions);
                 ServerConfigurationManager.Configuration.ChapterOptions = null;
+                saveConfig = true;
+            }
+
+            if (saveConfig)
+            {
                 ServerConfigurationManager.SaveConfiguration();
             }
         }
@@ -1088,10 +1094,12 @@ namespace MediaBrowser.ServerApplication
             var version = InstallationManager.GetLatestCompatibleVersion(availablePackages, "MBServer", null, ApplicationVersion,
                                                            ConfigurationManager.CommonConfiguration.SystemUpdateLevel);
 
-            HasUpdateAvailable = version != null && version.version >= ApplicationVersion;
+            var versionObject = version == null || string.IsNullOrWhiteSpace(version.versionStr) ? null : new Version(version.versionStr);
+
+            HasUpdateAvailable = versionObject != null && versionObject >= ApplicationVersion;
 
-            return version != null ? new CheckForUpdateResult { AvailableVersion = version.version, IsUpdateAvailable = version.version > ApplicationVersion, Package = version } :
-                       new CheckForUpdateResult { AvailableVersion = ApplicationVersion, IsUpdateAvailable = false };
+            return versionObject != null ? new CheckForUpdateResult { AvailableVersion = versionObject.ToString(), IsUpdateAvailable = versionObject > ApplicationVersion, Package = version } :
+                       new CheckForUpdateResult { AvailableVersion = ApplicationVersion.ToString(), IsUpdateAvailable = false };
         }
 
         /// <summary>
-- 
cgit v1.2.3


From c273f5fd9c33415a1fa985222e43c9c02f3d36e5 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 30 Jun 2014 15:24:35 -0400
Subject: fixes #860 - Add options to display channels directly within user
 views

---
 MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs            |  5 +++--
 MediaBrowser.Controller/Channels/Channel.cs                   |  2 +-
 MediaBrowser.Model/Configuration/UserConfiguration.cs         |  3 +++
 .../Library/UserViewManager.cs                                | 11 +++++++++--
 .../Localization/Server/server.json                           |  4 +++-
 5 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
index b5b6849ce..bde2c5694 100644
--- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
@@ -335,8 +335,9 @@ namespace MediaBrowser.Api.Playback.Hls
                 var newBitrate = totalBitrate - variation;
                 AppendPlaylist(builder, playlistUrl.Replace(requestedVideoBitrate.ToString(UsCulture), (requestedVideoBitrate - variation).ToString(UsCulture)), newBitrate);
 
-                newBitrate = totalBitrate - (2 * variation);
-                AppendPlaylist(builder, playlistUrl.Replace(requestedVideoBitrate.ToString(UsCulture), (requestedVideoBitrate - (2 * variation)).ToString(UsCulture)), newBitrate);
+                variation *= 2;
+                newBitrate = totalBitrate - variation;
+                AppendPlaylist(builder, playlistUrl.Replace(requestedVideoBitrate.ToString(UsCulture), (requestedVideoBitrate - variation).ToString(UsCulture)), newBitrate);
             }
 
             return builder.ToString();
diff --git a/MediaBrowser.Controller/Channels/Channel.cs b/MediaBrowser.Controller/Channels/Channel.cs
index 3d9d0d381..df38259b4 100644
--- a/MediaBrowser.Controller/Channels/Channel.cs
+++ b/MediaBrowser.Controller/Channels/Channel.cs
@@ -4,7 +4,7 @@ using System.Linq;
 
 namespace MediaBrowser.Controller.Channels
 {
-    public class Channel : BaseItem
+    public class Channel : Folder
     {
         public string OriginalChannelName { get; set; }
 
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 94a41bdda..84ce2747a 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -65,6 +65,8 @@ namespace MediaBrowser.Model.Configuration
         public string[] BlockedMediaFolders { get; set; }
         public string[] BlockedChannels { get; set; }
 
+        public string[] DisplayChannelsWithinViews { get; set; }
+        
         public string[] ExcludeFoldersFromGrouping { get; set; }
 
         public UnratedItem[] BlockUnratedItems { get; set; }
@@ -85,6 +87,7 @@ namespace MediaBrowser.Model.Configuration
             EnableLiveTvAccess = true;
 
             BlockedMediaFolders = new string[] { };
+            DisplayChannelsWithinViews = new string[] { };
             BlockedChannels = new string[] { };
             BlockUnratedItems = new UnratedItem[] { };
 
diff --git a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
index fc4b9eb4c..9ac82690b 100644
--- a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
@@ -90,12 +90,19 @@ namespace MediaBrowser.Server.Implementations.Library
             {
                 var channelResult = await _channelManager.GetChannels(new ChannelQuery
                 {
-                    Limit = 0,
                     UserId = query.UserId
 
                 }, cancellationToken).ConfigureAwait(false);
 
-                if (channelResult.TotalRecordCount > 0)
+                var channels = channelResult.Items;
+
+                var embeddedChannels = channels
+                    .Where(i => user.Configuration.DisplayChannelsWithinViews.Contains(i.Id))
+                    .ToList();
+
+                list.AddRange(embeddedChannels.Select(i => _channelManager.GetChannel(i.Id)));
+
+                if (channels.Length > embeddedChannels.Count)
                 {
                     list.Add(await _channelManager.GetInternalChannelFolder(query.UserId, cancellationToken).ConfigureAwait(false));
                 }
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 9063ebc4b..4a3d93d1e 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -846,5 +846,7 @@
 	"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."
+	"LabelXbmcMetadataEnablePathSubstitutionHelp2": "See path substitution.",
+	"LabelGroupChannelsIntoViews": "Display the following channels 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."
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 43943657b7ea0c607f998c6397d3878e3fb05c5f Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 1 Jul 2014 00:06:28 -0400
Subject: add additional view settings

---
 .../Collections/ICollectionManager.cs              |  7 ++++
 MediaBrowser.Controller/Entities/BaseItem.cs       |  5 +++
 MediaBrowser.Controller/Entities/Folder.cs         |  5 ++-
 .../Configuration/NotificationOptions.cs           | 10 ++---
 .../Configuration/UserConfiguration.cs             |  3 ++
 MediaBrowser.Model/Dlna/DeviceProfile.cs           | 10 ++---
 MediaBrowser.Model/Dlna/StreamBuilder.cs           | 43 ++++++++++++++++++----
 MediaBrowser.Model/Dlna/StreamInfo.cs              | 22 ++++++++---
 MediaBrowser.Model/Extensions/StringHelper.cs      | 11 ++++++
 MediaBrowser.Model/Notifications/Notification.cs   |  5 ---
 .../Collections/CollectionManager.cs               | 11 ++++--
 .../Collections/ManualCollectionsFolder.cs         |  5 +++
 .../Library/UserViewManager.cs                     | 17 +++++----
 13 files changed, 114 insertions(+), 40 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Controller/Collections/ICollectionManager.cs b/MediaBrowser.Controller/Collections/ICollectionManager.cs
index b63c49f99..fdb2a4975 100644
--- a/MediaBrowser.Controller/Collections/ICollectionManager.cs
+++ b/MediaBrowser.Controller/Collections/ICollectionManager.cs
@@ -38,5 +38,12 @@ namespace MediaBrowser.Controller.Collections
         /// <param name="user">The user.</param>
         /// <returns>IEnumerable{BaseItem}.</returns>
         IEnumerable<BaseItem> CollapseItemsWithinBoxSets(IEnumerable<BaseItem> items, User user);
+
+        /// <summary>
+        /// Gets the collections folder.
+        /// </summary>
+        /// <param name="userId">The user identifier.</param>
+        /// <returns>Folder.</returns>
+        Folder GetCollectionsFolder(string userId);
     }
 }
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index a2ff1b4fd..524d7097b 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -134,6 +134,11 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
+        public virtual bool IsHiddenFromUser(User user)
+        {
+            return false;
+        }
+
         [IgnoreDataMember]
         public virtual bool IsOwnedItem
         {
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index f503a5ff4..e54e72cd8 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -809,7 +809,10 @@ namespace MediaBrowser.Controller.Entities
                 {
                     if (filter == null || filter(child))
                     {
-                        list.Add(child);
+                        if (!child.IsHiddenFromUser(user))
+                        {
+                            list.Add(child);
+                        }
                     }
 
                     if (recursive && child.IsFolder)
diff --git a/MediaBrowser.Model/Configuration/NotificationOptions.cs b/MediaBrowser.Model/Configuration/NotificationOptions.cs
index 5aac1652f..dd523d947 100644
--- a/MediaBrowser.Model/Configuration/NotificationOptions.cs
+++ b/MediaBrowser.Model/Configuration/NotificationOptions.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using MediaBrowser.Model.Extensions;
+using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.Configuration
 {
@@ -90,7 +88,7 @@ namespace MediaBrowser.Model.Configuration
             NotificationOption opt = GetOptions(notificationType);
 
             return opt == null ||
-                   !opt.DisabledServices.Contains(service, StringComparer.OrdinalIgnoreCase);
+                   !ListHelper.ContainsIgnoreCase(opt.DisabledServices, service);
         }
 
         public bool IsEnabledToMonitorUser(string type, string userId)
@@ -98,7 +96,7 @@ namespace MediaBrowser.Model.Configuration
             NotificationOption opt = GetOptions(type);
 
             return opt != null && opt.Enabled &&
-                   !opt.DisabledMonitorUsers.Contains(userId, StringComparer.OrdinalIgnoreCase);
+                   !ListHelper.ContainsIgnoreCase(opt.DisabledMonitorUsers, userId);
         }
 
         public bool IsEnabledToSendToUser(string type, string userId, UserConfiguration userConfig)
@@ -117,7 +115,7 @@ namespace MediaBrowser.Model.Configuration
                     return true;
                 }
 
-                return opt.SendToUsers.Contains(userId, StringComparer.OrdinalIgnoreCase);
+                return ListHelper.ContainsIgnoreCase(opt.SendToUsers, userId);
             }
 
             return false;
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 84ce2747a..24a41863e 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -72,6 +72,7 @@ namespace MediaBrowser.Model.Configuration
         public UnratedItem[] BlockUnratedItems { get; set; }
 
         public SubtitlePlaybackMode SubtitleMode { get; set; }
+        public bool DisplayCollectionsView { get; set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="UserConfiguration" /> class.
@@ -92,6 +93,8 @@ namespace MediaBrowser.Model.Configuration
             BlockUnratedItems = new UnratedItem[] { };
 
             ExcludeFoldersFromGrouping = new string[] { };
+
+            DisplayCollectionsView = true;
         }
     }
 }
diff --git a/MediaBrowser.Model/Dlna/DeviceProfile.cs b/MediaBrowser.Model/Dlna/DeviceProfile.cs
index 807e04427..deaa30714 100644
--- a/MediaBrowser.Model/Dlna/DeviceProfile.cs
+++ b/MediaBrowser.Model/Dlna/DeviceProfile.cs
@@ -115,7 +115,7 @@ namespace MediaBrowser.Model.Dlna
 
         public TranscodingProfile GetAudioTranscodingProfile(string container, string audioCodec)
         {
-            container = (container ?? string.Empty).TrimStart('.');
+            container = StringHelper.TrimStart((container ?? string.Empty), '.');
 
             foreach (var i in TranscodingProfiles)
             {
@@ -141,7 +141,7 @@ namespace MediaBrowser.Model.Dlna
 
         public TranscodingProfile GetVideoTranscodingProfile(string container, string audioCodec, string videoCodec)
         {
-            container = (container ?? string.Empty).TrimStart('.');
+            container = StringHelper.TrimStart((container ?? string.Empty), '.');
 
             foreach (var i in TranscodingProfiles)
             {
@@ -172,7 +172,7 @@ namespace MediaBrowser.Model.Dlna
 
         public ResponseProfile GetAudioMediaProfile(string container, string audioCodec, int? audioChannels, int? audioBitrate)
         {
-            container = (container ?? string.Empty).TrimStart('.');
+            container = StringHelper.TrimStart((container ?? string.Empty), '.');
 
             foreach (var i in ResponseProfiles)
             {
@@ -217,7 +217,7 @@ namespace MediaBrowser.Model.Dlna
 
         public ResponseProfile GetImageMediaProfile(string container, int? width, int? height)
         {
-            container = (container ?? string.Empty).TrimStart('.');
+            container = StringHelper.TrimStart((container ?? string.Empty), '.');
 
             foreach (var i in ResponseProfiles)
             {
@@ -270,7 +270,7 @@ namespace MediaBrowser.Model.Dlna
             TransportStreamTimestamp timestamp,
             bool? isAnamorphic)
         {
-            container = (container ?? string.Empty).TrimStart('.');
+            container = StringHelper.TrimStart((container ?? string.Empty), '.');
 
             foreach (var i in ResponseProfiles)
             {
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 877570844..8aadd428f 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -136,7 +136,12 @@ namespace MediaBrowser.Model.Dlna
                         foreach (CodecProfile i in options.Profile.CodecProfiles)
                         {
                             if (i.Type == CodecType.Audio && i.ContainsCodec(audioCodec))
-                                conditions.AddRange(i.Conditions);
+                            {
+                                foreach (var c in i.Conditions)
+                                {
+                                    conditions.Add(c);
+                                }
+                            }
                         }
 
                         int? audioChannels = audioStream.Channels;
@@ -195,7 +200,12 @@ namespace MediaBrowser.Model.Dlna
 
                 List<ProfileCondition> audioTranscodingConditions = new List<ProfileCondition>();
                 foreach (CodecProfile i in audioCodecProfiles)
-                        audioTranscodingConditions.AddRange(i.Conditions);
+                {
+                    foreach (var c in i.Conditions)
+                    {
+                        audioTranscodingConditions.Add(c);
+                    }
+                }
 
                 ApplyTranscodingConditions(playlistItem, audioTranscodingConditions);
 
@@ -276,7 +286,10 @@ namespace MediaBrowser.Model.Dlna
                 {
                     if (i.Type == CodecType.Video && i.ContainsCodec(transcodingProfile.VideoCodec))
                     {
-                        videoTranscodingConditions.AddRange(i.Conditions);
+                        foreach (var c in i.Conditions)
+                        {
+                            videoTranscodingConditions.Add(c);
+                        }
                         break;
                     }
                 }
@@ -287,7 +300,10 @@ namespace MediaBrowser.Model.Dlna
                 {
                     if (i.Type == CodecType.VideoAudio && i.ContainsCodec(transcodingProfile.AudioCodec))
                     {
-                        audioTranscodingConditions.AddRange(i.Conditions);
+                        foreach (var c in i.Conditions)
+                        {
+                            audioTranscodingConditions.Add(c);
+                        }
                         break;
                     }
                 }
@@ -363,7 +379,10 @@ namespace MediaBrowser.Model.Dlna
                 if (i.Type == DlnaProfileType.Video &&
                     ListHelper.ContainsIgnoreCase(i.GetContainers(), container))
                 {
-                    conditions.AddRange(i.Conditions);
+                    foreach (var c in i.Conditions)
+                    {
+                        conditions.Add(c);
+                    }
                 }
             }
 
@@ -405,7 +424,12 @@ namespace MediaBrowser.Model.Dlna
             foreach (CodecProfile i in profile.CodecProfiles)
             {
                 if (i.Type == CodecType.Video && i.ContainsCodec(videoCodec))
-                    conditions.AddRange(i.Conditions);
+                {
+                    foreach (var c in i.Conditions)
+                    {
+                        conditions.Add(c);
+                    }
+                }
             }
 
             foreach (ProfileCondition i in conditions)
@@ -429,7 +453,12 @@ namespace MediaBrowser.Model.Dlna
                 foreach (CodecProfile i in profile.CodecProfiles)
                 {
                     if (i.Type == CodecType.VideoAudio && i.ContainsCodec(audioCodec))
-                        conditions.AddRange(i.Conditions);
+                    {
+                        foreach (var c in i.Conditions)
+                        {
+                            conditions.Add(c);
+                        }
+                    }
                 }
 
                 foreach (ProfileCondition i in conditions)
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index 8d507ae37..b8c256b25 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -305,8 +305,14 @@ namespace MediaBrowser.Model.Dlna
                 {
                     int? totalBitrate = TargetTotalBitrate;
 
+                    double totalSeconds = RunTimeTicks.Value;
+                    // Convert to ms
+                    totalSeconds /= 10000;
+                    // Convert to seconds
+                    totalSeconds /= 1000;
+
                     return totalBitrate.HasValue ?
-                        Convert.ToInt64(totalBitrate.Value * TimeSpan.FromTicks(RunTimeTicks.Value).TotalSeconds) :
+                        Convert.ToInt64(totalBitrate.Value * totalSeconds) :
                         (long?)null;
                 }
 
@@ -375,11 +381,14 @@ namespace MediaBrowser.Model.Dlna
                         Height = videoStream.Height.Value
                     };
 
+                    double? maxWidth = MaxWidth.HasValue ? (double)MaxWidth.Value : (double?)null;
+                    double? maxHeight = MaxHeight.HasValue ? (double)MaxHeight.Value : (double?)null;
+
                     ImageSize newSize = DrawingUtils.Resize(size,
                         null,
                         null,
-                        MaxWidth,
-                        MaxHeight);
+                        maxWidth,
+                        maxHeight);
 
                     return Convert.ToInt32(newSize.Width);
                 }
@@ -402,11 +411,14 @@ namespace MediaBrowser.Model.Dlna
                         Height = videoStream.Height.Value
                     };
 
+                    double? maxWidth = MaxWidth.HasValue ? (double)MaxWidth.Value : (double?)null;
+                    double? maxHeight = MaxHeight.HasValue ? (double)MaxHeight.Value : (double?)null;
+
                     ImageSize newSize = DrawingUtils.Resize(size,
                         null,
                         null,
-                        MaxWidth,
-                        MaxHeight);
+                        maxWidth,
+                        maxHeight);
 
                     return Convert.ToInt32(newSize.Height);
                 }
diff --git a/MediaBrowser.Model/Extensions/StringHelper.cs b/MediaBrowser.Model/Extensions/StringHelper.cs
index 1c086655f..2eae56cd4 100644
--- a/MediaBrowser.Model/Extensions/StringHelper.cs
+++ b/MediaBrowser.Model/Extensions/StringHelper.cs
@@ -59,5 +59,16 @@ namespace MediaBrowser.Model.Extensions
         {
             return val.ToString(CultureInfo.InvariantCulture);
         }
+
+        /// <summary>
+        /// Trims the start.
+        /// </summary>
+        /// <param name="str">The string.</param>
+        /// <param name="c">The c.</param>
+        /// <returns>System.String.</returns>
+        public static string TrimStart(string str, char c)
+        {
+            return str.TrimStart(c);
+        }
     }
 }
diff --git a/MediaBrowser.Model/Notifications/Notification.cs b/MediaBrowser.Model/Notifications/Notification.cs
index 731c3d303..5439b838d 100644
--- a/MediaBrowser.Model/Notifications/Notification.cs
+++ b/MediaBrowser.Model/Notifications/Notification.cs
@@ -19,10 +19,5 @@ namespace MediaBrowser.Model.Notifications
         public string Url { get; set; }
 
         public NotificationLevel Level { get; set; }
-
-        public Notification()
-        {
-            Date = DateTime.UtcNow;
-        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs b/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs
index a69f9e94b..d9323573d 100644
--- a/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs
+++ b/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs
@@ -4,13 +4,13 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
+using MoreLinq;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MoreLinq;
 
 namespace MediaBrowser.Server.Implementations.Collections
 {
@@ -27,6 +27,12 @@ namespace MediaBrowser.Server.Implementations.Collections
             _iLibraryMonitor = iLibraryMonitor;
         }
 
+        public Folder GetCollectionsFolder(string userId)
+        {
+            return _libraryManager.RootFolder.Children.Concat(_libraryManager.RootFolder.GetHiddenChildren()).OfType<ManualCollectionsFolder>()
+                .FirstOrDefault();
+        }
+
         public async Task<BoxSet> CreateCollection(CollectionCreationOptions options)
         {
             var name = options.Name;
@@ -104,8 +110,7 @@ namespace MediaBrowser.Server.Implementations.Collections
                 }
             }
 
-            return _libraryManager.RootFolder.Children.OfType<ManualCollectionsFolder>().FirstOrDefault() ??
-                _libraryManager.RootFolder.GetHiddenChildren().OfType<ManualCollectionsFolder>().FirstOrDefault();
+            return GetCollectionsFolder(string.Empty);
         }
 
         public async Task AddToCollection(Guid collectionId, IEnumerable<Guid> ids)
diff --git a/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs b/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs
index c58b9181b..03479d838 100644
--- a/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs
+++ b/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs
@@ -28,6 +28,11 @@ namespace MediaBrowser.Server.Implementations.Collections
             }
         }
 
+        public override bool IsHiddenFromUser(User user)
+        {
+            return true;
+        }
+
         public override string CollectionType
         {
             get { return Model.Entities.CollectionType.BoxSets; }
diff --git a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
index 9ac82690b..24e4f0ef4 100644
--- a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
@@ -62,28 +62,29 @@ namespace MediaBrowser.Server.Implementations.Library
 
             if (recursiveChildren.OfType<Series>().Any())
             {
-                list.Add(await GetUserView(CollectionType.TvShows, user, cancellationToken).ConfigureAwait(false));
+                list.Add(await GetUserView(CollectionType.TvShows, user, string.Empty, cancellationToken).ConfigureAwait(false));
             }
 
             if (recursiveChildren.OfType<MusicAlbum>().Any() ||
                 recursiveChildren.OfType<MusicVideo>().Any())
             {
-                list.Add(await GetUserView(CollectionType.Music, user, cancellationToken).ConfigureAwait(false));
+                list.Add(await GetUserView(CollectionType.Music, user, string.Empty, cancellationToken).ConfigureAwait(false));
             }
 
             if (recursiveChildren.OfType<Movie>().Any())
             {
-                list.Add(await GetUserView(CollectionType.Movies, user, cancellationToken).ConfigureAwait(false));
+                list.Add(await GetUserView(CollectionType.Movies, user, string.Empty, cancellationToken).ConfigureAwait(false));
             }
 
             if (recursiveChildren.OfType<Game>().Any())
             {
-                list.Add(await GetUserView(CollectionType.Games, user, cancellationToken).ConfigureAwait(false));
+                list.Add(await GetUserView(CollectionType.Games, user, string.Empty, cancellationToken).ConfigureAwait(false));
             }
 
-            if (recursiveChildren.OfType<BoxSet>().Any())
+            if (user.Configuration.DisplayCollectionsView ||
+                recursiveChildren.OfType<BoxSet>().Any())
             {
-                list.Add(await GetUserView(CollectionType.BoxSets, user, cancellationToken).ConfigureAwait(false));
+                list.Add(await GetUserView(CollectionType.BoxSets, user, "zzz_" + CollectionType.BoxSets, cancellationToken).ConfigureAwait(false));
             }
 
             if (query.IncludeExternalContent)
@@ -116,11 +117,11 @@ namespace MediaBrowser.Server.Implementations.Library
             return list.OrderBy(i => i.SortName);
         }
 
-        private Task<UserView> GetUserView(string type, User user, CancellationToken cancellationToken)
+        private Task<UserView> GetUserView(string type, User user, string sortName, CancellationToken cancellationToken)
         {
             var name = _localizationManager.GetLocalizedString("ViewType" + type);
 
-            return _libraryManager.GetNamedView(name, type, string.Empty, cancellationToken);
+            return _libraryManager.GetNamedView(name, type, sortName, cancellationToken);
         }
     }
 }
-- 
cgit v1.2.3


From 3bef6ead9cec4c33d43b6348ae4fc33c9b70316a Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 1 Jul 2014 17:13:32 -0400
Subject: #514 - Support HLS seeking

---
 MediaBrowser.Api/BaseApiService.cs                 |  9 ++--
 .../DefaultTheme/DefaultThemeService.cs            |  2 +-
 MediaBrowser.Api/Playback/Hls/BaseHlsService.cs    | 63 ++++++++++++++++------
 MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs | 42 +++------------
 MediaBrowser.Api/Playback/Hls/VideoHlsService.cs   | 13 ++++-
 MediaBrowser.Api/SearchService.cs                  |  4 +-
 MediaBrowser.Api/SimilarItemsHelper.cs             |  4 +-
 MediaBrowser.Api/UserLibrary/UserLibraryService.cs |  3 +-
 MediaBrowser.Controller/Entities/Folder.cs         | 27 +---------
 MediaBrowser.Controller/Entities/UserView.cs       | 12 +++--
 MediaBrowser.Model/ApiClient/IApiClient.cs         |  7 +++
 .../Configuration/UserConfiguration.cs             |  2 -
 MediaBrowser.Model/Dto/StudioDto.cs                |  9 +++-
 .../Dto/DtoService.cs                              |  7 ++-
 .../Library/SearchEngine.cs                        |  2 +-
 .../Library/UserViewManager.cs                     |  5 +-
 16 files changed, 110 insertions(+), 101 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs
index 569e12530..f1d596213 100644
--- a/MediaBrowser.Api/BaseApiService.cs
+++ b/MediaBrowser.Api/BaseApiService.cs
@@ -159,7 +159,7 @@ namespace MediaBrowser.Api
             return libraryManager.GetPerson(DeSlugPersonName(name, libraryManager));
         }
 
-        protected IList<BaseItem> GetAllLibraryItems(Guid? userId, IUserManager userManager, ILibraryManager libraryManager, string parentId = null)
+        protected IEnumerable<BaseItem> GetAllLibraryItems(Guid? userId, IUserManager userManager, ILibraryManager libraryManager, string parentId = null)
         {
             if (!string.IsNullOrEmpty(parentId))
             {
@@ -169,7 +169,7 @@ namespace MediaBrowser.Api
                 {
                     var user = userManager.GetUserById(userId.Value);
 
-                    return folder.GetRecursiveChildren(user).ToList();
+                    return folder.GetRecursiveChildren(user);
                 }
 
                 return folder.GetRecursiveChildren();
@@ -178,7 +178,7 @@ namespace MediaBrowser.Api
             {
                 var user = userManager.GetUserById(userId.Value);
 
-                return userManager.GetUserById(userId.Value).RootFolder.GetRecursiveChildren(user, null);
+                return userManager.GetUserById(userId.Value).RootFolder.GetRecursiveChildren(user);
             }
 
             return libraryManager.RootFolder.GetRecursiveChildren();
@@ -239,7 +239,8 @@ namespace MediaBrowser.Api
                 return name;
             }
 
-            return libraryManager.RootFolder.GetRecursiveChildren(i => i is Game)
+            return libraryManager.RootFolder.GetRecursiveChildren()
+                .OfType<Game>()
                 .SelectMany(i => i.Genres)
                 .Distinct(StringComparer.OrdinalIgnoreCase)
                 .FirstOrDefault(i =>
diff --git a/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs b/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs
index 6acecd342..8bc867a2e 100644
--- a/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs
+++ b/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs
@@ -381,7 +381,7 @@ namespace MediaBrowser.Api.DefaultTheme
             var currentUser1 = user;
 
             var ownedEpisodes = series
-                .SelectMany(i => i.GetRecursiveChildren(currentUser1, j => j.LocationType != LocationType.Virtual))
+                .SelectMany(i => i.GetRecursiveChildren(currentUser1).Where(j => j.LocationType != LocationType.Virtual))
                 .OfType<Episode>()
                 .ToList();
 
diff --git a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
index 57c2244c7..fa78fa020 100644
--- a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
@@ -59,10 +59,11 @@ namespace MediaBrowser.Api.Playback.Hls
         /// Processes the request.
         /// </summary>
         /// <param name="request">The request.</param>
+        /// <param name="isLive">if set to <c>true</c> [is live].</param>
         /// <returns>System.Object.</returns>
-        protected object ProcessRequest(StreamRequest request)
+        protected object ProcessRequest(StreamRequest request, bool isLive)
         {
-            return ProcessRequestAsync(request).Result;
+            return ProcessRequestAsync(request, isLive).Result;
         }
 
         private static readonly SemaphoreSlim FfmpegStartLock = new SemaphoreSlim(1, 1);
@@ -70,13 +71,12 @@ namespace MediaBrowser.Api.Playback.Hls
         /// Processes the request async.
         /// </summary>
         /// <param name="request">The request.</param>
+        /// <param name="isLive">if set to <c>true</c> [is live].</param>
         /// <returns>Task{System.Object}.</returns>
-        /// <exception cref="ArgumentException">
-        /// A video bitrate is required
+        /// <exception cref="ArgumentException">A video bitrate is required
         /// or
-        /// An audio bitrate is required
-        /// </exception>
-        private async Task<object> ProcessRequestAsync(StreamRequest request)
+        /// An audio bitrate is required</exception>
+        private async Task<object> ProcessRequestAsync(StreamRequest request, bool isLive)
         {
             var cancellationTokenSource = new CancellationTokenSource();
 
@@ -110,7 +110,8 @@ namespace MediaBrowser.Api.Playback.Hls
                             throw;
                         }
 
-                        await WaitForMinimumSegmentCount(playlist, GetSegmentWait(), cancellationTokenSource.Token).ConfigureAwait(false);
+                        var waitCount = isLive ? 1 : GetSegmentWait();
+                        await WaitForMinimumSegmentCount(playlist, waitCount, cancellationTokenSource.Token).ConfigureAwait(false);
                     }
                 }
                 finally
@@ -119,6 +120,22 @@ namespace MediaBrowser.Api.Playback.Hls
                 }
             }
 
+            if (isLive)
+            {
+                //var file = request.PlaylistId + Path.GetExtension(Request.PathInfo);
+
+                //file = Path.Combine(ServerConfigurationManager.ApplicationPaths.TranscodingTempPath, file);
+
+                try
+                {
+                    return ResultFactory.GetStaticFileResult(Request, playlist, FileShare.ReadWrite);
+                }
+                finally
+                {
+                    ApiEntryPoint.Instance.OnTranscodeEndRequest(playlist, TranscodingJobType.Hls);
+                }
+            }
+
             var audioBitrate = state.OutputAudioBitrate ?? 0;
             var videoBitrate = state.OutputVideoBitrate ?? 0;
 
@@ -188,16 +205,18 @@ namespace MediaBrowser.Api.Playback.Hls
 
         protected async Task WaitForMinimumSegmentCount(string playlist, int segmentCount, CancellationToken cancellationToken)
         {
-            var count = 0;
+            Logger.Debug("Waiting for {0} segments in {1}", segmentCount, playlist);
 
-            // Need to use FileShare.ReadWrite because we're reading the file at the same time it's being written
-            using (var fileStream = FileSystem.GetFileStream(playlist, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, true))
+            while (true)
             {
-                using (var reader = new StreamReader(fileStream))
+                // Need to use FileShare.ReadWrite because we're reading the file at the same time it's being written
+                using (var fileStream = FileSystem.GetFileStream(playlist, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, true))
                 {
-                    while (true)
+                    using (var reader = new StreamReader(fileStream))
                     {
-                        if (!reader.EndOfStream)
+                        var count = 0;
+
+                        while (!reader.EndOfStream)
                         {
                             var line = await reader.ReadLineAsync().ConfigureAwait(false);
 
@@ -206,11 +225,12 @@ namespace MediaBrowser.Api.Playback.Hls
                                 count++;
                                 if (count >= segmentCount)
                                 {
+                                    Logger.Debug("Finished waiting for {0} segments in {1}", segmentCount, playlist);
                                     return;
                                 }
                             }
                         }
-                        await Task.Delay(25, cancellationToken).ConfigureAwait(false);
+                        await Task.Delay(100, cancellationToken).ConfigureAwait(false);
                     }
                 }
             }
@@ -229,7 +249,7 @@ namespace MediaBrowser.Api.Playback.Hls
             
             var itsOffsetMs = hlsVideoRequest == null
                                        ? 0
-                                       : ((GetHlsVideoStream)state.VideoRequest).TimeStampOffsetMs;
+                                       : hlsVideoRequest.TimeStampOffsetMs;
 
             var itsOffset = itsOffsetMs == 0 ? string.Empty : string.Format("-itsoffset {0} ", TimeSpan.FromMilliseconds(itsOffsetMs).TotalSeconds.ToString(UsCulture));
 
@@ -240,7 +260,15 @@ namespace MediaBrowser.Api.Playback.Hls
             // If isEncoding is true we're actually starting ffmpeg
             var startNumberParam = isEncoding ? GetStartNumber(state).ToString(UsCulture) : "0";
 
-            var args = string.Format("{0} {1} -i {2} -map_metadata -1 -threads {3} {4} {5} -sc_threshold 0 {6} -hls_time {7} -start_number {8} -hls_list_size {9} -y \"{10}\"",
+            var baseUrlParam = string.Empty;
+
+            if (state.Request is GetLiveHlsStream)
+            {
+                baseUrlParam = string.Format(" -hls_base_url \"{0}/\"",
+                    "hls/" + Path.GetFileNameWithoutExtension(outputPath));
+            }
+
+            var args = string.Format("{0} {1} -i {2} -map_metadata -1 -threads {3} {4} {5} -sc_threshold 0 {6} -hls_time {7} -start_number {8} -hls_list_size {9}{10} -y \"{11}\"",
                 itsOffset,
                 inputModifier,
                 GetInputArgument(state),
@@ -251,6 +279,7 @@ namespace MediaBrowser.Api.Playback.Hls
                 state.SegmentLength.ToString(UsCulture),
                 startNumberParam,
                 state.HlsListSize.ToString(UsCulture),
+                baseUrlParam,
                 outputPath
                 ).Trim();
 
diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
index bde2c5694..5bb610686 100644
--- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
@@ -22,11 +22,6 @@ namespace MediaBrowser.Api.Playback.Hls
     [Api(Description = "Gets a video stream using HTTP live streaming.")]
     public class GetMasterHlsVideoStream : VideoStreamRequest
     {
-        [ApiMember(Name = "BaselineStreamAudioBitRate", Description = "Optional. Specify the audio bitrate for the baseline stream.", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
-        public int? BaselineStreamAudioBitRate { get; set; }
-
-        [ApiMember(Name = "AppendBaselineStream", Description = "Optional. Whether or not to include a baseline audio-only stream in the master playlist.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
-        public bool AppendBaselineStream { get; set; }
     }
 
     [Route("/Videos/{Id}/main.m3u8", "GET")]
@@ -35,12 +30,6 @@ namespace MediaBrowser.Api.Playback.Hls
     {
     }
 
-    [Route("/Videos/{Id}/baseline.m3u8", "GET")]
-    [Api(Description = "Gets a video stream using HTTP live streaming.")]
-    public class GetBaselineHlsVideoStream : VideoStreamRequest
-    {
-    }
-
     /// <summary>
     /// Class GetHlsVideoSegment
     /// </summary>
@@ -73,16 +62,11 @@ namespace MediaBrowser.Api.Playback.Hls
 
         public object Get(GetDynamicHlsVideoSegment request)
         {
-            if (string.Equals("baseline", request.PlaylistId, StringComparison.OrdinalIgnoreCase))
-            {
-                return GetDynamicSegment(request, false).Result;
-            }
-
-            return GetDynamicSegment(request, true).Result;
+            return GetDynamicSegment(request).Result;
         }
 
         private static readonly SemaphoreSlim FfmpegStartLock = new SemaphoreSlim(1, 1);
-        private async Task<object> GetDynamicSegment(GetDynamicHlsVideoSegment request, bool isMain)
+        private async Task<object> GetDynamicSegment(GetDynamicHlsVideoSegment request)
         {
             if ((request.StartTimeTicks ?? 0) > 0)
             {
@@ -322,7 +306,9 @@ namespace MediaBrowser.Api.Playback.Hls
             var queryString = queryStringIndex == -1 ? string.Empty : Request.RawUrl.Substring(queryStringIndex);
 
             // Main stream
-            var playlistUrl = "main.m3u8" + queryString;
+            var playlistUrl = (state.RunTimeTicks ?? 0) > 0 ? "main.m3u8" : "live.m3u8";
+            playlistUrl += queryString;
+
             AppendPlaylist(builder, playlistUrl, totalBitrate);
 
             if (state.VideoRequest.VideoBitRate.HasValue)
@@ -385,13 +371,6 @@ namespace MediaBrowser.Api.Playback.Hls
             return result;
         }
 
-        public object Get(GetBaselineHlsVideoStream request)
-        {
-            var result = GetPlaylistAsync(request, "baseline").Result;
-
-            return result;
-        }
-
         private async Task<object> GetPlaylistAsync(VideoStreamRequest request, string name)
         {
             var state = await GetState(request, CancellationToken.None).ConfigureAwait(false);
@@ -506,14 +485,6 @@ namespace MediaBrowser.Api.Playback.Hls
         /// <returns>System.String.</returns>
         protected override string GetCommandLineArguments(string outputPath, StreamState state, bool isEncoding)
         {
-            var hlsVideoRequest = state.VideoRequest as GetHlsVideoStream;
-
-            var itsOffsetMs = hlsVideoRequest == null
-                                       ? 0
-                                       : ((GetHlsVideoStream)state.VideoRequest).TimeStampOffsetMs;
-
-            var itsOffset = itsOffsetMs == 0 ? string.Empty : string.Format("-itsoffset {0} ", TimeSpan.FromMilliseconds(itsOffsetMs).TotalSeconds.ToString(UsCulture));
-
             var threads = GetNumberOfThreads(state, false);
 
             var inputModifier = GetInputModifier(state);
@@ -521,8 +492,7 @@ namespace MediaBrowser.Api.Playback.Hls
             // If isEncoding is true we're actually starting ffmpeg
             var startNumberParam = isEncoding ? GetStartNumber(state).ToString(UsCulture) : "0";
 
-            var args = string.Format("{0} {1} -i {2} -map_metadata -1 -threads {3} {4} {5} -flags -global_header {6} -hls_time {7} -start_number {8} -hls_list_size {9} -y \"{10}\"",
-                itsOffset,
+            var args = string.Format("{0} -i {1} -map_metadata -1 -threads {2} {3} {4} -flags -global_header {5} -hls_time {6} -start_number {7} -hls_list_size {8} -y \"{9}\"",
                 inputModifier,
                 GetInputArgument(state),
                 threads,
diff --git a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
index 1a925378b..28c0219fc 100644
--- a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
@@ -32,6 +32,12 @@ namespace MediaBrowser.Api.Playback.Hls
         public int TimeStampOffsetMs { get; set; }
     }
 
+    [Route("/Videos/{Id}/live.m3u8", "GET")]
+    [Api(Description = "Gets a video stream using HTTP live streaming.")]
+    public class GetLiveHlsStream : VideoStreamRequest
+    {
+    }
+    
     /// <summary>
     /// Class GetHlsVideoSegment
     /// </summary>
@@ -105,7 +111,12 @@ namespace MediaBrowser.Api.Playback.Hls
         /// <returns>System.Object.</returns>
         public object Get(GetHlsVideoStream request)
         {
-            return ProcessRequest(request);
+            return ProcessRequest(request, false);
+        }
+
+        public object Get(GetLiveHlsStream request)
+        {
+            return ProcessRequest(request, true);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Api/SearchService.cs b/MediaBrowser.Api/SearchService.cs
index 9fcbe39eb..e72edcc98 100644
--- a/MediaBrowser.Api/SearchService.cs
+++ b/MediaBrowser.Api/SearchService.cs
@@ -192,14 +192,14 @@ namespace MediaBrowser.Api
             {
                 result.Series = season.Series.Name;
 
-                result.EpisodeCount = season.GetRecursiveChildren(i => i is Episode).Count;
+                result.EpisodeCount = season.GetRecursiveChildren().Count(i => i is Episode);
             }
 
             var series = item as Series;
 
             if (series != null)
             {
-                result.EpisodeCount = series.GetRecursiveChildren(i => i is Episode).Count;
+                result.EpisodeCount = series.GetRecursiveChildren().Count(i => i is Episode);
             }
 
             var album = item as MusicAlbum;
diff --git a/MediaBrowser.Api/SimilarItemsHelper.cs b/MediaBrowser.Api/SimilarItemsHelper.cs
index 660b55f30..2da29928b 100644
--- a/MediaBrowser.Api/SimilarItemsHelper.cs
+++ b/MediaBrowser.Api/SimilarItemsHelper.cs
@@ -78,8 +78,8 @@ namespace MediaBrowser.Api
             var fields = request.GetItemFields().ToList();
 
             var inputItems = user == null
-                                 ? libraryManager.RootFolder.GetRecursiveChildren(i => i.Id != item.Id)
-                                 : user.RootFolder.GetRecursiveChildren(user, i => i.Id != item.Id);
+                                 ? libraryManager.RootFolder.GetRecursiveChildren().Where(i => i.Id != item.Id)
+                                 : user.RootFolder.GetRecursiveChildren(user).Where(i => i.Id != item.Id);
 
             var items = GetSimilaritems(item, inputItems.Where(includeInSearch), getSimilarityScore)
                 .ToList();
diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
index 96bbd6dff..a1625d052 100644
--- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
@@ -541,7 +541,8 @@ namespace MediaBrowser.Api.UserLibrary
             if (series != null)
             {
                 var dtos = series
-                    .GetRecursiveChildren(i => i is Episode && i.ParentIndexNumber.HasValue && i.ParentIndexNumber.Value == 0)
+                    .GetRecursiveChildren()
+                    .Where(i => i is Episode && i.ParentIndexNumber.HasValue && i.ParentIndexNumber.Value == 0)
                     .OrderBy(i =>
                     {
                         if (i.PremiereDate.HasValue)
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index c712d50af..52c414ae8 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -856,19 +856,6 @@ namespace MediaBrowser.Controller.Entities
         /// <returns>IEnumerable{BaseItem}.</returns>
         /// <exception cref="System.ArgumentNullException"></exception>
         public IEnumerable<BaseItem> GetRecursiveChildren(User user, bool includeLinkedChildren = true)
-        {
-            return GetRecursiveChildren(user, null, includeLinkedChildren);
-        }
-
-        /// <summary>
-        /// Gets the recursive children.
-        /// </summary>
-        /// <param name="user">The user.</param>
-        /// <param name="filter">The filter.</param>
-        /// <param name="includeLinkedChildren">if set to <c>true</c> [include linked children].</param>
-        /// <returns>IList{BaseItem}.</returns>
-        /// <exception cref="System.ArgumentNullException"></exception>
-        public IList<BaseItem> GetRecursiveChildren(User user, Func<BaseItem, bool> filter, bool includeLinkedChildren = true)
         {
             if (user == null)
             {
@@ -877,7 +864,7 @@ namespace MediaBrowser.Controller.Entities
 
             var list = new List<BaseItem>();
 
-            var hasLinkedChildren = AddChildrenToList(user, includeLinkedChildren, list, true, filter);
+            var hasLinkedChildren = AddChildrenToList(user, includeLinkedChildren, list, true, null);
 
             return hasLinkedChildren ? list.DistinctBy(i => i.Id).ToList() : list;
         }
@@ -887,20 +874,10 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <returns>IList{BaseItem}.</returns>
         public IList<BaseItem> GetRecursiveChildren()
-        {
-            return GetRecursiveChildren(i => true);
-        }
-
-        /// <summary>
-        /// Gets the recursive children.
-        /// </summary>
-        /// <param name="filter">The filter.</param>
-        /// <returns>IEnumerable{BaseItem}.</returns>
-        public IList<BaseItem> GetRecursiveChildren(Func<BaseItem, bool> filter)
         {
             var list = new List<BaseItem>();
 
-            AddChildrenToList(list, true, filter);
+            AddChildrenToList(list, true, null);
 
             return list;
         }
diff --git a/MediaBrowser.Controller/Entities/UserView.cs b/MediaBrowser.Controller/Entities/UserView.cs
index ce188554c..86099fdc0 100644
--- a/MediaBrowser.Controller/Entities/UserView.cs
+++ b/MediaBrowser.Controller/Entities/UserView.cs
@@ -18,11 +18,17 @@ namespace MediaBrowser.Controller.Entities
             switch (ViewType)
             {
                 case CollectionType.Games:
-                    return mediaFolders.SelectMany(i => i.GetRecursiveChildren(user, includeLinkedChildren)).OfType<GameSystem>();
+                    return mediaFolders.SelectMany(i => i.GetRecursiveChildren(user, includeLinkedChildren))
+                        .OfType<GameSystem>();
                 case CollectionType.BoxSets:
-                    return mediaFolders.SelectMany(i => i.GetRecursiveChildren(user, includeLinkedChildren)).OfType<BoxSet>();
+                    return mediaFolders.SelectMany(i => i.GetRecursiveChildren(user, includeLinkedChildren))
+                        .OfType<BoxSet>();
                 case CollectionType.TvShows:
-                    return mediaFolders.SelectMany(i => i.GetRecursiveChildren(user, includeLinkedChildren)).OfType<Series>();
+                    return mediaFolders.SelectMany(i => i.GetRecursiveChildren(user, includeLinkedChildren))
+                        .OfType<Series>();
+                case CollectionType.Trailers:
+                    return mediaFolders.SelectMany(i => i.GetRecursiveChildren(user, includeLinkedChildren))
+                        .OfType<Trailer>();
                 default:
                     return mediaFolders.SelectMany(i => i.GetChildren(user, includeLinkedChildren));
             }
diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index 4f008571c..33c6f980c 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -217,6 +217,7 @@ namespace MediaBrowser.Model.ApiClient
         /// Gets the additional parts.
         /// </summary>
         /// <param name="itemId">The item identifier.</param>
+        /// <param name="userId">The user identifier.</param>
         /// <returns>Task{BaseItemDto[]}.</returns>
         Task<ItemsResult> GetAdditionalParts(string itemId, string userId);
         
@@ -241,6 +242,12 @@ namespace MediaBrowser.Model.ApiClient
         /// <returns>Task{SessionInfoDto[]}.</returns>
         Task<SessionInfoDto[]> GetClientSessionsAsync(SessionQuery query);
 
+        /// <summary>
+        /// Gets the client session asynchronous.
+        /// </summary>
+        /// <returns>Task{SessionInfoDto}.</returns>
+        Task<SessionInfoDto> GetCurrentSessionAsync();
+        
         /// <summary>
         /// Gets the item counts async.
         /// </summary>
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 24a41863e..0834452fb 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -93,8 +93,6 @@ namespace MediaBrowser.Model.Configuration
             BlockUnratedItems = new UnratedItem[] { };
 
             ExcludeFoldersFromGrouping = new string[] { };
-
-            DisplayCollectionsView = true;
         }
     }
 }
diff --git a/MediaBrowser.Model/Dto/StudioDto.cs b/MediaBrowser.Model/Dto/StudioDto.cs
index 4f21784fd..a0027cc4e 100644
--- a/MediaBrowser.Model/Dto/StudioDto.cs
+++ b/MediaBrowser.Model/Dto/StudioDto.cs
@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Runtime.Serialization;
 
@@ -17,6 +16,12 @@ namespace MediaBrowser.Model.Dto
         /// <value>The name.</value>
         public string Name { get; set; }
 
+        /// <summary>
+        /// Gets or sets the identifier.
+        /// </summary>
+        /// <value>The identifier.</value>
+        public string Id { get; set; }
+        
         /// <summary>
         /// Gets or sets the primary image tag.
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index 7f63dac33..73216ca33 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -328,7 +328,8 @@ namespace MediaBrowser.Server.Implementations.Dto
             if (!string.IsNullOrEmpty(item.Album))
             {
                 var parentAlbum = _libraryManager.RootFolder
-                    .GetRecursiveChildren(i => i is MusicAlbum)
+                    .GetRecursiveChildren()
+                    .Where(i => i is MusicAlbum)
                     .FirstOrDefault(i => string.Equals(i.Name, item.Album, StringComparison.OrdinalIgnoreCase));
 
                 if (parentAlbum != null)
@@ -539,6 +540,7 @@ namespace MediaBrowser.Server.Implementations.Dto
 
                 if (dictionary.TryGetValue(studio, out entity))
                 {
+                    studioDto.Id = entity.Id.ToString("N");
                     studioDto.PrimaryImageTag = GetImageCacheTag(entity, ImageType.Primary);
                 }
 
@@ -1248,7 +1250,8 @@ namespace MediaBrowser.Server.Implementations.Dto
             }
             else
             {
-                children = folder.GetRecursiveChildren(user, i => !i.IsFolder && i.LocationType != LocationType.Virtual);
+                children = folder.GetRecursiveChildren(user)
+                    .Where(i => !i.IsFolder && i.LocationType != LocationType.Virtual);
             }
 
             // Loop through each recursive child
diff --git a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
index 4c65fad68..6faa72b81 100644
--- a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
+++ b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
@@ -41,7 +41,7 @@ namespace MediaBrowser.Server.Implementations.Library
             {
                 var user = _userManager.GetUserById(new Guid(query.UserId));
 
-                inputItems = user.RootFolder.GetRecursiveChildren(user, null);
+                inputItems = user.RootFolder.GetRecursiveChildren(user, true);
             }
 
 
diff --git a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
index 24e4f0ef4..dd2978b17 100644
--- a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
@@ -15,6 +15,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Server.Implementations.Library
 {
@@ -84,7 +85,7 @@ namespace MediaBrowser.Server.Implementations.Library
             if (user.Configuration.DisplayCollectionsView ||
                 recursiveChildren.OfType<BoxSet>().Any())
             {
-                list.Add(await GetUserView(CollectionType.BoxSets, user, "zzz_" + CollectionType.BoxSets, cancellationToken).ConfigureAwait(false));
+                list.Add(await GetUserView(CollectionType.BoxSets, user, CollectionType.BoxSets, cancellationToken).ConfigureAwait(false));
             }
 
             if (query.IncludeExternalContent)
@@ -114,7 +115,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 }
             }
 
-            return list.OrderBy(i => i.SortName);
+            return _libraryManager.Sort(list, user, new[] { ItemSortBy.SortName }, SortOrder.Ascending).Cast<Folder>();
         }
 
         private Task<UserView> GetUserView(string type, User user, string sortName, CancellationToken cancellationToken)
-- 
cgit v1.2.3


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.Api/ApiEntryPoint.cs                  |  60 ++-
 .../DefaultTheme/DefaultThemeService.cs            |   2 +
 MediaBrowser.Api/Dlna/DlnaService.cs               |   2 +
 MediaBrowser.Api/ItemLookupService.cs              |   2 +
 MediaBrowser.Api/ItemRefreshService.cs             |   2 +
 MediaBrowser.Api/ItemUpdateService.cs              |   6 +-
 MediaBrowser.Api/Library/ChapterService.cs         |   2 +
 .../Library/FileOrganizationService.cs             |   2 +
 .../Library/LibraryStructureService.cs             |  28 +-
 MediaBrowser.Api/Library/SubtitleService.cs        |   2 +
 MediaBrowser.Api/LiveTv/LiveTvService.cs           |   2 +
 MediaBrowser.Api/LocalizationService.cs            |   2 +
 MediaBrowser.Api/Movies/CollectionService.cs       |   2 +
 MediaBrowser.Api/Movies/MoviesService.cs           |   2 +
 MediaBrowser.Api/Movies/TrailersService.cs         |   2 +
 MediaBrowser.Api/Music/AlbumsService.cs            |   3 +-
 MediaBrowser.Api/Music/InstantMixService.cs        |   2 +
 MediaBrowser.Api/PackageReviewService.cs           |   2 +
 MediaBrowser.Api/PackageService.cs                 |   2 +
 MediaBrowser.Api/Playback/BaseStreamingService.cs  |   7 -
 MediaBrowser.Api/Playback/Hls/BaseHlsService.cs    |  12 +-
 MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs |  10 +-
 MediaBrowser.Api/Playback/Hls/HlsSegmentService.cs |   4 +-
 MediaBrowser.Api/PluginService.cs                  |   2 +
 .../ScheduledTasks/ScheduledTaskService.cs         |   2 +
 MediaBrowser.Api/SearchService.cs                  |   2 +
 MediaBrowser.Api/TvShowsService.cs                 |   2 +
 MediaBrowser.Api/UserLibrary/ArtistsService.cs     |   2 +
 MediaBrowser.Api/UserLibrary/GameGenresService.cs  |   2 +
 MediaBrowser.Api/UserLibrary/GenresService.cs      |   2 +
 MediaBrowser.Api/UserLibrary/ItemsService.cs       |   2 +
 MediaBrowser.Api/UserLibrary/MusicGenresService.cs |   2 +
 MediaBrowser.Api/UserLibrary/PersonsService.cs     |   2 +
 MediaBrowser.Api/UserLibrary/StudiosService.cs     |   2 +
 MediaBrowser.Api/UserLibrary/UserLibraryService.cs |   2 +
 MediaBrowser.Api/UserLibrary/YearsService.cs       |   2 +
 MediaBrowser.Api/UserService.cs                    |  63 +---
 MediaBrowser.Api/VideosService.cs                  |   2 +
 MediaBrowser.Controller/Library/IUserManager.cs    |   4 +-
 MediaBrowser.Controller/Net/AuthorizationInfo.cs   |   5 +
 MediaBrowser.Controller/Session/ISessionManager.cs |  13 +-
 .../MediaBrowser.Model.Portable.csproj             |  24 +-
 .../MediaBrowser.Model.net35.csproj                |  24 +-
 .../Configuration/NotificationOption.cs            |  54 ---
 .../Configuration/NotificationOptions.cs           | 124 -------
 .../Configuration/NotificationType.cs              |  23 --
 MediaBrowser.Model/Configuration/SendToUserType.cs |   9 -
 .../Configuration/ServerConfiguration.cs           |   8 +-
 MediaBrowser.Model/MediaBrowser.Model.csproj       |   8 +-
 .../Notifications/NotificationOption.cs            |  56 +++
 .../Notifications/NotificationOptions.cs           | 125 +++++++
 .../Notifications/NotificationType.cs              |  23 ++
 MediaBrowser.Model/Notifications/SendToUserType.cs |   9 +
 MediaBrowser.Model/Updates/PackageVersionInfo.cs   |  32 +-
 MediaBrowser.Model/Users/AuthenticationResult.cs   |   6 +
 .../HttpServer/Security/AuthService.cs             |  25 +-
 .../HttpServer/Security/AuthorizationContext.cs    |   3 +-
 .../Library/UserManager.cs                         |  11 +-
 .../LiveTv/LiveTvManager.cs                        | 125 ++++---
 .../Localization/JavaScript/javascript.json        |  18 +-
 .../MediaBrowser.Server.Implementations.csproj     |   1 +
 .../NotificationConfigurationFactory.cs            |  21 ++
 .../Notifications/NotificationManager.cs           |  16 +-
 .../Session/SessionManager.cs                      |  31 +-
 MediaBrowser.ServerApplication/ApplicationHost.cs  |   7 +
 MediaBrowser.WebDashboard/Api/DashboardService.cs  |   4 +-
 .../MediaBrowser.WebDashboard.csproj               | 409 +++++++++++----------
 67 files changed, 828 insertions(+), 641 deletions(-)
 delete mode 100644 MediaBrowser.Model/Configuration/NotificationOption.cs
 delete mode 100644 MediaBrowser.Model/Configuration/NotificationOptions.cs
 delete mode 100644 MediaBrowser.Model/Configuration/NotificationType.cs
 delete mode 100644 MediaBrowser.Model/Configuration/SendToUserType.cs
 create mode 100644 MediaBrowser.Model/Notifications/NotificationOption.cs
 create mode 100644 MediaBrowser.Model/Notifications/NotificationOptions.cs
 create mode 100644 MediaBrowser.Model/Notifications/NotificationType.cs
 create mode 100644 MediaBrowser.Model/Notifications/SendToUserType.cs
 create mode 100644 MediaBrowser.Server.Implementations/Notifications/NotificationConfigurationFactory.cs

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs
index 2177f90c2..8e6ca4401 100644
--- a/MediaBrowser.Api/ApiEntryPoint.cs
+++ b/MediaBrowser.Api/ApiEntryPoint.cs
@@ -37,6 +37,8 @@ namespace MediaBrowser.Api
 
         private readonly ISessionManager _sessionManager;
 
+        public readonly SemaphoreSlim TranscodingStartLock = new SemaphoreSlim(1,1);
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ApiEntryPoint" /> class.
         /// </summary>
@@ -301,8 +303,9 @@ namespace MediaBrowser.Api
         /// </summary>
         /// <param name="deviceId">The device id.</param>
         /// <param name="deleteMode">The delete mode.</param>
+        /// <param name="acquireLock">if set to <c>true</c> [acquire lock].</param>
         /// <exception cref="System.ArgumentNullException">sourcePath</exception>
-        internal void KillTranscodingJobs(string deviceId, FileDeleteMode deleteMode)
+        internal async Task KillTranscodingJobs(string deviceId, FileDeleteMode deleteMode, bool acquireLock)
         {
             if (string.IsNullOrEmpty(deviceId))
             {
@@ -318,9 +321,29 @@ namespace MediaBrowser.Api
                 jobs.AddRange(_activeTranscodingJobs.Where(i => string.Equals(deviceId, i.DeviceId, StringComparison.OrdinalIgnoreCase)));
             }
 
-            foreach (var job in jobs)
+            if (jobs.Count == 0)
+            {
+                return;
+            }
+
+            if (acquireLock)
             {
-                KillTranscodingJob(job, deleteMode);
+                await TranscodingStartLock.WaitAsync(CancellationToken.None).ConfigureAwait(false);
+            }
+            
+            try
+            {
+                foreach (var job in jobs)
+                {
+                    KillTranscodingJob(job, deleteMode);
+                }
+            }
+            finally
+            {
+                if (acquireLock)
+                {
+                    TranscodingStartLock.Release();
+                }
             }
         }
 
@@ -328,10 +351,11 @@ namespace MediaBrowser.Api
         /// Kills the transcoding jobs.
         /// </summary>
         /// <param name="deviceId">The device identifier.</param>
-        /// <param name="outputPath">The output path.</param>
+        /// <param name="type">The type.</param>
         /// <param name="deleteMode">The delete mode.</param>
+        /// <param name="acquireLock">if set to <c>true</c> [acquire lock].</param>
         /// <exception cref="System.ArgumentNullException">deviceId</exception>
-        internal void KillTranscodingJobs(string deviceId, string outputPath, FileDeleteMode deleteMode)
+        internal async Task KillTranscodingJobs(string deviceId, TranscodingJobType type, FileDeleteMode deleteMode, bool acquireLock)
         {
             if (string.IsNullOrEmpty(deviceId))
             {
@@ -344,12 +368,32 @@ namespace MediaBrowser.Api
             {
                 // This is really only needed for HLS. 
                 // Progressive streams can stop on their own reliably
-                jobs.AddRange(_activeTranscodingJobs.Where(i => string.Equals(deviceId, i.DeviceId, StringComparison.OrdinalIgnoreCase) && string.Equals(outputPath, i.Path, StringComparison.OrdinalIgnoreCase)));
+                jobs.AddRange(_activeTranscodingJobs.Where(i => string.Equals(deviceId, i.DeviceId, StringComparison.OrdinalIgnoreCase) && i.Type == type));
             }
 
-            foreach (var job in jobs)
+            if (jobs.Count == 0)
             {
-                KillTranscodingJob(job, deleteMode);
+                return;
+            }
+
+            if (acquireLock)
+            {
+                await TranscodingStartLock.WaitAsync(CancellationToken.None).ConfigureAwait(false);
+            }
+
+            try
+            {
+                foreach (var job in jobs)
+                {
+                    KillTranscodingJob(job, deleteMode);
+                }
+            }
+            finally
+            {
+                if (acquireLock)
+                {
+                    TranscodingStartLock.Release();
+                }
             }
         }
 
diff --git a/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs b/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs
index 8bc867a2e..21ba47bd4 100644
--- a/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs
+++ b/MediaBrowser.Api/DefaultTheme/DefaultThemeService.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.Model.Entities;
 using MediaBrowser.Model.Logging;
@@ -86,6 +87,7 @@ namespace MediaBrowser.Api.DefaultTheme
         public Guid UserId { get; set; }
     }
 
+    [Authenticated]
     public class DefaultThemeService : BaseApiService
     {
         private readonly IUserManager _userManager;
diff --git a/MediaBrowser.Api/Dlna/DlnaService.cs b/MediaBrowser.Api/Dlna/DlnaService.cs
index 9e6ca3aea..fec6d698a 100644
--- a/MediaBrowser.Api/Dlna/DlnaService.cs
+++ b/MediaBrowser.Api/Dlna/DlnaService.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Controller.Dlna;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Dlna;
 using ServiceStack;
 using System.Collections.Generic;
@@ -42,6 +43,7 @@ namespace MediaBrowser.Api.Dlna
     {
     }
 
+    [Authenticated]
     public class DlnaService : BaseApiService
     {
         private readonly IDlnaManager _dlnaManager;
diff --git a/MediaBrowser.Api/ItemLookupService.cs b/MediaBrowser.Api/ItemLookupService.cs
index e68aa73f6..35b1b5385 100644
--- a/MediaBrowser.Api/ItemLookupService.cs
+++ b/MediaBrowser.Api/ItemLookupService.cs
@@ -6,6 +6,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.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Providers;
@@ -104,6 +105,7 @@ namespace MediaBrowser.Api
         public string Id { get; set; }
     }
 
+    [Authenticated]
     public class ItemLookupService : BaseApiService
     {
         private readonly IProviderManager _providerManager;
diff --git a/MediaBrowser.Api/ItemRefreshService.cs b/MediaBrowser.Api/ItemRefreshService.cs
index 0094282c8..b95e18a0d 100644
--- a/MediaBrowser.Api/ItemRefreshService.cs
+++ b/MediaBrowser.Api/ItemRefreshService.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Providers;
 using ServiceStack;
 using System;
@@ -30,6 +31,7 @@ namespace MediaBrowser.Api
         public string Id { get; set; }
     }
 
+    [Authenticated]
     public class ItemRefreshService : BaseApiService
     {
         private readonly ILibraryManager _libraryManager;
diff --git a/MediaBrowser.Api/ItemUpdateService.cs b/MediaBrowser.Api/ItemUpdateService.cs
index ad7da8e3c..db6c6ce53 100644
--- a/MediaBrowser.Api/ItemUpdateService.cs
+++ b/MediaBrowser.Api/ItemUpdateService.cs
@@ -1,11 +1,12 @@
-using System.Collections.Generic;
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Dto;
 using ServiceStack;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -19,6 +20,7 @@ namespace MediaBrowser.Api
         public string ItemId { get; set; }
     }
 
+    [Authenticated]
     public class ItemUpdateService : BaseApiService
     {
         private readonly ILibraryManager _libraryManager;
diff --git a/MediaBrowser.Api/Library/ChapterService.cs b/MediaBrowser.Api/Library/ChapterService.cs
index 72ffa3fca..6b8dd18f1 100644
--- a/MediaBrowser.Api/Library/ChapterService.cs
+++ b/MediaBrowser.Api/Library/ChapterService.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Controller.Chapters;
+using MediaBrowser.Controller.Net;
 using ServiceStack;
 using System.Linq;
 
@@ -9,6 +10,7 @@ namespace MediaBrowser.Api.Library
     {
     }
 
+    [Authenticated]
     public class ChapterService : BaseApiService
     {
         private readonly IChapterManager _chapterManager;
diff --git a/MediaBrowser.Api/Library/FileOrganizationService.cs b/MediaBrowser.Api/Library/FileOrganizationService.cs
index 01531a7ae..adf6a522b 100644
--- a/MediaBrowser.Api/Library/FileOrganizationService.cs
+++ b/MediaBrowser.Api/Library/FileOrganizationService.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Controller.FileOrganization;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.FileOrganization;
 using MediaBrowser.Model.Querying;
 using ServiceStack;
@@ -78,6 +79,7 @@ namespace MediaBrowser.Api.Library
         public bool RememberCorrection { get; set; }
     }
 
+    [Authenticated]
     public class FileOrganizationService : BaseApiService
     {
         private readonly IFileOrganizationService _iFileOrganizationService;
diff --git a/MediaBrowser.Api/Library/LibraryStructureService.cs b/MediaBrowser.Api/Library/LibraryStructureService.cs
index 947da29fe..c3ef58768 100644
--- a/MediaBrowser.Api/Library/LibraryStructureService.cs
+++ b/MediaBrowser.Api/Library/LibraryStructureService.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Common.IO;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
 using ServiceStack;
@@ -130,36 +131,11 @@ namespace MediaBrowser.Api.Library
         /// <value><c>true</c> if [refresh library]; otherwise, <c>false</c>.</value>
         public bool RefreshLibrary { get; set; }
     }
-
-    [Route("/Library/Downloaded", "POST")]
-    public class ReportContentDownloaded : IReturnVoid
-    {
-        [ApiMember(Name = "Path", Description = "The path being downloaded to.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string Path { get; set; }
-
-        [ApiMember(Name = "ImageUrl", Description = "Optional thumbnail image url of the content.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string ImageUrl { get; set; }
-
-        [ApiMember(Name = "Name", Description = "The name of the content.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string Name { get; set; }
-    }
-
-    [Route("/Library/Downloading", "POST")]
-    public class ReportContentDownloading : IReturnVoid
-    {
-        [ApiMember(Name = "Path", Description = "The path being downloaded to.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string Path { get; set; }
-
-        [ApiMember(Name = "ImageUrl", Description = "Optional thumbnail image url of the content.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string ImageUrl { get; set; }
-
-        [ApiMember(Name = "Name", Description = "The name of the content.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string Name { get; set; }
-    }
     
     /// <summary>
     /// Class LibraryStructureService
     /// </summary>
+    [Authenticated]
     public class LibraryStructureService : BaseApiService
     {
         /// <summary>
diff --git a/MediaBrowser.Api/Library/SubtitleService.cs b/MediaBrowser.Api/Library/SubtitleService.cs
index 62c7ac7c0..4fc3e00c0 100644
--- a/MediaBrowser.Api/Library/SubtitleService.cs
+++ b/MediaBrowser.Api/Library/SubtitleService.cs
@@ -1,6 +1,7 @@
 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;
@@ -86,6 +87,7 @@ namespace MediaBrowser.Api.Library
         public string Id { get; set; }
     }
 
+    [Authenticated]
     public class SubtitleService : BaseApiService
     {
         private readonly ILibraryManager _libraryManager;
diff --git a/MediaBrowser.Api/LiveTv/LiveTvService.cs b/MediaBrowser.Api/LiveTv/LiveTvService.cs
index de01628f8..497f2d0a3 100644
--- a/MediaBrowser.Api/LiveTv/LiveTvService.cs
+++ b/MediaBrowser.Api/LiveTv/LiveTvService.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.LiveTv;
@@ -267,6 +268,7 @@ namespace MediaBrowser.Api.LiveTv
         public string UserId { get; set; }
     }
 
+    [Authenticated]
     public class LiveTvService : BaseApiService
     {
         private readonly ILiveTvManager _liveTvManager;
diff --git a/MediaBrowser.Api/LocalizationService.cs b/MediaBrowser.Api/LocalizationService.cs
index d3c47dfa1..5696d8df7 100644
--- a/MediaBrowser.Api/LocalizationService.cs
+++ b/MediaBrowser.Api/LocalizationService.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Controller.Localization;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
 using ServiceStack;
@@ -42,6 +43,7 @@ namespace MediaBrowser.Api
     /// <summary>
     /// Class CulturesService
     /// </summary>
+    [Authenticated]
     public class LocalizationService : BaseApiService
     {
         /// <summary>
diff --git a/MediaBrowser.Api/Movies/CollectionService.cs b/MediaBrowser.Api/Movies/CollectionService.cs
index b9e3888fd..19e47eb85 100644
--- a/MediaBrowser.Api/Movies/CollectionService.cs
+++ b/MediaBrowser.Api/Movies/CollectionService.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Controller.Collections;
 using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Querying;
 using ServiceStack;
 using System;
@@ -45,6 +46,7 @@ namespace MediaBrowser.Api.Movies
         public Guid Id { get; set; }
     }
 
+    [Authenticated]
     public class CollectionService : BaseApiService
     {
         private readonly ICollectionManager _collectionManager;
diff --git a/MediaBrowser.Api/Movies/MoviesService.cs b/MediaBrowser.Api/Movies/MoviesService.cs
index db02ed428..f0bf22c5e 100644
--- a/MediaBrowser.Api/Movies/MoviesService.cs
+++ b/MediaBrowser.Api/Movies/MoviesService.cs
@@ -3,6 +3,7 @@ using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
@@ -64,6 +65,7 @@ namespace MediaBrowser.Api.Movies
     /// <summary>
     /// Class MoviesService
     /// </summary>
+    [Authenticated]
     public class MoviesService : BaseApiService
     {
         /// <summary>
diff --git a/MediaBrowser.Api/Movies/TrailersService.cs b/MediaBrowser.Api/Movies/TrailersService.cs
index 05e6a9577..b0ee6b6d5 100644
--- a/MediaBrowser.Api/Movies/TrailersService.cs
+++ b/MediaBrowser.Api/Movies/TrailersService.cs
@@ -2,6 +2,7 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using ServiceStack;
 
@@ -18,6 +19,7 @@ namespace MediaBrowser.Api.Movies
     /// <summary>
     /// Class TrailersService
     /// </summary>
+    [Authenticated]
     public class TrailersService : BaseApiService
     {
         /// <summary>
diff --git a/MediaBrowser.Api/Music/AlbumsService.cs b/MediaBrowser.Api/Music/AlbumsService.cs
index 0732c951a..34a933dee 100644
--- a/MediaBrowser.Api/Music/AlbumsService.cs
+++ b/MediaBrowser.Api/Music/AlbumsService.cs
@@ -2,10 +2,10 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using ServiceStack;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 
 namespace MediaBrowser.Api.Music
@@ -15,6 +15,7 @@ namespace MediaBrowser.Api.Music
     {
     }
 
+    [Authenticated]
     public class AlbumsService : BaseApiService
     {
         /// <summary>
diff --git a/MediaBrowser.Api/Music/InstantMixService.cs b/MediaBrowser.Api/Music/InstantMixService.cs
index f50c87f47..ff029d5b5 100644
--- a/MediaBrowser.Api/Music/InstantMixService.cs
+++ b/MediaBrowser.Api/Music/InstantMixService.cs
@@ -2,6 +2,7 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Querying;
 using ServiceStack;
 using System.Collections.Generic;
@@ -33,6 +34,7 @@ namespace MediaBrowser.Api.Music
         public string Name { get; set; }
     }
 
+    [Authenticated]
     public class InstantMixService : BaseApiService
     {
         private readonly IUserManager _userManager;
diff --git a/MediaBrowser.Api/PackageReviewService.cs b/MediaBrowser.Api/PackageReviewService.cs
index 94ff1b62e..112a2c5ce 100644
--- a/MediaBrowser.Api/PackageReviewService.cs
+++ b/MediaBrowser.Api/PackageReviewService.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Common.Constants;
 using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Serialization;
 using ServiceStack;
@@ -96,6 +97,7 @@ namespace MediaBrowser.Api
 
     }
 
+    [Authenticated]
     public class PackageReviewService : BaseApiService
     {
         private readonly IHttpClient _httpClient;
diff --git a/MediaBrowser.Api/PackageService.cs b/MediaBrowser.Api/PackageService.cs
index b54b05fcf..84b42baa3 100644
--- a/MediaBrowser.Api/PackageService.cs
+++ b/MediaBrowser.Api/PackageService.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Common;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Updates;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Updates;
 using ServiceStack;
 using System;
@@ -121,6 +122,7 @@ namespace MediaBrowser.Api
     /// <summary>
     /// Class PackageService
     /// </summary>
+    [Authenticated]
     public class PackageService : BaseApiService
     {
         private readonly IInstallationManager _installationManager;
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 9ff482a1a..75e13f92c 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -13,7 +13,6 @@ using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Library;
 using MediaBrowser.Model.LiveTv;
 using MediaBrowser.Model.MediaInfo;
 using System;
@@ -1955,12 +1954,6 @@ namespace MediaBrowser.Api.Playback
         /// <param name="videoRequest">The video request.</param>
         private void EnforceResolutionLimit(StreamState state, VideoStreamRequest videoRequest)
         {
-            // If enabled, allow whatever the client asks for
-            if (ServerConfigurationManager.Configuration.AllowVideoUpscaling)
-            {
-                return;
-            }
-
             // Switch the incoming params to be ceilings rather than fixed values
             videoRequest.MaxWidth = videoRequest.MaxWidth ?? videoRequest.Width;
             videoRequest.MaxHeight = videoRequest.MaxHeight ?? videoRequest.Height;
diff --git a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
index fa78fa020..8a65e2b56 100644
--- a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
@@ -66,7 +66,6 @@ namespace MediaBrowser.Api.Playback.Hls
             return ProcessRequestAsync(request, isLive).Result;
         }
 
-        private static readonly SemaphoreSlim FfmpegStartLock = new SemaphoreSlim(1, 1);
         /// <summary>
         /// Processes the request async.
         /// </summary>
@@ -82,6 +81,11 @@ namespace MediaBrowser.Api.Playback.Hls
 
             var state = await GetState(request, cancellationTokenSource.Token).ConfigureAwait(false);
 
+            if (isLive)
+            {
+                state.Request.StartTimeTicks = null;
+            }
+
             var playlist = state.OutputFilePath;
 
             if (File.Exists(playlist))
@@ -90,7 +94,7 @@ namespace MediaBrowser.Api.Playback.Hls
             }
             else
             {
-                await FfmpegStartLock.WaitAsync(cancellationTokenSource.Token).ConfigureAwait(false);
+                await ApiEntryPoint.Instance.TranscodingStartLock.WaitAsync(cancellationTokenSource.Token).ConfigureAwait(false);
                 try
                 {
                     if (File.Exists(playlist))
@@ -99,6 +103,8 @@ namespace MediaBrowser.Api.Playback.Hls
                     }
                     else
                     {
+                        await ApiEntryPoint.Instance.KillTranscodingJobs(state.Request.DeviceId, TranscodingJobType.Hls, FileDeleteMode.All, false).ConfigureAwait(false);
+                        
                         // If the playlist doesn't already exist, startup ffmpeg
                         try
                         {
@@ -116,7 +122,7 @@ namespace MediaBrowser.Api.Playback.Hls
                 }
                 finally
                 {
-                    FfmpegStartLock.Release();
+                    ApiEntryPoint.Instance.TranscodingStartLock.Release();
                 }
             }
 
diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
index 5bb610686..0af336c55 100644
--- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
@@ -65,7 +65,6 @@ namespace MediaBrowser.Api.Playback.Hls
             return GetDynamicSegment(request).Result;
         }
 
-        private static readonly SemaphoreSlim FfmpegStartLock = new SemaphoreSlim(1, 1);
         private async Task<object> GetDynamicSegment(GetDynamicHlsVideoSegment request)
         {
             if ((request.StartTimeTicks ?? 0) > 0)
@@ -90,7 +89,7 @@ namespace MediaBrowser.Api.Playback.Hls
                 return await GetSegmentResult(playlistPath, segmentPath, index, cancellationToken).ConfigureAwait(false);
             }
 
-            await FfmpegStartLock.WaitAsync(cancellationTokenSource.Token).ConfigureAwait(false);
+            await ApiEntryPoint.Instance.TranscodingStartLock.WaitAsync(cancellationTokenSource.Token).ConfigureAwait(false);
             try
             {
                 if (File.Exists(segmentPath))
@@ -107,10 +106,11 @@ namespace MediaBrowser.Api.Playback.Hls
                         // If the playlist doesn't already exist, startup ffmpeg
                         try
                         {
+                            // TODO: Delete files from other jobs, but not this one
+                            await ApiEntryPoint.Instance.KillTranscodingJobs(state.Request.DeviceId, TranscodingJobType.Hls, FileDeleteMode.None, false).ConfigureAwait(false);
+
                             if (currentTranscodingIndex.HasValue)
                             {
-                                ApiEntryPoint.Instance.KillTranscodingJobs(state.Request.DeviceId, playlistPath, FileDeleteMode.None);
-
                                 DeleteLastFile(playlistPath, 0);
                             }
 
@@ -131,7 +131,7 @@ namespace MediaBrowser.Api.Playback.Hls
             }
             finally
             {
-                FfmpegStartLock.Release();
+                ApiEntryPoint.Instance.TranscodingStartLock.Release();
             }
 
             Logger.Info("waiting for {0}", segmentPath);
diff --git a/MediaBrowser.Api/Playback/Hls/HlsSegmentService.cs b/MediaBrowser.Api/Playback/Hls/HlsSegmentService.cs
index f31671b1a..3848cb2de 100644
--- a/MediaBrowser.Api/Playback/Hls/HlsSegmentService.cs
+++ b/MediaBrowser.Api/Playback/Hls/HlsSegmentService.cs
@@ -74,7 +74,9 @@ namespace MediaBrowser.Api.Playback.Hls
 
         public void Delete(StopEncodingProcess request)
         {
-            ApiEntryPoint.Instance.KillTranscodingJobs(request.DeviceId, FileDeleteMode.All);
+            var task = ApiEntryPoint.Instance.KillTranscodingJobs(request.DeviceId, FileDeleteMode.All, true);
+
+            Task.WaitAll(task);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Api/PluginService.cs b/MediaBrowser.Api/PluginService.cs
index 31463dc3f..29cc7baf8 100644
--- a/MediaBrowser.Api/PluginService.cs
+++ b/MediaBrowser.Api/PluginService.cs
@@ -2,6 +2,7 @@
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Security;
 using MediaBrowser.Common.Updates;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Plugins;
 using MediaBrowser.Model.Serialization;
@@ -100,6 +101,7 @@ namespace MediaBrowser.Api
     /// <summary>
     /// Class PluginsService
     /// </summary>
+    [Authenticated]
     public class PluginService : BaseApiService
     {
         /// <summary>
diff --git a/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs b/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
index aaf14ce71..483133c10 100644
--- a/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
+++ b/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.ScheduledTasks;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Tasks;
 using ServiceStack;
 using ServiceStack.Text.Controller;
@@ -78,6 +79,7 @@ namespace MediaBrowser.Api.ScheduledTasks
     /// <summary>
     /// Class ScheduledTasksService
     /// </summary>
+    [Authenticated]
     public class ScheduledTaskService : BaseApiService
     {
         /// <summary>
diff --git a/MediaBrowser.Api/SearchService.cs b/MediaBrowser.Api/SearchService.cs
index e72edcc98..a6fcaf438 100644
--- a/MediaBrowser.Api/SearchService.cs
+++ b/MediaBrowser.Api/SearchService.cs
@@ -4,6 +4,7 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Search;
 using ServiceStack;
@@ -79,6 +80,7 @@ namespace MediaBrowser.Api
     /// <summary>
     /// Class SearchService
     /// </summary>
+    [Authenticated]
     public class SearchService : BaseApiService
     {
         /// <summary>
diff --git a/MediaBrowser.Api/TvShowsService.cs b/MediaBrowser.Api/TvShowsService.cs
index 6776cbf17..c32e67216 100644
--- a/MediaBrowser.Api/TvShowsService.cs
+++ b/MediaBrowser.Api/TvShowsService.cs
@@ -4,6 +4,7 @@ using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Querying;
@@ -175,6 +176,7 @@ namespace MediaBrowser.Api
     /// <summary>
     /// Class TvShowsService
     /// </summary>
+    [Authenticated]
     public class TvShowsService : BaseApiService
     {
         /// <summary>
diff --git a/MediaBrowser.Api/UserLibrary/ArtistsService.cs b/MediaBrowser.Api/UserLibrary/ArtistsService.cs
index 13027d30b..07015ecae 100644
--- a/MediaBrowser.Api/UserLibrary/ArtistsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ArtistsService.cs
@@ -2,6 +2,7 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Querying;
@@ -46,6 +47,7 @@ namespace MediaBrowser.Api.UserLibrary
     /// <summary>
     /// Class ArtistsService
     /// </summary>
+    [Authenticated]
     public class ArtistsService : BaseItemsByNameService<MusicArtist>
     {
         /// <summary>
diff --git a/MediaBrowser.Api/UserLibrary/GameGenresService.cs b/MediaBrowser.Api/UserLibrary/GameGenresService.cs
index b1379ad5d..49e979e55 100644
--- a/MediaBrowser.Api/UserLibrary/GameGenresService.cs
+++ b/MediaBrowser.Api/UserLibrary/GameGenresService.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
@@ -41,6 +42,7 @@ namespace MediaBrowser.Api.UserLibrary
         public Guid? UserId { get; set; }
     }
 
+    [Authenticated]
     public class GameGenresService : BaseItemsByNameService<GameGenre>
     {
         public GameGenresService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepo, IDtoService dtoService)
diff --git a/MediaBrowser.Api/UserLibrary/GenresService.cs b/MediaBrowser.Api/UserLibrary/GenresService.cs
index 68f0e21ed..c8c45c1bb 100644
--- a/MediaBrowser.Api/UserLibrary/GenresService.cs
+++ b/MediaBrowser.Api/UserLibrary/GenresService.cs
@@ -2,6 +2,7 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Querying;
@@ -46,6 +47,7 @@ namespace MediaBrowser.Api.UserLibrary
     /// <summary>
     /// Class GenresService
     /// </summary>
+    [Authenticated]
     public class GenresService : BaseItemsByNameService<Genre>
     {
         public GenresService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepo, IDtoService dtoService)
diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs
index c926c16ff..ba07571bf 100644
--- a/MediaBrowser.Api/UserLibrary/ItemsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs
@@ -6,6 +6,7 @@ using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Localization;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Querying;
@@ -246,6 +247,7 @@ namespace MediaBrowser.Api.UserLibrary
     /// <summary>
     /// Class ItemsService
     /// </summary>
+    [Authenticated]
     public class ItemsService : BaseApiService
     {
         /// <summary>
diff --git a/MediaBrowser.Api/UserLibrary/MusicGenresService.cs b/MediaBrowser.Api/UserLibrary/MusicGenresService.cs
index 538b16575..f50f0a0bd 100644
--- a/MediaBrowser.Api/UserLibrary/MusicGenresService.cs
+++ b/MediaBrowser.Api/UserLibrary/MusicGenresService.cs
@@ -2,6 +2,7 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Querying;
@@ -41,6 +42,7 @@ namespace MediaBrowser.Api.UserLibrary
         public Guid? UserId { get; set; }
     }
 
+    [Authenticated]
     public class MusicGenresService : BaseItemsByNameService<MusicGenre>
     {
         public MusicGenresService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepo, IDtoService dtoService)
diff --git a/MediaBrowser.Api/UserLibrary/PersonsService.cs b/MediaBrowser.Api/UserLibrary/PersonsService.cs
index 962effded..cf9959e53 100644
--- a/MediaBrowser.Api/UserLibrary/PersonsService.cs
+++ b/MediaBrowser.Api/UserLibrary/PersonsService.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Querying;
@@ -51,6 +52,7 @@ namespace MediaBrowser.Api.UserLibrary
     /// <summary>
     /// Class PersonsService
     /// </summary>
+    [Authenticated]
     public class PersonsService : BaseItemsByNameService<Person>
     {
         /// <summary>
diff --git a/MediaBrowser.Api/UserLibrary/StudiosService.cs b/MediaBrowser.Api/UserLibrary/StudiosService.cs
index 4c38ba0d1..2024d779b 100644
--- a/MediaBrowser.Api/UserLibrary/StudiosService.cs
+++ b/MediaBrowser.Api/UserLibrary/StudiosService.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Querying;
@@ -43,6 +44,7 @@ namespace MediaBrowser.Api.UserLibrary
     /// <summary>
     /// Class StudiosService
     /// </summary>
+    [Authenticated]
     public class StudiosService : BaseItemsByNameService<Studio>
     {
         public StudiosService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepo, IDtoService dtoService)
diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
index da12a9e3d..d1767e7fd 100644
--- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
@@ -3,6 +3,7 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
@@ -424,6 +425,7 @@ namespace MediaBrowser.Api.UserLibrary
     /// <summary>
     /// Class UserLibraryService
     /// </summary>
+    [Authenticated]
     public class UserLibraryService : BaseApiService
     {
         /// <summary>
diff --git a/MediaBrowser.Api/UserLibrary/YearsService.cs b/MediaBrowser.Api/UserLibrary/YearsService.cs
index 4dda045c0..2b300f900 100644
--- a/MediaBrowser.Api/UserLibrary/YearsService.cs
+++ b/MediaBrowser.Api/UserLibrary/YearsService.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Querying;
@@ -43,6 +44,7 @@ namespace MediaBrowser.Api.UserLibrary
     /// <summary>
     /// Class YearsService
     /// </summary>
+    [Authenticated]
     public class YearsService : BaseItemsByNameService<Year>
     {
         public YearsService(IUserManager userManager, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepo, IDtoService dtoService)
diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs
index 764a28102..64d1fcb34 100644
--- a/MediaBrowser.Api/UserService.cs
+++ b/MediaBrowser.Api/UserService.cs
@@ -268,28 +268,6 @@ namespace MediaBrowser.Api
         /// </summary>
         /// <param name="request">The request.</param>
         public object Post(AuthenticateUser request)
-        {
-            // No response needed. Will throw an exception on failure.
-            var result = AuthenticateUser(request).Result;
-
-            return result;
-        }
-
-        public object Post(AuthenticateUserByName request)
-        {
-            var user = _userManager.Users.FirstOrDefault(i => string.Equals(request.Username, i.Name, StringComparison.OrdinalIgnoreCase));
-
-            if (user == null)
-            {
-                throw new ArgumentException(string.Format("User {0} not found.", request.Username));
-            }
-
-            var result = AuthenticateUser(new AuthenticateUser { Id = user.Id, Password = request.Password }).Result;
-
-            return ToOptimizedResult(result);
-        }
-
-        private async Task<AuthenticationResult> AuthenticateUser(AuthenticateUser request)
         {
             var user = _userManager.GetUserById(request.Id);
 
@@ -298,38 +276,21 @@ namespace MediaBrowser.Api
                 throw new ResourceNotFoundException("User not found");
             }
 
-            var auth = AuthorizationContext.GetAuthorizationInfo(Request);
-
-            // Login in the old way if the header is missing
-            if (string.IsNullOrEmpty(auth.Client) ||
-                string.IsNullOrEmpty(auth.Device) ||
-                string.IsNullOrEmpty(auth.DeviceId) ||
-                string.IsNullOrEmpty(auth.Version))
+            return Post(new AuthenticateUserByName
             {
-                var success = await _userManager.AuthenticateUser(user, request.Password).ConfigureAwait(false);
-
-                if (!success)
-                {
-                    // Unauthorized
-                    throw new UnauthorizedAccessException("Invalid user or password entered.");
-                }
-
-                return new AuthenticationResult
-                {
-                    User = _dtoService.GetUserDto(user)
-                };
-            }
+                Username = user.Name,
+                Password = request.Password
+            });
+        }
 
-            var session = await _sessionMananger.AuthenticateNewSession(user, request.Password, auth.Client, auth.Version,
-                        auth.DeviceId, auth.Device, Request.RemoteIp).ConfigureAwait(false);
+        public object Post(AuthenticateUserByName request)
+        {
+            var auth = AuthorizationContext.GetAuthorizationInfo(Request);
 
-            var result = new AuthenticationResult
-            {
-                User = _dtoService.GetUserDto(user),
-                SessionInfo = _sessionMananger.GetSessionInfoDto(session)
-            };
+            var result = _sessionMananger.AuthenticateNewSession(request.Username, request.Password, auth.Client, auth.Version,
+                        auth.DeviceId, auth.Device, Request.RemoteIp).Result;
 
-            return result;
+            return ToOptimizedResult(result);
         }
 
         /// <summary>
@@ -353,7 +314,7 @@ namespace MediaBrowser.Api
             }
             else
             {
-                var success = _userManager.AuthenticateUser(user, request.CurrentPassword).Result;
+                var success = _userManager.AuthenticateUser(user.Name, request.CurrentPassword).Result;
 
                 if (!success)
                 {
diff --git a/MediaBrowser.Api/VideosService.cs b/MediaBrowser.Api/VideosService.cs
index f62e37f79..2407a1a39 100644
--- a/MediaBrowser.Api/VideosService.cs
+++ b/MediaBrowser.Api/VideosService.cs
@@ -3,6 +3,7 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Querying;
 using ServiceStack;
@@ -41,6 +42,7 @@ namespace MediaBrowser.Api
         public string Ids { get; set; }
     }
 
+    [Authenticated]
     public class VideosService : BaseApiService
     {
         private readonly ILibraryManager _libraryManager;
diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs
index 010caa233..0da5f9272 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
diff --git a/MediaBrowser.Controller/Net/AuthorizationInfo.cs b/MediaBrowser.Controller/Net/AuthorizationInfo.cs
index e609204d6..d7dcb60f0 100644
--- a/MediaBrowser.Controller/Net/AuthorizationInfo.cs
+++ b/MediaBrowser.Controller/Net/AuthorizationInfo.cs
@@ -28,5 +28,10 @@ namespace MediaBrowser.Controller.Net
         /// </summary>
         /// <value>The version.</value>
         public string Version { get; set; }
+        /// <summary>
+        /// Gets or sets the token.
+        /// </summary>
+        /// <value>The token.</value>
+        public string Token { get; set; }
     }
 }
diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs
index 74ad1b7ee..6d3a9d20c 100644
--- a/MediaBrowser.Controller/Session/ISessionManager.cs
+++ b/MediaBrowser.Controller/Session/ISessionManager.cs
@@ -2,6 +2,7 @@
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Session;
+using MediaBrowser.Model.Users;
 using System;
 using System.Collections.Generic;
 using System.Threading;
@@ -206,11 +207,11 @@ namespace MediaBrowser.Controller.Session
         /// <param name="sessionId">The session identifier.</param>
         /// <param name="item">The item.</param>
         void ReportNowViewingItem(string sessionId, BaseItemInfo item);
-        
+
         /// <summary>
         /// Authenticates the new session.
         /// </summary>
-        /// <param name="user">The user.</param>
+        /// <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>
@@ -218,7 +219,7 @@ 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<SessionInfo> AuthenticateNewSession(User user, 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.
@@ -248,5 +249,11 @@ namespace MediaBrowser.Controller.Session
         /// <param name="version">The version.</param>
         /// <returns>SessionInfo.</returns>
         SessionInfo GetSession(string deviceId, string client, string version);
+
+        /// <summary>
+        /// Validates the security token.
+        /// </summary>
+        /// <param name="token">The token.</param>
+        void ValidateSecurityToken(string token);
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
index 2d19d335d..0ed49d5f8 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -137,21 +137,9 @@
     <Compile Include="..\MediaBrowser.Model\Configuration\MetadataPluginType.cs">
       <Link>Configuration\MetadataPluginType.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Configuration\NotificationOption.cs">
-      <Link>Configuration\NotificationOption.cs</Link>
-    </Compile>
-    <Compile Include="..\MediaBrowser.Model\Configuration\NotificationOptions.cs">
-      <Link>Configuration\NotificationOptions.cs</Link>
-    </Compile>
-    <Compile Include="..\MediaBrowser.Model\Configuration\NotificationType.cs">
-      <Link>Configuration\NotificationType.cs</Link>
-    </Compile>
     <Compile Include="..\MediaBrowser.Model\Configuration\PathSubstitution.cs">
       <Link>Configuration\PathSubstitution.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Configuration\SendToUserType.cs">
-      <Link>Configuration\SendToUserType.cs</Link>
-    </Compile>
     <Compile Include="..\MediaBrowser.Model\Configuration\ServerConfiguration.cs">
       <Link>Configuration\ServerConfiguration.cs</Link>
     </Compile>
@@ -638,6 +626,12 @@
     <Compile Include="..\MediaBrowser.Model\Notifications\NotificationLevel.cs">
       <Link>Notifications\NotificationLevel.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Notifications\NotificationOption.cs">
+      <Link>Notifications\NotificationOption.cs</Link>
+    </Compile>
+    <Compile Include="..\MediaBrowser.Model\Notifications\NotificationOptions.cs">
+      <Link>Notifications\NotificationOptions.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Notifications\NotificationQuery.cs">
       <Link>Notifications\NotificationQuery.cs</Link>
     </Compile>
@@ -653,9 +647,15 @@
     <Compile Include="..\MediaBrowser.Model\Notifications\NotificationsSummary.cs">
       <Link>Notifications\NotificationsSummary.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Notifications\NotificationType.cs">
+      <Link>Notifications\NotificationType.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Notifications\NotificationTypeInfo.cs">
       <Link>Notifications\NotificationTypeInfo.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Notifications\SendToUserType.cs">
+      <Link>Notifications\SendToUserType.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Plugins\BasePluginConfiguration.cs">
       <Link>Plugins\BasePluginConfiguration.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
index c0c886c8a..12c87ca97 100644
--- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
+++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
@@ -124,21 +124,9 @@
     <Compile Include="..\MediaBrowser.Model\Configuration\MetadataPluginType.cs">
       <Link>Configuration\MetadataPluginType.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Configuration\NotificationOption.cs">
-      <Link>Configuration\NotificationOption.cs</Link>
-    </Compile>
-    <Compile Include="..\MediaBrowser.Model\Configuration\NotificationOptions.cs">
-      <Link>Configuration\NotificationOptions.cs</Link>
-    </Compile>
-    <Compile Include="..\MediaBrowser.Model\Configuration\NotificationType.cs">
-      <Link>Configuration\NotificationType.cs</Link>
-    </Compile>
     <Compile Include="..\MediaBrowser.Model\Configuration\PathSubstitution.cs">
       <Link>Configuration\PathSubstitution.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Configuration\SendToUserType.cs">
-      <Link>Configuration\SendToUserType.cs</Link>
-    </Compile>
     <Compile Include="..\MediaBrowser.Model\Configuration\ServerConfiguration.cs">
       <Link>Configuration\ServerConfiguration.cs</Link>
     </Compile>
@@ -619,6 +607,12 @@
     <Compile Include="..\MediaBrowser.Model\Notifications\NotificationLevel.cs">
       <Link>Notifications\NotificationLevel.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Notifications\NotificationOption.cs">
+      <Link>Notifications\NotificationOption.cs</Link>
+    </Compile>
+    <Compile Include="..\MediaBrowser.Model\Notifications\NotificationOptions.cs">
+      <Link>Notifications\NotificationOptions.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Notifications\NotificationQuery.cs">
       <Link>Notifications\NotificationQuery.cs</Link>
     </Compile>
@@ -634,9 +628,15 @@
     <Compile Include="..\MediaBrowser.Model\Notifications\NotificationsSummary.cs">
       <Link>Notifications\NotificationsSummary.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Notifications\NotificationType.cs">
+      <Link>Notifications\NotificationType.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Notifications\NotificationTypeInfo.cs">
       <Link>Notifications\NotificationTypeInfo.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Notifications\SendToUserType.cs">
+      <Link>Notifications\SendToUserType.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Plugins\BasePluginConfiguration.cs">
       <Link>Plugins\BasePluginConfiguration.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model/Configuration/NotificationOption.cs b/MediaBrowser.Model/Configuration/NotificationOption.cs
deleted file mode 100644
index 5fcf3550c..000000000
--- a/MediaBrowser.Model/Configuration/NotificationOption.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-namespace MediaBrowser.Model.Configuration
-{
-    public class NotificationOption
-    {
-        public string Type { get; set; }
-
-        /// <summary>
-        /// User Ids to not monitor (it's opt out)
-        /// </summary>
-        public string[] DisabledMonitorUsers { get; set; }
-
-        /// <summary>
-        /// User Ids to send to (if SendToUserMode == Custom)
-        /// </summary>
-        public string[] SendToUsers { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this <see cref="NotificationOption"/> is enabled.
-        /// </summary>
-        /// <value><c>true</c> if enabled; otherwise, <c>false</c>.</value>
-        public bool Enabled { get; set; }
-
-        /// <summary>
-        /// Gets or sets the title format string.
-        /// </summary>
-        /// <value>The title format string.</value>
-        public string Title { get; set; }
-
-        /// <summary>
-        /// Gets or sets the description.
-        /// </summary>
-        /// <value>The description.</value>
-        public string Description { get; set; }
-        
-        /// <summary>
-        /// Gets or sets the disabled services.
-        /// </summary>
-        /// <value>The disabled services.</value>
-        public string[] DisabledServices { get; set; }
-
-        /// <summary>
-        /// Gets or sets the send to user mode.
-        /// </summary>
-        /// <value>The send to user mode.</value>
-        public SendToUserType SendToUserMode { get; set; }
-
-        public NotificationOption()
-        {
-            DisabledServices = new string[] { };
-            DisabledMonitorUsers = new string[] { };
-            SendToUsers = new string[] { };
-        }
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/NotificationOptions.cs b/MediaBrowser.Model/Configuration/NotificationOptions.cs
deleted file mode 100644
index dd523d947..000000000
--- a/MediaBrowser.Model/Configuration/NotificationOptions.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-using MediaBrowser.Model.Extensions;
-
-namespace MediaBrowser.Model.Configuration
-{
-    public class NotificationOptions
-    {
-        public NotificationOption[] Options { get; set; }
-
-        public NotificationOptions()
-        {
-            Options = new[]
-            {
-                new NotificationOption
-                {
-                    Type = NotificationType.TaskFailed.ToString(),
-                    Enabled = true,
-                    SendToUserMode = SendToUserType.Admins
-                },
-                new NotificationOption
-                {
-                    Type = NotificationType.ServerRestartRequired.ToString(),
-                    Enabled = true,
-                    SendToUserMode = SendToUserType.Admins
-                },
-                new NotificationOption
-                {
-                    Type = NotificationType.ApplicationUpdateAvailable.ToString(),
-                    Enabled = true,
-                    SendToUserMode = SendToUserType.Admins
-                },
-                new NotificationOption
-                {
-                    Type = NotificationType.ApplicationUpdateInstalled.ToString(),
-                    Enabled = true,
-                    SendToUserMode = SendToUserType.Admins
-                },
-                new NotificationOption
-                {
-                    Type = NotificationType.PluginUpdateInstalled.ToString(),
-                    Enabled = true,
-                    SendToUserMode = SendToUserType.Admins
-                },
-                new NotificationOption
-                {
-                    Type = NotificationType.PluginUninstalled.ToString(),
-                    Enabled = true,
-                    SendToUserMode = SendToUserType.Admins
-                },
-                new NotificationOption
-                {
-                    Type = NotificationType.InstallationFailed.ToString(),
-                    Enabled = true,
-                    SendToUserMode = SendToUserType.Admins
-                },
-                new NotificationOption
-                {
-                    Type = NotificationType.PluginInstalled.ToString(),
-                    Enabled = true,
-                    SendToUserMode = SendToUserType.Admins
-                },
-                new NotificationOption
-                {
-                    Type = NotificationType.PluginError.ToString(),
-                    Enabled = true,
-                    SendToUserMode = SendToUserType.Admins
-                }
-            };
-        }
-
-        public NotificationOption GetOptions(string type)
-        {
-            foreach (NotificationOption i in Options)
-            {
-                if (StringHelper.EqualsIgnoreCase(type, i.Type)) return i;
-            }
-            return null;
-        }
-
-        public bool IsEnabled(string type)
-        {
-            NotificationOption opt = GetOptions(type);
-
-            return opt != null && opt.Enabled;
-        }
-
-        public bool IsServiceEnabled(string service, string notificationType)
-        {
-            NotificationOption opt = GetOptions(notificationType);
-
-            return opt == null ||
-                   !ListHelper.ContainsIgnoreCase(opt.DisabledServices, service);
-        }
-
-        public bool IsEnabledToMonitorUser(string type, string userId)
-        {
-            NotificationOption opt = GetOptions(type);
-
-            return opt != null && opt.Enabled &&
-                   !ListHelper.ContainsIgnoreCase(opt.DisabledMonitorUsers, userId);
-        }
-
-        public bool IsEnabledToSendToUser(string type, string userId, UserConfiguration userConfig)
-        {
-            NotificationOption opt = GetOptions(type);
-
-            if (opt != null && opt.Enabled)
-            {
-                if (opt.SendToUserMode == SendToUserType.All)
-                {
-                    return true;
-                }
-
-                if (opt.SendToUserMode == SendToUserType.Admins && userConfig.IsAdministrator)
-                {
-                    return true;
-                }
-
-                return ListHelper.ContainsIgnoreCase(opt.SendToUsers, userId);
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/MediaBrowser.Model/Configuration/NotificationType.cs b/MediaBrowser.Model/Configuration/NotificationType.cs
deleted file mode 100644
index d8043b0e1..000000000
--- a/MediaBrowser.Model/Configuration/NotificationType.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace MediaBrowser.Model.Configuration
-{
-    public enum NotificationType
-    {
-        ApplicationUpdateAvailable,
-        ApplicationUpdateInstalled,
-        AudioPlayback,
-        GamePlayback,
-        VideoPlayback,
-        AudioPlaybackStopped,
-        GamePlaybackStopped,
-        VideoPlaybackStopped,
-        InstallationFailed,
-        PluginError,
-        PluginInstalled,
-        PluginUpdateInstalled,
-        PluginUninstalled,
-        NewLibraryContent,
-        NewLibraryContentMultiple,
-        ServerRestartRequired,
-        TaskFailed
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/SendToUserType.cs b/MediaBrowser.Model/Configuration/SendToUserType.cs
deleted file mode 100644
index a2eac4c2d..000000000
--- a/MediaBrowser.Model/Configuration/SendToUserType.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace MediaBrowser.Model.Configuration
-{
-    public enum SendToUserType
-    {
-        All = 0,
-        Admins = 1,
-        Custom = 2
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index f7b888f82..36c353479 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Model.Weather;
+using MediaBrowser.Model.Notifications;
+using MediaBrowser.Model.Weather;
 using System;
 
 namespace MediaBrowser.Model.Configuration
@@ -178,8 +179,6 @@ namespace MediaBrowser.Model.Configuration
         /// <value>The encoding quality.</value>
         public EncodingQuality MediaEncodingQuality { get; set; }
 
-        public bool AllowVideoUpscaling { get; set; }
-
         public MetadataOptions[] MetadataOptions { get; set; }
 
         public bool EnableDebugEncodingLogging { get; set; }
@@ -268,10 +267,7 @@ namespace MediaBrowser.Model.Configuration
                 new MetadataOptions(0, 1280) {ItemType = "Season"}
             };
 
-            NotificationOptions = new NotificationOptions();
-
             SubtitleOptions = new SubtitleOptions();
-
             LiveTvOptions = new LiveTvOptions();
             TvFileOrganizationOptions = new TvFileOrganizationOptions();
         }
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index d2b0a8caf..d758f2f39 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -88,11 +88,11 @@
     <Compile Include="Configuration\MetadataOptions.cs" />
     <Compile Include="Configuration\MetadataPluginSummary.cs" />
     <Compile Include="Configuration\MetadataPluginType.cs" />
-    <Compile Include="Configuration\NotificationOption.cs" />
-    <Compile Include="Configuration\NotificationOptions.cs" />
-    <Compile Include="Configuration\NotificationType.cs" />
+    <Compile Include="Notifications\NotificationOption.cs" />
+    <Compile Include="Notifications\NotificationOptions.cs" />
+    <Compile Include="Notifications\NotificationType.cs" />
     <Compile Include="Configuration\PathSubstitution.cs" />
-    <Compile Include="Configuration\SendToUserType.cs" />
+    <Compile Include="Notifications\SendToUserType.cs" />
     <Compile Include="Configuration\ServerConfiguration.cs" />
     <Compile Include="Configuration\SubtitleOptions.cs" />
     <Compile Include="Configuration\UnratedItem.cs" />
diff --git a/MediaBrowser.Model/Notifications/NotificationOption.cs b/MediaBrowser.Model/Notifications/NotificationOption.cs
new file mode 100644
index 000000000..09f7072dd
--- /dev/null
+++ b/MediaBrowser.Model/Notifications/NotificationOption.cs
@@ -0,0 +1,56 @@
+using MediaBrowser.Model.Configuration;
+
+namespace MediaBrowser.Model.Notifications
+{
+    public class NotificationOption
+    {
+        public string Type { get; set; }
+
+        /// <summary>
+        /// User Ids to not monitor (it's opt out)
+        /// </summary>
+        public string[] DisabledMonitorUsers { get; set; }
+
+        /// <summary>
+        /// User Ids to send to (if SendToUserMode == Custom)
+        /// </summary>
+        public string[] SendToUsers { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this <see cref="NotificationOption"/> is enabled.
+        /// </summary>
+        /// <value><c>true</c> if enabled; otherwise, <c>false</c>.</value>
+        public bool Enabled { get; set; }
+
+        /// <summary>
+        /// Gets or sets the title format string.
+        /// </summary>
+        /// <value>The title format string.</value>
+        public string Title { get; set; }
+
+        /// <summary>
+        /// Gets or sets the description.
+        /// </summary>
+        /// <value>The description.</value>
+        public string Description { get; set; }
+        
+        /// <summary>
+        /// Gets or sets the disabled services.
+        /// </summary>
+        /// <value>The disabled services.</value>
+        public string[] DisabledServices { get; set; }
+
+        /// <summary>
+        /// Gets or sets the send to user mode.
+        /// </summary>
+        /// <value>The send to user mode.</value>
+        public SendToUserType SendToUserMode { get; set; }
+
+        public NotificationOption()
+        {
+            DisabledServices = new string[] { };
+            DisabledMonitorUsers = new string[] { };
+            SendToUsers = new string[] { };
+        }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Notifications/NotificationOptions.cs b/MediaBrowser.Model/Notifications/NotificationOptions.cs
new file mode 100644
index 000000000..7d80f3177
--- /dev/null
+++ b/MediaBrowser.Model/Notifications/NotificationOptions.cs
@@ -0,0 +1,125 @@
+using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Extensions;
+
+namespace MediaBrowser.Model.Notifications
+{
+    public class NotificationOptions
+    {
+        public NotificationOption[] Options { get; set; }
+
+        public NotificationOptions()
+        {
+            Options = new[]
+            {
+                new NotificationOption
+                {
+                    Type = NotificationType.TaskFailed.ToString(),
+                    Enabled = true,
+                    SendToUserMode = SendToUserType.Admins
+                },
+                new NotificationOption
+                {
+                    Type = NotificationType.ServerRestartRequired.ToString(),
+                    Enabled = true,
+                    SendToUserMode = SendToUserType.Admins
+                },
+                new NotificationOption
+                {
+                    Type = NotificationType.ApplicationUpdateAvailable.ToString(),
+                    Enabled = true,
+                    SendToUserMode = SendToUserType.Admins
+                },
+                new NotificationOption
+                {
+                    Type = NotificationType.ApplicationUpdateInstalled.ToString(),
+                    Enabled = true,
+                    SendToUserMode = SendToUserType.Admins
+                },
+                new NotificationOption
+                {
+                    Type = NotificationType.PluginUpdateInstalled.ToString(),
+                    Enabled = true,
+                    SendToUserMode = SendToUserType.Admins
+                },
+                new NotificationOption
+                {
+                    Type = NotificationType.PluginUninstalled.ToString(),
+                    Enabled = true,
+                    SendToUserMode = SendToUserType.Admins
+                },
+                new NotificationOption
+                {
+                    Type = NotificationType.InstallationFailed.ToString(),
+                    Enabled = true,
+                    SendToUserMode = SendToUserType.Admins
+                },
+                new NotificationOption
+                {
+                    Type = NotificationType.PluginInstalled.ToString(),
+                    Enabled = true,
+                    SendToUserMode = SendToUserType.Admins
+                },
+                new NotificationOption
+                {
+                    Type = NotificationType.PluginError.ToString(),
+                    Enabled = true,
+                    SendToUserMode = SendToUserType.Admins
+                }
+            };
+        }
+
+        public NotificationOption GetOptions(string type)
+        {
+            foreach (NotificationOption i in Options)
+            {
+                if (StringHelper.EqualsIgnoreCase(type, i.Type)) return i;
+            }
+            return null;
+        }
+
+        public bool IsEnabled(string type)
+        {
+            NotificationOption opt = GetOptions(type);
+
+            return opt != null && opt.Enabled;
+        }
+
+        public bool IsServiceEnabled(string service, string notificationType)
+        {
+            NotificationOption opt = GetOptions(notificationType);
+
+            return opt == null ||
+                   !ListHelper.ContainsIgnoreCase(opt.DisabledServices, service);
+        }
+
+        public bool IsEnabledToMonitorUser(string type, string userId)
+        {
+            NotificationOption opt = GetOptions(type);
+
+            return opt != null && opt.Enabled &&
+                   !ListHelper.ContainsIgnoreCase(opt.DisabledMonitorUsers, userId);
+        }
+
+        public bool IsEnabledToSendToUser(string type, string userId, UserConfiguration userConfig)
+        {
+            NotificationOption opt = GetOptions(type);
+
+            if (opt != null && opt.Enabled)
+            {
+                if (opt.SendToUserMode == SendToUserType.All)
+                {
+                    return true;
+                }
+
+                if (opt.SendToUserMode == SendToUserType.Admins && userConfig.IsAdministrator)
+                {
+                    return true;
+                }
+
+                return ListHelper.ContainsIgnoreCase(opt.SendToUsers, userId);
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/MediaBrowser.Model/Notifications/NotificationType.cs b/MediaBrowser.Model/Notifications/NotificationType.cs
new file mode 100644
index 000000000..34e4d32b5
--- /dev/null
+++ b/MediaBrowser.Model/Notifications/NotificationType.cs
@@ -0,0 +1,23 @@
+namespace MediaBrowser.Model.Notifications
+{
+    public enum NotificationType
+    {
+        ApplicationUpdateAvailable,
+        ApplicationUpdateInstalled,
+        AudioPlayback,
+        GamePlayback,
+        VideoPlayback,
+        AudioPlaybackStopped,
+        GamePlaybackStopped,
+        VideoPlaybackStopped,
+        InstallationFailed,
+        PluginError,
+        PluginInstalled,
+        PluginUpdateInstalled,
+        PluginUninstalled,
+        NewLibraryContent,
+        NewLibraryContentMultiple,
+        ServerRestartRequired,
+        TaskFailed
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Notifications/SendToUserType.cs b/MediaBrowser.Model/Notifications/SendToUserType.cs
new file mode 100644
index 000000000..1998d3102
--- /dev/null
+++ b/MediaBrowser.Model/Notifications/SendToUserType.cs
@@ -0,0 +1,9 @@
+namespace MediaBrowser.Model.Notifications
+{
+    public enum SendToUserType
+    {
+        All = 0,
+        Admins = 1,
+        Custom = 2
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Updates/PackageVersionInfo.cs b/MediaBrowser.Model/Updates/PackageVersionInfo.cs
index de8f4e8b8..b9bf6e7fe 100644
--- a/MediaBrowser.Model/Updates/PackageVersionInfo.cs
+++ b/MediaBrowser.Model/Updates/PackageVersionInfo.cs
@@ -1,4 +1,6 @@
-
+using System;
+using System.Runtime.Serialization;
+
 namespace MediaBrowser.Model.Updates
 {
     /// <summary>
@@ -24,6 +26,32 @@ namespace MediaBrowser.Model.Updates
         /// <value>The version STR.</value>
         public string versionStr { get; set; }
 
+        /// <summary>
+        /// The _version
+        /// </summary>
+        private Version _version;
+        /// <summary>
+        /// Gets or sets the version.
+        /// Had to make this an interpreted property since Protobuf can't handle Version
+        /// </summary>
+        /// <value>The version.</value>
+        [IgnoreDataMember]
+        public Version version
+        {
+            get { return _version ?? (_version = new Version(ValueOrDefault(versionStr, "0.0.0.1"))); }
+        }
+
+        /// <summary>
+        /// Values the or default.
+        /// </summary>
+        /// <param name="str">The STR.</param>
+        /// <param name="def">The def.</param>
+        /// <returns>System.String.</returns>
+        private static string ValueOrDefault(string str, string def)
+        {
+            return string.IsNullOrEmpty(str) ? def : str;
+        }
+
         /// <summary>
         /// Gets or sets the classification.
         /// </summary>
@@ -60,4 +88,4 @@ namespace MediaBrowser.Model.Updates
         /// <value>The target filename.</value>
         public string targetFilename { get; set; }
     }
-}
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Users/AuthenticationResult.cs b/MediaBrowser.Model/Users/AuthenticationResult.cs
index 998aaa3a7..8046e83c7 100644
--- a/MediaBrowser.Model/Users/AuthenticationResult.cs
+++ b/MediaBrowser.Model/Users/AuthenticationResult.cs
@@ -16,5 +16,11 @@ namespace MediaBrowser.Model.Users
         /// </summary>
         /// <value>The session information.</value>
         public SessionInfoDto SessionInfo { get; set; }
+
+        /// <summary>
+        /// Gets or sets the authentication token.
+        /// </summary>
+        /// <value>The authentication token.</value>
+        public string AuthenticationToken { get; set; }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs b/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs
index 1a7f9db28..c29a7d14e 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs
@@ -51,13 +51,16 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security
 
         private void ValidateUser(IRequest req)
         {
-            User user = null;
-
             //This code is executed before the service
             var auth = AuthorizationContext.GetAuthorizationInfo(req);
 
-            if (auth != null)
+            if (string.IsNullOrWhiteSpace(auth.Token))
             {
+                // Legacy
+                // TODO: Deprecate this in Oct 2014
+
+                User user = null;
+
                 if (!string.IsNullOrWhiteSpace(auth.UserId))
                 {
                     var userId = auth.UserId;
@@ -65,22 +68,14 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security
                     user = UserManager.GetUserById(new Guid(userId));
                 }
 
-                string deviceId = auth.DeviceId;
-                string device = auth.Device;
-                string client = auth.Client;
-                string version = auth.Version;
-
-                if (!string.IsNullOrEmpty(client) && !string.IsNullOrEmpty(deviceId) && !string.IsNullOrEmpty(device) && !string.IsNullOrEmpty(version))
+                if (user == null || user.Configuration.IsDisabled)
                 {
-                    var remoteEndPoint = req.RemoteIp;
-
-                    SessionManager.LogSessionActivity(client, version, deviceId, device, remoteEndPoint, user);
+                    throw new UnauthorizedAccessException("Unauthorized access.");
                 }
             }
-
-            if (user == null || user.Configuration.IsDisabled)
+            else
             {
-                throw new UnauthorizedAccessException("Unauthorized access.");
+                SessionManager.ValidateSecurityToken(auth.Token);
             }
         }
 
diff --git a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthorizationContext.cs b/MediaBrowser.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
index 6ea77f251..77343ab4e 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
@@ -42,7 +42,8 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security
                 Device = device,
                 DeviceId = deviceId,
                 UserId = userId,
-                Version = version
+                Version = version,
+                Token = httpReq.Headers["X-AUTH-TOKEN"]
             };
         }
 
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index f9d7479ce..1e0bbc39b 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -121,17 +121,20 @@ namespace MediaBrowser.Server.Implementations.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>
-        public async Task<bool> AuthenticateUser(User user, string password)
+        /// <exception cref="System.UnauthorizedAccessException"></exception>
+        public async Task<bool> AuthenticateUser(string username, string password)
         {
-            if (user == null)
+            if (string.IsNullOrWhiteSpace(username))
             {
-                throw new ArgumentNullException("user");
+                throw new ArgumentNullException("username");
             }
 
+            var user = Users.First(i => string.Equals(username, i.Name, StringComparison.OrdinalIgnoreCase));
+
             if (user.Configuration.IsDisabled)
             {
                 throw new UnauthorizedAccessException(string.Format("The {0} account is currently disabled. Please consult with your administrator.", user.Name));
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 467bedcf1..ad1ddba88 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -49,8 +49,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
         private readonly List<ILiveTvService> _services = new List<ILiveTvService>();
 
-        private readonly ConcurrentDictionary<string, LiveStreamInfo> _openStreams =
-            new ConcurrentDictionary<string, LiveStreamInfo>();
+        private readonly ConcurrentDictionary<string, LiveStreamData> _openStreams =
+            new ConcurrentDictionary<string, LiveStreamData>();
 
         private List<Guid> _channelIdList = new List<Guid>();
         private Dictionary<Guid, LiveTvProgram> _programs = new Dictionary<Guid, LiveTvProgram>();
@@ -291,66 +291,69 @@ namespace MediaBrowser.Server.Implementations.LiveTv
         private readonly SemaphoreSlim _liveStreamSemaphore = new SemaphoreSlim(1, 1);
 
         public async Task<LiveStreamInfo> GetRecordingStream(string id, CancellationToken cancellationToken)
+        {
+            return await GetLiveStream(id, false, cancellationToken).ConfigureAwait(false);
+        }
+
+        public async Task<LiveStreamInfo> GetChannelStream(string id, CancellationToken cancellationToken)
+        {
+            return await GetLiveStream(id, true, cancellationToken).ConfigureAwait(false);
+        }
+
+        private async Task<LiveStreamInfo> GetLiveStream(string id, bool isChannel, CancellationToken cancellationToken)
         {
             await _liveStreamSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
 
             try
             {
-                var service = ActiveService;
-
-                var recordings = await service.GetRecordingsAsync(cancellationToken).ConfigureAwait(false);
-
-                var recording = recordings.First(i => _tvDtoService.GetInternalRecordingId(service.Name, i.Id) == new Guid(id));
-
-                var result = await service.GetRecordingStream(recording.Id, cancellationToken).ConfigureAwait(false);
-
-                Sanitize(result);
+                // Avoid implicitly captured closure
+                var itemId = id;
 
-                _logger.Debug("Live stream info: " + _json.SerializeToString(result));
+                var stream = _openStreams
+                    .Where(i => string.Equals(i.Value.ItemId, itemId) && isChannel == i.Value.IsChannel)
+                    .Take(1)
+                    .Select(i => i.Value)
+                    .FirstOrDefault();
 
-                if (!string.IsNullOrEmpty(result.Id))
+                if (stream != null)
                 {
-                    _openStreams.AddOrUpdate(result.Id, result, (key, info) => result);
+                    stream.ConsumerCount++;
+                    _logger.Debug("Returning existing live tv stream");
+                    return stream.Info;
                 }
 
-                return result;
-            }
-            catch (Exception ex)
-            {
-                _logger.ErrorException("Error getting recording stream", ex);
-
-                throw;
-            }
-            finally
-            {
-                _liveStreamSemaphore.Release();
-            }
-        }
-
-        public async Task<LiveStreamInfo> GetChannelStream(string id, CancellationToken cancellationToken)
-        {
-            await _liveStreamSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
-
-            try
-            {
                 var service = ActiveService;
+                LiveStreamInfo info;
 
-                var channel = GetInternalChannel(id);
-
-                _logger.Info("Opening channel stream from {0}, external channel Id: {1}", service.Name, channel.ExternalId);
+                if (isChannel)
+                {
+                    var channel = GetInternalChannel(id);
+                    _logger.Info("Opening channel stream from {0}, external channel Id: {1}", service.Name, channel.ExternalId);
 
-                var result = await service.GetChannelStream(channel.ExternalId, cancellationToken).ConfigureAwait(false);
+                    info = await service.GetChannelStream(channel.ExternalId, cancellationToken).ConfigureAwait(false);
+                }
+                else
+                {
+                    var recordings = await service.GetRecordingsAsync(cancellationToken).ConfigureAwait(false);
+                    var recording = recordings.First(i => _tvDtoService.GetInternalRecordingId(service.Name, i.Id) == new Guid(id));
 
-                Sanitize(result);
+                    _logger.Info("Opening recording stream from {0}, external recording Id: {1}", service.Name, recording.Id);
+                    info = await service.GetRecordingStream(recording.Id, cancellationToken).ConfigureAwait(false);
+                }
 
-                _logger.Debug("Live stream info: " + _json.SerializeToString(result));
+                Sanitize(info);
 
-                if (!string.IsNullOrEmpty(result.Id))
+                var data = new LiveStreamData
                 {
-                    _openStreams.AddOrUpdate(result.Id, result, (key, info) => result);
-                }
+                    Info = info,
+                    ConsumerCount = 1,
+                    IsChannel = isChannel,
+                    ItemId = id
+                };
 
-                return result;
+                _openStreams.AddOrUpdate(info.Id, data, (key, i) => data);
+
+                return info;
             }
             catch (Exception ex)
             {
@@ -1597,20 +1600,38 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             };
         }
 
+        class LiveStreamData
+        {
+            internal LiveStreamInfo Info;
+            internal int ConsumerCount;
+            internal string ItemId;
+            internal bool IsChannel;
+        }
+
         public async Task CloseLiveStream(string id, CancellationToken cancellationToken)
         {
             await _liveStreamSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
 
-            var service = ActiveService;
-
-            _logger.Info("Closing live stream from {0}, stream Id: {1}", service.Name, id);
-
             try
             {
-                await service.CloseLiveStream(id, cancellationToken).ConfigureAwait(false);
+                var service = ActiveService;
+
+                LiveStreamData data;
+                if (_openStreams.TryGetValue(id, out data))
+                {
+                    if (data.ConsumerCount > 1)
+                    {
+                        data.ConsumerCount--;
+                        _logger.Info("Decrementing live stream client count.");
+                        return;
+                    }
 
-                LiveStreamInfo removed;
-                _openStreams.TryRemove(id, out removed);
+                }
+                _openStreams.TryRemove(id, out data);
+
+                _logger.Info("Closing live stream from {0}, stream Id: {1}", service.Name, id);
+
+                await service.CloseLiveStream(id, cancellationToken).ConfigureAwait(false);
             }
             catch (Exception ex)
             {
@@ -1662,7 +1683,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 {
                     foreach (var stream in _openStreams.Values.ToList())
                     {
-                        var task = CloseLiveStream(stream.Id, CancellationToken.None);
+                        var task = CloseLiveStream(stream.Info.Id, CancellationToken.None);
 
                         Task.WaitAll(task);
                     }
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
index b3280dac7..41555fe82 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -201,5 +201,21 @@
 	"ButtonOpenInNewTab": "Open in new tab",
 	"ButtonShuffle": "Shuffle",
 	"ButtonInstantMix": "Instant mix",
-	"ButtonResume": "Resume"
+	"ButtonResume": "Resume",
+	"HeaderScenes": "Scenes",
+	"HeaderAudioTracks": "Audio Tracks",
+	"LabelUnknownLanguage": "Unknown language",
+	"HeaderSubtitles": "Subtitles",
+	"HeaderVideoQuality": "Video Quality",
+	"MessageErrorPlayingVideo": "There was an error playing the video.",
+	"MessageEnsureOpenTuner": "Please ensure there is an open tuner availalble.",
+	"ButtonHome": "Home",
+	"ButtonDashboard": "Dashboard",
+	"ButtonReports": "Reports",
+	"ButtonMetadataManager": "Metadata Manager",
+	"HeaderTime": "Time",
+	"HeaderName": "Name",
+	"HeaderAlbum": "Album",
+	"HeaderAlbumArtist": "Album Artist",
+	"HeaderArtist": "Artist"
 }
\ 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 10e27bc30..a909929ae 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -200,6 +200,7 @@
     <Compile Include="News\NewsService.cs" />
     <Compile Include="Notifications\CoreNotificationTypes.cs" />
     <Compile Include="Notifications\InternalNotificationService.cs" />
+    <Compile Include="Notifications\NotificationConfigurationFactory.cs" />
     <Compile Include="Notifications\NotificationManager.cs" />
     <Compile Include="Persistence\SqliteChapterRepository.cs" />
     <Compile Include="Persistence\SqliteExtensions.cs" />
diff --git a/MediaBrowser.Server.Implementations/Notifications/NotificationConfigurationFactory.cs b/MediaBrowser.Server.Implementations/Notifications/NotificationConfigurationFactory.cs
new file mode 100644
index 000000000..a336eba0e
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Notifications/NotificationConfigurationFactory.cs
@@ -0,0 +1,21 @@
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Model.Notifications;
+using System.Collections.Generic;
+
+namespace MediaBrowser.Server.Implementations.Notifications
+{
+    public class NotificationConfigurationFactory : IConfigurationFactory
+    {
+        public IEnumerable<ConfigurationStore> GetConfigurations()
+        {
+            return new List<ConfigurationStore>
+            {
+                new ConfigurationStore
+                {
+                    Key = "notifications",
+                    ConfigurationType = typeof (NotificationOptions)
+                }
+            };
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/Notifications/NotificationManager.cs b/MediaBrowser.Server.Implementations/Notifications/NotificationManager.cs
index 416b29e86..964e2cd24 100644
--- a/MediaBrowser.Server.Implementations/Notifications/NotificationManager.cs
+++ b/MediaBrowser.Server.Implementations/Notifications/NotificationManager.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
@@ -30,13 +31,18 @@ namespace MediaBrowser.Server.Implementations.Notifications
             _logger = logManager.GetLogger(GetType().Name);
         }
 
+        private NotificationOptions GetConfiguration()
+        {
+            return _config.GetConfiguration<NotificationOptions>("notifications");
+        }
+
         public Task SendNotification(NotificationRequest request, CancellationToken cancellationToken)
         {
             var notificationType = request.NotificationType;
 
             var options = string.IsNullOrWhiteSpace(notificationType) ?
                 null :
-                _config.Configuration.NotificationOptions.GetOptions(notificationType);
+                GetConfiguration().GetOptions(notificationType);
 
             var users = GetUserIds(request, options)
                 .Except(request.ExcludeUserIds)
@@ -223,7 +229,7 @@ namespace MediaBrowser.Server.Implementations.Notifications
         private bool IsEnabled(INotificationService service, string notificationType)
         {
             return string.IsNullOrEmpty(notificationType) ||
-                _config.Configuration.NotificationOptions.IsServiceEnabled(service.Name, notificationType);
+                GetConfiguration().IsServiceEnabled(service.Name, notificationType);
         }
 
         public void AddParts(IEnumerable<INotificationService> services, IEnumerable<INotificationTypeFactory> notificationTypeFactories)
@@ -248,9 +254,11 @@ namespace MediaBrowser.Server.Implementations.Notifications
 
             }).SelectMany(i => i).ToList();
 
+            var config = GetConfiguration();
+
             foreach (var i in list)
             {
-                i.Enabled = _config.Configuration.NotificationOptions.IsEnabled(i.Type);
+                i.Enabled = config.IsEnabled(i.Type);
             }
 
             return list;
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 4e2b3c7b7..2f6790a3e 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -25,6 +25,7 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Model.Users;
 
 namespace MediaBrowser.Server.Implementations.Session
 {
@@ -1138,10 +1139,15 @@ namespace MediaBrowser.Server.Implementations.Session
             }
         }
 
+        public void ValidateSecurityToken(string token)
+        {
+
+        }
+
         /// <summary>
         /// Authenticates the new session.
         /// </summary>
-        /// <param name="user">The user.</param>
+        /// <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>
@@ -1149,17 +1155,34 @@ namespace MediaBrowser.Server.Implementations.Session
         /// <param name="deviceName">Name of the device.</param>
         /// <param name="remoteEndPoint">The remote end point.</param>
         /// <returns>Task{SessionInfo}.</returns>
+        /// <exception cref="System.UnauthorizedAccessException">Invalid user or password entered.</exception>
         /// <exception cref="UnauthorizedAccessException"></exception>
-        public async Task<SessionInfo> AuthenticateNewSession(User user, string password, string clientType, string appVersion, string deviceId, string deviceName, string remoteEndPoint)
+        public async Task<AuthenticationResult> AuthenticateNewSession(string username, string password, string clientType, string appVersion, string deviceId, string deviceName, string remoteEndPoint)
         {
-            var result = await _userManager.AuthenticateUser(user, password).ConfigureAwait(false);
+            var result = await _userManager.AuthenticateUser(username, password).ConfigureAwait(false);
 
             if (!result)
             {
                 throw new UnauthorizedAccessException("Invalid user or password entered.");
             }
 
-            return await LogSessionActivity(clientType, appVersion, deviceId, deviceName, remoteEndPoint, user).ConfigureAwait(false);
+            var user = _userManager.Users
+                .First(i => string.Equals(username, i.Name, StringComparison.OrdinalIgnoreCase));
+
+            var session = await LogSessionActivity(clientType,
+                appVersion,
+                deviceId,
+                deviceName,
+                remoteEndPoint,
+                user)
+                .ConfigureAwait(false);
+
+            return new AuthenticationResult
+            {
+                User = _dtoService.GetUserDto(user),
+                SessionInfo = GetSessionInfoDto(session),
+                AuthenticationToken = Guid.NewGuid().ToString("N")
+            };
         }
 
         /// <summary>
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index e8fb7bfcb..673a9f151 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -318,6 +318,13 @@ namespace MediaBrowser.ServerApplication
                 saveConfig = true;
             }
 
+            if (ServerConfigurationManager.Configuration.NotificationOptions != null)
+            {
+                ServerConfigurationManager.SaveConfiguration("notifications", ServerConfigurationManager.Configuration.NotificationOptions);
+                ServerConfigurationManager.Configuration.NotificationOptions = null;
+                saveConfig = true;
+            }
+
             if (saveConfig)
             {
                 ServerConfigurationManager.SaveConfiguration();
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 80f864a32..3ccf26c37 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -403,7 +403,7 @@ namespace MediaBrowser.WebDashboard.Api
 
             var files = new[]
                             {
-                                "thirdparty/jquerymobile-1.4.2/jquery.mobile-1.4.2.min.css",
+                                "thirdparty/jquerymobile-1.4.3/jquery.mobile-1.4.3.min.css",
                                 "css/all.css" + versionString
                             };
 
@@ -449,7 +449,7 @@ namespace MediaBrowser.WebDashboard.Api
 
             // jQuery + jQuery mobile
             await AppendResource(memoryStream, "thirdparty/jquery-2.0.3.min.js", newLineBytes).ConfigureAwait(false);
-            await AppendResource(memoryStream, "thirdparty/jquerymobile-1.4.2/jquery.mobile-1.4.2.min.js", newLineBytes).ConfigureAwait(false);
+            await AppendResource(memoryStream, "thirdparty/jquerymobile-1.4.3/jquery.mobile-1.4.3.min.js", newLineBytes).ConfigureAwait(false);
 
             await AppendLocalization(memoryStream).ConfigureAwait(false);
             await memoryStream.WriteAsync(newLineBytes, 0, newLineBytes.Length).ConfigureAwait(false);
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index cbdae6d08..8f85fcb51 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -815,613 +815,613 @@
     <Content Include="dashboard-ui\thirdparty\jquery.unveil-custom.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\ajax-loader.gif">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\ajax-loader.gif">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\action-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\action-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\action-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\action-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\alert-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\alert-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\alert-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\alert-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\arrow-d-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\arrow-d-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\arrow-d-l-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\arrow-d-l-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\arrow-d-l-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\arrow-d-l-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\arrow-d-r-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\arrow-d-r-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\arrow-d-r-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\arrow-d-r-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\arrow-d-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\arrow-d-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\arrow-l-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\arrow-l-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\arrow-l-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\arrow-l-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\arrow-r-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\arrow-r-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\arrow-r-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\arrow-r-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\arrow-u-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\arrow-u-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\arrow-u-l-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\arrow-u-l-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\arrow-u-l-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\arrow-u-l-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\arrow-u-r-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\arrow-u-r-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\arrow-u-r-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\arrow-u-r-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\arrow-u-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\arrow-u-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\audio-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\audio-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\audio-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\audio-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\back-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\back-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\back-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\back-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\bars-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\bars-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\bars-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\bars-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\bullets-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\bullets-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\bullets-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\bullets-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\calendar-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\calendar-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\calendar-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\calendar-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\camera-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\camera-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\camera-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\camera-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\carat-d-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\carat-d-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\carat-d-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\carat-d-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\carat-l-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\carat-l-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\carat-l-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\carat-l-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\carat-r-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\carat-r-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\carat-r-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\carat-r-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\carat-u-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\carat-u-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\carat-u-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\carat-u-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\check-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\check-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\check-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\check-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\clock-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\clock-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\clock-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\clock-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\cloud-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\cloud-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\cloud-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\cloud-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\comment-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\comment-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\comment-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\comment-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\delete-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\delete-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\delete-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\delete-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\edit-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\edit-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\edit-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\edit-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\eye-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\eye-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\eye-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\eye-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\forbidden-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\forbidden-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\forbidden-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\forbidden-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\forward-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\forward-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\forward-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\forward-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\gear-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\gear-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\gear-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\gear-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\grid-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\grid-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\grid-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\grid-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\heart-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\heart-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\heart-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\heart-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\home-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\home-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\home-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\home-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\info-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\info-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\info-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\info-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\location-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\location-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\location-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\location-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\lock-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\lock-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\lock-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\lock-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\mail-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\mail-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\mail-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\mail-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\minus-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\minus-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\minus-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\minus-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\navigation-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\navigation-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\navigation-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\navigation-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\phone-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\phone-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\phone-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\phone-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\plus-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\plus-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\plus-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\plus-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\power-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\power-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\power-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\power-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\recycle-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\recycle-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\recycle-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\recycle-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\refresh-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\refresh-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\refresh-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\refresh-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\search-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\search-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\search-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\search-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\shop-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\shop-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\shop-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\shop-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\star-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\star-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\star-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\star-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\tag-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\tag-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\tag-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\tag-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\user-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\user-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\user-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\user-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\video-black.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\video-black.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-png\video-white.png">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-png\video-white.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\action-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\action-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\action-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\action-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\alert-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\alert-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\alert-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\alert-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\arrow-d-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\arrow-d-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\arrow-d-l-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\arrow-d-l-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\arrow-d-l-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\arrow-d-l-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\arrow-d-r-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\arrow-d-r-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\arrow-d-r-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\arrow-d-r-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\arrow-d-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\arrow-d-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\arrow-l-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\arrow-l-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\arrow-l-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\arrow-l-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\arrow-r-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\arrow-r-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\arrow-r-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\arrow-r-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\arrow-u-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\arrow-u-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\arrow-u-l-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\arrow-u-l-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\arrow-u-l-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\arrow-u-l-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\arrow-u-r-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\arrow-u-r-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\arrow-u-r-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\arrow-u-r-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\arrow-u-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\arrow-u-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\audio-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\audio-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\audio-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\audio-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\back-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\back-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\back-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\back-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\bars-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\bars-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\bars-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\bars-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\bullets-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\bullets-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\bullets-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\bullets-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\calendar-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\calendar-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\calendar-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\calendar-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\camera-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\camera-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\camera-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\camera-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\carat-d-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\carat-d-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\carat-d-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\carat-d-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\carat-l-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\carat-l-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\carat-l-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\carat-l-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\carat-r-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\carat-r-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\carat-r-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\carat-r-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\carat-u-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\carat-u-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\carat-u-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\carat-u-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\check-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\check-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\check-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\check-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\clock-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\clock-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\clock-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\clock-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\cloud-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\cloud-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\cloud-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\cloud-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\comment-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\comment-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\comment-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\comment-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\delete-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\delete-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\delete-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\delete-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\edit-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\edit-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\edit-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\edit-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\eye-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\eye-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\eye-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\eye-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\forbidden-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\forbidden-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\forbidden-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\forbidden-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\forward-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\forward-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\forward-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\forward-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\gear-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\gear-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\gear-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\gear-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\grid-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\grid-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\grid-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\grid-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\heart-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\heart-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\heart-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\heart-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\home-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\home-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\home-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\home-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\info-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\info-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\info-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\info-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\location-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\location-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\location-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\location-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\lock-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\lock-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\lock-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\lock-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\mail-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\mail-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\mail-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\mail-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\minus-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\minus-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\minus-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\minus-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\navigation-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\navigation-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\navigation-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\navigation-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\phone-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\phone-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\phone-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\phone-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\plus-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\plus-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\plus-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\plus-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\power-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\power-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\power-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\power-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\recycle-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\recycle-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\recycle-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\recycle-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\refresh-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\refresh-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\refresh-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\refresh-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\search-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\search-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\search-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\search-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\shop-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\shop-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\shop-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\shop-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\star-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\star-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\star-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\star-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\tag-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\tag-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\tag-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\tag-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\user-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\user-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\user-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\user-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\video-black.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\video-black.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\images\icons-svg\video-white.svg">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\images\icons-svg\video-white.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\jquery.mobile-1.4.2.min.css">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\jquery.mobile-1.4.3.min.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.2\jquery.mobile-1.4.2.min.js">
+    <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\jquery.mobile-1.4.3.min.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="dashboard-ui\thirdparty\jstree1.0\jquery.jstree.min.js">
@@ -2144,6 +2144,9 @@
     <None Include="dashboard-ui\css\fonts\RobotoThin.woff">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="dashboard-ui\thirdparty\jquerymobile-1.4.3\jquery.mobile-1.4.3.min.map">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config" />
     <None Include="WebMarkupMin.Configuration.xsd">
       <SubType>Designer</SubType>
-- 
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.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/BrandingService.cs b/MediaBrowser.Api/BrandingService.cs
new file mode 100644
index 000000000..4b49b411a
--- /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 39fcc50d8..291deb3b0 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 4f8c348bb..deaefe019 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 b95e18a0d..993b69601 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 77a714755..10aa23126 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 4fc3e00c0..000000000
--- 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 a68966b33..ca2887d19 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 28edb61dd..51a080106 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 00c307a18..f4651601b 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 000000000..3e692cb22
--- /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 2f0741434..6f2e83a79 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 d1767e7fd..55cdc8681 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 64d1fcb34..cda489c94 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 46dabb042..000000000
--- 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 0cc4fc6b4..dcac5e7ba 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 f9d7cc21a..0d0555dc0 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 524d7097b..042834731 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 584091b13..b886cef19 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 780181a61..d576d90c4 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 b9630a66f..847183fd0 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 e5a8135c2..6404e71ec 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 86099fdc0..619a497f5 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 2bec9e3de..9db91e7f2 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 23610351e..ba1cb3043 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 692d6db90..7f1ddbce9 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 6d3a9d20c..7b2062182 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 0ed49d5f8..91c1508fc 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 12c87ca97..782e8524d 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 000000000..737cb5c48
--- /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 36c353479..49b731341 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 db8b69951..86eb40b97 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 26b0e9d9e..6ee9f1916 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 d758f2f39..4d4ca8e20 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 f511d41a9..6e9368f44 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 40723eff8..98df3efe5 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 000000000..ba409c542
--- /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 12af93dbd..1b2e9fa6d 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 92b4616e7..57a40741f 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 000000000..d6cd3424b
--- /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 73216ca33..62ff9f687 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 d7186aa21..c31f46215 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 833dfc5e4..cfcbb077e 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 77343ab4e..94be37e95 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 79f126511..d3030f31f 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 412b2e7bd..9c69e656d 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 ad1ddba88..09793f4fc 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 3bd0df0eb..d6d4bbc51 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 a909929ae..1d201e069 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 964e2cd24..b832f3a06 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 2f6790a3e..2d85a3aa7 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 46c3df07b..7e6a252cd 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 673a9f151..91e92e21c 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 4ba98e9b6..c2c64ea4d 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 f5f9434e7..47a4be8e3 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 3ccf26c37..36adae71c 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 8f85fcb51..0099daaf1 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 e2b3320f8000b695f5e45c79adc12b03505e4dff Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 4 Jul 2014 15:17:22 -0400
Subject: add one year tolerance to movie lookups

---
 MediaBrowser.Api/ItemLookupService.cs                     | 12 +++++++++++-
 MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs        | 10 ++++++++++
 MediaBrowser.Model/Dlna/StreamInfo.cs                     |  2 +-
 MediaBrowser.Providers/Movies/MovieDbSearch.cs            | 15 ++++++++++++---
 MediaBrowser.Providers/TV/TvdbSeasonImageProvider.cs      |  2 +-
 .../Library/MusicManager.cs                               | 10 ++++++++--
 .../Localization/Server/server.json                       |  4 +++-
 7 files changed, 46 insertions(+), 9 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/ItemLookupService.cs b/MediaBrowser.Api/ItemLookupService.cs
index 35b1b5385..a08f28533 100644
--- a/MediaBrowser.Api/ItemLookupService.cs
+++ b/MediaBrowser.Api/ItemLookupService.cs
@@ -22,6 +22,7 @@ namespace MediaBrowser.Api
 {
     [Route("/Items/{Id}/ExternalIdInfos", "GET")]
     [Api(Description = "Gets external id infos for an item")]
+    [Authenticated]
     public class GetExternalIdInfos : IReturn<List<ExternalIdInfo>>
     {
         /// <summary>
@@ -34,54 +35,63 @@ namespace MediaBrowser.Api
 
     [Route("/Items/RemoteSearch/Movie", "POST")]
     [Api(Description = "Gets external id infos for an item")]
+    [Authenticated]
     public class GetMovieRemoteSearchResults : RemoteSearchQuery<MovieInfo>, IReturn<List<RemoteSearchResult>>
     {
     }
 
     [Route("/Items/RemoteSearch/Trailer", "POST")]
     [Api(Description = "Gets external id infos for an item")]
+    [Authenticated]
     public class GetTrailerRemoteSearchResults : RemoteSearchQuery<TrailerInfo>, IReturn<List<RemoteSearchResult>>
     {
     }
 
     [Route("/Items/RemoteSearch/AdultVideo", "POST")]
     [Api(Description = "Gets external id infos for an item")]
+    [Authenticated]
     public class GetAdultVideoRemoteSearchResults : RemoteSearchQuery<ItemLookupInfo>, IReturn<List<RemoteSearchResult>>
     {
     }
 
     [Route("/Items/RemoteSearch/Series", "POST")]
     [Api(Description = "Gets external id infos for an item")]
+    [Authenticated]
     public class GetSeriesRemoteSearchResults : RemoteSearchQuery<SeriesInfo>, IReturn<List<RemoteSearchResult>>
     {
     }
 
     [Route("/Items/RemoteSearch/Game", "POST")]
     [Api(Description = "Gets external id infos for an item")]
+    [Authenticated]
     public class GetGameRemoteSearchResults : RemoteSearchQuery<GameInfo>, IReturn<List<RemoteSearchResult>>
     {
     }
 
     [Route("/Items/RemoteSearch/BoxSet", "POST")]
     [Api(Description = "Gets external id infos for an item")]
+    [Authenticated]
     public class GetBoxSetRemoteSearchResults : RemoteSearchQuery<BoxSetInfo>, IReturn<List<RemoteSearchResult>>
     {
     }
 
     [Route("/Items/RemoteSearch/MusicArtist", "POST")]
     [Api(Description = "Gets external id infos for an item")]
+    [Authenticated]
     public class GetMusicArtistRemoteSearchResults : RemoteSearchQuery<ArtistInfo>, IReturn<List<RemoteSearchResult>>
     {
     }
 
     [Route("/Items/RemoteSearch/MusicAlbum", "POST")]
     [Api(Description = "Gets external id infos for an item")]
+    [Authenticated]
     public class GetMusicAlbumRemoteSearchResults : RemoteSearchQuery<AlbumInfo>, IReturn<List<RemoteSearchResult>>
     {
     }
 
     [Route("/Items/RemoteSearch/Person", "POST")]
     [Api(Description = "Gets external id infos for an item")]
+    [Authenticated]
     public class GetPersonRemoteSearchResults : RemoteSearchQuery<PersonLookupInfo>, IReturn<List<RemoteSearchResult>>
     {
     }
@@ -99,13 +109,13 @@ namespace MediaBrowser.Api
 
     [Route("/Items/RemoteSearch/Apply/{Id}", "POST")]
     [Api(Description = "Applies search criteria to an item and refreshes metadata")]
+    [Authenticated]
     public class ApplySearchCriteria : RemoteSearchResult, IReturnVoid
     {
         [ApiMember(Name = "Id", Description = "The item id", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")]
         public string Id { get; set; }
     }
 
-    [Authenticated]
     public class ItemLookupService : BaseApiService
     {
         private readonly IProviderManager _providerManager;
diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
index a8c6c0239..ffe71f4ea 100644
--- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
@@ -57,6 +57,16 @@ namespace MediaBrowser.Api.Playback.Hls
         {
             var result = GetAsync(request).Result;
 
+            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.");
+            }
+
             return result;
         }
 
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index b8c256b25..e5e013b2a 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -91,7 +91,7 @@ namespace MediaBrowser.Model.Dlna
 
             if (StringHelper.EqualsIgnoreCase(Protocol, "hls"))
             {
-                return string.Format("{0}/videos/{1}/stream.m3u8?{2}", baseUrl, ItemId, dlnaCommand);
+                return string.Format("{0}/videos/{1}/master.m3u8?{2}", baseUrl, ItemId, dlnaCommand);
             }
 
             return string.Format("{0}/videos/{1}/stream{2}?{3}", baseUrl, ItemId, extension, dlnaCommand);
diff --git a/MediaBrowser.Providers/Movies/MovieDbSearch.cs b/MediaBrowser.Providers/Movies/MovieDbSearch.cs
index 500b71a79..b8f176454 100644
--- a/MediaBrowser.Providers/Movies/MovieDbSearch.cs
+++ b/MediaBrowser.Providers/Movies/MovieDbSearch.cs
@@ -109,7 +109,8 @@ namespace MediaBrowser.Providers.Movies
             {
                 if (year.HasValue && i.ProductionYear.HasValue)
                 {
-                    return year.Value == i.ProductionYear.Value;
+                    // Allow one year tolerance
+                    return Math.Abs(year.Value - i.ProductionYear.Value) <= 1;
                 }
 
                 return true;
@@ -177,11 +178,19 @@ namespace MediaBrowser.Providers.Movies
                 // These dates are always in this exact format
                 if (DateTime.TryParseExact(result.release_date, "yyyy-MM-dd", EnUs, DateTimeStyles.None, out r))
                 {
-                    return Math.Abs(r.Year - year.Value);
+                    // Allow one year tolernace, preserve order from Tmdb
+                    var variance = Math.Abs(r.Year - year.Value);
+
+                    if (variance <= 1)
+                    {
+                        return 0;
+                    }
+
+                    return variance;
                 }
             }
 
-            return 0;
+            return int.MaxValue;
         }
 
         /// <summary>
diff --git a/MediaBrowser.Providers/TV/TvdbSeasonImageProvider.cs b/MediaBrowser.Providers/TV/TvdbSeasonImageProvider.cs
index af1edeed0..5e2c8b919 100644
--- a/MediaBrowser.Providers/TV/TvdbSeasonImageProvider.cs
+++ b/MediaBrowser.Providers/TV/TvdbSeasonImageProvider.cs
@@ -95,7 +95,7 @@ namespace MediaBrowser.Providers.TV
         {
             var offset = TvdbSeriesProvider.GetSeriesOffset(series.ProviderIds);
             if (offset != null)
-                return (int) (seasonNumber + offset);
+                return (seasonNumber + offset.Value);
 
             return seasonNumber;
         }
diff --git a/MediaBrowser.Server.Implementations/Library/MusicManager.cs b/MediaBrowser.Server.Implementations/Library/MusicManager.cs
index 9d5826454..df122e166 100644
--- a/MediaBrowser.Server.Implementations/Library/MusicManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MusicManager.cs
@@ -18,7 +18,12 @@ namespace MediaBrowser.Server.Implementations.Library
 
         public IEnumerable<Audio> GetInstantMixFromSong(Audio item, User user)
         {
-            return GetInstantMixFromGenres(item.Genres, user);
+            var list = new List<Audio>
+            {
+                item
+            };
+
+            return list.Concat(GetInstantMixFromGenres(item.Genres, user));
         }
 
         public IEnumerable<Audio> GetInstantMixFromArtist(string name, User user)
@@ -39,7 +44,7 @@ namespace MediaBrowser.Server.Implementations.Library
         public IEnumerable<Audio> GetInstantMixFromAlbum(MusicAlbum item, User user)
         {
             var genres = item
-               .RecursiveChildren
+                .GetRecursiveChildren(user, true)
                .OfType<Audio>()
                .SelectMany(i => i.Genres)
                .Concat(item.Genres)
@@ -57,6 +62,7 @@ namespace MediaBrowser.Server.Implementations.Library
             return inputItems
                 .OfType<Audio>()
                 .Select(i => new Tuple<Audio, int>(i, i.Genres.Count(genresDictionary.ContainsKey)))
+                .Where(i => i.Item2 > 0)
                 .OrderByDescending(i => i.Item2)
                 .ThenBy(i => Guid.NewGuid())
                 .Select(i => i.Item1)
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index d6d4bbc51..a1c08c8d8 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -858,5 +858,7 @@
 	"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."
+	"LabelLoginDisclaimerHelp": "This will be displayed at the bottom of the login page.",
+	"LabelAutomaticallyDonate": "Automatically donate this amount each month",
+	"LabelAutomaticallyDonateHelp": "You can cancel at any time via your PayPal account."
 }
\ No newline at end of file
-- 
cgit v1.2.3


From baf44b2718162c7f1d4f3061e438efbafc22201b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 13 Jul 2014 00:55:56 -0400
Subject: 3.0.5306.42925

---
 MediaBrowser.Api/ConfigurationService.cs           | 24 ++++----
 MediaBrowser.Api/ItemUpdateService.cs              | 11 +++-
 MediaBrowser.Api/UserService.cs                    | 71 +++++++++++++++++++---
 .../Updates/InstallationManager.cs                 | 24 +++++---
 .../Configuration/IServerConfigurationManager.cs   |  2 +-
 .../Resolvers/EntityResolutionHelper.cs            | 15 +++++
 MediaBrowser.Controller/Session/ISessionManager.cs | 11 +---
 .../MediaBrowser.Model.Portable.csproj             | 21 +++++++
 MediaBrowser.Model.Portable/app.config             | 15 +++++
 MediaBrowser.Model.Portable/packages.config        |  3 +
 MediaBrowser.Model/ApiClient/IApiClient.cs         |  6 ++
 MediaBrowser.Model/Entities/CollectionType.cs      |  3 +-
 .../Configuration/ServerConfigurationManager.cs    |  2 +-
 .../Library/CoreResolutionIgnoreRule.cs            | 17 +-----
 .../Library/Resolvers/Movies/MovieResolver.cs      | 14 ++---
 .../Session/SessionManager.cs                      | 37 ++---------
 MediaBrowser.ServerApplication/ApplicationHost.cs  |  2 +-
 Nuget/MediaBrowser.Common.Internal.nuspec          |  4 +-
 Nuget/MediaBrowser.Common.nuspec                   | 12 ++--
 Nuget/MediaBrowser.Model.Signed.nuspec             |  2 +-
 Nuget/MediaBrowser.Server.Core.nuspec              |  4 +-
 21 files changed, 191 insertions(+), 109 deletions(-)
 create mode 100644 MediaBrowser.Model.Portable/app.config

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/ConfigurationService.cs b/MediaBrowser.Api/ConfigurationService.cs
index c83028bb2..29848cfc0 100644
--- a/MediaBrowser.Api/ConfigurationService.cs
+++ b/MediaBrowser.Api/ConfigurationService.cs
@@ -122,42 +122,44 @@ namespace MediaBrowser.Api
             return ToOptimizedResult(result);
         }
 
+        const string XbmcMetadata = "Xbmc Nfo";
+        const string MediaBrowserMetadata = "Media Browser Xml";
+
         public void Post(AutoSetMetadataOptions request)
         {
             var service = AutoDetectMetadataService();
 
             Logger.Info("Setting preferred metadata format to " + service);
 
-            _configurationManager.SetPreferredMetadataService(service);
+            var serviceToDisable = string.Equals(service, XbmcMetadata) ?
+                MediaBrowserMetadata :
+                XbmcMetadata;
+
+            _configurationManager.DisableMetadataService(serviceToDisable);
             _configurationManager.SaveConfiguration();
         }
 
         private string AutoDetectMetadataService()
         {
-            const string xbmc = "Xbmc Nfo";
-            const string mb = "Media Browser Xml";
-
             var paths = _libraryManager.GetDefaultVirtualFolders()
                 .SelectMany(i => i.Locations)
                 .Distinct(StringComparer.OrdinalIgnoreCase)
                 .Select(i => new DirectoryInfo(i))
                 .ToList();
 
-            if (paths.Select(i => i.EnumerateFiles("*.xml", SearchOption.AllDirectories))
-                .SelectMany(i => i)
+            if (paths.SelectMany(i => i.EnumerateFiles("*.xml", SearchOption.AllDirectories))
                 .Any())
             {
-                return xbmc;
+                return XbmcMetadata;
             }
 
-            if (paths.Select(i => i.EnumerateFiles("*.xml", SearchOption.AllDirectories))
-                .SelectMany(i => i)
+            if (paths.SelectMany(i => i.EnumerateFiles("*.xml", SearchOption.AllDirectories))
                 .Any(i => string.Equals(i.Name, "series.xml", StringComparison.OrdinalIgnoreCase) || string.Equals(i.Name, "movie.xml", StringComparison.OrdinalIgnoreCase)))
             {
-                return mb;
+                return MediaBrowserMetadata;
             }
             
-            return xbmc;
+            return XbmcMetadata;
         }
 
         /// <summary>
diff --git a/MediaBrowser.Api/ItemUpdateService.cs b/MediaBrowser.Api/ItemUpdateService.cs
index db6c6ce53..1fa1a5509 100644
--- a/MediaBrowser.Api/ItemUpdateService.cs
+++ b/MediaBrowser.Api/ItemUpdateService.cs
@@ -65,6 +65,11 @@ namespace MediaBrowser.Api
             }
         }
 
+        private DateTime NormalizeDateTime(DateTime val)
+        {
+            return DateTime.SpecifyKind(val, DateTimeKind.Utc);
+        }
+
         private void UpdateItem(BaseItemDto request, BaseItem item)
         {
             item.Name = request.Name;
@@ -140,11 +145,11 @@ namespace MediaBrowser.Api
 
             if (request.DateCreated.HasValue)
             {
-                item.DateCreated = request.DateCreated.Value.ToUniversalTime();
+                item.DateCreated = NormalizeDateTime(request.DateCreated.Value);
             }
 
-            item.EndDate = request.EndDate.HasValue ? request.EndDate.Value.ToUniversalTime() : (DateTime?)null;
-            item.PremiereDate = request.PremiereDate.HasValue ? request.PremiereDate.Value.ToUniversalTime() : (DateTime?)null;
+            item.EndDate = request.EndDate.HasValue ? NormalizeDateTime(request.EndDate.Value) : (DateTime?)null;
+            item.PremiereDate = request.PremiereDate.HasValue ? NormalizeDateTime(request.PremiereDate.Value) : (DateTime?)null;
             item.ProductionYear = request.ProductionYear;
             item.OfficialRating = request.OfficialRating;
             item.CustomRating = request.CustomRating;
diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs
index 178199b22..df4bc06ba 100644
--- a/MediaBrowser.Api/UserService.cs
+++ b/MediaBrowser.Api/UserService.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Library;
@@ -11,6 +12,7 @@ using ServiceStack.Text.Controller;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.Threading.Tasks;
 
 namespace MediaBrowser.Api
@@ -168,6 +170,7 @@ namespace MediaBrowser.Api
         private readonly IDtoService _dtoService;
         private readonly ISessionManager _sessionMananger;
         private readonly IServerConfigurationManager _config;
+        private readonly INetworkManager _networkManager;
 
         public IAuthorizationContext AuthorizationContext { get; set; }
 
@@ -178,12 +181,13 @@ namespace MediaBrowser.Api
         /// <param name="dtoService">The dto service.</param>
         /// <param name="sessionMananger">The session mananger.</param>
         /// <exception cref="System.ArgumentNullException">xmlSerializer</exception>
-        public UserService(IUserManager userManager, IDtoService dtoService, ISessionManager sessionMananger, IServerConfigurationManager config)
+        public UserService(IUserManager userManager, IDtoService dtoService, ISessionManager sessionMananger, IServerConfigurationManager config, INetworkManager networkManager)
         {
             _userManager = userManager;
             _dtoService = dtoService;
             _sessionMananger = sessionMananger;
             _config = config;
+            _networkManager = networkManager;
         }
 
         public object Get(GetPublicUsers request)
@@ -200,18 +204,65 @@ namespace MediaBrowser.Api
                 });
             }
 
-            // TODO: Add or is authenticated
-            if (_sessionMananger.IsInLocalNetwork(Request.RemoteIp))
+            // TODO: Uncomment this once all clients can handle an empty user list.
+            return Get(new GetUsers
             {
-                return Get(new GetUsers
+                IsHidden = false,
+                IsDisabled = false
+            });
+
+            //// TODO: Add or is authenticated
+            //if (Request.IsLocal || IsInLocalNetwork(Request.RemoteIp))
+            //{
+            //    return Get(new GetUsers
+            //    {
+            //        IsHidden = false,
+            //        IsDisabled = false
+            //    });
+            //}
+
+            //// Return empty when external
+            //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)))
                 {
-                    IsHidden = false,
-                    IsDisabled = false
-                });
+                    return true;
+                }
             }
 
-            // Return empty when external
-            return ToOptimizedResult(new List<UserDto>());
+            // 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>
@@ -307,7 +358,7 @@ namespace MediaBrowser.Api
             var auth = AuthorizationContext.GetAuthorizationInfo(Request);
 
             var result = _sessionMananger.AuthenticateNewSession(request.Username, request.Password, auth.Client, auth.Version,
-                        auth.DeviceId, auth.Device, Request.RemoteIp).Result;
+                        auth.DeviceId, auth.Device, Request.RemoteIp, Request.IsLocal).Result;
 
             return ToOptimizedResult(result);
         }
diff --git a/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs b/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs
index 751ff55a5..e4c88e656 100644
--- a/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs
+++ b/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs
@@ -177,17 +177,27 @@ namespace MediaBrowser.Common.Implementations.Updates
         {
             if (_lastPackageListResult != null)
             {
-                // Let dev users get results more often for testing purposes
-                var cacheLength = _config.CommonConfiguration.SystemUpdateLevel == PackageVersionClass.Dev
-                                      ? TimeSpan.FromMinutes(3)
-                                      : TimeSpan.FromHours(6);
+                TimeSpan cacheLength;
+
+                switch (_config.CommonConfiguration.SystemUpdateLevel)
+                {
+                    case PackageVersionClass.Beta:
+                        cacheLength = TimeSpan.FromMinutes(30);
+                        break;
+                    case PackageVersionClass.Dev:
+                        cacheLength = TimeSpan.FromMinutes(3);
+                        break;
+                    default:
+                        cacheLength = TimeSpan.FromHours(6);
+                        break;
+                }
 
                 if ((DateTime.UtcNow - _lastPackageListResult.Item2) < cacheLength)
                 {
                     return _lastPackageListResult.Item1;
                 }
             }
-            
+
             using (var json = await _httpClient.Get(Constants.Constants.MbAdminUrl + "service/MB3Packages.json", cancellationToken).ConfigureAwait(false))
             {
                 cancellationToken.ThrowIfCancellationRequested();
@@ -274,7 +284,7 @@ namespace MediaBrowser.Common.Implementations.Updates
         {
             var packages = await GetAvailablePackages(CancellationToken.None).ConfigureAwait(false);
 
-            var package = packages.FirstOrDefault(p => string.Equals(p.guid, guid ?? "none", StringComparison.OrdinalIgnoreCase)) 
+            var package = packages.FirstOrDefault(p => string.Equals(p.guid, guid ?? "none", StringComparison.OrdinalIgnoreCase))
                             ?? packages.FirstOrDefault(p => p.name.Equals(name, StringComparison.OrdinalIgnoreCase));
 
             if (package == null)
@@ -310,7 +320,7 @@ namespace MediaBrowser.Common.Implementations.Updates
         /// <returns>PackageVersionInfo.</returns>
         public PackageVersionInfo GetLatestCompatibleVersion(IEnumerable<PackageInfo> availablePackages, string name, string guid, Version currentServerVersion, PackageVersionClass classification = PackageVersionClass.Release)
         {
-            var package = availablePackages.FirstOrDefault(p => string.Equals(p.guid, guid ?? "none", StringComparison.OrdinalIgnoreCase)) 
+            var package = availablePackages.FirstOrDefault(p => string.Equals(p.guid, guid ?? "none", StringComparison.OrdinalIgnoreCase))
                             ?? availablePackages.FirstOrDefault(p => p.name.Equals(name, StringComparison.OrdinalIgnoreCase));
 
             if (package == null)
diff --git a/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs b/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs
index c3d1796f9..aac8cda2e 100644
--- a/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs
+++ b/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs
@@ -31,6 +31,6 @@ namespace MediaBrowser.Controller.Configuration
         /// Sets the preferred metadata service.
         /// </summary>
         /// <param name="service">The service.</param>
-        void SetPreferredMetadataService(string service);
+        void DisableMetadataService(string service);
     }
 }
diff --git a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
index 42178c44c..ff94ceff3 100644
--- a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
+++ b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
@@ -14,6 +14,21 @@ namespace MediaBrowser.Controller.Resolvers
     /// </summary>
     public static class EntityResolutionHelper
     {
+        /// <summary>
+        /// Any folder named in this list will be ignored - can be added to at runtime for extensibility
+        /// </summary>
+        public static readonly List<string> IgnoreFolders = new List<string>
+        {
+                "metadata",
+                "ps3_update",
+                "ps3_vprm",
+                "extrafanart",
+                "extrathumbs",
+                ".actors",
+                ".wd_tv"
+
+        };
+
         /// <summary>
         /// Any extension in this list is considered a video file - can be added to at runtime for extensibility
         /// </summary>
diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs
index c8ae0e6a7..e37a13923 100644
--- a/MediaBrowser.Controller/Session/ISessionManager.cs
+++ b/MediaBrowser.Controller/Session/ISessionManager.cs
@@ -218,6 +218,7 @@ namespace MediaBrowser.Controller.Session
         /// <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="isLocal">if set to <c>true</c> [is local].</param>
         /// <returns>Task{SessionInfo}.</returns>
         Task<AuthenticationResult> AuthenticateNewSession(string username, 
             string password, 
@@ -225,7 +226,8 @@ namespace MediaBrowser.Controller.Session
             string appVersion, 
             string deviceId, 
             string deviceName, 
-            string remoteEndPoint);
+            string remoteEndPoint,
+            bool isLocal);
 
         /// <summary>
         /// Reports the capabilities.
@@ -282,12 +284,5 @@ namespace MediaBrowser.Controller.Session
         /// <param name="id">The identifier.</param>
         /// <returns>Task.</returns>
         Task RevokeToken(string id);
-        
-        /// <summary>
-        /// Determines whether the specified remote endpoint is local.
-        /// </summary>
-        /// <param name="remoteEndpoint">The remote endpoint.</param>
-        /// <returns><c>true</c> if the specified remote endpoint is local; otherwise, <c>false</c>.</returns>
-        bool IsInLocalNetwork(string remoteEndpoint);
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
index bb919edb8..baa9f933d 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -57,14 +57,30 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- A reference to the entire .NET Framework is automatically included -->
+    <None Include="app.config" />
     <None Include="Fody.targets" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Threading.Tasks">
+      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Threading.Tasks.Extensions">
+      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="PropertyChanged">
       <HintPath>..\packages\PropertyChanged.Fody.1.41.0.0\Lib\portable-net4+sl4+wp7+win8+MonoAndroid16+MonoTouch40\PropertyChanged.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="System.IO">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.8\lib\portable-net40+sl5+win8+wp8+wpa81\System.IO.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.8\lib\portable-net40+sl5+win8+wp8+wpa81\System.Runtime.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks">
+      <HintPath>..\packages\Microsoft.Bcl.1.1.8\lib\portable-net40+sl5+win8+wp8+wpa81\System.Threading.Tasks.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\MediaBrowser.Model\ApiClient\ApiClientExtensions.cs">
@@ -914,6 +930,11 @@ xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\portable\" /y /d /r /i
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Import Project="Fody.targets" />
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
   <!-- 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.
   <Target Name="BeforeBuild">
diff --git a/MediaBrowser.Model.Portable/app.config b/MediaBrowser.Model.Portable/app.config
new file mode 100644
index 000000000..3c7378292
--- /dev/null
+++ b/MediaBrowser.Model.Portable/app.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.6.8.0" newVersion="2.6.8.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.6.8.0" newVersion="2.6.8.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/MediaBrowser.Model.Portable/packages.config b/MediaBrowser.Model.Portable/packages.config
index a0f393fdd..4d54d0baf 100644
--- a/MediaBrowser.Model.Portable/packages.config
+++ b/MediaBrowser.Model.Portable/packages.config
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Fody" version="1.19.1.0" targetFramework="portable-win+net45+sl40+wp71" developmentDependency="true" />
+  <package id="Microsoft.Bcl" version="1.1.8" targetFramework="portable-net45+sl50+win+wp80" />
+  <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="portable-net45+sl50+win+wp80" />
+  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="portable-net45+sl50+win+wp80" />
   <package id="PropertyChanged.Fody" version="1.41.0.0" targetFramework="portable-net45+sl40+wp71+win" />
 </packages>
\ No newline at end of file
diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index 74a3314b7..80a9ec3c4 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -92,6 +92,12 @@ namespace MediaBrowser.Model.ApiClient
         /// <returns>Task.</returns>
         Task ReportCapabilities(ClientCapabilities capabilities, CancellationToken cancellationToken);
 
+        /// <summary>
+        /// Logouts this instance.
+        /// </summary>
+        /// <returns>Task.</returns>
+        Task Logout();
+
         /// <summary>
         /// Gets the index of the game players.
         /// </summary>
diff --git a/MediaBrowser.Model/Entities/CollectionType.cs b/MediaBrowser.Model/Entities/CollectionType.cs
index 1aae2a89c..5a9526d95 100644
--- a/MediaBrowser.Model/Entities/CollectionType.cs
+++ b/MediaBrowser.Model/Entities/CollectionType.cs
@@ -1,5 +1,4 @@
-
-namespace MediaBrowser.Model.Entities
+namespace MediaBrowser.Model.Entities
 {
     public static class CollectionType
     {
diff --git a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
index 404c333c2..18117c100 100644
--- a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
+++ b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
@@ -211,7 +211,7 @@ namespace MediaBrowser.Server.Implementations.Configuration
             }
         }
 
-        public void SetPreferredMetadataService(string service)
+        public void DisableMetadataService(string service)
         {
             DisableMetadataService(typeof(Movie), Configuration, service);
             DisableMetadataService(typeof(MusicAlbum), Configuration, service);
diff --git a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
index 17118f4b4..8229c8a2f 100644
--- a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
+++ b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs
@@ -14,21 +14,6 @@ namespace MediaBrowser.Server.Implementations.Library
     /// </summary>
     public class CoreResolutionIgnoreRule : IResolverIgnoreRule
     {
-        /// <summary>
-        /// Any folder named in this list will be ignored - can be added to at runtime for extensibility
-        /// </summary>
-        private static readonly Dictionary<string, string> IgnoreFolders = new List<string>
-        {
-                "metadata",
-                "ps3_update",
-                "ps3_vprm",
-                "extrafanart",
-                "extrathumbs",
-                ".actors",
-                ".wd_tv"
-
-        }.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
-
         private readonly IFileSystem _fileSystem;
 
         public CoreResolutionIgnoreRule(IFileSystem fileSystem)
@@ -78,7 +63,7 @@ namespace MediaBrowser.Server.Implementations.Library
             if (args.IsDirectory)
             {
                 // Ignore any folders in our list
-                if (IgnoreFolders.ContainsKey(filename))
+                if (EntityResolutionHelper.IgnoreFolders.Contains(filename, StringComparer.OrdinalIgnoreCase))
                 {
                     return true;
                 }
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index 905e6e676..f3e6fcdba 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -6,11 +6,11 @@ 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;
 using System.Linq;
-using MediaBrowser.Model.Logging;
 
 namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
 {
@@ -79,29 +79,29 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
             {
                 if (string.Equals(collectionType, CollectionType.Trailers, StringComparison.OrdinalIgnoreCase))
                 {
-                    return FindMovie<Trailer>(args.Path, args.Parent, args.FileSystemChildren, args.DirectoryService, false, false);
+                    return FindMovie<Trailer>(args.Path, args.Parent, args.FileSystemChildren.ToList(), args.DirectoryService, false, false);
                 }
 
                 if (string.Equals(collectionType, CollectionType.MusicVideos, StringComparison.OrdinalIgnoreCase))
                 {
-                    return FindMovie<MusicVideo>(args.Path, args.Parent, args.FileSystemChildren, args.DirectoryService, false, false);
+                    return FindMovie<MusicVideo>(args.Path, args.Parent, args.FileSystemChildren.ToList(), args.DirectoryService, false, false);
                 }
 
                 if (string.Equals(collectionType, CollectionType.AdultVideos, StringComparison.OrdinalIgnoreCase))
                 {
-                    return FindMovie<AdultVideo>(args.Path, args.Parent, args.FileSystemChildren, args.DirectoryService, true, false);
+                    return FindMovie<AdultVideo>(args.Path, args.Parent, args.FileSystemChildren.ToList(), args.DirectoryService, true, false);
                 }
 
                 if (string.Equals(collectionType, CollectionType.HomeVideos, StringComparison.OrdinalIgnoreCase))
                 {
-                    return FindMovie<Video>(args.Path, args.Parent, args.FileSystemChildren, args.DirectoryService, true, false);
+                    return FindMovie<Video>(args.Path, args.Parent, args.FileSystemChildren.ToList(), args.DirectoryService, true, false);
                 }
 
                 if (string.IsNullOrEmpty(collectionType) ||
                     string.Equals(collectionType, CollectionType.Movies, StringComparison.OrdinalIgnoreCase) ||
                     string.Equals(collectionType, CollectionType.BoxSets, StringComparison.OrdinalIgnoreCase))
                 {
-                    return FindMovie<Movie>(args.Path, args.Parent, args.FileSystemChildren, args.DirectoryService, true, true);
+                    return FindMovie<Movie>(args.Path, args.Parent, args.FileSystemChildren.ToList(), args.DirectoryService, true, true);
                 }
 
                 return null;
@@ -187,7 +187,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
         /// <param name="directoryService">The directory service.</param>
         /// <param name="supportMultiFileItems">if set to <c>true</c> [support multi file items].</param>
         /// <returns>Movie.</returns>
-        private T FindMovie<T>(string path, Folder parent, IEnumerable<FileSystemInfo> fileSystemEntries, IDirectoryService directoryService, bool supportMultiFileItems, bool supportsMultipleSources)
+        private T FindMovie<T>(string path, Folder parent, List<FileSystemInfo> fileSystemEntries, IDirectoryService directoryService, bool supportMultiFileItems, bool supportsMultipleSources)
             where T : Video, new()
         {
             var movies = new List<T>();
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 1d1910e40..754f63cbd 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -1207,18 +1207,20 @@ namespace MediaBrowser.Server.Implementations.Session
         /// <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="isLocal">if set to <c>true</c> [is local].</param>
         /// <returns>Task{SessionInfo}.</returns>
         /// <exception cref="System.UnauthorizedAccessException">Invalid user or password entered.</exception>
-        /// <exception cref="UnauthorizedAccessException"></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)
+            string remoteEndPoint,
+            bool isLocal)
         {
-            var result = (IsLocalhost(remoteEndPoint) && string.Equals(clientType, "Dashboard", StringComparison.OrdinalIgnoreCase)) ||
+            var result = (isLocal && string.Equals(clientType, "Dashboard", StringComparison.OrdinalIgnoreCase)) ||
                 await _userManager.AuthenticateUser(username, password).ConfigureAwait(false);
 
             if (!result)
@@ -1337,35 +1339,6 @@ namespace MediaBrowser.Server.Implementations.Session
             return Logout(token);
         }
 
-        private bool IsLocalhost(string remoteEndpoint)
-        {
-            if (string.IsNullOrWhiteSpace(remoteEndpoint))
-            {
-                throw new ArgumentNullException("remoteEndpoint");
-            }
-
-            return remoteEndpoint.IndexOf("localhost", StringComparison.OrdinalIgnoreCase) != -1 ||
-                remoteEndpoint.StartsWith("127.", StringComparison.OrdinalIgnoreCase) ||
-                remoteEndpoint.StartsWith("::", StringComparison.OrdinalIgnoreCase);
-        }
-
-        public bool IsInLocalNetwork(string remoteEndpoint)
-        {
-            if (string.IsNullOrWhiteSpace(remoteEndpoint))
-            {
-                throw new ArgumentNullException("remoteEndpoint");
-            }
-
-            // Private address space:
-            // http://en.wikipedia.org/wiki/Private_network
-
-            return IsLocalhost(remoteEndpoint) ||
-                remoteEndpoint.StartsWith("10.", StringComparison.OrdinalIgnoreCase) ||
-                remoteEndpoint.StartsWith("192.", StringComparison.OrdinalIgnoreCase) ||
-                remoteEndpoint.StartsWith("172.", StringComparison.OrdinalIgnoreCase) ||
-                remoteEndpoint.StartsWith("169.", StringComparison.OrdinalIgnoreCase);
-        }
-
         /// <summary>
         /// Reports the capabilities.
         /// </summary>
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index e6d864578..1e248ab57 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -337,7 +337,7 @@ namespace MediaBrowser.ServerApplication
                 // Make sure xbmc metadata is disabled for existing users.
                 // New users will be handled by the startup wizard.
 
-                ServerConfigurationManager.SetPreferredMetadataService("Media Browser Xml");
+                ServerConfigurationManager.DisableMetadataService("Xbmc Nfo");
             }
 
             ServerConfigurationManager.Configuration.DefaultMetadataSettingsApplied = true;
diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec
index 1df5ab37f..92f7fa355 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.415</version>
+        <version>3.0.418</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.415" />
+            <dependency id="MediaBrowser.Common" version="3.0.418" />
             <dependency id="NLog" version="2.1.0" />
             <dependency id="SimpleInjector" version="2.5.0" />
             <dependency id="sharpcompress" version="0.10.2" />
diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec
index 71bc24e34..4cb876d65 100644
--- a/Nuget/MediaBrowser.Common.nuspec
+++ b/Nuget/MediaBrowser.Common.nuspec
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common</id>
-        <version>3.0.415</version>
+        <version>3.0.418</version>
         <title>MediaBrowser.Common</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,9 +12,11 @@
         <description>Contains common model objects and interfaces used by all Media Browser solutions.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-			<group targetFramework=".NETFramework4.5"/>
-            <group targetFramework=".NETFramework3.5"/>
-            <group targetFramework=".NETPortable0.0-net45+sl4+wp71+win8"/>
+            <group targetFramework=".NETFramework4.5" />
+            <group targetFramework=".NETFramework3.5" />
+            <group targetFramework=".NETPortable0.0-net45+sl4+wp71+win8">
+                <dependency id="Microsoft.Bcl.Async" version="1.0.168" />
+            </group>
         </dependencies>
     </metadata>
     <files>
diff --git a/Nuget/MediaBrowser.Model.Signed.nuspec b/Nuget/MediaBrowser.Model.Signed.nuspec
index bfcdddcfb..597a29b7c 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.415</version>
+        <version>3.0.418</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 6de3eb821..05863d47a 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.415</version>
+        <version>3.0.418</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.415" />
+            <dependency id="MediaBrowser.Common" version="3.0.418" />
         </dependencies>
     </metadata>
     <files>
-- 
cgit v1.2.3


From d7f3214b3251a210d784e86fcdcfdca9765e69b8 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 13 Jul 2014 17:03:57 -0400
Subject: move last fm providers to a plugin

---
 .../Channels/ChannelMediaInfo.cs                   |   2 +
 .../Configuration/UserConfiguration.cs             |   1 +
 .../MediaBrowser.Providers.csproj                  |   4 -
 MediaBrowser.Providers/MediaInfo/FFProbeHelpers.cs |   5 +
 .../Music/AudioDbAlbumProvider.cs                  |   3 +
 .../Music/FanArtAlbumProvider.cs                   |   2 +-
 .../Music/FanArtArtistProvider.cs                  |   4 +-
 .../Music/LastFmImageProvider.cs                   | 164 -----------
 .../Music/LastfmAlbumProvider.cs                   | 322 ---------------------
 .../Music/LastfmArtistProvider.cs                  | 160 ----------
 MediaBrowser.Providers/Music/LastfmHelper.cs       |  76 -----
 .../Collections/ManualCollectionsFolder.cs         |   2 +-
 .../Library/UserViewManager.cs                     |   4 +-
 13 files changed, 17 insertions(+), 732 deletions(-)
 delete mode 100644 MediaBrowser.Providers/Music/LastFmImageProvider.cs
 delete mode 100644 MediaBrowser.Providers/Music/LastfmAlbumProvider.cs
 delete mode 100644 MediaBrowser.Providers/Music/LastfmArtistProvider.cs
 delete mode 100644 MediaBrowser.Providers/Music/LastfmHelper.cs

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Controller/Channels/ChannelMediaInfo.cs b/MediaBrowser.Controller/Channels/ChannelMediaInfo.cs
index 64b480414..f16fd1120 100644
--- a/MediaBrowser.Controller/Channels/ChannelMediaInfo.cs
+++ b/MediaBrowser.Controller/Channels/ChannelMediaInfo.cs
@@ -29,6 +29,8 @@ namespace MediaBrowser.Controller.Channels
 
         public MediaProtocol Protocol { get; set; }
 
+        public long? RunTimeTicks { get; set; }
+
         public ChannelMediaInfo()
         {
             RequiredHttpHeaders = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 0834452fb..1afc9a191 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -93,6 +93,7 @@ namespace MediaBrowser.Model.Configuration
             BlockUnratedItems = new UnratedItem[] { };
 
             ExcludeFoldersFromGrouping = new string[] { };
+            DisplayCollectionsView = true;
         }
     }
 }
diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
index fe22d4c99..9a26101a1 100644
--- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj
+++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
@@ -126,7 +126,6 @@
     <Compile Include="Music\AudioDbExternalIds.cs" />
     <Compile Include="Music\AudioMetadataService.cs" />
     <Compile Include="Music\Extensions.cs" />
-    <Compile Include="Music\LastfmArtistProvider.cs" />
     <Compile Include="Music\MovieDbMusicVideoProvider.cs" />
     <Compile Include="Music\MusicBrainzArtistProvider.cs" />
     <Compile Include="Music\MusicExternalIds.cs" />
@@ -138,11 +137,8 @@
     <Compile Include="Movies\FanArtMovieUpdatesPostScanTask.cs" />
     <Compile Include="Movies\MovieDbProvider.cs" />
     <Compile Include="Music\FanArtUpdatesPostScanTask.cs" />
-    <Compile Include="Music\LastfmAlbumProvider.cs" />
-    <Compile Include="Music\LastfmHelper.cs" />
     <Compile Include="Music\FanArtAlbumProvider.cs" />
     <Compile Include="Music\FanArtArtistProvider.cs" />
-    <Compile Include="Music\LastFmImageProvider.cs" />
     <Compile Include="Music\MusicBrainzAlbumProvider.cs" />
     <Compile Include="Music\SoundtrackPostScanTask.cs" />
     <Compile Include="People\PersonMetadataService.cs" />
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeHelpers.cs b/MediaBrowser.Providers/MediaInfo/FFProbeHelpers.cs
index 49c7ebec8..2044979e4 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeHelpers.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeHelpers.cs
@@ -12,6 +12,11 @@ namespace MediaBrowser.Providers.MediaInfo
         /// <param name="result">The result.</param>
         public static void NormalizeFFProbeResult(InternalMediaInfoResult result)
         {
+            if (result == null)
+            {
+                throw new ArgumentNullException("result");
+            }
+
             if (result.format != null && result.format.tags != null)
             {
                 result.format.tags = ConvertDictionaryToCaseInSensitive(result.format.tags);
diff --git a/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs b/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs
index a9b3d8e11..ab9ac2331 100644
--- a/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs
+++ b/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
@@ -86,6 +87,8 @@ namespace MediaBrowser.Providers.Music
 
             item.SetProviderId(MetadataProviders.MusicBrainzAlbumArtist, result.strMusicBrainzArtistID);
             item.SetProviderId(MetadataProviders.MusicBrainzReleaseGroup, result.strMusicBrainzID);
+
+            item.Overview = (result.strDescriptionEN ?? string.Empty).StripHtml();
         }
 
         public string Name
diff --git a/MediaBrowser.Providers/Music/FanArtAlbumProvider.cs b/MediaBrowser.Providers/Music/FanArtAlbumProvider.cs
index ccab30bc6..94d682f44 100644
--- a/MediaBrowser.Providers/Music/FanArtAlbumProvider.cs
+++ b/MediaBrowser.Providers/Music/FanArtAlbumProvider.cs
@@ -67,7 +67,7 @@ namespace MediaBrowser.Providers.Music
 
             if (!string.IsNullOrEmpty(artistMusicBrainzId))
             {
-                await FanartArtistProvider.Current.EnsureMovieXml(artistMusicBrainzId, cancellationToken).ConfigureAwait(false);
+                await FanartArtistProvider.Current.EnsureArtistXml(artistMusicBrainzId, cancellationToken).ConfigureAwait(false);
 
                 var artistXmlPath = FanartArtistProvider.GetArtistXmlPath(_config.CommonApplicationPaths, artistMusicBrainzId);
 
diff --git a/MediaBrowser.Providers/Music/FanArtArtistProvider.cs b/MediaBrowser.Providers/Music/FanArtArtistProvider.cs
index b9916dfba..a8df95fd1 100644
--- a/MediaBrowser.Providers/Music/FanArtArtistProvider.cs
+++ b/MediaBrowser.Providers/Music/FanArtArtistProvider.cs
@@ -79,7 +79,7 @@ namespace MediaBrowser.Providers.Music
 
             if (!String.IsNullOrEmpty(artistMusicBrainzId))
             {
-                await EnsureMovieXml(artistMusicBrainzId, cancellationToken).ConfigureAwait(false);
+                await EnsureArtistXml(artistMusicBrainzId, cancellationToken).ConfigureAwait(false);
 
                 var artistXmlPath = GetArtistXmlPath(_config.CommonApplicationPaths, artistMusicBrainzId);
 
@@ -390,7 +390,7 @@ namespace MediaBrowser.Providers.Music
         }
 
         private readonly Task _cachedTask = Task.FromResult(true);
-        internal Task EnsureMovieXml(string musicBrainzId, CancellationToken cancellationToken)
+        internal Task EnsureArtistXml(string musicBrainzId, CancellationToken cancellationToken)
         {
             var xmlPath = GetArtistXmlPath(_config.ApplicationPaths, musicBrainzId);
 
diff --git a/MediaBrowser.Providers/Music/LastFmImageProvider.cs b/MediaBrowser.Providers/Music/LastFmImageProvider.cs
deleted file mode 100644
index b55a97351..000000000
--- a/MediaBrowser.Providers/Music/LastFmImageProvider.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Providers;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Providers.Music
-{
-    public class LastfmImageProvider : IRemoteImageProvider, IHasOrder
-    {
-        private readonly IHttpClient _httpClient;
-        private readonly IServerConfigurationManager _config;
-
-        public LastfmImageProvider(IHttpClient httpClient, IServerConfigurationManager config)
-        {
-            _httpClient = httpClient;
-            _config = config;
-        }
-
-        public string Name
-        {
-            get { return ProviderName; }
-        }
-
-        public static string ProviderName
-        {
-            get { return "last.fm"; }
-        }
-
-        public bool Supports(IHasImages item)
-        {
-            return item is MusicAlbum || item is MusicArtist;
-        }
-
-        public IEnumerable<ImageType> GetSupportedImages(IHasImages item)
-        {
-            return new List<ImageType>
-            {
-                ImageType.Primary
-            };
-        }
-
-        public Task<IEnumerable<RemoteImageInfo>> GetImages(IHasImages item, CancellationToken cancellationToken)
-        {
-            var list = new List<RemoteImageInfo>();
-
-            RemoteImageInfo info = null;
-
-            var musicBrainzId = item is MusicAlbum ?
-                item.GetProviderId(MetadataProviders.MusicBrainzAlbum) :
-                item.GetProviderId(MetadataProviders.MusicBrainzArtist);
-
-            if (!string.IsNullOrEmpty(musicBrainzId))
-            {
-                var cachePath = Path.Combine(_config.ApplicationPaths.CachePath, "lastfm", musicBrainzId, "image.txt");
-
-                try
-                {
-                    var parts = File.ReadAllText(cachePath).Split('|');
-
-                    info = GetInfo(parts.FirstOrDefault(), parts.LastOrDefault());
-                }
-                catch (DirectoryNotFoundException)
-                {
-                }
-                catch (FileNotFoundException)
-                {
-                }
-            }
-
-            if (info ==  null)
-            {
-                var musicBrainzReleaseGroupId = item.GetProviderId(MetadataProviders.MusicBrainzReleaseGroup);
-
-                if (!string.IsNullOrEmpty(musicBrainzReleaseGroupId))
-                {
-                    var cachePath = Path.Combine(_config.ApplicationPaths.CachePath, "lastfm", musicBrainzReleaseGroupId, "image.txt");
-
-                    try
-                    {
-                        var parts = File.ReadAllText(cachePath).Split('|');
-
-                        info = GetInfo(parts.FirstOrDefault(), parts.LastOrDefault());
-                    }
-                    catch (DirectoryNotFoundException)
-                    {
-                    }
-                    catch (FileNotFoundException)
-                    {
-                    }
-                }
-            }
-
-            if (info != null)
-            {
-                list.Add(info);
-            }
-
-            // The only info we have is size
-            return Task.FromResult<IEnumerable<RemoteImageInfo>>(list.OrderByDescending(i => i.Width ?? 0));
-        }
-
-        private RemoteImageInfo GetInfo(string url, string size)
-        {
-            if (string.IsNullOrEmpty(url))
-            {
-                return null;
-            }
-
-            var info = new RemoteImageInfo
-            {
-                ProviderName = Name,
-                Url = url,
-                Type = ImageType.Primary
-            };
-
-            if (string.Equals(size, "mega", StringComparison.OrdinalIgnoreCase))
-            {
-                
-            }
-            else if (string.Equals(size, "extralarge", StringComparison.OrdinalIgnoreCase))
-            {
-
-            }
-            else if (string.Equals(size, "large", StringComparison.OrdinalIgnoreCase))
-            {
-
-            }
-            else if (string.Equals(size, "medium", StringComparison.OrdinalIgnoreCase))
-            {
-
-            }
-
-            return info;
-        }
-
-        public int Order
-        {
-            get
-            {
-                // After all others
-                return 3;
-            }
-        }
-
-        public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
-        {
-            return _httpClient.GetResponse(new HttpRequestOptions
-            {
-                CancellationToken = cancellationToken,
-                Url = url,
-                ResourcePool = LastfmArtistProvider.LastfmResourcePool
-            });
-        }
-    }
-}
diff --git a/MediaBrowser.Providers/Music/LastfmAlbumProvider.cs b/MediaBrowser.Providers/Music/LastfmAlbumProvider.cs
deleted file mode 100644
index 846539748..000000000
--- a/MediaBrowser.Providers/Music/LastfmAlbumProvider.cs
+++ /dev/null
@@ -1,322 +0,0 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Providers;
-using MediaBrowser.Model.Serialization;
-using MoreLinq;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Providers.Music
-{
-    public class LastfmAlbumProvider : IRemoteMetadataProvider<MusicAlbum, AlbumInfo>, IHasOrder
-    {
-        private readonly IJsonSerializer _json;
-        private readonly IHttpClient _httpClient;
-
-        private readonly IServerConfigurationManager _config;
-        private readonly ILogger _logger;
-
-        public LastfmAlbumProvider(IHttpClient httpClient, IJsonSerializer json, IServerConfigurationManager config, ILogger logger)
-        {
-            _httpClient = httpClient;
-            _json = json;
-            _config = config;
-            _logger = logger;
-        }
-
-        public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(AlbumInfo searchInfo, CancellationToken cancellationToken)
-        {
-            return new List<RemoteSearchResult>();
-        }
-
-        public async Task<MetadataResult<MusicAlbum>> GetMetadata(AlbumInfo id, CancellationToken cancellationToken)
-        {
-            var result = new MetadataResult<MusicAlbum>();
-
-            var lastFmData = await GetAlbumResult(id, cancellationToken).ConfigureAwait(false);
-
-            if (lastFmData != null && lastFmData.album != null)
-            {
-                result.HasMetadata = true;
-                result.Item = new MusicAlbum();
-                ProcessAlbumData(result.Item, lastFmData.album);
-            }
-
-            return result;
-        }
-
-        private async Task<LastfmGetAlbumResult> GetAlbumResult(AlbumInfo item, CancellationToken cancellationToken)
-        {
-            // Try album release Id
-            var id = item.GetReleaseId();
-            if (!string.IsNullOrEmpty(id))
-            {
-                var result = await GetAlbumResult(id, cancellationToken).ConfigureAwait(false);
-
-                if (result != null && result.album != null)
-                {
-                    return result;
-                }
-            }
-
-            // Try album release group Id
-            id = item.GetReleaseGroupId();
-            if (!string.IsNullOrEmpty(id))
-            {
-                var result = await GetAlbumResult(id, cancellationToken).ConfigureAwait(false);
-
-                if (result != null && result.album != null)
-                {
-                    return result;
-                }
-            }
-
-            var albumArtist = item.GetAlbumArtist();
-            // Get each song, distinct by the combination of AlbumArtist and Album
-            var songs = item.SongInfos.DistinctBy(i => (i.AlbumArtists.FirstOrDefault() ?? string.Empty) + (i.Album ?? string.Empty), StringComparer.OrdinalIgnoreCase).ToList();
-
-            foreach (var song in songs.Where(song => !string.IsNullOrEmpty(song.Album) && !string.IsNullOrEmpty(song.AlbumArtists.FirstOrDefault())))
-            {
-                var result = await GetAlbumResult(song.AlbumArtists.FirstOrDefault(), song.Album, cancellationToken).ConfigureAwait(false);
-
-                if (result != null && result.album != null)
-                {
-                    return result;
-                }
-            }
-
-            if (string.IsNullOrEmpty(albumArtist))
-            {
-                return null;
-            }
-
-            return await GetAlbumResult(albumArtist, item.Name, cancellationToken);
-        }
-
-        private async Task<LastfmGetAlbumResult> GetAlbumResult(string artist, string album, CancellationToken cancellationToken)
-        {
-            // Get albu info using artist and album name
-            var url = LastfmArtistProvider.RootUrl + string.Format("method=album.getInfo&artist={0}&album={1}&api_key={2}&format=json", UrlEncode(artist), UrlEncode(album), LastfmArtistProvider.ApiKey);
-
-            using (var json = await _httpClient.Get(new HttpRequestOptions
-            {
-                Url = url,
-                ResourcePool = LastfmArtistProvider.LastfmResourcePool,
-                CancellationToken = cancellationToken,
-                EnableHttpCompression = false
-
-            }).ConfigureAwait(false))
-            {
-                using (var reader = new StreamReader(json))
-                {
-                    var jsonText = await reader.ReadToEndAsync().ConfigureAwait(false);
-
-                    // Fix their bad json
-                    jsonText = jsonText.Replace("\"#text\"", "\"url\"");
-
-                    return _json.DeserializeFromString<LastfmGetAlbumResult>(jsonText);
-                }
-            }
-        }
-
-        private async Task<LastfmGetAlbumResult> GetAlbumResult(string musicbraizId, CancellationToken cancellationToken)
-        {
-            // Get albu info using artist and album name
-            var url = LastfmArtistProvider.RootUrl + string.Format("method=album.getInfo&mbid={0}&api_key={1}&format=json", musicbraizId, LastfmArtistProvider.ApiKey);
-
-            using (var json = await _httpClient.Get(new HttpRequestOptions
-            {
-                Url = url,
-                ResourcePool = LastfmArtistProvider.LastfmResourcePool,
-                CancellationToken = cancellationToken,
-                EnableHttpCompression = false
-
-            }).ConfigureAwait(false))
-            {
-                return _json.DeserializeFromStream<LastfmGetAlbumResult>(json);
-            }
-        }
-
-        private void ProcessAlbumData(MusicAlbum item, LastfmAlbum data)
-        {
-            var overview = data.wiki != null ? data.wiki.content : null;
-
-            if (!item.LockedFields.Contains(MetadataFields.Overview))
-            {
-                item.Overview = overview;
-            }
-
-            // Only grab the date here if the album doesn't already have one, since id3 tags are preferred
-            DateTime release;
-
-            if (DateTime.TryParse(data.releasedate, out release))
-            {
-                // Lastfm sends back null as sometimes 1901, other times 0
-                if (release.Year > 1901)
-                {
-                    if (!item.PremiereDate.HasValue)
-                    {
-                        item.PremiereDate = release;
-                    }
-
-                    if (!item.ProductionYear.HasValue)
-                    {
-                        item.ProductionYear = release.Year;
-                    }
-                }
-            }
-
-            string imageSize;
-            var url = LastfmHelper.GetImageUrl(data, out imageSize);
-
-            var musicBrainzId = item.GetProviderId(MetadataProviders.MusicBrainzAlbum) ??
-                item.GetProviderId(MetadataProviders.MusicBrainzReleaseGroup);
-
-            if (!string.IsNullOrEmpty(musicBrainzId) && !string.IsNullOrEmpty(url))
-            {
-                LastfmHelper.SaveImageInfo(_config.ApplicationPaths, _logger, musicBrainzId, url, imageSize);
-            }
-        }
-
-        /// <summary>
-        /// Encodes an URL.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <returns>System.String.</returns>
-        private string UrlEncode(string name)
-        {
-            return WebUtility.UrlEncode(name);
-        }
-
-        public string Name
-        {
-            get { return "last.fm"; }
-        }
-
-        public int Order
-        {
-            get
-            {
-                // After fanart & audiodb
-                return 2;
-            }
-        }
-
-        public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-    #region Result Objects
-
-    public class LastfmStats
-    {
-        public string listeners { get; set; }
-        public string playcount { get; set; }
-    }
-
-    public class LastfmTag
-    {
-        public string name { get; set; }
-        public string url { get; set; }
-    }
-
-
-    public class LastfmTags
-    {
-        public List<LastfmTag> tag { get; set; }
-    }
-
-    public class LastfmFormationInfo
-    {
-        public string yearfrom { get; set; }
-        public string yearto { get; set; }
-    }
-
-    public class LastFmBio
-    {
-        public string published { get; set; }
-        public string summary { get; set; }
-        public string content { get; set; }
-        public string placeformed { get; set; }
-        public string yearformed { get; set; }
-        public List<LastfmFormationInfo> formationlist { get; set; }
-    }
-
-    public class LastFmImage
-    {
-        public string url { get; set; }
-        public string size { get; set; }
-    }
-
-    public class LastfmArtist : IHasLastFmImages
-    {
-        public string name { get; set; }
-        public string mbid { get; set; }
-        public string url { get; set; }
-        public string streamable { get; set; }
-        public string ontour { get; set; }
-        public LastfmStats stats { get; set; }
-        public List<LastfmArtist> similar { get; set; }
-        public LastfmTags tags { get; set; }
-        public LastFmBio bio { get; set; }
-        public List<LastFmImage> image { get; set; }
-    }
-
-
-    public class LastfmAlbum : IHasLastFmImages
-    {
-        public string name { get; set; }
-        public string artist { get; set; }
-        public string id { get; set; }
-        public string mbid { get; set; }
-        public string releasedate { get; set; }
-        public int listeners { get; set; }
-        public int playcount { get; set; }
-        public LastfmTags toptags { get; set; }
-        public LastFmBio wiki { get; set; }
-        public List<LastFmImage> image { get; set; }
-    }
-
-    public interface IHasLastFmImages
-    {
-        List<LastFmImage> image { get; set; }
-    }
-
-    public class LastfmGetAlbumResult
-    {
-        public LastfmAlbum album { get; set; }
-    }
-
-    public class LastfmGetArtistResult
-    {
-        public LastfmArtist artist { get; set; }
-    }
-
-    public class Artistmatches
-    {
-        public List<LastfmArtist> artist { get; set; }
-    }
-
-    public class LastfmArtistSearchResult
-    {
-        public Artistmatches artistmatches { get; set; }
-    }
-
-    public class LastfmArtistSearchResults
-    {
-        public LastfmArtistSearchResult results { get; set; }
-    }
-
-    #endregion
-}
diff --git a/MediaBrowser.Providers/Music/LastfmArtistProvider.cs b/MediaBrowser.Providers/Music/LastfmArtistProvider.cs
deleted file mode 100644
index a2aa9d719..000000000
--- a/MediaBrowser.Providers/Music/LastfmArtistProvider.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Providers;
-using MediaBrowser.Model.Serialization;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Providers.Music
-{
-    public class LastfmArtistProvider : IRemoteMetadataProvider<MusicArtist, ArtistInfo>, IHasOrder
-    {
-        private readonly IJsonSerializer _json;
-        private readonly IHttpClient _httpClient;
-
-        internal static readonly SemaphoreSlim LastfmResourcePool = new SemaphoreSlim(4, 4);
-
-        internal const string RootUrl = @"http://ws.audioscrobbler.com/2.0/?";
-        internal static string ApiKey = "7b76553c3eb1d341d642755aecc40a33";
-
-        private readonly IServerConfigurationManager _config;
-        private readonly ILogger _logger;
-
-        public LastfmArtistProvider(IHttpClient httpClient, IJsonSerializer json, IServerConfigurationManager config, ILogger logger)
-        {
-            _httpClient = httpClient;
-            _json = json;
-            _config = config;
-            _logger = logger;
-        }
-
-        public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(ArtistInfo searchInfo, CancellationToken cancellationToken)
-        {
-            return new List<RemoteSearchResult>();
-        }
-
-        public async Task<MetadataResult<MusicArtist>> GetMetadata(ArtistInfo id, CancellationToken cancellationToken)
-        {
-            var result = new MetadataResult<MusicArtist>();
-
-            var musicBrainzId = id.GetMusicBrainzArtistId();
-
-            if (!String.IsNullOrWhiteSpace(musicBrainzId))
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-
-                result.Item = new MusicArtist();
-                result.HasMetadata = true;
-
-                await FetchLastfmData(result.Item, musicBrainzId, cancellationToken).ConfigureAwait(false);
-            }
-
-            return result;
-        }
-
-        protected async Task FetchLastfmData(MusicArtist item, string musicBrainzId, CancellationToken cancellationToken)
-        {
-            // Get artist info with provided id
-            var url = RootUrl + String.Format("method=artist.getInfo&mbid={0}&api_key={1}&format=json", UrlEncode(musicBrainzId), ApiKey);
-
-            LastfmGetArtistResult result;
-
-            using (var json = await _httpClient.Get(new HttpRequestOptions
-            {
-                Url = url,
-                ResourcePool = LastfmResourcePool,
-                CancellationToken = cancellationToken,
-                EnableHttpCompression = false
-
-            }).ConfigureAwait(false))
-            {
-                using (var reader = new StreamReader(json))
-                {
-                    var jsonText = await reader.ReadToEndAsync().ConfigureAwait(false);
-
-                    // Fix their bad json
-                    jsonText = jsonText.Replace("\"#text\"", "\"url\"");
-
-                    result = _json.DeserializeFromString<LastfmGetArtistResult>(jsonText);
-                }
-            }
-
-            if (result != null && result.artist != null)
-            {
-                ProcessArtistData(item, result.artist, musicBrainzId);
-            }
-        }
-
-        private void ProcessArtistData(MusicArtist artist, LastfmArtist data, string musicBrainzId)
-        {
-            var yearFormed = 0;
-
-            if (data.bio != null)
-            {
-                Int32.TryParse(data.bio.yearformed, out yearFormed);
-                if (!artist.LockedFields.Contains(MetadataFields.Overview))
-                {
-                    artist.Overview = (data.bio.content ?? string.Empty).StripHtml();
-                }
-                if (!string.IsNullOrEmpty(data.bio.placeformed) && !artist.LockedFields.Contains(MetadataFields.ProductionLocations))
-                {
-                    artist.AddProductionLocation(data.bio.placeformed);
-                }
-            }
-
-            if (yearFormed > 0)
-            {
-                artist.PremiereDate = new DateTime(yearFormed, 1, 1, 0, 0, 0, DateTimeKind.Utc);
-
-                artist.ProductionYear = yearFormed;
-            }
-
-            string imageSize;
-            var url = LastfmHelper.GetImageUrl(data, out imageSize);
-
-            if (!string.IsNullOrEmpty(musicBrainzId) && !string.IsNullOrEmpty(url))
-            {
-                LastfmHelper.SaveImageInfo(_config.ApplicationPaths, _logger, musicBrainzId, url, imageSize);
-            }
-        }
-
-        /// <summary>
-        /// Encodes an URL.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <returns>System.String.</returns>
-        private string UrlEncode(string name)
-        {
-            return WebUtility.UrlEncode(name);
-        }
-
-        public string Name
-        {
-            get { return "last.fm"; }
-        }
-
-        public int Order
-        {
-            get
-            {
-                // After fanart & audiodb
-                return 2;
-            }
-        }
-
-        public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/MediaBrowser.Providers/Music/LastfmHelper.cs b/MediaBrowser.Providers/Music/LastfmHelper.cs
deleted file mode 100644
index 7c83cec6b..000000000
--- a/MediaBrowser.Providers/Music/LastfmHelper.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Model.Logging;
-using System;
-using System.IO;
-using System.Linq;
-
-namespace MediaBrowser.Providers.Music
-{
-    public static class LastfmHelper
-    {
-        public static string GetImageUrl(IHasLastFmImages data, out string size)
-        {
-            size = null;
-
-            if (data.image == null)
-            {
-                return null;
-            }
-
-            var validImages = data.image
-                .Where(i => !string.IsNullOrWhiteSpace(i.url))
-                .ToList();
-
-            var img = validImages
-                .FirstOrDefault(i => string.Equals(i.size, "mega", StringComparison.OrdinalIgnoreCase)) ??
-                data.image.FirstOrDefault(i => string.Equals(i.size, "extralarge", StringComparison.OrdinalIgnoreCase)) ??
-                data.image.FirstOrDefault(i => string.Equals(i.size, "large", StringComparison.OrdinalIgnoreCase)) ??
-                data.image.FirstOrDefault(i => string.Equals(i.size, "medium", StringComparison.OrdinalIgnoreCase)) ??
-                data.image.FirstOrDefault();
-
-            if (img != null)
-            {
-                size = img.size;
-                return img.url;
-            }
-
-            return null;
-        }
-
-        public static void SaveImageInfo(IApplicationPaths appPaths, ILogger logger, string musicBrainzId, string url, string size)
-        {
-            if (appPaths == null)
-            {
-                throw new ArgumentNullException("appPaths");
-            }
-            if (string.IsNullOrEmpty(musicBrainzId))
-            {
-                throw new ArgumentNullException("musicBrainzId");
-            }
-            if (string.IsNullOrEmpty(url))
-            {
-                throw new ArgumentNullException("url");
-            }
-
-            var cachePath = Path.Combine(appPaths.CachePath, "lastfm", musicBrainzId, "image.txt");
-
-            try
-            {
-                if (string.IsNullOrEmpty(url))
-                {
-                    File.Delete(cachePath);
-                }
-                else
-                {
-                    Directory.CreateDirectory(Path.GetDirectoryName(cachePath));
-                    File.WriteAllText(cachePath, url + "|" + size);
-                }
-            }
-            catch (IOException ex)
-            {
-                // Don't fail if this is unable to write
-                logger.ErrorException("Error saving to {0}", ex, cachePath);
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs b/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs
index 07c86ed31..aaa02c720 100644
--- a/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs
+++ b/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs
@@ -26,7 +26,7 @@ namespace MediaBrowser.Server.Implementations.Collections
 
         public override bool IsHiddenFromUser(User user)
         {
-            return true;
+            return !user.Configuration.DisplayCollectionsView;
         }
 
         public override string CollectionType
diff --git a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
index dd2978b17..73afa22e3 100644
--- a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
@@ -10,12 +10,12 @@ using MediaBrowser.Controller.Localization;
 using MediaBrowser.Model.Channels;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Library;
+using MediaBrowser.Model.Querying;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Server.Implementations.Library
 {
@@ -82,7 +82,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 list.Add(await GetUserView(CollectionType.Games, user, string.Empty, cancellationToken).ConfigureAwait(false));
             }
 
-            if (user.Configuration.DisplayCollectionsView ||
+            if (user.Configuration.DisplayCollectionsView &&
                 recursiveChildren.OfType<BoxSet>().Any())
             {
                 list.Add(await GetUserView(CollectionType.BoxSets, user, CollectionType.BoxSets, cancellationToken).ConfigureAwait(false));
-- 
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.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/ItemRefreshService.cs b/MediaBrowser.Api/ItemRefreshService.cs
index 993b69601..768e9a4a8 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 a098d26da..f01d8ddf4 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 178b840a8..850309465 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 78f60632f..38b6b4ad6 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 05f7975bc..b31a95319 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 9f9dfaeca..b7715e20b 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 88eadda00..af0ff8319 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 904c7bcdd..3448a2905 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 62a43751d..f530564ea 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 f89cdac47..c7669fecb 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 412789240..7ff3a1247 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 6b376d3b4..a756dc794 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 eb1334c10..1192bafb7 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 f31718893..37a5735e4 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 a7f714175..92f352ca6 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 2b70bf74e..988b03650 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 be4cf1bbf..58b273c26 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 a033dcbc9..9ad65edbd 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 59dbb63e6..03694cad0 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 a0fc056bc..bfd93b795 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 5c199c8ea..05647f10d 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 1ca3aa56d..62ecc2578 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 0919afc7d..e0b199b12 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 6310881f2..2cb25ef9b 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 96e71a971..1963f249a 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 187bcb59f..0b6e7c9c5 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 a15a12878..113389a11 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 30a6b8e26..3ed0c8735 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 6f726759d..c1700fe51 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 3f0d01084..10275847d 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 b97935dde..3375c1a1d 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 367e971d8..aac6a2c05 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 c7f7c0f69..eb3740b84 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 a7d6690f0..ea32fb932 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 a0ee4fdaf..421a0dea9 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 b9b21645b..0f93d0695 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 5408f0b91..fe7d37994 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 59438e2b5..df4178c6a 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 1de1534e7..461e56f49 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 507045cbb..d6cdfe028 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 55c296948..8db9c68f8 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 cfb0924d2..90c4c9e52 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 b6c94c512..b778dc415 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 48a5cc004..653811157 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 16700e356..f315798ec 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 45b3b5c78..18e44a03c 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 733e37706..55439632f 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 ccfccea6a..fc02a9e8c 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 473b2523f..effeb0ad6 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 77d265bd4..2757333f1 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 caee46351..b588e6c11 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 18cc943e1..e1a405972 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 f90a35018..515cd70a2 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 94927eb12..c2afde015 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 7f1545c2b..4e01acfa1 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 43444b689..b5b610654 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 e60c7b3c3..b635d7318 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 c53ecd9d8..12850f803 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 7d9e83cbc..fcf3756ab 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 741bc52ca..4a23b0c07 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 75e204f68..e28dfe231 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 cc5a77433..78f308b33 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 c2c8f5002..e67aa9f58 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 6f14bb322..a65184f61 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 2b60f3116..3c3d7740a 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 3d6865f85..7c36a7c5e 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 9e31fc800..f8b03bbc2 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 d762dfaf7..350412344 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 d2e542536..e5989db3b 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 cbd0ce4a1..545894b0d 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 725a5edcb..104e63447 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 b50cb254f..64c055ba0 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 176094b75..06a44d747 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 c524f3919ef019092d3bcfa246870bc3f16070c5 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 21 Jul 2014 21:29:06 -0400
Subject: added cloud sync model objects

---
 MediaBrowser.Api/ApiEntryPoint.cs                  |  55 +-----
 MediaBrowser.Api/Playback/Hls/BaseHlsService.cs    |   5 -
 MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs |   2 +-
 MediaBrowser.Api/UserService.cs                    |   2 +-
 .../MediaBrowser.Common.Implementations.csproj     |   6 +-
 .../packages.config                                |   2 +-
 .../MediaBrowser.Controller.csproj                 |   2 +
 MediaBrowser.Controller/Sync/ICloudSyncProvider.cs |  12 ++
 MediaBrowser.Controller/Sync/ISyncManager.cs       |  11 ++
 MediaBrowser.Controller/Sync/ISyncProvider.cs      |  28 +++
 MediaBrowser.Dlna/Channels/DlnaChannelFactory.cs   | 154 +++++++++++++--
 MediaBrowser.Dlna/Main/DlnaEntryPoint.cs           |  15 +-
 MediaBrowser.Dlna/PlayTo/Device.cs                 |  19 +-
 MediaBrowser.Dlna/PlayTo/PlayToController.cs       |  59 +++---
 MediaBrowser.Dlna/PlayTo/PlayToManager.cs          |  39 ++--
 MediaBrowser.Dlna/Ssdp/DeviceDiscovery.cs          |  71 ++++---
 MediaBrowser.Dlna/Ssdp/SsdpMessageEventArgs.cs     |   2 +
 .../Images/LocalImageProvider.cs                   |   2 +-
 .../Savers/XmlSaverHelpers.cs                      |   7 +
 .../MediaBrowser.Model.Portable.csproj             |   3 +
 .../MediaBrowser.Model.net35.csproj                |   3 +
 MediaBrowser.Model/Entities/MediaStream.cs         |   6 +-
 MediaBrowser.Model/MediaBrowser.Model.csproj       |   1 +
 MediaBrowser.Model/Sync/SyncJob.cs                 |   2 +-
 MediaBrowser.Model/Sync/SyncJobRequest.cs          |   4 +-
 MediaBrowser.Model/Sync/SyncScheduleRequest.cs     |   4 +-
 MediaBrowser.Model/Sync/SyncTarget.cs              |  17 ++
 .../HttpServer/HttpListenerHost.cs                 |   3 +-
 .../HttpServer/Security/AuthService.cs             |   2 +-
 .../Library/UserManager.cs                         |   3 +-
 .../Localization/JavaScript/ar.json                |   4 +-
 .../Localization/JavaScript/ca.json                |   4 +-
 .../Localization/JavaScript/cs.json                |   8 +-
 .../Localization/JavaScript/da.json                |   4 +-
 .../Localization/JavaScript/de.json                |   4 +-
 .../Localization/JavaScript/el.json                |   4 +-
 .../Localization/JavaScript/en_GB.json             |   4 +-
 .../Localization/JavaScript/en_US.json             |   4 +-
 .../Localization/JavaScript/es.json                |   4 +-
 .../Localization/JavaScript/es_MX.json             |   4 +-
 .../Localization/JavaScript/fr.json                | 218 +++++++++++----------
 .../Localization/JavaScript/he.json                |   4 +-
 .../Localization/JavaScript/it.json                | 128 ++++++------
 .../Localization/JavaScript/javascript.json        |   4 +-
 .../Localization/JavaScript/kk.json                |  10 +-
 .../Localization/JavaScript/ms.json                |   4 +-
 .../Localization/JavaScript/nb.json                |   4 +-
 .../Localization/JavaScript/nl.json                |   8 +-
 .../Localization/JavaScript/pl.json                |   4 +-
 .../Localization/JavaScript/pt_BR.json             |   8 +-
 .../Localization/JavaScript/pt_PT.json             |   4 +-
 .../Localization/JavaScript/ru.json                |  16 +-
 .../Localization/JavaScript/sv.json                |   4 +-
 .../Localization/JavaScript/vi.json                |   4 +-
 .../Localization/JavaScript/zh_TW.json             |   4 +-
 .../Localization/Server/ar.json                    |   6 +-
 .../Localization/Server/ca.json                    |   6 +-
 .../Localization/Server/cs.json                    |  18 +-
 .../Localization/Server/da.json                    |   6 +-
 .../Localization/Server/de.json                    |   6 +-
 .../Localization/Server/el.json                    |   6 +-
 .../Localization/Server/en_GB.json                 |   6 +-
 .../Localization/Server/en_US.json                 |   6 +-
 .../Localization/Server/es.json                    |   6 +-
 .../Localization/Server/es_MX.json                 |   6 +-
 .../Localization/Server/fr.json                    | 168 ++++++++--------
 .../Localization/Server/he.json                    |   6 +-
 .../Localization/Server/it.json                    |  76 +++----
 .../Localization/Server/kk.json                    |  50 ++---
 .../Localization/Server/ko.json                    |   6 +-
 .../Localization/Server/ms.json                    |   6 +-
 .../Localization/Server/nb.json                    |   6 +-
 .../Localization/Server/nl.json                    |  10 +-
 .../Localization/Server/pl.json                    |   6 +-
 .../Localization/Server/pt_BR.json                 |  14 +-
 .../Localization/Server/pt_PT.json                 |   6 +-
 .../Localization/Server/ru.json                    | 110 ++++++-----
 .../Localization/Server/server.json                |   5 +-
 .../Localization/Server/sv.json                    |   6 +-
 .../Localization/Server/vi.json                    |   6 +-
 .../Localization/Server/zh_TW.json                 |   6 +-
 .../MediaBrowser.Server.Implementations.csproj     |   3 +
 .../Security/AuthenticationException.cs            |  16 ++
 .../Session/SessionManager.cs                      |  27 +--
 .../Sync/AppSyncProvider.cs                        |  26 +++
 .../Sync/CloudSyncProvider.cs                      |  35 ++++
 .../Sync/SyncManager.cs                            |  13 ++
 MediaBrowser.ServerApplication/ApplicationHost.cs  |  14 +-
 .../FFMpeg/FFMpegDownloadInfo.cs                   |   6 +-
 .../FFMpeg/FFMpegDownloader.cs                     |   9 +-
 MediaBrowser.WebDashboard/Api/DashboardService.cs  |   9 +-
 .../MediaBrowser.WebDashboard.csproj               |  15 +-
 Nuget/MediaBrowser.Common.Internal.nuspec          |   2 +-
 93 files changed, 1078 insertions(+), 665 deletions(-)
 create mode 100644 MediaBrowser.Controller/Sync/ICloudSyncProvider.cs
 create mode 100644 MediaBrowser.Controller/Sync/ISyncProvider.cs
 create mode 100644 MediaBrowser.Model/Sync/SyncTarget.cs
 create mode 100644 MediaBrowser.Server.Implementations/Security/AuthenticationException.cs
 create mode 100644 MediaBrowser.Server.Implementations/Sync/AppSyncProvider.cs
 create mode 100644 MediaBrowser.Server.Implementations/Sync/CloudSyncProvider.cs

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs
index f255339bc..c51d9e7c0 100644
--- a/MediaBrowser.Api/ApiEntryPoint.cs
+++ b/MediaBrowser.Api/ApiEntryPoint.cs
@@ -302,75 +302,38 @@ namespace MediaBrowser.Api
         /// Kills the single transcoding job.
         /// </summary>
         /// <param name="deviceId">The device id.</param>
-        /// <param name="delete">The delete.</param>
+        /// <param name="deleteFiles">The delete files.</param>
         /// <param name="acquireLock">if set to <c>true</c> [acquire lock].</param>
         /// <returns>Task.</returns>
+        /// <exception cref="ArgumentNullException">deviceId</exception>
         /// <exception cref="System.ArgumentNullException">sourcePath</exception>
-        internal async Task KillTranscodingJobs(string deviceId, Func<string, bool> delete, bool acquireLock)
+        internal Task KillTranscodingJobs(string deviceId, Func<string, bool> deleteFiles, bool acquireLock)
         {
             if (string.IsNullOrEmpty(deviceId))
             {
                 throw new ArgumentNullException("deviceId");
             }
 
-            var jobs = new List<TranscodingJob>();
-
-            lock (_activeTranscodingJobs)
-            {
-                // This is really only needed for HLS. 
-                // Progressive streams can stop on their own reliably
-                jobs.AddRange(_activeTranscodingJobs.Where(i => string.Equals(deviceId, i.DeviceId, StringComparison.OrdinalIgnoreCase)));
-            }
-
-            if (jobs.Count == 0)
-            {
-                return;
-            }
-
-            if (acquireLock)
-            {
-                await TranscodingStartLock.WaitAsync(CancellationToken.None).ConfigureAwait(false);
-            }
-
-            try
-            {
-                foreach (var job in jobs)
-                {
-                    KillTranscodingJob(job, delete);
-                }
-            }
-            finally
-            {
-                if (acquireLock)
-                {
-                    TranscodingStartLock.Release();
-                }
-            }
+            return KillTranscodingJobs(j => string.Equals(deviceId, j.DeviceId, StringComparison.OrdinalIgnoreCase), deleteFiles, acquireLock);
         }
 
         /// <summary>
         /// Kills the transcoding jobs.
         /// </summary>
-        /// <param name="deviceId">The device identifier.</param>
-        /// <param name="type">The type.</param>
-        /// <param name="delete">The delete.</param>
+        /// <param name="killJob">The kill job.</param>
+        /// <param name="deleteFiles">The delete files.</param>
         /// <param name="acquireLock">if set to <c>true</c> [acquire lock].</param>
         /// <returns>Task.</returns>
         /// <exception cref="System.ArgumentNullException">deviceId</exception>
-        internal async Task KillTranscodingJobs(string deviceId, TranscodingJobType type, Func<string, bool> delete, bool acquireLock)
+        internal async Task KillTranscodingJobs(Func<TranscodingJob,bool> killJob, Func<string, bool> deleteFiles, bool acquireLock)
         {
-            if (string.IsNullOrEmpty(deviceId))
-            {
-                throw new ArgumentNullException("deviceId");
-            }
-
             var jobs = new List<TranscodingJob>();
 
             lock (_activeTranscodingJobs)
             {
                 // This is really only needed for HLS. 
                 // Progressive streams can stop on their own reliably
-                jobs.AddRange(_activeTranscodingJobs.Where(i => string.Equals(deviceId, i.DeviceId, StringComparison.OrdinalIgnoreCase) && i.Type == type));
+                jobs.AddRange(_activeTranscodingJobs.Where(killJob));
             }
 
             if (jobs.Count == 0)
@@ -387,7 +350,7 @@ namespace MediaBrowser.Api
             {
                 foreach (var job in jobs)
                 {
-                    KillTranscodingJob(job, delete);
+                    KillTranscodingJob(job, deleteFiles);
                 }
             }
             finally
diff --git a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
index 317c4455a..bd17dc0b2 100644
--- a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
@@ -104,11 +104,6 @@ namespace MediaBrowser.Api.Playback.Hls
                     }
                     else
                     {
-                        if (!string.IsNullOrWhiteSpace(state.Request.DeviceId))
-                        {
-                            await ApiEntryPoint.Instance.KillTranscodingJobs(state.Request.DeviceId, TranscodingJobType.Hls, p => true, false).ConfigureAwait(false);
-                        }
-
                         // If the playlist doesn't already exist, startup ffmpeg
                         try
                         {
diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
index f01d8ddf4..5e49fbf7a 100644
--- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
@@ -132,7 +132,7 @@ namespace MediaBrowser.Api.Playback.Hls
                         // If the playlist doesn't already exist, startup ffmpeg
                         try
                         {
-                            await ApiEntryPoint.Instance.KillTranscodingJobs(state.Request.DeviceId, TranscodingJobType.Hls, p => !string.Equals(p, playlistPath, StringComparison.OrdinalIgnoreCase), false).ConfigureAwait(false);
+                            await ApiEntryPoint.Instance.KillTranscodingJobs(j => j.Type == TranscodingJobType.Hls && string.Equals(j.DeviceId, request.DeviceId, StringComparison.OrdinalIgnoreCase), p => !string.Equals(p, playlistPath, StringComparison.OrdinalIgnoreCase), false).ConfigureAwait(false);
 
                             if (currentTranscodingIndex.HasValue)
                             {
diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs
index b7a43c237..f5a1f54cb 100644
--- a/MediaBrowser.Api/UserService.cs
+++ b/MediaBrowser.Api/UserService.cs
@@ -405,7 +405,7 @@ namespace MediaBrowser.Api
 
                 if (!success)
                 {
-                    throw new UnauthorizedAccessException("Invalid user or password entered.");
+                    throw new ArgumentException("Invalid user or password entered.");
                 }
 
                 var task = _userManager.ChangePassword(user, request.NewPassword);
diff --git a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
index f6651a9e3..718119fe3 100644
--- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
+++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
@@ -54,11 +54,11 @@
     </Reference>
     <Reference Include="SimpleInjector, Version=2.5.0.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\SimpleInjector.2.5.0\lib\net45\SimpleInjector.dll</HintPath>
+      <HintPath>..\packages\SimpleInjector.2.5.2\lib\net45\SimpleInjector.dll</HintPath>
     </Reference>
-    <Reference Include="SimpleInjector.Diagnostics, Version=2.5.0.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
+    <Reference Include="SimpleInjector.Diagnostics, Version=2.5.2.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\SimpleInjector.2.5.0\lib\net45\SimpleInjector.Diagnostics.dll</HintPath>
+      <HintPath>..\packages\SimpleInjector.2.5.2\lib\net45\SimpleInjector.Diagnostics.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/MediaBrowser.Common.Implementations/packages.config b/MediaBrowser.Common.Implementations/packages.config
index 71d9749da..4f2a4c224 100644
--- a/MediaBrowser.Common.Implementations/packages.config
+++ b/MediaBrowser.Common.Implementations/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="NLog" version="3.1.0.0" targetFramework="net45" />
   <package id="sharpcompress" version="0.10.2" targetFramework="net45" />
-  <package id="SimpleInjector" version="2.5.0" targetFramework="net45" />
+  <package id="SimpleInjector" version="2.5.2" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index fb50deb66..5c3f10b54 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -319,7 +319,9 @@
     <Compile Include="Sorting\SortExtensions.cs" />
     <Compile Include="Subtitles\SubtitleResponse.cs" />
     <Compile Include="Subtitles\SubtitleSearchRequest.cs" />
+    <Compile Include="Sync\ICloudSyncProvider.cs" />
     <Compile Include="Sync\ISyncManager.cs" />
+    <Compile Include="Sync\ISyncProvider.cs" />
     <Compile Include="Themes\IAppThemeManager.cs" />
     <Compile Include="Themes\InternalThemeImage.cs" />
   </ItemGroup>
diff --git a/MediaBrowser.Controller/Sync/ICloudSyncProvider.cs b/MediaBrowser.Controller/Sync/ICloudSyncProvider.cs
new file mode 100644
index 000000000..f93360c64
--- /dev/null
+++ b/MediaBrowser.Controller/Sync/ICloudSyncProvider.cs
@@ -0,0 +1,12 @@
+
+namespace MediaBrowser.Controller.Sync
+{
+    public interface ICloudSyncProvider
+    {
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        string Name { get; }
+    }
+}
diff --git a/MediaBrowser.Controller/Sync/ISyncManager.cs b/MediaBrowser.Controller/Sync/ISyncManager.cs
index 63a5d8a7c..ef4b84f27 100644
--- a/MediaBrowser.Controller/Sync/ISyncManager.cs
+++ b/MediaBrowser.Controller/Sync/ISyncManager.cs
@@ -60,5 +60,16 @@ namespace MediaBrowser.Controller.Sync
         /// <param name="id">The identifier.</param>
         /// <returns>Task.</returns>
         Task CancelSchedule(string id);
+
+        /// <summary>
+        /// Adds the parts.
+        /// </summary>
+        void AddParts(IEnumerable<ISyncProvider> providers);
+
+        /// <summary>
+        /// Gets the synchronize targets.
+        /// </summary>
+        /// <returns>IEnumerable&lt;SyncTarget&gt;.</returns>
+        IEnumerable<SyncTarget> GetSyncTargets();
     }
 }
diff --git a/MediaBrowser.Controller/Sync/ISyncProvider.cs b/MediaBrowser.Controller/Sync/ISyncProvider.cs
new file mode 100644
index 000000000..89f61b80e
--- /dev/null
+++ b/MediaBrowser.Controller/Sync/ISyncProvider.cs
@@ -0,0 +1,28 @@
+using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Sync;
+using System.Collections.Generic;
+
+namespace MediaBrowser.Controller.Sync
+{
+    public interface ISyncProvider
+    {
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        string Name { get; }
+
+        /// <summary>
+        /// Gets the synchronize targets.
+        /// </summary>
+        /// <returns>IEnumerable&lt;SyncTarget&gt;.</returns>
+        IEnumerable<SyncTarget> GetSyncTargets();
+
+        /// <summary>
+        /// Gets the device profile.
+        /// </summary>
+        /// <param name="target">The target.</param>
+        /// <returns>DeviceProfile.</returns>
+        DeviceProfile GetDeviceProfile(SyncTarget target);
+    }
+}
diff --git a/MediaBrowser.Dlna/Channels/DlnaChannelFactory.cs b/MediaBrowser.Dlna/Channels/DlnaChannelFactory.cs
index 847d856fb..414bec715 100644
--- a/MediaBrowser.Dlna/Channels/DlnaChannelFactory.cs
+++ b/MediaBrowser.Dlna/Channels/DlnaChannelFactory.cs
@@ -1,9 +1,12 @@
-using MediaBrowser.Controller.Channels;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Channels;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Dlna.PlayTo;
 using MediaBrowser.Dlna.Ssdp;
+using MediaBrowser.Model.Channels;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Events;
+using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,45 +17,140 @@ namespace MediaBrowser.Dlna.Channels
 {
     public class DlnaChannelFactory : IChannelFactory, IDisposable
     {
+        private readonly IServerConfigurationManager _config;
+        private readonly ILogger _logger;
+        private readonly IHttpClient _httpClient;
+        
         private DeviceDiscovery _deviceDiscovery;
 
-        private readonly object _syncLock = new object();
-        private readonly List<Device> _servers = new List<Device>();
+        private readonly SemaphoreSlim _syncLock = new SemaphoreSlim(1, 1);
+        private List<Device> _servers = new List<Device>();
 
         public static DlnaChannelFactory Instance;
 
-        public DlnaChannelFactory()
+        private Func<List<string>> _localServersLookup;
+
+        public DlnaChannelFactory(IServerConfigurationManager config, IHttpClient httpClient, ILogger logger)
         {
+            _config = config;
+            _httpClient = httpClient;
+            _logger = logger;
             Instance = this;
         }
 
-        internal void Start(DeviceDiscovery deviceDiscovery)
+        internal void Start(DeviceDiscovery deviceDiscovery, Func<List<string>> localServersLookup)
         {
+            _localServersLookup = localServersLookup;
+
             _deviceDiscovery = deviceDiscovery;
             deviceDiscovery.DeviceDiscovered += deviceDiscovery_DeviceDiscovered;
+            deviceDiscovery.DeviceLeft += deviceDiscovery_DeviceLeft;
         }
 
-        void deviceDiscovery_DeviceDiscovered(object sender, GenericEventArgs<DeviceDiscoveryInfo> e)
+        async void deviceDiscovery_DeviceDiscovered(object sender, SsdpMessageEventArgs e)
         {
-            var usn = e.Argument.Usn;
-            var nt = e.Argument.Nt;
+            string usn;
+            if (!e.Headers.TryGetValue("USN", out usn)) usn = string.Empty;
 
-            // It has to report that it's a media renderer
-            if (usn.IndexOf("ContentDirectory:", StringComparison.OrdinalIgnoreCase) == -1 &&
-                     nt.IndexOf("ContentDirectory:", StringComparison.OrdinalIgnoreCase) == -1)
+            string nt;
+            if (!e.Headers.TryGetValue("NT", out nt)) nt = string.Empty;
+
+            string location;
+            if (!e.Headers.TryGetValue("Location", out location)) location = string.Empty;
+
+            if (!IsValid(nt, usn))
+            {
+                return;
+            }
+
+            if (_localServersLookup != null)
+            {
+                if (_localServersLookup().Any(i => usn.IndexOf(i, StringComparison.OrdinalIgnoreCase) != -1))
+                {
+                    // Don't add the local Dlna server to this
+                    return;
+                }
+            }
+
+            if (GetExistingServers(usn).Any())
+            {
+                return;
+            }
+
+            await _syncLock.WaitAsync().ConfigureAwait(false);
+
+            try
+            {
+                if (GetExistingServers(usn).Any())
+                {
+                    return;
+                }
+
+                var device = await Device.CreateuPnpDeviceAsync(new Uri(location), _httpClient, _config, _logger).ConfigureAwait(false);
+
+                _servers.Add(device);
+            }
+            finally
+            {
+                _syncLock.Release();
+            }
+        }
+
+        async void deviceDiscovery_DeviceLeft(object sender, SsdpMessageEventArgs e)
+        {
+            string usn;
+            if (!e.Headers.TryGetValue("USN", out usn)) usn = String.Empty;
+
+            string nt;
+            if (!e.Headers.TryGetValue("NT", out nt)) nt = String.Empty;
+
+            if (!IsValid(nt, usn))
             {
                 return;
             }
 
-            if (_servers.Any(i => usn.IndexOf(i.Properties.UUID, StringComparison.OrdinalIgnoreCase) != -1))
+            if (!GetExistingServers(usn).Any())
             {
                 return;
             }
 
-            lock (_syncLock)
+            await _syncLock.WaitAsync().ConfigureAwait(false);
+            
+            try
+            {
+                var list = _servers.ToList();
+
+                foreach (var device in GetExistingServers(usn).ToList())
+                {
+                    list.Remove(device);
+                }
+
+                _servers = list;
+            }
+            finally
+            {
+                _syncLock.Release();
+            }
+        }
+
+        private bool IsValid(string nt, string usn)
+        {
+            // It has to report that it's a media renderer
+            if (usn.IndexOf("ContentDirectory:", StringComparison.OrdinalIgnoreCase) == -1 &&
+                     nt.IndexOf("ContentDirectory:", StringComparison.OrdinalIgnoreCase) == -1 &&
+                     usn.IndexOf("MediaServer:", StringComparison.OrdinalIgnoreCase) == -1 &&
+                     nt.IndexOf("MediaServer:", StringComparison.OrdinalIgnoreCase) == -1)
             {
-                _servers.Add(e.Argument.Device);
+                return false;
             }
+
+            return true;
+        }
+
+        private IEnumerable<Device> GetExistingServers(string usn)
+        {
+            return _servers
+                .Where(i => usn.IndexOf(i.Properties.UUID, StringComparison.OrdinalIgnoreCase) != -1);
         }
 
         public IEnumerable<IChannel> GetChannels()
@@ -65,6 +163,7 @@ namespace MediaBrowser.Dlna.Channels
             if (_deviceDiscovery != null)
             {
                 _deviceDiscovery.DeviceDiscovered -= deviceDiscovery_DeviceDiscovered;
+                _deviceDiscovery.DeviceLeft -= deviceDiscovery_DeviceLeft;
             }
         }
     }
@@ -107,7 +206,18 @@ namespace MediaBrowser.Dlna.Channels
         {
             return new InternalChannelFeatures
             {
-                 
+                ContentTypes = new List<ChannelMediaContentType>
+                {
+                    ChannelMediaContentType.Song,
+                    ChannelMediaContentType.Clip
+                },
+
+                MediaTypes = new List<ChannelMediaType>
+                {
+                    ChannelMediaType.Audio,
+                    ChannelMediaType.Video,
+                    ChannelMediaType.Photo
+                }
             };
         }
 
@@ -118,17 +228,25 @@ namespace MediaBrowser.Dlna.Channels
 
         public Task<ChannelItemResult> GetChannelItems(InternalChannelItemQuery query, CancellationToken cancellationToken)
         {
+            // TODO: Implement
             return Task.FromResult(new ChannelItemResult());
         }
 
         public Task<DynamicImageResponse> GetChannelImage(ImageType type, CancellationToken cancellationToken)
         {
-            return Task.FromResult(new DynamicImageResponse());
+            // TODO: Implement
+            return Task.FromResult(new DynamicImageResponse
+            {
+                HasImage = false
+            });
         }
 
         public IEnumerable<ImageType> GetSupportedChannelImages()
         {
-            return new List<ImageType>();
+            return new List<ImageType>
+            {
+                ImageType.Primary
+            };
         }
     }
 }
diff --git a/MediaBrowser.Dlna/Main/DlnaEntryPoint.cs b/MediaBrowser.Dlna/Main/DlnaEntryPoint.cs
index e2772b036..8914ae8bf 100644
--- a/MediaBrowser.Dlna/Main/DlnaEntryPoint.cs
+++ b/MediaBrowser.Dlna/Main/DlnaEntryPoint.cs
@@ -38,7 +38,7 @@ namespace MediaBrowser.Dlna.Main
         private SsdpHandler _ssdpHandler;
         private DeviceDiscovery _deviceDiscovery;
 
-        private readonly List<Guid> _registeredServerIds = new List<Guid>();
+        private readonly List<string> _registeredServerIds = new List<string>();
         private bool _dlnaServerStarted;
 
         public DlnaEntryPoint(IServerConfigurationManager config, ILogManager logManager, IServerApplicationHost appHost, INetworkManager network, ISessionManager sessionManager, IHttpClient httpClient, IItemRepository itemRepo, ILibraryManager libraryManager, IUserManager userManager, IDlnaManager dlnaManager, IImageProcessor imageProcessor)
@@ -63,7 +63,7 @@ namespace MediaBrowser.Dlna.Main
 
             _config.NamedConfigurationUpdated += _config_NamedConfigurationUpdated;
 
-            DlnaChannelFactory.Instance.Start(_deviceDiscovery);
+            DlnaChannelFactory.Instance.Start(_deviceDiscovery, () => _registeredServerIds);
         }
 
         void _config_NamedConfigurationUpdated(object sender, ConfigurationUpdateEventArgs e)
@@ -109,7 +109,7 @@ namespace MediaBrowser.Dlna.Main
 
                 _ssdpHandler.Start();
 
-                _deviceDiscovery = new DeviceDiscovery(_logger, _config, _httpClient, _ssdpHandler);
+                _deviceDiscovery = new DeviceDiscovery(_logger, _config, _httpClient, _ssdpHandler, _network);
 
                 _deviceDiscovery.Start();
             }
@@ -174,7 +174,7 @@ namespace MediaBrowser.Dlna.Main
                 
                 _ssdpHandler.RegisterNotification(guid, uri, IPAddress.Parse(address), services);
 
-                _registeredServerIds.Add(guid);
+                _registeredServerIds.Add(guid.ToString("N"));
             }
         }
 
@@ -216,8 +216,9 @@ namespace MediaBrowser.Dlna.Main
                         _dlnaManager,
                         _appHost,
                         _imageProcessor,
-                        _ssdpHandler,
-                        _deviceDiscovery);
+                        _deviceDiscovery,
+                        _httpClient,
+                        _config);
 
                     _manager.Start();
                 }
@@ -260,7 +261,7 @@ namespace MediaBrowser.Dlna.Main
             {
                 try
                 {
-                    _ssdpHandler.UnregisterNotification(id);
+                    _ssdpHandler.UnregisterNotification(new Guid(id));
                 }
                 catch (Exception ex)
                 {
diff --git a/MediaBrowser.Dlna/PlayTo/Device.cs b/MediaBrowser.Dlna/PlayTo/Device.cs
index 045217a57..272e34a78 100644
--- a/MediaBrowser.Dlna/PlayTo/Device.cs
+++ b/MediaBrowser.Dlna/PlayTo/Device.cs
@@ -370,6 +370,8 @@ namespace MediaBrowser.Dlna.PlayTo
             if (_disposed)
                 return;
 
+            const int maxSuccessiveStopReturns = 5;
+
             try
             {
                 var transportState = await GetTransportInfo().ConfigureAwait(false);
@@ -408,7 +410,7 @@ namespace MediaBrowser.Dlna.PlayTo
                     {
                         _successiveStopCount++;
 
-                        if (_successiveStopCount >= 10)
+                        if (_successiveStopCount >= maxSuccessiveStopReturns)
                         {
                             RestartTimerInactive();
                         }
@@ -423,6 +425,13 @@ namespace MediaBrowser.Dlna.PlayTo
             catch (Exception ex)
             {
                 _logger.ErrorException("Error updating device info", ex);
+
+                _successiveStopCount++;
+
+                if (_successiveStopCount >= maxSuccessiveStopReturns)
+                {
+                    RestartTimerInactive();
+                }
             }
         }
 
@@ -828,17 +837,15 @@ namespace MediaBrowser.Dlna.PlayTo
                 }
             }
 
+            var device = new Device(deviceProperties, httpClient, logger, config);
+
             if (isRenderer)
             {
-                var device = new Device(deviceProperties, httpClient, logger, config);
-
                 await device.GetRenderingProtocolAsync().ConfigureAwait(false);
                 await device.GetAVProtocolAsync().ConfigureAwait(false);
-
-                return device;
             }
 
-            return null;
+            return device;
         }
 
         #endregion
diff --git a/MediaBrowser.Dlna/PlayTo/PlayToController.cs b/MediaBrowser.Dlna/PlayTo/PlayToController.cs
index 34f657217..eb4eb3889 100644
--- a/MediaBrowser.Dlna/PlayTo/PlayToController.cs
+++ b/MediaBrowser.Dlna/PlayTo/PlayToController.cs
@@ -1,7 +1,6 @@
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Session;
@@ -34,7 +33,7 @@ namespace MediaBrowser.Dlna.PlayTo
         private readonly IUserManager _userManager;
         private readonly IImageProcessor _imageProcessor;
 
-        private readonly SsdpHandler _ssdpHandler;
+        private readonly DeviceDiscovery _deviceDiscovery;
         private readonly string _serverAddress;
 
         public bool IsSessionActive
@@ -52,7 +51,7 @@ namespace MediaBrowser.Dlna.PlayTo
 
         private Timer _updateTimer;
 
-        public PlayToController(SessionInfo session, ISessionManager sessionManager, IItemRepository itemRepository, ILibraryManager libraryManager, ILogger logger, IDlnaManager dlnaManager, IUserManager userManager, IImageProcessor imageProcessor, SsdpHandler ssdpHandler, string serverAddress)
+        public PlayToController(SessionInfo session, ISessionManager sessionManager, IItemRepository itemRepository, ILibraryManager libraryManager, ILogger logger, IDlnaManager dlnaManager, IUserManager userManager, IImageProcessor imageProcessor, string serverAddress, DeviceDiscovery deviceDiscovery)
         {
             _session = session;
             _itemRepository = itemRepository;
@@ -61,8 +60,8 @@ namespace MediaBrowser.Dlna.PlayTo
             _dlnaManager = dlnaManager;
             _userManager = userManager;
             _imageProcessor = imageProcessor;
-            _ssdpHandler = ssdpHandler;
             _serverAddress = serverAddress;
+            _deviceDiscovery = deviceDiscovery;
             _logger = logger;
         }
 
@@ -75,33 +74,12 @@ namespace MediaBrowser.Dlna.PlayTo
             _device.MediaChanged += _device_MediaChanged;
             _device.Start();
 
-            _ssdpHandler.MessageReceived += _SsdpHandler_MessageReceived;
+            _deviceDiscovery.DeviceLeft += _deviceDiscovery_DeviceLeft;
 
             _updateTimer = new Timer(updateTimer_Elapsed, null, 60000, 60000);
         }
 
-        private void updateTimer_Elapsed(object state)
-        {
-            if (DateTime.UtcNow >= _device.DateLastActivity.AddSeconds(120))
-            {
-                try
-                {
-                    // Session is inactive, mark it for Disposal and don't start the elapsed timer.
-                    _sessionManager.ReportSessionEnded(_session.Id);
-                }
-                catch (Exception ex)
-                {
-                    _logger.ErrorException("Error in ReportSessionEnded", ex);
-                }
-            }
-        }
-
-        private string GetServerAddress()
-        {
-            return _serverAddress;
-        }
-
-        void _SsdpHandler_MessageReceived(object sender, SsdpMessageEventArgs e)
+        void _deviceDiscovery_DeviceLeft(object sender, SsdpMessageEventArgs e)
         {
             string nts;
             e.Headers.TryGetValue("NTS", out nts);
@@ -112,9 +90,7 @@ namespace MediaBrowser.Dlna.PlayTo
             string nt;
             if (!e.Headers.TryGetValue("NT", out nt)) nt = String.Empty;
 
-            if (String.Equals(e.Method, "NOTIFY", StringComparison.OrdinalIgnoreCase) &&
-                String.Equals(nts, "ssdp:byebye", StringComparison.OrdinalIgnoreCase) &&
-                usn.IndexOf(_device.Properties.UUID, StringComparison.OrdinalIgnoreCase) != -1 &&
+            if ( usn.IndexOf(_device.Properties.UUID, StringComparison.OrdinalIgnoreCase) != -1 &&
                 !_disposed)
             {
                 if (usn.IndexOf("MediaRenderer:", StringComparison.OrdinalIgnoreCase) != -1 ||
@@ -132,6 +108,27 @@ namespace MediaBrowser.Dlna.PlayTo
             }
         }
 
+        private void updateTimer_Elapsed(object state)
+        {
+            if (DateTime.UtcNow >= _device.DateLastActivity.AddSeconds(120))
+            {
+                try
+                {
+                    // Session is inactive, mark it for Disposal and don't start the elapsed timer.
+                    _sessionManager.ReportSessionEnded(_session.Id);
+                }
+                catch (Exception ex)
+                {
+                    _logger.ErrorException("Error in ReportSessionEnded", ex);
+                }
+            }
+        }
+
+        private string GetServerAddress()
+        {
+            return _serverAddress;
+        }
+
         async void _device_MediaChanged(object sender, MediaChangedEventArgs e)
         {
             try
@@ -626,7 +623,7 @@ namespace MediaBrowser.Dlna.PlayTo
                 _device.PlaybackProgress -= _device_PlaybackProgress;
                 _device.PlaybackStopped -= _device_PlaybackStopped;
                 _device.MediaChanged -= _device_MediaChanged;
-                _ssdpHandler.MessageReceived -= _SsdpHandler_MessageReceived;
+                _deviceDiscovery.DeviceLeft -= _deviceDiscovery_DeviceLeft;
 
                 DisposeUpdateTimer();
 
diff --git a/MediaBrowser.Dlna/PlayTo/PlayToManager.cs b/MediaBrowser.Dlna/PlayTo/PlayToManager.cs
index 165f788e8..cea397cae 100644
--- a/MediaBrowser.Dlna/PlayTo/PlayToManager.cs
+++ b/MediaBrowser.Dlna/PlayTo/PlayToManager.cs
@@ -1,4 +1,6 @@
-using MediaBrowser.Controller;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Library;
@@ -26,11 +28,12 @@ namespace MediaBrowser.Dlna.PlayTo
         private readonly IDlnaManager _dlnaManager;
         private readonly IServerApplicationHost _appHost;
         private readonly IImageProcessor _imageProcessor;
+        private readonly IHttpClient _httpClient;
+        private readonly IServerConfigurationManager _config;
 
-        private readonly SsdpHandler _ssdpHandler;
         private readonly DeviceDiscovery _deviceDiscovery;
         
-        public PlayToManager(ILogger logger, ISessionManager sessionManager, IItemRepository itemRepository, ILibraryManager libraryManager, IUserManager userManager, IDlnaManager dlnaManager, IServerApplicationHost appHost, IImageProcessor imageProcessor, SsdpHandler ssdpHandler, DeviceDiscovery deviceDiscovery)
+        public PlayToManager(ILogger logger, ISessionManager sessionManager, IItemRepository itemRepository, ILibraryManager libraryManager, IUserManager userManager, IDlnaManager dlnaManager, IServerApplicationHost appHost, IImageProcessor imageProcessor, DeviceDiscovery deviceDiscovery, IHttpClient httpClient, IServerConfigurationManager config)
         {
             _logger = logger;
             _sessionManager = sessionManager;
@@ -40,8 +43,9 @@ namespace MediaBrowser.Dlna.PlayTo
             _dlnaManager = dlnaManager;
             _appHost = appHost;
             _imageProcessor = imageProcessor;
-            _ssdpHandler = ssdpHandler;
             _deviceDiscovery = deviceDiscovery;
+            _httpClient = httpClient;
+            _config = config;
         }
 
         public void Start()
@@ -49,14 +53,19 @@ namespace MediaBrowser.Dlna.PlayTo
             _deviceDiscovery.DeviceDiscovered += _deviceDiscovery_DeviceDiscovered;
         }
 
-        async void _deviceDiscovery_DeviceDiscovered(object sender, GenericEventArgs<DeviceDiscoveryInfo> e)
+        async void _deviceDiscovery_DeviceDiscovered(object sender, SsdpMessageEventArgs e)
         {
-            var device = e.Argument.Device;
-            var localIp = e.Argument.LocalIpAddress;
+            var localIp = e.LocalIp;
 
-            var usn = e.Argument.Usn;
-            var nt = e.Argument.Nt;
+            string usn;
+            if (!e.Headers.TryGetValue("USN", out usn)) usn = string.Empty;
 
+            string nt;
+            if (!e.Headers.TryGetValue("NT", out nt)) nt = string.Empty;
+
+            string location;
+            if (!e.Headers.TryGetValue("Location", out location)) location = string.Empty;
+            
             // It has to report that it's a media renderer
             if (usn.IndexOf("MediaRenderer:", StringComparison.OrdinalIgnoreCase) == -1 &&
                      nt.IndexOf("MediaRenderer:", StringComparison.OrdinalIgnoreCase) == -1)
@@ -67,12 +76,14 @@ namespace MediaBrowser.Dlna.PlayTo
             if (_sessionManager.Sessions.Any(i => usn.IndexOf(i.DeviceId, StringComparison.OrdinalIgnoreCase) != -1))
             {
                 return;
-            } 
+            }
+
+            var uri = new Uri(location);
+
+            var device = await Device.CreateuPnpDeviceAsync(uri, _httpClient, _config, _logger).ConfigureAwait(false);
             
             if (device.RendererCommands != null)
             {
-                var uri = e.Argument.Uri;
-
                 var sessionInfo = await _sessionManager.LogSessionActivity(device.Properties.ClientType, _appHost.ApplicationVersion.ToString(), device.Properties.UUID, device.Properties.Name, uri.OriginalString, null)
                     .ConfigureAwait(false);
 
@@ -90,8 +101,8 @@ namespace MediaBrowser.Dlna.PlayTo
                         _dlnaManager,
                         _userManager,
                         _imageProcessor,
-                        _ssdpHandler,
-                        serverAddress);
+                        serverAddress,
+                        _deviceDiscovery);
 
                     controller.Init(device);
 
diff --git a/MediaBrowser.Dlna/Ssdp/DeviceDiscovery.cs b/MediaBrowser.Dlna/Ssdp/DeviceDiscovery.cs
index aca164092..8cda73082 100644
--- a/MediaBrowser.Dlna/Ssdp/DeviceDiscovery.cs
+++ b/MediaBrowser.Dlna/Ssdp/DeviceDiscovery.cs
@@ -25,10 +25,12 @@ namespace MediaBrowser.Dlna.Ssdp
         private readonly SsdpHandler _ssdpHandler;
         private readonly CancellationTokenSource _tokenSource;
         private readonly IHttpClient _httpClient;
+        private readonly INetworkManager _networkManager;
 
-        public event EventHandler<GenericEventArgs<DeviceDiscoveryInfo>> DeviceDiscovered;
+        public event EventHandler<SsdpMessageEventArgs> DeviceDiscovered;
+        public event EventHandler<SsdpMessageEventArgs> DeviceLeft;
 
-        public DeviceDiscovery(ILogger logger, IServerConfigurationManager config, IHttpClient httpClient, SsdpHandler ssdpHandler)
+        public DeviceDiscovery(ILogger logger, IServerConfigurationManager config, IHttpClient httpClient, SsdpHandler ssdpHandler, INetworkManager networkManager)
         {
             _tokenSource = new CancellationTokenSource();
 
@@ -36,11 +38,12 @@ namespace MediaBrowser.Dlna.Ssdp
             _config = config;
             _httpClient = httpClient;
             _ssdpHandler = ssdpHandler;
+            _networkManager = networkManager;
         }
 
         public void Start()
         {
-            //_ssdpHandler.MessageReceived += _ssdpHandler_MessageReceived;
+            _ssdpHandler.MessageReceived += _ssdpHandler_MessageReceived;
 
             foreach (var network in GetNetworkInterfaces())
             {
@@ -72,8 +75,30 @@ namespace MediaBrowser.Dlna.Ssdp
             }
         }
 
-        void _ssdpHandler_MessageReceived(object sender, SsdpMessageEventArgs e)
+         void _ssdpHandler_MessageReceived(object sender, SsdpMessageEventArgs e)
         {
+            string nts;
+            e.Headers.TryGetValue("NTS", out nts);
+
+            if (String.Equals(e.Method, "NOTIFY", StringComparison.OrdinalIgnoreCase) &&
+                String.Equals(nts, "ssdp:byebye", StringComparison.OrdinalIgnoreCase) &&
+                !_disposed)
+            {
+                EventHelper.FireEventIfNotNull(DeviceLeft, this, e, _logger);
+                return;
+            }
+            
+             try
+            {
+                //TryCreateDevice(e, IPAddress.Parse(_networkManager.GetLocalIpAddresses().First()));
+            }
+            catch (OperationCanceledException)
+            {
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error creating play to controller", ex);
+            }
         }
 
         private IEnumerable<NetworkInterface> GetNetworkInterfaces()
@@ -113,8 +138,9 @@ namespace MediaBrowser.Dlna.Ssdp
                         if (receivedBytes > 0)
                         {
                             var args = SsdpHelper.ParseSsdpResponse(receiveBuffer, endPoint);
+                            args.LocalIp = localIp;
 
-                            TryCreateDevice(args, localIp);
+                            TryCreateDevice(args);
                         }
                     }
 
@@ -197,7 +223,7 @@ namespace MediaBrowser.Dlna.Ssdp
             return socket;
         }
 
-        private async void TryCreateDevice(SsdpMessageEventArgs args, IPAddress localIp)
+        private  void TryCreateDevice(SsdpMessageEventArgs args)
         {
             string nts;
             args.Headers.TryGetValue("NTS", out nts);
@@ -230,38 +256,7 @@ namespace MediaBrowser.Dlna.Ssdp
                 _logger.Debug("{0} Device message received from {1}. Headers: {2}", args.Method, args.EndPoint, headerText);
             }
 
-            try
-            {
-                await TryCreateDevice(new Uri(location), localIp, usn, nt).ConfigureAwait(false);
-            }
-            catch (OperationCanceledException)
-            {
-            }
-            catch (Exception ex)
-            {
-                _logger.ErrorException("Error creating play to controller", ex);
-            }
-        }
-
-        private async Task TryCreateDevice(Uri uri, IPAddress localIp, string usn, string nt)
-        {
-            var device = await Device.CreateuPnpDeviceAsync(uri, _httpClient, _config, _logger).ConfigureAwait(false);
-
-            if (device != null)
-            {
-                EventHelper.FireEventIfNotNull(DeviceDiscovered, this, new GenericEventArgs<DeviceDiscoveryInfo>
-                {
-                    Argument = new DeviceDiscoveryInfo
-                    {
-                        Device = device,
-                        LocalIpAddress = localIp,
-                        Uri = uri,
-                        Usn = usn, 
-                        Nt = nt
-                    }
-
-                }, _logger);
-            }
+            EventHelper.FireEventIfNotNull(DeviceDiscovered, this, args, _logger);
         }
 
         public void Dispose()
diff --git a/MediaBrowser.Dlna/Ssdp/SsdpMessageEventArgs.cs b/MediaBrowser.Dlna/Ssdp/SsdpMessageEventArgs.cs
index d6368191b..189476830 100644
--- a/MediaBrowser.Dlna/Ssdp/SsdpMessageEventArgs.cs
+++ b/MediaBrowser.Dlna/Ssdp/SsdpMessageEventArgs.cs
@@ -12,6 +12,8 @@ namespace MediaBrowser.Dlna.Ssdp
 
         public Dictionary<string, string> Headers { get; set; }
 
+        public IPAddress LocalIp { get; set; }
+
         public SsdpMessageEventArgs()
         {
             Headers = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
diff --git a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
index a5ef7977b..5d7762823 100644
--- a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
@@ -29,7 +29,7 @@ namespace MediaBrowser.LocalMetadata.Images
             if (item.SupportsLocalMetadata)
             {
                 // Episode has it's own provider
-                if (item.IsOwnedItem || item is Episode || item is Audio)
+                if (item.IsOwnedItem || item is Episode || item is Audio || item is Photo)
                 {
                     return false;
                 }
diff --git a/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs b/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs
index c43875b04..1a2c341da 100644
--- a/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs
+++ b/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs
@@ -63,6 +63,8 @@ namespace MediaBrowser.LocalMetadata.Savers
                     // Deprecated. No longer saving in this field.
                     "MPAARating",
 
+                    "MPAADescription",
+
                     "MusicBrainzArtistId",
                     "MusicBrainzAlbumArtistId",
                     "MusicBrainzAlbumId",
@@ -230,6 +232,11 @@ namespace MediaBrowser.LocalMetadata.Savers
                 builder.Append("<ContentRating>" + SecurityElement.Escape(item.OfficialRating) + "</ContentRating>");
             }
 
+            if (!string.IsNullOrEmpty(item.OfficialRatingDescription))
+            {
+                builder.Append("<MPAADescription>" + SecurityElement.Escape(item.OfficialRatingDescription) + "</MPAADescription>");
+            }
+
             builder.Append("<Added>" + SecurityElement.Escape(item.DateCreated.ToLocalTime().ToString("G")) + "</Added>");
 
             builder.Append("<LockData>" + item.IsLocked.ToString().ToLower() + "</LockData>");
diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
index c33e00944..17463941c 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -869,6 +869,9 @@
     <Compile Include="..\MediaBrowser.Model\Sync\SyncScheduleRequest.cs">
       <Link>Sync\SyncScheduleRequest.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Sync\SyncTarget.cs">
+      <Link>Sync\SyncTarget.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\System\LogFile.cs">
       <Link>System\LogFile.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
index 22eb008d1..9dafe0cef 100644
--- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
+++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
@@ -826,6 +826,9 @@
     <Compile Include="..\MediaBrowser.Model\Sync\SyncScheduleRequest.cs">
       <Link>Sync\SyncScheduleRequest.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Sync\SyncTarget.cs">
+      <Link>Sync\SyncTarget.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\System\LogFile.cs">
       <Link>System\LogFile.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index fe05483e7..f525ae5e0 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -1,6 +1,5 @@
 using MediaBrowser.Model.Extensions;
 using System.Diagnostics;
-using System.Runtime.Serialization;
 
 namespace MediaBrowser.Model.Entities
 {
@@ -138,8 +137,11 @@ namespace MediaBrowser.Model.Entities
 
                 string codec = Codec ?? string.Empty;
 
+                // sub = external .sub file
+
                 return StringHelper.IndexOfIgnoreCase(codec, "pgs") == -1 &&
-                       StringHelper.IndexOfIgnoreCase(codec, "dvd") == -1;
+                       StringHelper.IndexOfIgnoreCase(codec, "dvd") == -1 &&
+                       !StringHelper.EqualsIgnoreCase(codec, "sub");
             }
         }
 
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index a2f2b1318..3c265ff91 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -304,6 +304,7 @@
     <Compile Include="Sync\SyncSchedule.cs" />
     <Compile Include="Sync\SyncScheduleQuery.cs" />
     <Compile Include="Sync\SyncScheduleRequest.cs" />
+    <Compile Include="Sync\SyncTarget.cs" />
     <Compile Include="System\LogFile.cs" />
     <Compile Include="Themes\AppTheme.cs" />
     <Compile Include="Themes\AppThemeInfo.cs" />
diff --git a/MediaBrowser.Model/Sync/SyncJob.cs b/MediaBrowser.Model/Sync/SyncJob.cs
index 09049a196..34809834c 100644
--- a/MediaBrowser.Model/Sync/SyncJob.cs
+++ b/MediaBrowser.Model/Sync/SyncJob.cs
@@ -12,7 +12,7 @@ namespace MediaBrowser.Model.Sync
         /// Gets or sets the device identifier.
         /// </summary>
         /// <value>The device identifier.</value>
-        public string DeviceId { get; set; }
+        public string TargetId { get; set; }
         /// <summary>
         /// Gets or sets the item identifier.
         /// </summary>
diff --git a/MediaBrowser.Model/Sync/SyncJobRequest.cs b/MediaBrowser.Model/Sync/SyncJobRequest.cs
index 9871f976d..42b744db6 100644
--- a/MediaBrowser.Model/Sync/SyncJobRequest.cs
+++ b/MediaBrowser.Model/Sync/SyncJobRequest.cs
@@ -8,7 +8,7 @@ namespace MediaBrowser.Model.Sync
         /// Gets or sets the device identifier.
         /// </summary>
         /// <value>The device identifier.</value>
-        public List<string> DeviceIds { get; set; }
+        public List<string> TargetIds { get; set; }
         /// <summary>
         /// Gets or sets the item identifier.
         /// </summary>
@@ -22,7 +22,7 @@ namespace MediaBrowser.Model.Sync
 
         public SyncJobRequest()
         {
-            DeviceIds = new List<string>();
+            TargetIds = new List<string>();
         }
     }
 }
diff --git a/MediaBrowser.Model/Sync/SyncScheduleRequest.cs b/MediaBrowser.Model/Sync/SyncScheduleRequest.cs
index e1ba4b115..076548f57 100644
--- a/MediaBrowser.Model/Sync/SyncScheduleRequest.cs
+++ b/MediaBrowser.Model/Sync/SyncScheduleRequest.cs
@@ -8,7 +8,7 @@ namespace MediaBrowser.Model.Sync
         /// Gets or sets the device identifier.
         /// </summary>
         /// <value>The device identifier.</value>
-        public List<string> DeviceIds { get; set; }
+        public List<string> TargetIds { get; set; }
         /// <summary>
         /// Gets or sets the quality.
         /// </summary>
@@ -17,7 +17,7 @@ namespace MediaBrowser.Model.Sync
 
         public SyncScheduleRequest()
         {
-            DeviceIds = new List<string>();
+            TargetIds = new List<string>();
         }
     }
 }
diff --git a/MediaBrowser.Model/Sync/SyncTarget.cs b/MediaBrowser.Model/Sync/SyncTarget.cs
new file mode 100644
index 000000000..8901f0f27
--- /dev/null
+++ b/MediaBrowser.Model/Sync/SyncTarget.cs
@@ -0,0 +1,17 @@
+
+namespace MediaBrowser.Model.Sync
+{
+    public class SyncTarget
+    {
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name { get; set; }
+        /// <summary>
+        /// Gets or sets the identifier.
+        /// </summary>
+        /// <value>The identifier.</value>
+        public string Id { get; set; }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index f530564ea..94715b490 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -76,7 +76,8 @@ namespace MediaBrowser.Server.Implementations.HttpServer
                 {typeof (InvalidOperationException), 422},
                 {typeof (ResourceNotFoundException), 404},
                 {typeof (FileNotFoundException), 404},
-                {typeof (DirectoryNotFoundException), 404}
+                {typeof (DirectoryNotFoundException), 404},
+                {typeof (Implementations.Security.AuthenticationException), 401}
             };
 
             HostConfig.Instance.DebugMode = true;
diff --git a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs b/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs
index 1933cc716..ebb5ab741 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs
@@ -74,7 +74,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security
 
             if (user != null && user.Configuration.IsDisabled)
             {
-                throw new UnauthorizedAccessException("User account has been disabled.");
+                throw new AuthenticationException("User account has been disabled.");
             }
 
             if (!string.IsNullOrWhiteSpace(auth.DeviceId) &&
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index 1e0bbc39b..dbe020908 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -17,6 +17,7 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Server.Implementations.Security;
 
 namespace MediaBrowser.Server.Implementations.Library
 {
@@ -137,7 +138,7 @@ namespace MediaBrowser.Server.Implementations.Library
 
             if (user.Configuration.IsDisabled)
             {
-                throw new UnauthorizedAccessException(string.Format("The {0} account is currently disabled. Please consult with your administrator.", user.Name));
+                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;
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json
index 1192bafb7..4b2e7ba1d 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json
@@ -317,5 +317,7 @@
     "HeaderNotifications": "Notifications",
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Select",
-    "ButtonNew": "New"
+    "ButtonNew": "New",
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "HeaderVideoError": "Video Error"
 }
\ 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 37a5735e4..d3bdf0bbb 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ca.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ca.json
@@ -317,5 +317,7 @@
     "HeaderNotifications": "Notifications",
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Select",
-    "ButtonNew": "New"
+    "ButtonNew": "New",
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "HeaderVideoError": "Video Error"
 }
\ 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 92f352ca6..a853a39eb 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/cs.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/cs.json
@@ -125,7 +125,7 @@
     "HeaderLatestMedia": "Latest Media",
     "ButtonMore": "V\u00edce...",
     "HeaderFavoriteMovies": "Obl\u00edben\u00e9 filmy",
-    "HeaderFavoriteShows": "Favorite Shows",
+    "HeaderFavoriteShows": "Obl\u00edben\u00e9 seri\u00e1ly",
     "HeaderFavoriteEpisodes": "Favorite Episodes",
     "HeaderFavoriteGames": "Favorite Games",
     "HeaderRatingsDownloads": "Rating \/ Downloads",
@@ -208,7 +208,7 @@
     "MessageEnsureOpenTuner": "Please ensure there is an open tuner availalble.",
     "ButtonHome": "Dom\u016f",
     "ButtonDashboard": "Dashboard",
-    "ButtonReports": "Reports",
+    "ButtonReports": "Hl\u00e1\u0161en\u00ed",
     "ButtonMetadataManager": "Metadata Manager",
     "HeaderTime": "Time",
     "HeaderName": "N\u00e1zev",
@@ -317,5 +317,7 @@
     "HeaderNotifications": "Notifications",
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Vybrat",
-    "ButtonNew": "Nov\u00e9"
+    "ButtonNew": "Nov\u00e9",
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "HeaderVideoError": "Video Error"
 }
\ 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 988b03650..8c13b22b7 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/da.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/da.json
@@ -317,5 +317,7 @@
     "HeaderNotifications": "Notifications",
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "V\u00e6lg",
-    "ButtonNew": "Ny"
+    "ButtonNew": "Ny",
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "HeaderVideoError": "Video Error"
 }
\ 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 58b273c26..c871cae0a 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
@@ -317,5 +317,7 @@
     "HeaderNotifications": "Notifications",
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Ausw\u00e4hlen",
-    "ButtonNew": "Neu"
+    "ButtonNew": "Neu",
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "HeaderVideoError": "Video Error"
 }
\ 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 9ad65edbd..3514a060a 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/el.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/el.json
@@ -317,5 +317,7 @@
     "HeaderNotifications": "Notifications",
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Select",
-    "ButtonNew": "New"
+    "ButtonNew": "New",
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "HeaderVideoError": "Video Error"
 }
\ 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 03694cad0..da4787718 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_GB.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_GB.json
@@ -317,5 +317,7 @@
     "HeaderNotifications": "Notifications",
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Select",
-    "ButtonNew": "New"
+    "ButtonNew": "New",
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "HeaderVideoError": "Video Error"
 }
\ 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 bfd93b795..ff77db14b 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
@@ -317,5 +317,7 @@
     "HeaderNotifications": "Notifications",
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Select",
-    "ButtonNew": "New"
+    "ButtonNew": "New",
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "HeaderVideoError": "Video Error"
 }
\ 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 05647f10d..f5f30360d 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json
@@ -317,5 +317,7 @@
     "HeaderNotifications": "Notifications",
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Seleccionar",
-    "ButtonNew": "Nuevo"
+    "ButtonNew": "Nuevo",
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "HeaderVideoError": "Video Error"
 }
\ 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 62ecc2578..53047104c 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json
@@ -317,5 +317,7 @@
     "HeaderNotifications": "Notifications",
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Seleccionar",
-    "ButtonNew": "Nuevo"
+    "ButtonNew": "Nuevo",
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "HeaderVideoError": "Video Error"
 }
\ 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 e0b199b12..6bcb5aed5 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
@@ -30,7 +30,7 @@
     "HeaderConfirmation": "Confirmation",
     "MessageKeyUpdated": "Merci. Votre cl\u00e9 de supporteur a \u00e9t\u00e9 mise \u00e0 jour.",
     "MessageKeyRemoved": "Merci, Votre cl\u00e9 de supporteur a \u00e9t\u00e9 supprim\u00e9e.",
-    "ErrorLaunchingChromecast": "There was an error launching chromecast. Please ensure your device is connected to your wireless network.",
+    "ErrorLaunchingChromecast": "Une erreur est rencontr\u00e9e lors du lancement de Chromecast. Assurez-vous bien que votre p\u00e9riph\u00e9rique est bien connect\u00e9 \u00e0 votre r\u00e9seau sans-fil.",
     "HeaderSearch": "Recherche",
     "LabelArtist": "Artiste",
     "LabelMovie": "Film",
@@ -104,7 +104,7 @@
     "LabelVersionUpToDate": "\u00c0 jour!",
     "ButtonResetTuner": "Red\u00e9marrer tuner",
     "HeaderResetTuner": "Red\u00e9marrer tuner",
-    "MessageConfirmResetTuner": "Are you sure you wish to reset this tuner? Any active players or recordings will be abruptly stopped.",
+    "MessageConfirmResetTuner": "\u00cates-vous s\u00fbr de vouloir r\u00e9initialiser ce tuner ? Tout les lecteurs ou enregistrements actifs seront brusquement interrompus.",
     "ButtonCancelSeries": "Annuler s\u00e9ries",
     "HeaderSeriesRecordings": "Enregistrements de s\u00e9ries",
     "LabelAnytime": "N'importe quelle heure",
@@ -112,8 +112,8 @@
     "StatusWatching": "En lecture",
     "StatusRecordingProgram": "Enregistre {0}",
     "StatusWatchingProgram": "En lecture de {0}",
-    "HeaderSplitMedia": "Split Media Apart",
-    "MessageConfirmSplitMedia": "Are you sure you wish to split the media sources into separate items?",
+    "HeaderSplitMedia": "S\u00e9parer les m\u00e9dias",
+    "MessageConfirmSplitMedia": "\u00cates vous s\u00fbrs de vouloir diviser les sources de m\u00e9dia dans des items s\u00e9par\u00e9s ?",
     "HeaderError": "Erreur",
     "MessagePleaseSelectOneItem": "Veuillez s\u00e9lectionner au moins un item.",
     "MessagePleaseSelectTwoItems": "Veuillez s\u00e9lectionner au moins deux items.",
@@ -136,16 +136,16 @@
     "HeaderSelectImagesByNamePath": "S\u00e9lectionner le chemin d'acc\u00e8s du \"Images By Name\"",
     "HeaderSelectMetadataPath": "S\u00e9lectionner le chemin d'acc\u00e8s des m\u00e9tadonn\u00e9es",
     "HeaderSelectServerCachePathHelp": "Parcourez ou entrez le chemin \u00e0 utiliser pour les fichiers caches du serveur. Le dossier doit \u00eatre accessible en \u00e9criture. L'emplacement de ce fichier aura un impact direct sur les performances du serveur et devrait \u00eatre plac\u00e9 id\u00e9alement sur un SSD.",
-    "HeaderSelectTranscodingPathHelp": "Browse or enter the path to use for transcoding temporary files. The folder must be writeable.",
-    "HeaderSelectImagesByNamePathHelp": "Browse or enter the path to your items by name folder. The folder must be writeable.",
-    "HeaderSelectMetadataPathHelp": "Browse or enter the path you'd like to store metadata within. The folder must be writeable.",
-    "HeaderSelectChannelDownloadPath": "Select Channel Download Path",
-    "HeaderSelectChannelDownloadPathHelp": "Browse or enter the path to use for storing channel cache files. The folder must be writeable.",
+    "HeaderSelectTranscodingPathHelp": "Parcourir ou saisir le chemin dossier \u00e0 utiliser pour le transcodage des fichiers temporaires. Le dossier devra \u00eatre accessible en \u00e9criture.",
+    "HeaderSelectImagesByNamePathHelp": "Parcourir ou saisir le chemin dossier de vos items par le nom du dossier. Le dossier devra \u00eatre accessible en \u00e9criture.",
+    "HeaderSelectMetadataPathHelp": "Parcourir ou saisir le chemin o\u00f9 vous aimeriez stocker les m\u00e9tadonn\u00e9es. Le r\u00e9pertoire doit \u00eatre accessible en \u00e9criture.",
+    "HeaderSelectChannelDownloadPath": "S\u00e9lectionnez le chemin de t\u00e9l\u00e9chargement des cha\u00eenes.",
+    "HeaderSelectChannelDownloadPathHelp": "Parcourir ou saisir le chemin destin\u00e9 au stockage des fichers cache des cha\u00eenes. Le r\u00e9pertoire doit \u00eatre accessible en \u00e9criture.",
     "OptionNewCollection": "Nouveau...",
     "ButtonAdd": "Ajouter",
     "ButtonRemove": "Supprimer",
     "LabelChapterDownloaders": "Agents de t\u00e9l\u00e9chargement de chapitres:",
-    "LabelChapterDownloadersHelp": "Enable and rank your preferred chapter downloaders in order of priority. Lower priority downloaders will only be used to fill in missing information.",
+    "LabelChapterDownloadersHelp": "Activer et classer vos sources de t\u00e9l\u00e9chargement de chapitre pr\u00e9f\u00e9r\u00e9s dans un ordre de priorit\u00e9. Les sources de t\u00e9l\u00e9chargement ayant une priorit\u00e9 basse, seront seulement utilis\u00e9es pour remplir les informations manquantes.",
     "HeaderFavoriteAlbums": "Albums favoris",
     "HeaderLatestChannelMedia": "Derniers items de cha\u00eenes",
     "ButtonOrganizeFile": "Organiser fichier",
@@ -157,11 +157,11 @@
     "StatusSuccess": "Succ\u00e8s",
     "MessageFileWillBeDeleted": "Le fichier suivant sera supprim\u00e9:",
     "MessageSureYouWishToProceed": "\u00cates-vous s\u00fbr de vouloir continuer?",
-    "MessageDuplicatesWillBeDeleted": "In addition the following dupliates will be deleted:",
+    "MessageDuplicatesWillBeDeleted": "De plus, les doubles suivants vont \u00eatre supprim\u00e9s :",
     "MessageFollowingFileWillBeMovedFrom": "Le fichier suivant sera d\u00e9plac\u00e9 de:",
     "MessageDestinationTo": "Vers:",
     "HeaderSelectWatchFolder": "S\u00e9lectionner le r\u00e9pertoire surveill\u00e9",
-    "HeaderSelectWatchFolderHelp": "Browse or enter the path to your watch folder. The folder must be writeable.",
+    "HeaderSelectWatchFolderHelp": "Parcourir ou saisir le chemin de votre r\u00e9pertoire de surveillance. Le r\u00e9pertoire doit \u00eatre accessible en \u00e9criture.",
     "OrganizePatternResult": "R\u00e9sultats: {0}",
     "HeaderRestart": "Red\u00e9marrer",
     "HeaderShutdown": "\u00c9teindre",
@@ -191,131 +191,133 @@
     "ButtonCancel": "Annuler",
     "ButtonRefresh": "Actualiser",
     "LabelCurrentPath": "Chemin actuel:",
-    "HeaderSelectMediaPath": "Select Media Path",
+    "HeaderSelectMediaPath": "S\u00e9lectionner le chemin m\u00e9dia",
     "ButtonNetwork": "R\u00e9seau",
-    "MessageDirectoryPickerInstruction": "Network paths can be entered manually in the event the Network button fails to locate your devices. For example, {0} or {1}.",
+    "MessageDirectoryPickerInstruction": "Les chemins r\u00e9seaux seront saisis manuellement dans le cas o\u00f9 le bouton R\u00e9seau ne parvient pas \u00e0 rechercher vos p\u00e9riph\u00e9riques. Par exmple, {0} ou {1}.",
     "HeaderMenu": "Menu",
-    "ButtonOpen": "Open",
-    "ButtonOpenInNewTab": "Open in new tab",
-    "ButtonShuffle": "Shuffle",
-    "ButtonInstantMix": "Instant mix",
-    "ButtonResume": "Resume",
+    "ButtonOpen": "Ouvrir",
+    "ButtonOpenInNewTab": "Ouvrir dans un nouvel onglet",
+    "ButtonShuffle": "M\u00e9langer",
+    "ButtonInstantMix": "Instantan\u00e9",
+    "ButtonResume": "Reprendre",
     "HeaderScenes": "Sc\u00e8nes",
-    "HeaderAudioTracks": "Audio Tracks",
-    "HeaderSubtitles": "Subtitles",
-    "HeaderVideoQuality": "Video Quality",
-    "MessageErrorPlayingVideo": "There was an error playing the video.",
-    "MessageEnsureOpenTuner": "Please ensure there is an open tuner availalble.",
+    "HeaderAudioTracks": "Pistes audio",
+    "HeaderSubtitles": "Sous-titres",
+    "HeaderVideoQuality": "Qualit\u00e9 vid\u00e9o",
+    "MessageErrorPlayingVideo": "La lecture de la vid\u00e9o a rencontr\u00e9 une erreur",
+    "MessageEnsureOpenTuner": "V\u00e9rifiez bien que le tuner est disponible",
     "ButtonHome": "Principal",
-    "ButtonDashboard": "Dashboard",
-    "ButtonReports": "Reports",
-    "ButtonMetadataManager": "Metadata Manager",
-    "HeaderTime": "Time",
+    "ButtonDashboard": "Tableau de bord",
+    "ButtonReports": "Rapports",
+    "ButtonMetadataManager": "Gestionnaire de m\u00e9tadonn\u00e9es",
+    "HeaderTime": "Heure",
     "HeaderName": "Nom",
     "HeaderAlbum": "Album",
-    "HeaderAlbumArtist": "Album Artist",
-    "HeaderArtist": "Artist",
-    "LabelAddedOnDate": "Added {0}",
-    "ButtonStart": "Start",
+    "HeaderAlbumArtist": "Artiste de l'album",
+    "HeaderArtist": "Artiste",
+    "LabelAddedOnDate": "Ajout\u00e9 {0}",
+    "ButtonStart": "Commencer",
     "HeaderChannels": "Cha\u00eenes",
     "HeaderMediaFolders": "R\u00e9pertoires de m\u00e9dias",
-    "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",
-    "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.",
+    "HeaderBlockItemsWithNoRating": "Bloquer les items ne comportant aucune information de classement :",
+    "OptionBlockOthers": "Autres",
+    "OptionBlockTvShows": "Emissions TV",
+    "OptionBlockTrailers": "Bande-annonces",
+    "OptionBlockMusic": "Musiques",
+    "OptionBlockMovies": "Films",
+    "OptionBlockBooks": "Livres",
+    "OptionBlockGames": "Jeux",
+    "OptionBlockLiveTvPrograms": "Programmes TV en direct",
+    "OptionBlockLiveTvChannels": "Cha\u00eenes TV en direct",
+    "OptionBlockChannelContent": "Cha\u00eenes Internet",
+    "ButtonRevoke": "R\u00e9voquer",
+    "MessageConfirmRevokeApiKey": "\u00cates-vous s\u00fbr de vouloir r\u00e9voquer la cl\u00e9 API ? La connexion \u00e0 l'application Media Browser sera brusquement interrompue.",
+    "HeaderConfirmRevokeApiKey": "R\u00e9voquer la cl\u00e9 API",
+    "ValueContainer": "Conteneur : {0}",
+    "ValueAudioCodec": "Codec Audio : {0}",
+    "ValueVideoCodec": "Codec Vid\u00e9o : {0}",
+    "ValueCodec": "Codec : {0}",
+    "ValueConditions": "Conditions : {0}",
+    "LabelAll": "Tout",
+    "HeaderDeleteImage": "Supprimer l'image",
+    "MessageFileNotFound": "Fichier introuvable.",
+    "MessageFileReadError": "Une erreur a \u00e9t\u00e9 rencontr\u00e9e pendant la lecture de ce fichier.",
+    "ButtonNextPage": "Page suivante",
+    "ButtonPreviousPage": "Page pr\u00e9c\u00e9dente",
+    "ButtonMoveLeft": "D\u00e9placer \u00e0 gauche",
+    "ButtonMoveRight": "D\u00e9placer \u00e0 droite",
+    "ButtonBrowseOnlineImages": "Parcourir les images en ligne",
+    "HeaderDeleteItem": "Supprimer l'item",
+    "ConfirmDeleteItem": "\u00cates-vous s\u00fbr de vouloir supprimer cet item de votre biblioth\u00e8que ?",
+    "MessagePleaseEnterNameOrId": "Merci de saisir un nom ou un ID externe.",
+    "MessageValueNotCorrect": "La valeur saisie est incorrecte. Merci de r\u00e9\u00e9ssayer.",
+    "MessageItemSaved": "Item sauvegard\u00e9.",
     "OptionEnded": "Termin\u00e9",
     "OptionContinuing": "En cours",
     "OptionOff": "Off",
     "OptionOn": "On",
-    "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",
+    "HeaderFields": "Champs",
+    "HeaderFieldsHelp": "Glisser un champ sur \"off\" pour le v\u00e9rouiller et emp\u00eacher les modifications de donn\u00e9es.",
+    "HeaderLiveTV": "TV en direct",
+    "MissingLocalTrailer": "Bande-annonce locale manquante.",
+    "MissingPrimaryImage": "Image principale manquante.",
+    "MissingBackdropImage": "Image d'arri\u00e8re-plan manquante.",
+    "MissingLogoImage": "Image logo manquante.",
+    "MissingEpisode": "Episode manquant.",
+    "OptionScreenshots": "Captures d'\u00e9cran",
+    "OptionBackdrops": "Arri\u00e8re-plans",
     "OptionImages": "Images",
-    "OptionKeywords": "Keywords",
+    "OptionKeywords": "Mots-cl\u00e9s",
     "OptionTags": "Tags",
     "OptionStudios": "Studios",
-    "OptionName": "Name",
-    "OptionOverview": "Overview",
+    "OptionName": "Nom",
+    "OptionOverview": "Aper\u00e7u",
     "OptionGenres": "Genres",
     "OptionParentalRating": "Note d'\u00e9valuation de contr\u00f4le parental",
     "OptionPeople": "People",
     "OptionRuntime": "Dur\u00e9e",
-    "OptionProductionLocations": "Production Locations",
-    "OptionBirthLocation": "Birth Location",
+    "OptionProductionLocations": "Sites de production",
+    "OptionBirthLocation": "Lieu de naissance",
     "LabelAllChannels": "Toutes les cha\u00eenes",
-    "LabelLiveProgram": "LIVE",
-    "LabelNewProgram": "NEW",
+    "LabelLiveProgram": "DIRECT",
+    "LabelNewProgram": "NOUVEAUTE",
     "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.",
+    "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",
+    "MessagePleaseRestart": "Merci de red\u00e9marrer pour achever la mise \u00e0 jour.",
     "ButtonRestart": "Red\u00e9marrer",
-    "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": "Merci de rafra\u00eechir cette page pour recevoir les nouvelles mises \u00e0 jour du serveur.",
+    "ButtonHide": "Cacher",
+    "MessageSettingsSaved": "Param\u00e8tres sauvegard\u00e9s.",
+    "ButtonSignOut": "Se d\u00e9connecter",
+    "ButtonMyProfile": "Mon profil",
+    "ButtonMyPreferences": "Mes pr\u00e9f\u00e9rences",
+    "MessageBrowserDoesNotSupportWebSockets": "Ce navigateur ne supporte pas les sockets Web. Pour un meilleur confort d'utilisation, essayez avec un navigateur moderne tels que Chrome, Firefox, IE10+, Safari (iOS) ou Opera.",
+    "LabelInstallingPackage": "Installation de {0}",
+    "LabelPackageInstallCompleted": "L'installation de {0} est termin\u00e9e.",
+    "LabelPackageInstallFailed": "L'installation de {0} a \u00e9chou\u00e9.",
+    "LabelPackageInstallCancelled": "L'installation de {0} a \u00e9t\u00e9 annul\u00e9e.",
     "TabServer": "Serveur",
-    "TabUsers": "Users",
-    "TabLibrary": "Library",
+    "TabUsers": "Utilisateurs",
+    "TabLibrary": "Biblioth\u00e8que",
     "TabMetadata": "M\u00e9tadonn\u00e9es",
     "TabDLNA": "DLNA",
-    "TabLiveTV": "Live TV",
-    "TabAutoOrganize": "Auto-Organize",
+    "TabLiveTV": "TV en direct",
+    "TabAutoOrganize": "Auto-Organiser",
     "TabPlugins": "Plugins",
     "TabAdvanced": "Avanc\u00e9",
-    "TabHelp": "Help",
-    "TabScheduledTasks": "Scheduled Tasks",
-    "ButtonFullscreen": "Fullscreen",
-    "ButtonAudioTracks": "Audio Tracks",
+    "TabHelp": "Aide",
+    "TabScheduledTasks": "T\u00e2ches planifi\u00e9es",
+    "ButtonFullscreen": "Plein \u00e9cran",
+    "ButtonAudioTracks": "Pistes audio",
     "ButtonSubtitles": "Sous-titres",
     "ButtonScenes": "Sc\u00e8nes",
-    "ButtonQuality": "Quality",
+    "ButtonQuality": "Qualit\u00e9",
     "HeaderNotifications": "Notifications",
-    "HeaderSelectPlayer": "Select Player:",
+    "HeaderSelectPlayer": "S\u00e9lectionner le lecteur :",
     "ButtonSelect": "S\u00e9lectionner",
-    "ButtonNew": "Nouveau"
+    "ButtonNew": "Nouveau",
+    "MessageInternetExplorerWebm": "Pour de meilleurs r\u00e9sultats avec Internet Explorer, merci d'installer le plugin WebM pour IE.",
+    "HeaderVideoError": "Erreur vid\u00e9o"
 }
\ 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 2cb25ef9b..d5202486f 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/he.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/he.json
@@ -317,5 +317,7 @@
     "HeaderNotifications": "Notifications",
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "\u05d1\u05d7\u05e8",
-    "ButtonNew": "\u05d7\u05d3\u05e9"
+    "ButtonNew": "\u05d7\u05d3\u05e9",
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "HeaderVideoError": "Video Error"
 }
\ 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 1963f249a..4cf04f2a7 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/it.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/it.json
@@ -58,14 +58,14 @@
     "ButtonMute": "Muto",
     "ButtonUnmute": "Togli muto",
     "ButtonStop": "Stop",
-    "ButtonNextTrack": "Prossimo",
+    "ButtonNextTrack": "traccia Prossima",
     "ButtonPause": "Pausa",
     "ButtonPlay": "Riproduci",
     "ButtonEdit": "Modifica",
     "ButtonQueue": "In coda",
-    "ButtonPlayTrailer": "Visualizza trailer",
+    "ButtonPlayTrailer": "Visualizza Trailer",
     "ButtonPlaylist": "Playlist",
-    "ButtonPreviousTrack": "Precedente",
+    "ButtonPreviousTrack": "Precedente traccia",
     "LabelEnabled": "Abilitato",
     "LabelDisabled": "Disabilitato",
     "ButtonMoreInformation": "Maggiori informazioni",
@@ -121,7 +121,7 @@
     "MessageConfirmItemGrouping": "Clienti Media Browser sceglier\u00e0 automaticamente la versione ottimale per giocare sulla base del dispositivo e prestazioni di rete. Sei sicuro di voler continuare?",
     "HeaderResume": "Riprendi",
     "HeaderMyViews": "Mie viste",
-    "HeaderLibraryFolders": "Vista",
+    "HeaderLibraryFolders": "Cartelle dei mediata",
     "HeaderLatestMedia": "Ultimi Media",
     "ButtonMore": "Pi\u00f9 info...",
     "HeaderFavoriteMovies": "Film preferiti",
@@ -215,7 +215,7 @@
     "HeaderAlbum": "Album",
     "HeaderAlbumArtist": "Artista Album",
     "HeaderArtist": "Artista",
-    "LabelAddedOnDate": "Added {0}",
+    "LabelAddedOnDate": "Aggiunto {0}",
     "ButtonStart": "Avvio",
     "HeaderChannels": "Canali",
     "HeaderMediaFolders": "Cartelle dei media",
@@ -233,89 +233,91 @@
     "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}",
+    "ValueContainer": "Contenitore: {0}",
     "ValueAudioCodec": "Audio Codec: {0}",
     "ValueVideoCodec": "Video Codec: {0}",
     "ValueCodec": "Codec: {0}",
-    "ValueConditions": "Conditions: {0}",
+    "ValueConditions": "Condizioni: {0}",
     "LabelAll": "Tutti",
     "HeaderDeleteImage": "Cancella Immagine",
     "MessageFileNotFound": "File non trovato.",
-    "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.",
+    "MessageFileReadError": "Errore leggendo questo file",
+    "ButtonNextPage": "Prossima pagina",
+    "ButtonPreviousPage": "Pagina precedente",
+    "ButtonMoveLeft": "Muovi a sinistra",
+    "ButtonMoveRight": "Muovi a destra",
+    "ButtonBrowseOnlineImages": "Sfoglia le immagini Online",
+    "HeaderDeleteItem": "Elimina elemento",
+    "ConfirmDeleteItem": "Sei sicuro di voler eliminare questo elemento dalla tua libreria?",
+    "MessagePleaseEnterNameOrId": "Inserisci il nome o id esterno.",
+    "MessageValueNotCorrect": "Il valore inserito non \u00e8 corretto.Riprova di nuovo.",
+    "MessageItemSaved": "Elemento salvato.",
     "OptionEnded": "Finito",
     "OptionContinuing": "In corso",
     "OptionOff": "Off",
     "OptionOn": "On",
-    "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.",
+    "HeaderFields": "Campi",
+    "HeaderFieldsHelp": "Far scorrere un campo a 'off' per bloccarlo e impedire che sia i dati vengano modificati.",
+    "HeaderLiveTV": "Tv in diretta",
+    "MissingLocalTrailer": "Trailer locali mancanti",
+    "MissingPrimaryImage": "Immagini principali locali mancanti",
+    "MissingBackdropImage": "Sfondi mancanti",
+    "MissingLogoImage": "Loghi mancanti",
+    "MissingEpisode": "Episodi mancanti",
     "OptionScreenshots": "Screenshots",
-    "OptionBackdrops": "Backdrops",
-    "OptionImages": "Images",
-    "OptionKeywords": "Keywords",
+    "OptionBackdrops": "Sfondi",
+    "OptionImages": "Immagini",
+    "OptionKeywords": "Parole",
     "OptionTags": "Tags",
     "OptionStudios": "Studios",
-    "OptionName": "Name",
-    "OptionOverview": "Overview",
-    "OptionGenres": "Genres",
+    "OptionName": "Nome",
+    "OptionOverview": "Panoramica",
+    "OptionGenres": "Generi",
     "OptionParentalRating": "Voto Genitori",
-    "OptionPeople": "People",
+    "OptionPeople": "Persone",
     "OptionRuntime": "Durata",
-    "OptionProductionLocations": "Production Locations",
-    "OptionBirthLocation": "Birth Location",
+    "OptionProductionLocations": "Sedi di produzione",
+    "OptionBirthLocation": "Nascita Posizione",
     "LabelAllChannels": "Tutti i canali",
     "LabelLiveProgram": "LIVE",
-    "LabelNewProgram": "NEW",
+    "LabelNewProgram": "Nuovo",
     "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.",
+    "HeaderChangeFolderType": "Cambia il tipo di cartella",
+    "HeaderChangeFolderTypeHelp": "Per cambiare il tipo di cartella, rimuovere e ricostruire la collezione con il nuovo tipo.",
+    "HeaderAlert": "Avviso",
+    "MessagePleaseRestart": "Si prega di riavviare per completare l'aggiornamento.",
     "ButtonRestart": "Riavvia",
-    "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": "Si prega di aggiornare questa pagina per ricevere i nuovi aggiornamenti dal server.",
+    "ButtonHide": "Nascondi",
+    "MessageSettingsSaved": "Settaggi salvati.",
+    "ButtonSignOut": "Esci",
+    "ButtonMyProfile": "Mio Profilo",
+    "ButtonMyPreferences": "Mie preferenze",
+    "MessageBrowserDoesNotSupportWebSockets": "Questo browser non supporta i socket web. Per una migliore esperienza, provare un browser pi\u00f9 recente come Chrome, Firefox, IE10 +, Safari (iOS) o Opera.",
+    "LabelInstallingPackage": "Installazione di {0}",
+    "LabelPackageInstallCompleted": "{0} completamento dell'installazione.",
+    "LabelPackageInstallFailed": "{0} installazione non \u00e8 riuscita.",
+    "LabelPackageInstallCancelled": "{0} installazione annullata.",
     "TabServer": "Server",
-    "TabUsers": "Users",
-    "TabLibrary": "Library",
+    "TabUsers": "Utenti",
+    "TabLibrary": "Librerie",
     "TabMetadata": "Metadata",
     "TabDLNA": "DLNA",
-    "TabLiveTV": "Live TV",
-    "TabAutoOrganize": "Auto-Organize",
+    "TabLiveTV": "Tv indiretta",
+    "TabAutoOrganize": "Organizza Automaticamente",
     "TabPlugins": "Plugins",
     "TabAdvanced": "Avanzato",
-    "TabHelp": "Help",
-    "TabScheduledTasks": "Scheduled Tasks",
-    "ButtonFullscreen": "Fullscreen",
-    "ButtonAudioTracks": "Audio Tracks",
+    "TabHelp": "Aiuto",
+    "TabScheduledTasks": "Operazioni pianificate",
+    "ButtonFullscreen": "Tutto schermo",
+    "ButtonAudioTracks": "Tracce audio",
     "ButtonSubtitles": "Sottotitoli",
     "ButtonScenes": "Scene",
-    "ButtonQuality": "Quality",
-    "HeaderNotifications": "Notifications",
-    "HeaderSelectPlayer": "Select Player:",
+    "ButtonQuality": "Qualit\u00e0",
+    "HeaderNotifications": "Notifiche",
+    "HeaderSelectPlayer": "Utente selezionato:",
     "ButtonSelect": "Seleziona",
-    "ButtonNew": "Nuovo"
+    "ButtonNew": "Nuovo",
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "HeaderVideoError": "Video Error"
 }
\ 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 0b6e7c9c5..4c17357ff 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -323,5 +323,7 @@
     "HeaderNotifications": "Notifications",
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Select",
-    "ButtonNew": "New"
+    "ButtonNew": "New",
+    "MessageInternetExplorerWebm":  "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "HeaderVideoError":  "Video Error"
 }
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
index 113389a11..083f02665 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
@@ -306,7 +306,7 @@
     "TabLiveTV": "\u042d\u0444\u0438\u0440\u043b\u0456\u043a \u0422\u0414",
     "TabAutoOrganize": "\u0410\u0432\u0442\u043e\u04b1\u0439\u044b\u043c\u0434\u0430\u0441\u0442\u044b\u0440\u0443",
     "TabPlugins": "\u041f\u043b\u0430\u0433\u0438\u043d\u0434\u0435\u0440",
-    "TabAdvanced": "\u041a\u0435\u04a3\u0435\u0439\u0442\u0456\u043b\u0433\u0435\u043d\u0434\u0435\u0440",
+    "TabAdvanced": "\u049a\u043e\u0441\u044b\u043c\u0448\u0430",
     "TabHelp": "\u0410\u043d\u044b\u049b\u0442\u0430\u043c\u0430",
     "TabScheduledTasks": "\u0416\u043e\u0441\u043f\u0430\u0440\u043b\u0430\u0443\u0448\u044b",
     "ButtonFullscreen": "\u0422\u043e\u043b\u044b\u049b \u044d\u043a\u0440\u0430\u043d",
@@ -314,8 +314,10 @@
     "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",
-    "HeaderNotifications": "Notifications",
-    "HeaderSelectPlayer": "Select Player:",
+    "HeaderNotifications": "\u0425\u0430\u0431\u0430\u0440\u043b\u0430\u043d\u0434\u044b\u0440\u0443\u043b\u0430\u0440",
+    "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"
+    "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"
 }
\ 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 3ed0c8735..9c7d90092 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ms.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ms.json
@@ -317,5 +317,7 @@
     "HeaderNotifications": "Notifications",
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Select",
-    "ButtonNew": "New"
+    "ButtonNew": "New",
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "HeaderVideoError": "Video Error"
 }
\ 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 c1700fe51..b16e5e101 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/nb.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/nb.json
@@ -317,5 +317,7 @@
     "HeaderNotifications": "Notifications",
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Select",
-    "ButtonNew": "New"
+    "ButtonNew": "New",
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "HeaderVideoError": "Video Error"
 }
\ 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 10275847d..191a89000 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
@@ -314,8 +314,10 @@
     "ButtonSubtitles": "Ondertitels",
     "ButtonScenes": "Scenes",
     "ButtonQuality": "Kwaliteit",
-    "HeaderNotifications": "Notifications",
-    "HeaderSelectPlayer": "Select Player:",
+    "HeaderNotifications": "Meldingen",
+    "HeaderSelectPlayer": "Selecteer Speler:",
     "ButtonSelect": "Selecteer",
-    "ButtonNew": "Nieuw"
+    "ButtonNew": "Nieuw",
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "HeaderVideoError": "Video Fout"
 }
\ 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 3375c1a1d..44ac4c93f 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pl.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pl.json
@@ -317,5 +317,7 @@
     "HeaderNotifications": "Notifications",
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Select",
-    "ButtonNew": "New"
+    "ButtonNew": "New",
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "HeaderVideoError": "Video Error"
 }
\ 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 aac6a2c05..51559053d 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json
@@ -314,8 +314,10 @@
     "ButtonSubtitles": "Legendas",
     "ButtonScenes": "Cenas",
     "ButtonQuality": "Qualidade",
-    "HeaderNotifications": "Notifications",
-    "HeaderSelectPlayer": "Select Player:",
+    "HeaderNotifications": "Avisos",
+    "HeaderSelectPlayer": "Selecione onde executar:",
     "ButtonSelect": "Selecionar",
-    "ButtonNew": "Nova"
+    "ButtonNew": "Nova",
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "HeaderVideoError": "Video Error"
 }
\ 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 eb3740b84..473d75cb5 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
@@ -317,5 +317,7 @@
     "HeaderNotifications": "Notifications",
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Selecionar",
-    "ButtonNew": "Novo"
+    "ButtonNew": "Novo",
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "HeaderVideoError": "Video Error"
 }
\ 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 ea32fb932..2fa7f2ea7 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
@@ -1,5 +1,5 @@
 {
-    "SettingsSaved": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0431\u044b\u043b\u0438 \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u044b.",
+    "SettingsSaved": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u044b.",
     "AddUser": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f",
     "Users": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438",
     "Delete": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c",
@@ -289,7 +289,7 @@
     "ButtonRestart": "\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c",
     "MessagePleaseRefreshPage": "\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u0435 \u0434\u0430\u043d\u043d\u0443\u044e \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443, \u0447\u0442\u043e\u0431\u044b \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u043d\u043e\u0432\u044b\u0435 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f \u043e\u0442 \u0441\u0435\u0440\u0432\u0435\u0440\u0430.",
     "ButtonHide": "\u0421\u043a\u0440\u044b\u0442\u044c",
-    "MessageSettingsSaved": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0431\u044b\u043b\u0430 \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0430.",
+    "MessageSettingsSaved": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0431\u044b\u043b\u0438 \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u044b.",
     "ButtonSignOut": "\u0412\u044b\u0439\u0442\u0438",
     "ButtonMyProfile": "\u041c\u043e\u0439 \u043f\u0440\u043e\u0444\u0438\u043b\u044c",
     "ButtonMyPreferences": "\u041c\u043e\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438",
@@ -302,11 +302,11 @@
     "TabUsers": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438",
     "TabLibrary": "\u041c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0430",
     "TabMetadata": "\u041c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0435",
-    "TabDLNA": "DLNA-\u0440\u0435\u0436\u0438\u043c",
+    "TabDLNA": "DLNA \u0442\u0435\u0445\u043d\u043e\u043b\u043e\u0433\u0438\u044f",
     "TabLiveTV": "\u0422\u0412 \u044d\u0444\u0438\u0440",
     "TabAutoOrganize": "\u0410\u0432\u0442\u043e\u0440\u0435\u043e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u044f",
     "TabPlugins": "\u041f\u043b\u0430\u0433\u0438\u043d\u044b",
-    "TabAdvanced": "\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u044b\u0435",
+    "TabAdvanced": "\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e",
     "TabHelp": "\u0421\u043f\u0440\u0430\u0432\u043a\u0430",
     "TabScheduledTasks": "\u041f\u043b\u0430\u043d\u0438\u0440\u043e\u0432\u0449\u0438\u043a",
     "ButtonFullscreen": "\u041f\u043e\u043b\u043d\u044b\u0439 \u044d\u043a\u0440\u0430\u043d",
@@ -314,8 +314,10 @@
     "ButtonSubtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044b",
     "ButtonScenes": "\u0421\u0446\u0435\u043d\u044b",
     "ButtonQuality": "\u041a\u0430\u0447\u0435\u0441\u0442\u0432\u043e",
-    "HeaderNotifications": "Notifications",
-    "HeaderSelectPlayer": "Select Player:",
+    "HeaderNotifications": "\u0423\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f",
+    "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"
+    "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"
 }
\ 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 421a0dea9..a8ae113be 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/sv.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/sv.json
@@ -317,5 +317,7 @@
     "HeaderNotifications": "Notifications",
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "V\u00e4lj",
-    "ButtonNew": "Nytillkommet"
+    "ButtonNew": "Nytillkommet",
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "HeaderVideoError": "Video Error"
 }
\ 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 0f93d0695..3440a8ab0 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/vi.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/vi.json
@@ -317,5 +317,7 @@
     "HeaderNotifications": "Notifications",
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "L\u1ef1a ch\u1ecdn",
-    "ButtonNew": "M\u1edbi"
+    "ButtonNew": "M\u1edbi",
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "HeaderVideoError": "Video Error"
 }
\ 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 fe7d37994..763337f43 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json
@@ -317,5 +317,7 @@
     "HeaderNotifications": "Notifications",
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "\u9078\u64c7",
-    "ButtonNew": "\u5275\u5efa"
+    "ButtonNew": "\u5275\u5efa",
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM plugin for IE.",
+    "HeaderVideoError": "Video Error"
 }
\ 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 df4178c6a..81922f713 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ar.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ar.json
@@ -884,5 +884,9 @@
     "LabelView": "View:",
     "TabUsers": "Users",
     "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "HeaderAdvanced": "Advanced",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "Scheduled Tasks",
+    "HeaderChapters": "Chapters",
+    "HeaderResumeSettings": "Resume Settings"
 }
\ 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 461e56f49..a56ccf4de 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ca.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ca.json
@@ -884,5 +884,9 @@
     "LabelView": "View:",
     "TabUsers": "Users",
     "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "HeaderAdvanced": "Advanced",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "Scheduled Tasks",
+    "HeaderChapters": "Chapters",
+    "HeaderResumeSettings": "Resume Settings"
 }
\ 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 d6cdfe028..729768b78 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/cs.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/cs.json
@@ -95,7 +95,7 @@
     "TabSuggested": "Doporu\u010den\u00e9",
     "TabLatest": "Posledn\u00ed",
     "TabUpcoming": "Nadch\u00e1zej\u00edc\u00ed",
-    "TabShows": "Shows",
+    "TabShows": "Seri\u00e1ly",
     "TabEpisodes": "Epizody",
     "TabGenres": "\u017d\u00e1nry",
     "TabPeople": "Lid\u00e9",
@@ -296,7 +296,7 @@
     "PasswordLocalhostMessage": "Heslo nen\u00ed nutn\u00e9, pokud se p\u0159ihla\u0161ujete z m\u00edstn\u00edho PC-",
     "TabGuide": "Pr\u016fvodce",
     "TabChannels": "Kan\u00e1ly",
-    "TabCollections": "Collections",
+    "TabCollections": "Kolekce",
     "HeaderChannels": "Kan\u00e1ly",
     "TabRecordings": "Nahran\u00e9",
     "TabScheduled": "Napl\u00e1nov\u00e1no",
@@ -643,7 +643,7 @@
     "ButtonMute": "Mute",
     "HeaderLatestMedia": "Latest Media",
     "OptionSpecialFeatures": "Special Features",
-    "HeaderCollections": "Collections",
+    "HeaderCollections": "Kolekce",
     "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",
@@ -780,8 +780,8 @@
     "HeaderLatestChannelItems": "Latest Channel Items",
     "OptionNone": "None",
     "HeaderLiveTv": "Live TV",
-    "HeaderReports": "Reports",
-    "HeaderMetadataManager": "Metadata Manager",
+    "HeaderReports": "Hl\u00e1\u0161en\u00ed",
+    "HeaderMetadataManager": "Spr\u00e1vce metadat",
     "HeaderPreferences": "Preferences",
     "MessageLoadingChannels": "Loading channel content...",
     "ButtonMarkRead": "Ozna\u010dit jako p\u0159e\u010dten\u00e9",
@@ -822,7 +822,7 @@
     "OptionLatestTvRecordings": "Latest recordings",
     "LabelProtocolInfo": "Protocol info:",
     "LabelProtocolInfoHelp": "The value that will be used when responding to GetProtocolInfo requests from the device.",
-    "TabXbmcMetadata": "Xbmc",
+    "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.",
@@ -884,5 +884,9 @@
     "LabelView": "View:",
     "TabUsers": "Users",
     "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "HeaderAdvanced": "Advanced",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "Scheduled Tasks",
+    "HeaderChapters": "Chapters",
+    "HeaderResumeSettings": "Resume Settings"
 }
\ 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 8db9c68f8..c2fafba45 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/da.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/da.json
@@ -884,5 +884,9 @@
     "LabelView": "View:",
     "TabUsers": "Users",
     "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "HeaderAdvanced": "Advanced",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "Scheduled Tasks",
+    "HeaderChapters": "Chapters",
+    "HeaderResumeSettings": "Resume Settings"
 }
\ 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 90c4c9e52..5ffff96dd 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/de.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/de.json
@@ -884,5 +884,9 @@
     "LabelView": "View:",
     "TabUsers": "Users",
     "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "HeaderAdvanced": "Advanced",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "Scheduled Tasks",
+    "HeaderChapters": "Chapters",
+    "HeaderResumeSettings": "Resume Settings"
 }
\ 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 b778dc415..fe7451fed 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/el.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/el.json
@@ -884,5 +884,9 @@
     "LabelView": "View:",
     "TabUsers": "Users",
     "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "HeaderAdvanced": "Advanced",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "Scheduled Tasks",
+    "HeaderChapters": "Chapters",
+    "HeaderResumeSettings": "Resume Settings"
 }
\ 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 653811157..5044e6d95 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
@@ -884,5 +884,9 @@
     "LabelView": "View:",
     "TabUsers": "Users",
     "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "HeaderAdvanced": "Advanced",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "Scheduled Tasks",
+    "HeaderChapters": "Chapters",
+    "HeaderResumeSettings": "Resume Settings"
 }
\ 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 f315798ec..dc4ac80cb 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
@@ -884,5 +884,9 @@
     "LabelView": "View:",
     "TabUsers": "Users",
     "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "HeaderAdvanced": "Advanced",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "Scheduled Tasks",
+    "HeaderChapters": "Chapters",
+    "HeaderResumeSettings": "Resume Settings"
 }
\ 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 18e44a03c..9c43a9c9e 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/es.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es.json
@@ -884,5 +884,9 @@
     "LabelView": "View:",
     "TabUsers": "Users",
     "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "HeaderAdvanced": "Advanced",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "Scheduled Tasks",
+    "HeaderChapters": "Chapters",
+    "HeaderResumeSettings": "Resume Settings"
 }
\ 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 55439632f..98a36f8dd 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
@@ -884,5 +884,9 @@
     "LabelView": "Vista:",
     "TabUsers": "Usuarios",
     "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "HeaderAdvanced": "Advanced",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "Tareas Programadas",
+    "HeaderChapters": "Chapters",
+    "HeaderResumeSettings": "Resume Settings"
 }
\ 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 fc02a9e8c..f5f3d9387 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/fr.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
@@ -16,7 +16,7 @@
     "LabelYoureDone": "Vous avez Termin\u00e9!",
     "WelcomeToMediaBrowser": "Bienvenue dans Media Browser!",
     "TitleMediaBrowser": "Media Browser",
-    "ThisWizardWillGuideYou": "Cet assistant vous guidera dans le processus de configuration. Pour commencer, SVP s\u00e9lectionnez votre langue pr\u00e9f\u00e9r\u00e9e.",
+    "ThisWizardWillGuideYou": "Cet assistant vous guidera dans le processus de configuration. Pour commencer, merci de s\u00e9lectionner votre langue pr\u00e9f\u00e9r\u00e9e.",
     "TellUsAboutYourself": "Parlez-nous de vous",
     "LabelYourFirstName": "Votre pr\u00e9nom:",
     "MoreUsersCanBeAddedLater": "D'autres utilisateurs pourront \u00eatre ajout\u00e9s ult\u00e9rieurement \u00e0 partir du tableau de bord.",
@@ -151,7 +151,7 @@
     "OptionVideoBitrate": "D\u00e9bit vid\u00e9o",
     "OptionResumable": "Reprenable",
     "ScheduledTasksHelp": "S\u00e9lectionnez une t\u00e2che pour ajuster sa programmation.",
-    "ScheduledTasksTitle": "T\u00e2ches programm\u00e9es",
+    "ScheduledTasksTitle": "T\u00e2ches planifi\u00e9es",
     "TabMyPlugins": "Mes Plugins",
     "TabCatalog": "Catalogue",
     "PluginsTitle": "Plugins",
@@ -199,7 +199,7 @@
     "OptionFriday": "Vendredi",
     "OptionSaturday": "Samedi",
     "HeaderManagement": "Gestion:",
-    "LabelManagement": "Management:",
+    "LabelManagement": "Gestion :",
     "OptionMissingImdbId": "ID IMDb manquant:",
     "OptionMissingTvdbId": "ID TVDB manquant:",
     "OptionMissingOverview": "R\u00e9sum\u00e9 manquant",
@@ -239,7 +239,7 @@
     "PismoMessage": "En utilisation de \"Pismo File Mount\" par une license fournie.",
     "TangibleSoftwareMessage": "Utilisation de convertisseurs Tangible Solutions Java\/C# par licence fournie.",
     "HeaderCredits": "Cr\u00e9dits",
-    "PleaseSupportOtherProduces": "SVP, soutenez les autres produits gratuits que nous utilisons:",
+    "PleaseSupportOtherProduces": "Merci de soutenir les autres produits gratuits que nous utilisons :",
     "VersionNumber": "Version {0}",
     "TabPaths": "Chemins d'acc\u00e8s",
     "TabServer": "Serveur",
@@ -289,7 +289,7 @@
     "OptionImageSavingStandard": "Standard - MB2",
     "ButtonSignIn": "Se connecter",
     "TitleSignIn": "Se connecter",
-    "HeaderPleaseSignIn": "SVP se connecter",
+    "HeaderPleaseSignIn": "Merci de vous identifier",
     "LabelUser": "Utilisateur:",
     "LabelPassword": "Mot de passe:",
     "ButtonManualLogin": "Connexion manuelle:",
@@ -299,7 +299,7 @@
     "TabCollections": "Collections",
     "HeaderChannels": "Cha\u00eenes",
     "TabRecordings": "Enregistrements",
-    "TabScheduled": "Programm\u00e9s",
+    "TabScheduled": "Planifi\u00e9s",
     "TabSeries": "S\u00e9ries",
     "TabFavorites": "Favoris",
     "TabMyLibrary": "Ma Biblioth\u00e8que",
@@ -336,7 +336,7 @@
     "LabelActiveServiceHelp": "Plusieurs Plugins de TV peuvent \u00eatre install\u00e9s mais seulement un \u00e0 la fois peut \u00eatre actif.",
     "OptionAutomatic": "Auto",
     "LiveTvPluginRequired": "Un fournisseur de service de TV en direct est requis pour continuer.",
-    "LiveTvPluginRequiredHelp": "SVP installer un de nos Plugins disponibles, comme Next Pvr ou ServerWmc.",
+    "LiveTvPluginRequiredHelp": "Merci d'installer un de nos plugins disponibles, comme Next Pvr ou ServerWmc.",
     "LabelCustomizeOptionsPerMediaType": "Personnaliser pour le type de m\u00e9dia:",
     "OptionDownloadThumbImage": "Vignette",
     "OptionDownloadMenuImage": "Menu",
@@ -492,13 +492,13 @@
     "LabelSupportAmount": "Montant (USD)",
     "HeaderSupportTheTeamHelp": "Aidez la continuation de ce projet en effectuant un don. Une portion de ce don contribuera au d\u00e9veloppement d'autres produits gratuits sur lesquels nous d\u00e9pendons.",
     "ButtonEnterSupporterKey": "Entrer la cl\u00e9 de supporteur",
-    "DonationNextStep": "Une fois compl\u00e9t\u00e9, SVP revenir et entrer la cl\u00e9 de supporteur re\u00e7ue par courriel.",
+    "DonationNextStep": "Une fois compl\u00e9t\u00e9, merci de revenir et saisir la cl\u00e9 de supporteur re\u00e7ue par courriel.",
     "AutoOrganizeHelp": "L'organisation automatique surveille vos r\u00e9pertoires de t\u00e9l\u00e9chargement et les nouveaux fichiers puis les d\u00e9place dans vos r\u00e9pertoires de m\u00e9dias. ",
     "AutoOrganizeTvHelp": "L'organisation de fichiers TV va seulement ajouter des \u00e9pisodes \u00e0 des s\u00e9ries existantes. Ce processus de cr\u00e9\u00e9ra pas de nouveaux r\u00e9pertoires de s\u00e9rie.",
     "OptionEnableEpisodeOrganization": "Activer l'organisation des nouvelles \u00e9pisodes",
     "LabelWatchFolder": "R\u00e9pertoire surveill\u00e9:",
     "LabelWatchFolderHelp": "Le serveur va utiliser ce r\u00e9pertoire pendant la t\u00e2che \"Organiser les nouveaux fichiers de m\u00e9dias\".",
-    "ButtonViewScheduledTasks": "Voir les t\u00e2ches programm\u00e9es",
+    "ButtonViewScheduledTasks": "Voir les t\u00e2ches planifi\u00e9es",
     "LabelMinFileSizeForOrganize": "Grosseur de fichier minimum (MB):",
     "LabelMinFileSizeForOrganizeHelp": "Les fichiers avec une grosseur inf\u00e9rieure seront ignor\u00e9s.",
     "LabelSeasonFolderPattern": "Mod\u00e8le de r\u00e9pertoire de saison:",
@@ -529,12 +529,12 @@
     "ButtonRestart": "Red\u00e9marrer",
     "ButtonShutdown": "\u00c9teindre",
     "ButtonUpdateNow": "Mettre \u00e0 jour maintenant",
-    "PleaseUpdateManually": "SVP fermer le serveur et mettre \u00e0 jour manuellement.",
+    "PleaseUpdateManually": "Merci d'\u00e9teindre le serveur et de le mettre \u00e0 jour manuellement.",
     "NewServerVersionAvailable": "Une nouvelle version de Media Browser Server est disponible!",
     "ServerUpToDate": "Media Browser est \u00e0 jour",
     "ErrorConnectingToMediaBrowserRepository": "Une erreur est survenue avec la connexion au r\u00e9f\u00e9rentiel de donn\u00e9es de Media Browser.",
     "LabelComponentsUpdated": "Les composants suivants ont \u00e9t\u00e9 install\u00e9s ou mis \u00e0 jour.",
-    "MessagePleaseRestartServerToFinishUpdating": "SVP red\u00e9marrer le serveur pour appliquer les mises \u00e0 jour.",
+    "MessagePleaseRestartServerToFinishUpdating": "Merci de red\u00e9marrer le serveur pour appliquer les mises \u00e0 jour.",
     "LabelDownMixAudioScale": "Boost audio lors de downmix:",
     "LabelDownMixAudioScaleHelp": "Boost audio lors de downmix. Mettre \u00e0 1 pour pr\u00e9server la valeur originale du volume.",
     "ButtonLinkKeys": "Lier les cl\u00e9s",
@@ -586,7 +586,7 @@
     "NotificationOptionVideoPlaybackStopped": "Lecture vid\u00e9o arr\u00eat\u00e9e",
     "NotificationOptionAudioPlaybackStopped": "Lecture audio arr\u00eat\u00e9e",
     "NotificationOptionGamePlaybackStopped": "Lecture de jeu arr\u00eat\u00e9e",
-    "NotificationOptionTaskFailed": "\u00c9chec de t\u00e2che programm\u00e9e",
+    "NotificationOptionTaskFailed": "\u00c9chec de t\u00e2che planifi\u00e9e",
     "NotificationOptionInstallationFailed": "\u00c9chec d'installation",
     "NotificationOptionNewLibraryContent": "Nouveau contenu ajout\u00e9",
     "NotificationOptionNewLibraryContentMultiple": "Nouveau contenu ajout\u00e9 (multiple)",
@@ -627,10 +627,10 @@
     "TabNowPlaying": "En cours de lecture",
     "TabNavigation": "Navigation",
     "TabControls": "Contr\u00f4les",
-    "ButtonFullscreen": "Toggle fullscreen",
+    "ButtonFullscreen": "Basculer en plein \u00e9cran",
     "ButtonScenes": "Sc\u00e8nes",
     "ButtonSubtitles": "Sous-titres",
-    "ButtonAudioTracks": "Audio tracks",
+    "ButtonAudioTracks": "Pistes audio",
     "ButtonPreviousTrack": "Previous track",
     "ButtonNextTrack": "Next track",
     "ButtonStop": "Arr\u00eat",
@@ -723,7 +723,7 @@
     "OptionReportByteRangeSeekingWhenTranscodingHelp": "Ceci est requis pour certains appareils dont le time seek n'est pas tr\u00e8s bon",
     "HeaderSubtitleDownloadingHelp": "Lorsque Media Browser balaye vos fichiers vid\u00e9os, le serveur peut rechercher des sous-titres manquants et les t\u00e9l\u00e9charger en utilisant un fournisseur de sous-titre comme OpenSubtitles.org.",
     "HeaderDownloadSubtitlesFor": "T\u00e9l\u00e9charger les sous-titres pour:",
-    "MessageNoChapterProviders": "Install a chapter provider plugin such as ChapterDb to enable additional chapter options.",
+    "MessageNoChapterProviders": "Installer un plugin de fournisseur de chapitre tel que ChapterDb pour activer les options suppl\u00e9mentaires de chapitre.",
     "LabelSkipIfGraphicalSubsPresent": "Sauter la vid\u00e9o si elle contient d\u00e9j\u00e0 des sous-titres graphiques",
     "LabelSkipIfGraphicalSubsPresentHelp": "Garder des versions textes des sous-titres va \u00eatre plus efficace avec les appareils mobiles.",
     "TabSubtitles": "Sous-titres",
@@ -731,7 +731,7 @@
     "HeaderDownloadChaptersFor": "T\u00e9l\u00e9charger les noms de chapitre pour:",
     "LabelOpenSubtitlesUsername": "Nom d'utilisateur de Open Subtitles:",
     "LabelOpenSubtitlesPassword": "Mot de passe de Open Subtitles:",
-    "HeaderChapterDownloadingHelp": "When Media Browser scans your video files it can download friendly chapter names from the internet using chapter plugins such as ChapterDb.",
+    "HeaderChapterDownloadingHelp": "Lorsque Media Browser scanne vos fichiers vid\u00e9o, il peut facilement t\u00e9l\u00e9charger les noms de chapitre depuis Internet en utilisant le plugin de chapitre tel que ChapterDb.",
     "LabelPlayDefaultAudioTrack": "Utiliser la flux audio par d\u00e9faut peu importe la langue",
     "LabelSubtitlePlaybackMode": "Mode de sous-titres:",
     "LabelDownloadLanguages": "T\u00e9l\u00e9chargement de langues:",
@@ -771,7 +771,7 @@
     "LabelHomePageSection2": "Section 2 de la page de d\u00e9marrage:",
     "LabelHomePageSection3": "Section 3 de la page de d\u00e9marrage:",
     "LabelHomePageSection4": "Section 4 de la page de d\u00e9marrage:",
-    "OptionMyViewsButtons": "My views (buttons)",
+    "OptionMyViewsButtons": "Mes vues (bouttons)",
     "OptionMyViews": "Mes vues",
     "OptionMyViewsSmall": "Mes vues (petit)",
     "OptionResumablemedia": "Reprendre",
@@ -794,13 +794,13 @@
     "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. ",
     "ButtonEditOtherUserPreferences": "Modifier les pr\u00e9f\u00e9rences personnelles de cet utilisateur.",
-    "LabelChannelStreamQuality": "Preferred internet stream quality:",
-    "LabelChannelStreamQualityHelp": "In a low bandwidth environment, limiting quality can help ensure a smooth streaming experience.",
+    "LabelChannelStreamQuality": "Qualit\u00e9 de diffusion internet pr\u00e9f\u00e9r\u00e9e :",
+    "LabelChannelStreamQualityHelp": "Avec une bande passante faible, limiter la qualit\u00e9 garantit un confort d'utilisation du streaming.",
     "OptionBestAvailableStreamQuality": "Meilleur disponible",
     "LabelEnableChannelContentDownloadingFor": "Activer le t\u00e9l\u00e9chargement de contenu de cha\u00eene pour:",
-    "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.",
+    "LabelEnableChannelContentDownloadingForHelp": "Certaines cha\u00eenes supportent la priorit\u00e9 de t\u00e9l\u00e9chargement de contenu lors du visionnage. Activez ceci pour les environnements \u00e0 bande passante faible afin de t\u00e9l\u00e9charger le contenu des cha\u00eenes pendant les horaires d'inactivit\u00e9. Le contenu est t\u00e9l\u00e9charg\u00e9 suivant la programmation de celui-ci dans les t\u00e2ches planifi\u00e9es.",
     "LabelChannelDownloadPath": "Chemin d'acc\u00e8s de t\u00e9l\u00e9chargement de contenu de cha\u00eene:",
-    "LabelChannelDownloadPathHelp": "Specify a custom download path if desired. Leave empty to download to an internal program data folder.",
+    "LabelChannelDownloadPathHelp": "Sp\u00e9cifiez un chemin de t\u00e9l\u00e9chargements personnalis\u00e9 si besoin. Laissez vide pour t\u00e9l\u00e9charger dans un r\u00e9pertoire interne du programme.",
     "LabelChannelDownloadAge": "Supprimer le contenu apr\u00e8s: (jours)",
     "LabelChannelDownloadAgeHelp": "Le contenu t\u00e9l\u00e9charg\u00e9 plus vieux sera supprim\u00e9. Par contre, il sera toujours disponible par flux Internet (en ligne).",
     "ChannelSettingsFormHelp": "Installer des cha\u00eenes comme \"Trailers\" and \"Vimeo\" par le catalogue de Plugins.",
@@ -811,78 +811,82 @@
     "ViewTypeMusic": "Musique",
     "ViewTypeBoxSets": "Collections",
     "ViewTypeChannels": "Cha\u00eenes",
-    "ViewTypeLiveTV": "TV en directe",
+    "ViewTypeLiveTV": "TV en direct",
     "HeaderOtherDisplaySettings": "Param\u00e8tres d'affichage",
     "HeaderMyViews": "Mes affichages",
-    "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.",
+    "LabelSelectFolderGroups": "Grouper automatiquement le contenu des r\u00e9pertoires suivants dans les vues tels que Films, Musiques et TV :",
+    "LabelSelectFolderGroupsHelp": "Les r\u00e9pertoires qui ne sont pas coch\u00e9s, seront affich\u00e9s tels quels avec leur propre disposition.",
     "OptionDisplayAdultContent": "Afficher le contenu adulte",
     "OptionLibraryFolders": "R\u00e9pertoires de m\u00e9dias",
     "TitleRemoteControl": "Acc\u00e8s \u00e0 distance",
     "OptionLatestTvRecordings": "Les plus r\u00e9cents enregistrements",
     "LabelProtocolInfo": "Infos sur le protocol:",
-    "LabelProtocolInfoHelp": "The value that will be used when responding to GetProtocolInfo requests from the device.",
+    "LabelProtocolInfoHelp": "La valeur sera utilis\u00e9e par le p\u00e9riph\u00e9rique pour r\u00e9pondre aux requ\u00eates GetProtocolInfo.",
     "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.",
+    "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": "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.",
+    "LabelXbmcMetadataUserHelp": "Activer ceci pour synchroniser en permanence 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.",
+    "LabelXbmcMetadataSaveImagePathsHelp": "Cela est r\u00e9command\u00e9 si les noms des fichiers d'images ne sont pas conformes aux directives d'Xbmc.",
+    "LabelXbmcMetadataEnablePathSubstitution": "Activer le remplacement de chemin",
+    "LabelXbmcMetadataEnablePathSubstitutionHelp": "Active la substitution de chemin des chemins d'image en utilisant les param\u00e8tres de substitution de chemin du serveur.",
+    "LabelXbmcMetadataEnablePathSubstitutionHelp2": "Voir la substitution de chemin.",
+    "LabelGroupChannelsIntoViews": "Afficher directement les cha\u00eenes suivantes dans mes vues.",
+    "LabelGroupChannelsIntoViewsHelp": "Si activ\u00e9, ces cha\u00eenes seront directement affich\u00e9es \u00e0 c\u00f4t\u00e9 des autres vues. Si d\u00e9sactiv\u00e9, elles seront affich\u00e9es dans une vue de cha\u00eenes s\u00e9par\u00e9es.",
+    "LabelDisplayCollectionsView": "Afficher un aper\u00e7u de collections pour montrer les collections de film",
+    "LabelXbmcMetadataEnableExtraThumbs": "Copier l'extrafanart dans les extrathumbs",
+    "LabelXbmcMetadataEnableExtraThumbsHelp": "Lors du t\u00e9l\u00e9chargement d'images, elles peuvent \u00eatre sauvegard\u00e9es en tant que extrafanart ou extrathumbs pour une compatibilit\u00e9 maximum avec le skin Xbmc.",
     "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",
+    "HeaderServerLogFiles": "Fichiers log du serveur :",
+    "TabBranding": "Slogan",
+    "HeaderBrandingHelp": "Personnaliser l'apparence de Media Browser pour r\u00e9pondre aux besoins de votre groupe ou organisation.",
+    "LabelLoginDisclaimer": "Avertissement sur la page d'accueil :",
+    "LabelLoginDisclaimerHelp": "Ce sera affich\u00e9 en bas de la page de connexion.",
+    "LabelAutomaticallyDonate": "Donner ce montant automatiquement tout les 6 mois.",
+    "LabelAutomaticallyDonateHelp": "Vous pouvez annuler via votre compte Paypal n'importe quand.",
+    "OptionList": "Liste",
+    "TabDashboard": "Tableau de bord",
+    "TitleServer": "Serveur",
+    "LabelCache": "Cache :",
+    "LabelLogs": "Logs :",
+    "LabelMetadata": "M\u00e9tadonn\u00e9es :",
+    "LabelImagesByName": "Images tri\u00e9es par nom :",
+    "LabelTranscodingTemporaryFiles": "Transcodage de fichiers temporaires :",
+    "HeaderLatestMusic": "Derni\u00e8re musique",
+    "HeaderBranding": "Slogan",
+    "HeaderApiKeys": "Cl\u00e9s API",
+    "HeaderApiKeysHelp": "Les applications externes n\u00e9cessitent d'avoir une cl\u00e9 API pour communiquer avec Media Browser. Les cl\u00e9s sont d\u00e9livr\u00e9es en se connectant avec un compte Media Browser, ou en octroyant manuellement la cl\u00e9 depuis l'application.",
+    "HeaderApiKey": "Cl\u00e9 API",
     "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.",
-    "HeaderHttpHeaders": "Http Headers",
-    "HeaderIdentificationHeader": "Identification Header",
-    "LabelValue": "Value:",
-    "LabelMatchType": "Match type:",
-    "OptionEquals": "Equals",
+    "HeaderDevice": "P\u00e9riph\u00e9rique",
+    "HeaderUser": "Utilisateur",
+    "HeaderDateIssued": "Date de publication",
+    "LabelChapterName": "Chapitre {0}",
+    "HeaderNewApiKey": "Nouvelle cl\u00e9 API",
+    "LabelAppName": "Nom de l'app",
+    "LabelAppNameExample": "Exemple: Sickbeard, NzbDrone",
+    "HeaderNewApiKeyHelp": "Allouer \u00e0 une application des droits pour communiquer avec Media Browser.",
+    "HeaderHttpHeaders": "Ent\u00eates HTTP",
+    "HeaderIdentificationHeader": "Ent\u00eate d'identification",
+    "LabelValue": "Valeur :",
+    "LabelMatchType": "Type recherch\u00e9 :",
+    "OptionEquals": "Equivalents",
     "OptionRegex": "Regex",
-    "OptionSubstring": "Substring",
-    "TabView": "View",
-    "TabSort": "Sort",
-    "TabFilter": "Filter",
-    "ButtonView": "View",
-    "LabelPageSize": "Item limit:",
-    "LabelView": "View:",
-    "TabUsers": "Users",
-    "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "OptionSubstring": "Sous-cha\u00eene",
+    "TabView": "Voir",
+    "TabSort": "Trier",
+    "TabFilter": "Filtrer",
+    "ButtonView": "Voir",
+    "LabelPageSize": "Limite de l'item :",
+    "LabelView": "Voir :",
+    "TabUsers": "Utilisateurs",
+    "HeaderFeatures": "Fonctionnalit\u00e9s",
+    "HeaderAdvanced": "Avanc\u00e9",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "T\u00e2ches planifi\u00e9es",
+    "HeaderChapters": "Chapitres",
+    "HeaderResumeSettings": "Reprendre les param\u00e8tres"
 }
\ 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 effeb0ad6..43135ec81 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/he.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/he.json
@@ -884,5 +884,9 @@
     "LabelView": "View:",
     "TabUsers": "Users",
     "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "HeaderAdvanced": "Advanced",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "Scheduled Tasks",
+    "HeaderChapters": "Chapters",
+    "HeaderResumeSettings": "Resume Settings"
 }
\ 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 2757333f1..e76d47a04 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/it.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/it.json
@@ -198,7 +198,7 @@
     "OptionThursday": "Giovedi",
     "OptionFriday": "Venerdi",
     "OptionSaturday": "Sabato",
-    "HeaderManagement": "Gestione:",
+    "HeaderManagement": "Gestione :",
     "LabelManagement": "Management:",
     "OptionMissingImdbId": "IMDB id mancante",
     "OptionMissingTvdbId": "TheTVDB Id mancante",
@@ -257,13 +257,13 @@
     "ButtonSelectDirectory": "Seleziona cartella",
     "LabelCustomPaths": "Specifica un percorso personalizzato.Lasciare vuoto per usare quello predefinito",
     "LabelCachePath": "Percorso Cache:",
-    "LabelCachePathHelp": "Questa cartella contiene la cache come files e immagini.",
+    "LabelCachePathHelp": "Questa cartella contiene la cache come files e immagini .",
     "LabelImagesByNamePath": "Percorso immagini per nome:",
-    "LabelImagesByNamePathHelp": "Questa cartella contiene le immagini degli attori,generi, e studio",
+    "LabelImagesByNamePathHelp": "Specificare un percorso personalizzato per le immagini scaricato attore, artista, genere e in studio.",
     "LabelMetadataPath": "Percorso dei file METADATI:",
-    "LabelMetadataPathHelp": "Questa cartella contiene i files relativi ai metadati e immagini che non sono stati salvati nella cartella dei Media.",
+    "LabelMetadataPathHelp": "Specificare un percorso personalizzato per opere d'arte scaricato e metadati, se non il salvataggio in cartelle multimediali.",
     "LabelTranscodingTempPath": "Cartella temporanea per la trascodifica:",
-    "LabelTranscodingTempPathHelp": "Questa cartella contiene i file usati dalla trascodifica.",
+    "LabelTranscodingTempPathHelp": "Questa cartella contiene i file di lavoro utilizzati dal transcoder. Specificare un percorso personalizzato, oppure lasciare vuoto per utilizzare l'impostazione predefinita all'interno della cartella dei dati del server.",
     "TabBasics": "Base",
     "TabTV": "SerieTv",
     "TabGames": "Giochi",
@@ -280,13 +280,13 @@
     "LabelAutomaticUpdatesFanartHelp": "Se abilitato le nuove immagini verranno scaricate automaticamente da fanart.tv.Le immagini esistenti non verranno sovrascritte.",
     "LabelAutomaticUpdatesTmdbHelp": "Se abilitato le nuove immagini verranno scaricate automaticamente da ThemovieDb.org.Le immagini esistenti non verranno sovrascritte.",
     "LabelAutomaticUpdatesTvdbHelp": "Se abilitato le nuove immagini verranno scaricate automaticamente da TheTvDB.com.Le immagini esistenti non verranno sovrascritte.",
-    "ExtractChapterImagesHelp": "Estrazione di immagini capitoli permetter\u00e0 ai clienti di visualizzare i menu di selezione delle scene grafiche. Il processo pu\u00f2 essere lento, e pu\u00f2 richiedere diversi gigabyte di spazio. Funziona come una operazione pianificata alle 04:00, anche se questo \u00e8 configurabile nella zona di operazioni pianificate. Non \u00e8 consigliabile eseguire questa operazione durante le ore diurne.",
+    "ExtractChapterImagesHelp": "Estrazione di immagini capitoli permetter\u00e0 ai clienti di visualizzare i menu di selezione delle scene grafiche. Il processo pu\u00f2 essere lento, cpu-intensive e pu\u00f2 richiedere diversi gigabyte di spazio. Funziona quando vengono scoperti i video, e anche come un compito serale in programma a 04:00. Il programma \u00e8 configurabile nella zona di operazioni pianificate. Non \u00e8 consigliabile eseguire questa operazione durante le ore di picco.",
     "LabelMetadataDownloadLanguage": "Lingua preferita per il download:",
     "ButtonAutoScroll": "Auto-scroll",
     "LabelImageSavingConvention": "Convenzione per il salvataggio di immagini:",
     "LabelImageSavingConventionHelp": "Media Browser riconosce le immagini dalla maggior parte delle principali applicazioni multimediali. Scegliere la convenzione piu adatta a te.",
-    "OptionImageSavingCompatible": "Compatibile - MB3\/Plex\/Xbmc",
-    "OptionImageSavingStandard": "Standard - MB3\/MB2",
+    "OptionImageSavingCompatible": "Compatibile- Media Browser\/Xbmc\/Plex",
+    "OptionImageSavingStandard": "Standard - MB2",
     "ButtonSignIn": "Accedi",
     "TitleSignIn": "Accedi",
     "HeaderPleaseSignIn": "Per favore accedi",
@@ -484,9 +484,9 @@
     "LabelSkipped": "Saltato",
     "HeaderEpisodeOrganization": "Organizzazione Episodi",
     "LabelSeries": "Series:",
-    "LabelSeasonNumber": "Numero Stagione:",
-    "LabelEpisodeNumber": "Numero Episodio:",
-    "LabelEndingEpisodeNumber": "Ultimo Episodio Numero:",
+    "LabelSeasonNumber": "Numero Stagione",
+    "LabelEpisodeNumber": "Numero Episodio",
+    "LabelEndingEpisodeNumber": "Ultimo Episodio Numero",
     "LabelEndingEpisodeNumberHelp": "\u00e8 richiesto solo se ci sono pi\u00f9 file per espisodio",
     "HeaderSupportTheTeam": "Team di supporto di Media Browser",
     "LabelSupportAmount": "Ammontare (Dollari)",
@@ -535,7 +535,7 @@
     "ErrorConnectingToMediaBrowserRepository": "Si \u00e8 verificato un errore durante la connessione al repository Media Browser remoto.",
     "LabelComponentsUpdated": "I seguenti componenti sono stati installati o aggiornati:",
     "MessagePleaseRestartServerToFinishUpdating": "Si prega di riavviare il server per completare l'applicazione degli aggiornamenti.",
-    "LabelDownMixAudioScale": "Audio Boost Mix Scala:",
+    "LabelDownMixAudioScale": "Audio Boost Mix Scala :",
     "LabelDownMixAudioScaleHelp": "Audio Mix: Valore originale 1",
     "ButtonLinkKeys": "Lnks Chiavi:",
     "LabelOldSupporterKey": "Vecchie Chiavi dl donatore",
@@ -550,8 +550,8 @@
     "ButtonRetrieveKey": "Ottieni chiave",
     "LabelSupporterKey": "Chiave ( incollala dalla mail ricevuta)",
     "LabelSupporterKeyHelp": "Inserisci la chiave per avere nuovi benefit che la comunit\u00e0 di Media Browser ha sviluppato per te",
-    "MessageInvalidKey": "Chiave MB3 mancante o invalida",
-    "ErrorMessageInvalidKey": "Per avere qualsiasi contenuto premium devi essere registrato. Devi anche essere un donatore. Si prega di donae er  sostenere lo sviluppo di MB3.Grazie.",
+    "MessageInvalidKey": "Chiave MB3 mancante o invalida.",
+    "ErrorMessageInvalidKey": "Per qualsiasi contenuto premium devi essere registrato. \u00e8 necessario anche essere un browser Supporter multimediale. Si prega di donare e sostenere il continuo sviluppo del prodotto di base. Grazie.",
     "HeaderDisplaySettings": "Configurazione Monitor",
     "TabPlayTo": "Riproduci su",
     "LabelEnableDlnaServer": "Abilita server Dlna",
@@ -580,9 +580,9 @@
     "NotificationOptionPluginUpdateInstalled": "Aggiornamento del plugin installato",
     "NotificationOptionPluginInstalled": "plugin installato",
     "NotificationOptionPluginUninstalled": "Plugin disinstallato",
-    "NotificationOptionVideoPlayback": "Riproduzione video",
-    "NotificationOptionAudioPlayback": "Riproduzione Audio",
-    "NotificationOptionGamePlayback": "Riproduzione gioco",
+    "NotificationOptionVideoPlayback": "La riproduzione video \u00e8 iniziato",
+    "NotificationOptionAudioPlayback": "Riproduzione audio iniziato",
+    "NotificationOptionGamePlayback": "La riproduzione di gioco \u00e8 parita",
     "NotificationOptionVideoPlaybackStopped": "Video Fermato",
     "NotificationOptionAudioPlaybackStopped": "Audio Fermato",
     "NotificationOptionGamePlaybackStopped": "Gioco Fermato",
@@ -627,10 +627,10 @@
     "TabNowPlaying": "In esecuzione",
     "TabNavigation": "Navigazione",
     "TabControls": "Controlli",
-    "ButtonFullscreen": "Toggle fullscreen",
+    "ButtonFullscreen": "Tutto Schermo",
     "ButtonScenes": "Scene",
     "ButtonSubtitles": "Sottotitoli",
-    "ButtonAudioTracks": "Audio tracks",
+    "ButtonAudioTracks": "Tracce audio",
     "ButtonPreviousTrack": "Previous track",
     "ButtonNextTrack": "Next track",
     "ButtonStop": "Stop",
@@ -723,7 +723,7 @@
     "OptionReportByteRangeSeekingWhenTranscodingHelp": "Questo \u00e8 necessario per alcuni dispositivi che il tempo non cercano molto bene.",
     "HeaderSubtitleDownloadingHelp": "Quando Media Browser esegue la scansione dei file video \u00e8 possibile cercare i sottotitoli mancanti, e scaricarli utilizzando un provider sottotitolo come OpenSubtitles.org.",
     "HeaderDownloadSubtitlesFor": "Scarica sottotitoli per:",
-    "MessageNoChapterProviders": "Installare un plugin fornitore capitolo come ChapterDb o tagChimp per attivare le opzioni capitolo aggiuntivo.",
+    "MessageNoChapterProviders": "Installare un plugin fornitore capitolo come ChapterDb per attivare le opzioni capitolo aggiuntivo.",
     "LabelSkipIfGraphicalSubsPresent": "Salta se il video contiene gi\u00e0 i sottotitoli grafici",
     "LabelSkipIfGraphicalSubsPresentHelp": "Mantenere le versioni del testo di sottotitoli si tradurr\u00e0 in consegna pi\u00f9 efficiente ai clienti di telefonia mobile.",
     "TabSubtitles": "sottotitoli",
@@ -731,7 +731,7 @@
     "HeaderDownloadChaptersFor": "Scarica i nomi dei capitoli per:",
     "LabelOpenSubtitlesUsername": "Sottotitoli utente:",
     "LabelOpenSubtitlesPassword": "Sottotitoli password:",
-    "HeaderChapterDownloadingHelp": "Quando Media Browser esegue la scansione dei file video \u00e8 possibile scaricare i nomi dei capitoli amichevoli da internet utilizzando i plugin capitolo come ChapterDb e tagChimp.",
+    "HeaderChapterDownloadingHelp": "Quando Media Browser esegue la scansione dei file video \u00e8 possibile scaricare i nomi dei capitoli amichevoli da internet utilizzando i plugin capitolo come ChapterDb",
     "LabelPlayDefaultAudioTrack": "Riprodurre la traccia audio di default indipendentemente dalla lingua",
     "LabelSubtitlePlaybackMode": "Modalit\u00e0 Sottotitolo:",
     "LabelDownloadLanguages": "Scarica lingue:",
@@ -817,7 +817,7 @@
     "LabelSelectFolderGroups": "Automaticamente i contenuti del gruppo dalle seguenti cartelle nella vista come film, musica e TV:",
     "LabelSelectFolderGroupsHelp": "Le cartelle che siano deselezionate verranno visualizzati da soli nel loro punto di vista.",
     "OptionDisplayAdultContent": "Visualizzazioni contenuti per adulti",
-    "OptionLibraryFolders": "Vista",
+    "OptionLibraryFolders": "Cartelle dei media",
     "TitleRemoteControl": "Telecomando",
     "OptionLatestTvRecordings": "Ultime registrazioni",
     "LabelProtocolInfo": "Info.protocollo:",
@@ -835,7 +835,7 @@
     "LabelXbmcMetadataEnablePathSubstitutionHelp2": "Vedere sostituzione di percorso.",
     "LabelGroupChannelsIntoViews": "Visualizzare i seguenti canali direttamente dentro le mie visite:",
     "LabelGroupChannelsIntoViewsHelp": "Se abilitata, questi canali verranno visualizzati direttamente accanto ad altri punti di vista. Se disattivato, saranno visualizzati all'interno di una visione canali separati.",
-    "LabelDisplayCollectionsView": "Visualizzare una vista Collezioni per mostrare collezioni di film",
+    "LabelDisplayCollectionsView": "Visualizzare una vista collezioni di mostrare collezioni di film",
     "LabelXbmcMetadataEnableExtraThumbs": "Copy extrafanart into extrathumbs",
     "LabelXbmcMetadataEnableExtraThumbsHelp": "Quando si scaricano le immagini possono essere salvate in entrambi extrafanart e extrathumbs per la massima compatibilit\u00e0 cutanea XBMC.",
     "TabServices": "Servizi",
@@ -845,7 +845,7 @@
     "HeaderBrandingHelp": "Personalizzare l'aspetto del browser media per soddisfare le esigenze del vostro gruppo o organizzazione.",
     "LabelLoginDisclaimer": "Login disclaimer:",
     "LabelLoginDisclaimerHelp": "Questo verr\u00e0 visualizzato nella parte inferiore della pagina di accesso.",
-    "LabelAutomaticallyDonate": "Donare automaticamente questo importo ogni mese",
+    "LabelAutomaticallyDonate": "Donare automaticamente questo importo ogni sei mesi",
     "LabelAutomaticallyDonateHelp": "\u00c8 possibile annullare in qualsiasi momento tramite il vostro conto PayPal.",
     "OptionList": "Lista",
     "TabDashboard": "Pannello Controllo",
@@ -864,25 +864,29 @@
     "HeaderDevice": "Dispositivo",
     "HeaderUser": "Utente",
     "HeaderDateIssued": "data di pubblicazione",
-    "LabelChapterName": "Chapter {0}",
+    "LabelChapterName": "Capitolo {0}",
     "HeaderNewApiKey": "Nessuna Chiave Api",
     "LabelAppName": "Nome app",
     "LabelAppNameExample": "Example: Sickbeard, NzbDrone",
     "HeaderNewApiKeyHelp": "Garantisci all'applicazione il permesso di comunicare con Media Browser.",
     "HeaderHttpHeaders": "Http Headers",
     "HeaderIdentificationHeader": "Identification Header",
-    "LabelValue": "Value:",
+    "LabelValue": "valore:",
     "LabelMatchType": "Match type:",
-    "OptionEquals": "Equals",
+    "OptionEquals": "Uguale",
     "OptionRegex": "Regex",
     "OptionSubstring": "Substring",
-    "TabView": "View",
-    "TabSort": "Sort",
-    "TabFilter": "Filter",
-    "ButtonView": "View",
-    "LabelPageSize": "Item limit:",
-    "LabelView": "View:",
-    "TabUsers": "Users",
-    "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "TabView": "Vista",
+    "TabSort": "Ordina",
+    "TabFilter": "Filtra",
+    "ButtonView": "Vista",
+    "LabelPageSize": "Limite articolo:",
+    "LabelView": "Vista:",
+    "TabUsers": "Utenti",
+    "HeaderFeatures": "Caratteristiche",
+    "HeaderAdvanced": "Avanzato",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "Operazioni pianificate",
+    "HeaderChapters": "Chapters",
+    "HeaderResumeSettings": "Resume Settings"
 }
\ 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 b588e6c11..9a1847ea4 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/kk.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/kk.json
@@ -55,7 +55,7 @@
     "TabProfile": "\u041f\u0440\u043e\u0444\u0438\u043b\u044c",
     "TabMetadata": "\u041c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a",
     "TabImages": "\u0421\u0443\u0440\u0435\u0442\u0442\u0435\u0440",
-    "TabNotifications": "\u0425\u0430\u0431\u0430\u0440\u043b\u0430\u043d\u0434\u044b\u0440\u0443",
+    "TabNotifications": "\u0425\u0430\u0431\u0430\u0440\u043b\u0430\u043d\u0434\u044b\u0440\u0443\u043b\u0430\u0440",
     "TabCollectionTitles": "\u0410\u0442\u0430\u0443\u043b\u0430\u0440",
     "LabelDisplayMissingEpisodesWithinSeasons": "\u0416\u043e\u049b \u044d\u043f\u0438\u0437\u043e\u0434\u0442\u0430\u0440\u0434\u044b \u043c\u0430\u0443\u0441\u044b\u043c \u0456\u0448\u0456\u043d\u0434\u0435 \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0443",
     "LabelUnairedMissingEpisodesWithinSeasons": "\u041a\u04e9\u0440\u0441\u0435\u0442\u0456\u043b\u043c\u0435\u0433\u0435\u043d \u044d\u043f\u0438\u0437\u043e\u0434\u0442\u0430\u0440\u0434\u044b \u043c\u0430\u0443\u0441\u044b\u043c \u0456\u0448\u0456\u043d\u0434\u0435 \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0443",
@@ -167,7 +167,7 @@
     "OptionDvd": "DVD",
     "OptionIso": "ISO",
     "Option3D": "3D",
-    "LabelFeatures": "\u049a\u043e\u0441\u044b\u043c\u0448\u0430\u043b\u0430\u0440:",
+    "LabelFeatures": "\u041c\u04d9\u043b\u0456\u043c\u0435\u0442\u0442\u0435\u0440:",
     "LabelService": "\u049a\u044b\u0437\u043c\u0435\u0442:",
     "LabelStatus": "\u041a\u04af\u0439:",
     "LabelVersion": "\u041d\u04b1\u0441\u049b\u0430:",
@@ -181,16 +181,16 @@
     "TabTrailers": "\u0422\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440",
     "HeaderLatestMovies": "\u0415\u04a3 \u043a\u0435\u0439\u0456\u043d\u0433\u0456 \u0444\u0438\u043b\u044c\u043c\u0434\u0435\u0440",
     "HeaderLatestTrailers": "\u0415\u04a3 \u043a\u0435\u0439\u0456\u043d\u0433\u0456 \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440",
-    "OptionHasSpecialFeatures": "\u049a\u043e\u0441\u044b\u043c\u0448\u0430\u043b\u0430\u0440",
+    "OptionHasSpecialFeatures": "\u041c\u04d9\u043b\u0456\u043c\u0435\u0442\u0442\u0435\u0440",
     "OptionImdbRating": "IMDb \u0431\u0430\u0493\u0430\u043b\u0430\u0443\u044b",
     "OptionParentalRating": "\u0416\u0430\u0441\u0442\u0430\u0441 \u0441\u0430\u043d\u0430\u0442",
     "OptionPremiereDate": "\u0422\u04b1\u0441\u0430\u0443\u043a\u0435\u0441\u0435\u0440 \u043a\u04af\u043d-\u0430\u0439\u044b",
     "TabBasic": "\u041d\u0435\u0433\u0456\u0437\u0433\u0456\u043b\u0435\u0440",
-    "TabAdvanced": "\u041a\u0435\u04a3\u0435\u0439\u0442\u0456\u043b\u0433\u0435\u043d\u0434\u0435\u0440",
+    "TabAdvanced": "\u049a\u043e\u0441\u044b\u043c\u0448\u0430",
     "HeaderStatus": "\u041a\u04af\u0439",
     "OptionContinuing": "\u0416\u0430\u043b\u0493\u0430\u0441\u0443\u0434\u0430",
     "OptionEnded": "\u0410\u044f\u049b\u0442\u0430\u043b\u0434\u044b",
-    "HeaderAirDays": "\u042d\u0444\u0438\u0440 \u043a\u04af\u043d\u0434\u0435\u0440\u0456:",
+    "HeaderAirDays": "\u042d\u0444\u0438\u0440 \u043a\u04af\u043d\u0434\u0435\u0440\u0456",
     "OptionSunday": "\u0436\u0435\u043a\u0441\u0435\u043d\u0431\u0456",
     "OptionMonday": "\u0434\u04af\u0439\u0441\u0435\u043d\u0431\u0456",
     "OptionTuesday": "\u0441\u0435\u0439\u0441\u0435\u043d\u0431\u0456",
@@ -198,8 +198,8 @@
     "OptionThursday": "\u0431\u0435\u0439\u0441\u0435\u043d\u0431\u0456",
     "OptionFriday": "\u0436\u04b1\u043c\u0430",
     "OptionSaturday": "\u0441\u0435\u043d\u0431\u0456",
-    "HeaderManagement": "\u041c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a:",
-    "LabelManagement": "Management:",
+    "HeaderManagement": "\u041c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440",
+    "LabelManagement": "\u041c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440",
     "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",
@@ -244,7 +244,7 @@
     "TabPaths": "\u0416\u043e\u043b\u0434\u0430\u0440",
     "TabServer": "\u0421\u0435\u0440\u0432\u0435\u0440",
     "TabTranscoding": "\u049a\u0430\u0439\u0442\u0430 \u043a\u043e\u0434\u0442\u0430\u0443",
-    "TitleAdvanced": "\u041a\u0435\u04a3\u0435\u0439\u0442\u0456\u043b\u0433\u0435\u043d \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043b\u0435\u0440",
+    "TitleAdvanced": "\u049a\u043e\u0441\u044b\u043c\u0448\u0430",
     "LabelAutomaticUpdateLevel": "\u0410\u0432\u0442\u043e\u0436\u0430\u04a3\u0430\u0440\u0442\u0443 \u0434\u0435\u04a3\u0433\u0435\u0439\u0456",
     "OptionRelease": "\u0420\u0435\u0441\u043c\u0438 \u0448\u044b\u0493\u0430\u0440\u044b\u043b\u044b\u043c",
     "OptionBeta": "\u0411\u0435\u0442\u0430 \u043d\u04b1\u0441\u049b\u0430",
@@ -255,15 +255,15 @@
     "LabelRunServerAtStartup": "\u0421\u0435\u0440\u0432\u0435\u0440\u0434\u0456 \u0456\u0441\u043a\u0435 \u049b\u043e\u0441\u044b\u043b\u0443\u0434\u0430\u043d \u0431\u0430\u0441\u0442\u0430\u043f \u043e\u0440\u044b\u043d\u0434\u0430\u0443",
     "LabelRunServerAtStartupHelp": "\u0411\u04b1\u043b Windows \u0436\u04b1\u043c\u044b\u0441\u044b\u043d \u0431\u0430\u0441\u0442\u0430\u0493\u0430\u043d\u0434\u0430 \u0436\u04af\u0439\u0435\u043b\u0456\u043a \u0442\u0430\u049b\u0442\u0430\u0434\u0430\u0493\u044b \u0431\u0435\u043b\u0433\u0456\u0448\u0435 \u0456\u0441\u043a\u0435 \u049b\u043e\u0441\u044b\u043b\u0430\u0434\u044b. Windows \u049b\u044b\u0437\u043c\u0435\u0442\u0456\u043d \u0456\u0441\u043a\u0435 \u049b\u043e\u0441\u0443 \u04af\u0448\u0456\u043d, \u049b\u04b1\u0441\u0431\u0435\u043b\u0433\u0456\u043d\u0456 \u0430\u043b\u044b\u04a3\u044b\u0437 \u0436\u04d9\u043d\u0435 \u049b\u044b\u0437\u043c\u0435\u0442\u0442\u0456 Windows \u049a\u044b\u0437\u043c\u0435\u0442\u0442\u0435\u0440 \u0434\u0438\u0441\u043f\u0435\u0442\u0447\u0435\u0440\u0456 \u0430\u0440\u049b\u044b\u043b\u044b \u043e\u0440\u044b\u043d\u0434\u0430\u04a3\u044b\u0437. \u041d\u0430\u0437\u0430\u0440 \u0430\u0443\u0434\u0430\u0440\u044b\u04a3\u044b\u0437! \u0411\u04b1\u043b \u0435\u043a\u0435\u0443\u0456\u043d \u0441\u043e\u043b \u043c\u0435\u0437\u0433\u0456\u043b\u0434\u0435 \u0431\u0456\u0440\u0433\u0435 \u043e\u0440\u044b\u043d\u0434\u0430\u0443 \u043c\u04af\u043c\u043a\u0456\u043d \u0435\u043c\u0435\u0441, \u0441\u043e\u043d\u044b\u043c\u0435\u043d \u049b\u044b\u0437\u043c\u0435\u0442\u0442\u0456 \u0456\u0441\u043a\u0435 \u049b\u043e\u0441\u0443 \u0430\u043b\u0434\u044b\u043d\u0430\u043d \u0436\u04af\u0439\u0435\u043b\u0456\u043a \u0442\u0430\u049b\u0442\u0430\u0434\u0430\u0493\u044b \u0431\u0435\u043b\u0433\u0456\u0448\u0435\u0434\u0435\u043d \u0448\u044b\u0493\u044b\u04a3\u044b\u0437.",
     "ButtonSelectDirectory": "\u049a\u0430\u0442\u0430\u043b\u043e\u0433\u0442\u044b \u0431\u04e9\u043b\u0435\u043a\u0442\u0435\u0443",
-    "LabelCustomPaths": "\u049a\u0430\u043b\u0430\u0443 \u0431\u043e\u0439\u044b\u043d\u0448\u0430 \u0442\u0435\u04a3\u0448\u0435\u043b\u0433\u0435\u043d \u0436\u043e\u043b\u0434\u0430\u0440\u0434\u044b \u043a\u04e9\u0440\u0441\u0435\u0442\u0456\u04a3\u0456\u0437. \u04d8\u0434\u0435\u043f\u043a\u0456\u043b\u0435\u0440\u0434\u0456 \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443 \u04af\u0448\u0456\u043d \u04e9\u0440\u0456\u0441\u0442\u0435\u0440\u0434\u0456 \u0431\u043e\u0441 \u049b\u0430\u043b\u0434\u044b\u0440\u044b\u04a3\u044b\u0437.",
+    "LabelCustomPaths": "\u049a\u0430\u043b\u0430\u0443\u044b\u04a3\u044b\u0437 \u0431\u043e\u0439\u044b\u043d\u0448\u0430 \u0442\u0435\u04a3\u0448\u0435\u043b\u0433\u0435\u043d \u0436\u043e\u043b\u0434\u0430\u0440\u0434\u044b \u0430\u043d\u044b\u049b\u0442\u0430\u04a3\u044b\u0437. \u04d8\u0434\u0435\u043f\u043a\u0456\u043b\u0435\u0440\u0434\u0456 \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443 \u04af\u0448\u0456\u043d \u04e9\u0440\u0456\u0441\u0442\u0435\u0440\u0434\u0456 \u0431\u043e\u0441 \u049b\u0430\u043b\u0434\u044b\u0440\u044b\u04a3\u044b\u0437.",
     "LabelCachePath": "Cache \u049b\u0430\u043b\u0442\u0430\u0441\u044b\u043d\u044b\u04a3 \u0436\u043e\u043b\u044b:",
-    "LabelCachePathHelp": "\u0411\u04b1\u043b \u049b\u0430\u043b\u0442\u0430 \u049b\u04b1\u0440\u0430\u043c\u044b\u043d\u0434\u0430 \u0441\u0443\u0440\u0435\u0442 \u0441\u0438\u044f\u049b\u0442\u044b \u0441\u0435\u0440\u0432\u0435\u0440\u0434\u0456\u04a3 \u043a\u044d\u0448 \u0444\u0430\u0439\u043b\u0434\u0430\u0440\u044b \u0431\u0430\u0440.",
+    "LabelCachePathHelp": "\u0421\u0443\u0440\u0435\u0442 \u0441\u0438\u044f\u049b\u0442\u044b \u0441\u0435\u0440\u0432\u0435\u0440\u0434\u0456\u04a3 \u043a\u044d\u0448 \u0444\u0430\u0439\u043b\u0434\u0430\u0440\u044b \u04af\u0448\u0456\u043d \u0442\u0435\u04a3\u0448\u0435\u043b\u0433\u0435\u043d \u0436\u0430\u0439\u0493\u0430\u0441\u044b\u043c\u0434\u044b \u0430\u043d\u044b\u049b\u0442\u0430\u04a3\u044b\u0437.",
     "LabelImagesByNamePath": "Images by name \u049b\u0430\u043b\u0442\u0430\u0441\u044b\u043d\u044b\u04a3 \u0436\u043e\u043b\u044b:",
-    "LabelImagesByNamePathHelp": "\u0411\u04b1\u043b \u049b\u0430\u043b\u0442\u0430 \u049b\u04b1\u0440\u0430\u043c\u044b\u043d\u0434\u0430 \u0436\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u044b\u043d\u0493\u0430\u043d \u0430\u043a\u0442\u0435\u0440, \u043e\u0440\u044b\u043d\u0434\u0430\u0443\u0448\u044b, \u0436\u0430\u043d\u0440, \u0436\u04d9\u043d\u0435 \u0441\u0442\u0443\u0434\u0438\u044f \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440\u0456 \u0431\u0430\u0440.",
+    "LabelImagesByNamePathHelp": "\u0416\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u044b\u043d\u0493\u0430\u043d \u0430\u043a\u0442\u0435\u0440, \u043e\u0440\u044b\u043d\u0434\u0430\u0443\u0448\u044b, \u0436\u0430\u043d\u0440, \u0436\u04d9\u043d\u0435 \u0441\u0442\u0443\u0434\u0438\u044f \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440\u0456  \u04af\u0448\u0456\u043d \u0442\u0435\u04a3\u0448\u0435\u043b\u0433\u0435\u043d \u0436\u0430\u0439\u0493\u0430\u0441\u044b\u043c\u0434\u044b \u0430\u043d\u044b\u049b\u0442\u0430\u04a3\u044b\u0437.",
     "LabelMetadataPath": "Metadata \u049b\u0430\u043b\u0442\u0430\u0441\u044b\u043d\u044b\u04a3 \u0436\u043e\u043b\u044b:",
-    "LabelMetadataPathHelp": "\u0411\u04b1\u043b \u0436\u0430\u0439\u0493\u0430\u0441\u044b\u043c \u0456\u0448\u0456\u043d\u0434\u0435 \u0442\u0430\u0441\u0443\u0448\u044b \u049b\u0430\u043b\u0442\u0430\u043b\u0430\u0440\u044b\u043d\u0434\u0430 \u0441\u0430\u049b\u0442\u0430\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f\u0441\u044b \u0456\u0441\u0442\u0435\u043b\u043c\u0435\u0433\u0435\u043d \u0436\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u044b\u043d\u0493\u0430\u043d \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u043c\u0435 \u043c\u0435\u043d \u043c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a \u0431\u0430\u0440.",
+    "LabelMetadataPathHelp": "\u0416\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u044b\u043d\u0493\u0430\u043d \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u043c\u0435\u043b\u0435\u0440 \u0431\u0435\u043d \u043c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440 \u04af\u0448\u0456\u043d \u0442\u0435\u04a3\u0448\u0435\u043b\u0433\u0435\u043d \u0436\u0430\u0439\u0493\u0430\u0441\u044b\u043c\u0434\u044b \u0430\u043d\u044b\u049b\u0442\u0430\u04a3\u044b\u0437.",
     "LabelTranscodingTempPath": "Transcoding temporary \u049b\u0430\u043b\u0442\u0430\u0441\u044b\u043d\u044b\u04a3 \u0436\u043e\u043b\u044b:",
-    "LabelTranscodingTempPathHelp": "\u0411\u04b1\u043b \u049b\u0430\u043b\u0442\u0430 \u049b\u04b1\u0440\u0430\u043c\u044b\u043d\u0434\u0430 \u049b\u0430\u0439\u0442\u0430 \u043a\u043e\u0434\u0442\u0430\u0443 \u049b\u04b1\u0440\u0430\u043b\u044b \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0430\u0442\u044b\u043d \u0436\u04b1\u043c\u044b\u0441 \u0444\u0430\u0439\u043b\u0434\u0430\u0440\u044b \u0431\u0430\u0440. \u0422\u0435\u04a3\u0448\u0435\u043b\u0433\u0435\u043d \u0436\u043e\u043b\u0434\u044b \u043a\u04e9\u0440\u0441\u0435\u0442\u0456\u04a3\u0456\u0437, \u043d\u0435\u043c\u0435\u0441\u0435 \u0441\u0435\u0440\u0432\u0435\u0440\u0434\u0456\u04a3  \u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440 \u049b\u0430\u043b\u0442\u0430\u0441\u044b \u0456\u0448\u0456\u043d\u0434\u0435\u0433\u0456 \u04d9\u0434\u0435\u043f\u043a\u0456\u0441\u0456\u043d \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443 \u04af\u0448\u0456\u043d \u0431\u043e\u0441 \u049b\u0430\u043b\u0434\u044b\u0440\u044b\u04a3\u044b\u0437.",
+    "LabelTranscodingTempPathHelp": "\u0411\u04b1\u043b \u049b\u0430\u043b\u0442\u0430 \u049b\u04b1\u0440\u0430\u043c\u044b\u043d\u0434\u0430 \u049b\u0430\u0439\u0442\u0430 \u043a\u043e\u0434\u0442\u0430\u0443 \u049b\u04b1\u0440\u0430\u043b\u044b \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0430\u0442\u044b\u043d \u0436\u04b1\u043c\u044b\u0441 \u0444\u0430\u0439\u043b\u0434\u0430\u0440\u044b \u0431\u0430\u0440. \u0422\u0435\u04a3\u0448\u0435\u043b\u0433\u0435\u043d \u0436\u043e\u043b\u0434\u044b \u0430\u043d\u044b\u049b\u0442\u0430\u04a3\u044b\u0437, \u043d\u0435\u043c\u0435\u0441\u0435 \u0441\u0435\u0440\u0432\u0435\u0440\u0434\u0456\u04a3  \u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440 \u049b\u0430\u043b\u0442\u0430\u0441\u044b \u0456\u0448\u0456\u043d\u0434\u0435\u0433\u0456 \u04d9\u0434\u0435\u043f\u043a\u0456\u0441\u0456\u043d \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443 \u04af\u0448\u0456\u043d \u0431\u043e\u0441 \u049b\u0430\u043b\u0434\u044b\u0440\u044b\u04a3\u044b\u0437.",
     "TabBasics": "\u041d\u0435\u0433\u0456\u0437\u0433\u0456\u043b\u0435\u0440",
     "TabTV": "\u0422\u0414",
     "TabGames": "\u041e\u0439\u044b\u043d\u0434\u0430\u0440",
@@ -393,7 +393,7 @@
     "HeaderAwardsAndReviews": "\u041c\u0430\u0440\u0430\u043f\u0430\u0442\u0442\u0430\u0440 \u043c\u0435\u043d \u043f\u0456\u043a\u0456\u0440\u043b\u0435\u0440",
     "HeaderSoundtracks": "\u0424\u0438\u043b\u044c\u043c\u0434\u0456\u04a3 \u043c\u0443\u0437\u044b\u043a\u0430\u0441\u044b",
     "HeaderMusicVideos": "\u0411\u0435\u0439\u043d\u0435\u043a\u043b\u0438\u043f\u0442\u0435\u0440",
-    "HeaderSpecialFeatures": "\u0410\u0440\u043d\u0430\u0439\u044b \u049b\u043e\u0441\u044b\u043c\u0448\u0430\u043b\u0430\u0440",
+    "HeaderSpecialFeatures": "\u0410\u0440\u043d\u0430\u0439\u044b \u043c\u04d9\u043b\u0456\u043c\u0435\u0442\u0442\u0435\u0440",
     "HeaderCastCrew": "\u0422\u04af\u0441\u0456\u0440\u0443\u0433\u0435 \u049b\u0430\u0442\u044b\u0441\u049b\u0430\u043d\u0434\u0430\u0440",
     "HeaderAdditionalParts": "\u0416\u0430\u043b\u0493\u0430\u0441\u0430\u0442\u044b\u043d \u0431\u04e9\u043b\u0456\u043c\u0434\u0435\u0440",
     "ButtonSplitVersionsApart": "\u041d\u04af\u0441\u049b\u0430\u043b\u0430\u0440\u0434\u044b \u049b\u0430\u0439\u0442\u0430 \u0431\u04e9\u043b\u0443",
@@ -590,7 +590,7 @@
     "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)",
-    "SendNotificationHelp": "\u0425\u0430\u0431\u0430\u0440\u043b\u0430\u043d\u0434\u044b\u0440\u043c\u0430\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.",
+    "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",
     "LabelMonitorUsers": "\u041c\u044b\u043d\u0430\u043d\u044b\u04a3 \u04d9\u0440\u0435\u043a\u0435\u0442\u0442\u0435\u0440\u0456\u043d \u0431\u0430\u049b\u044b\u043b\u0430\u0443:",
@@ -627,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": "Toggle fullscreen",
+    "ButtonFullscreen": "\u0422\u043e\u043b\u044b\u049b \u044d\u043a\u0440\u0430\u043d",
     "ButtonScenes": "\u0421\u0430\u0445\u043d\u0430\u043b\u0430\u0440",
     "ButtonSubtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440",
-    "ButtonAudioTracks": "Audio tracks",
+    "ButtonAudioTracks": "\u0414\u044b\u0431\u044b\u0441 \u0436\u043e\u043b\u0448\u044b\u049b\u0442\u0430\u0440\u044b",
     "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",
@@ -642,7 +642,7 @@
     "ButtonVolumeDown": "\u04ae\u043d\u0434\u0456\u043b\u0456\u043a\u0442\u0456 \u0442\u04e9\u043c\u0435\u043d\u0434\u0435\u0442\u0443",
     "ButtonMute": "\u0414\u044b\u0431\u044b\u0441\u0442\u044b \u04e9\u0448\u0456\u0440\u0443",
     "HeaderLatestMedia": "\u0415\u04a3 \u043a\u0435\u0439\u0456\u043d\u0433\u0456 \u0442\u0430\u0441\u0443\u0448\u044b\u043b\u0430\u0440",
-    "OptionSpecialFeatures": "\u0410\u0440\u043d\u0430\u0439\u044b \u049b\u043e\u0441\u044b\u043c\u0448\u0430\u043b\u0430\u0440",
+    "OptionSpecialFeatures": "\u0410\u0440\u043d\u0430\u0439\u044b \u043c\u04d9\u043b\u0456\u043c\u0435\u0442\u0442\u0435\u0440",
     "HeaderCollections": "\u0422\u043e\u043f\u0442\u0430\u043c\u0430\u043b\u0430\u0440",
     "LabelProfileCodecsHelp": "\u04ae\u0442\u0456\u0440 \u0430\u0440\u049b\u044b\u043b\u044b \u0431\u04e9\u043b\u0456\u043f \u0430\u043b\u044b\u043d\u0493\u0430\u043d. \u0411\u0430\u0440\u043b\u044b\u049b \u043a\u043e\u0434\u0435\u043a\u0442\u0435\u0440\u0433\u0435 \u049b\u043e\u043b\u0434\u0430\u043d\u0443 \u04af\u0448\u0456\u043d \u0431\u04b1\u043b \u0431\u043e\u0441 \u049b\u0430\u043b\u0434\u044b\u0440\u044b\u043b\u0443 \u043c\u04af\u043c\u043a\u0456\u043d.",
     "LabelProfileContainersHelp": "\u04ae\u0442\u0456\u0440 \u0430\u0440\u049b\u044b\u043b\u044b \u0431\u04e9\u043b\u0456\u043f \u0430\u043b\u044b\u043d\u0493\u0430\u043d. \u0411\u0430\u0440\u043b\u044b\u049b \u043a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440\u043b\u0435\u0440\u0433\u0435 \u049b\u043e\u043b\u0434\u0430\u043d\u0443 \u04af\u0448\u0456\u043d \u0431\u04b1\u043b \u0431\u043e\u0441 \u049b\u0430\u043b\u0434\u044b\u0440\u044b\u043b\u0443 \u043c\u04af\u043c\u043a\u0456\u043d.",
@@ -800,7 +800,7 @@
     "LabelEnableChannelContentDownloadingFor": "\u0411\u04b1\u043b \u04af\u0448\u0456\u043d \u0430\u0440\u043d\u0430 \u043c\u0430\u0437\u043c\u04b1\u043d\u044b\u043d \u0436\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u0443\u0434\u044b \u049b\u043e\u0441\u0443:",
     "LabelEnableChannelContentDownloadingForHelp": "\u041a\u0435\u0439\u0431\u0456\u0440 \u0430\u0440\u043d\u0430\u043b\u0430\u0440 \u049b\u0430\u0440\u0430\u0443\u0434\u044b\u04a3 \u0430\u043b\u0434\u044b\u043d\u0434\u0430 \u043c\u0430\u0437\u043c\u04af\u043d \u0436\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u0443\u0434\u044b \u049b\u043e\u043b\u0434\u0430\u0439\u0434\u044b. \u04e8\u0442\u043a\u0456\u0437\u0443 \u043c\u04af\u043c\u043a\u0456\u043d\u0434\u0456\u0433\u0456 \u0442\u04e9\u043c\u0435\u043d \u043e\u0440\u0442\u0430\u043b\u0430\u0440\u0434\u0430 \u0430\u0440\u043d\u0430 \u043c\u0430\u0437\u043c\u04b1\u043d\u044b\u043d \u0436\u04b1\u043c\u044b\u0441\u0442\u0430\u043d \u0431\u043e\u0441 \u0443\u0430\u049b\u044b\u0442\u0442\u0430 \u0436\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u0443 \u04af\u0448\u0456\u043d \u0431\u04b1\u043d\u044b \u049b\u043e\u0441\u044b\u04a3\u044b\u0437. \u041c\u0430\u0437\u043c\u04af\u043d \u0430\u0440\u043d\u0430 \u0436\u04af\u043a\u0442\u0435\u0443 \u0436\u043e\u0441\u043f\u0430\u0440\u043b\u0430\u0493\u0430\u043d \u0442\u0430\u043f\u0441\u044b\u0440\u043c\u0430\u0441\u044b \u0431\u04e9\u043b\u0456\u0433\u0456 \u0440\u0435\u0442\u0456\u043d\u0434\u0435 \u0436\u04af\u043a\u0442\u0435\u043b\u0435\u0434\u0456.",
     "LabelChannelDownloadPath": "\u0410\u0440\u043d\u0430 \u043c\u0430\u0437\u043c\u04b1\u043d\u044b\u043d \u0436\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u0443 \u0436\u043e\u043b\u044b:",
-    "LabelChannelDownloadPathHelp": "\u041a\u0435\u0440\u0435\u043a \u0431\u043e\u043b\u0441\u0430 \u0442\u0435\u04a3\u0448\u0435\u043b\u0433\u0435\u043d \u0436\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u0443 \u0436\u043e\u043b\u044b\u043d \u043a\u04e9\u0440\u0441\u0435\u0442\u0456\u04a3\u0456\u0437. \u0411\u0430\u0493\u0434\u0430\u0440\u043b\u0430\u043c\u0430 \u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440\u0456\u043d\u0456\u04a3 \u0456\u0448\u043a\u0456 \u049b\u0430\u043b\u0442\u0430\u0441\u044b\u043d\u0430 \u0436\u04af\u043a\u0442\u0435\u0443 \u04af\u0448\u0456\u043d \u0431\u043e\u0441 \u049b\u0430\u043b\u0434\u044b\u0440\u044b\u04a3\u044b\u0437.",
+    "LabelChannelDownloadPathHelp": "\u041a\u0435\u0440\u0435\u043a \u0431\u043e\u043b\u0441\u0430 \u0442\u0435\u04a3\u0448\u0435\u043b\u0433\u0435\u043d \u0436\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u0443 \u0436\u043e\u043b\u044b\u043d \u0430\u043d\u044b\u049b\u0442\u0430\u04a3\u044b\u0437. \u0411\u0430\u0493\u0434\u0430\u0440\u043b\u0430\u043c\u0430 \u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440\u0456\u043d\u0456\u04a3 \u0456\u0448\u043a\u0456 \u049b\u0430\u043b\u0442\u0430\u0441\u044b\u043d\u0430 \u0436\u04af\u043a\u0442\u0435\u0443 \u04af\u0448\u0456\u043d \u0431\u043e\u0441 \u049b\u0430\u043b\u0434\u044b\u0440\u044b\u04a3\u044b\u0437.",
     "LabelChannelDownloadAge": "\u041c\u0430\u0437\u043c\u04b1\u043d \u0436\u043e\u0439\u044b\u043b\u0443\u044b \u043a\u0435\u043b\u0435\u0441\u0456\u0434\u0435\u043d \u043a\u0435\u0439\u0456\u043d, \u043a\u04af\u043d:",
     "LabelChannelDownloadAgeHelp": "\u0411\u04b1\u0434\u0430\u043d \u0431\u04b1\u0440\u044b\u043d\u0493\u044b \u0436\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u044b\u043d\u0493\u0430\u043d \u043c\u0430\u0437\u043c\u04af\u043d \u0436\u043e\u0439\u044b\u043b\u0430\u0434\u044b. \u0418\u043d\u0442\u0435\u0440\u043d\u0435\u0442 \u0430\u0440\u049b\u044b\u043b\u044b \u0430\u0493\u044b\u043d\u043c\u0435\u043d \u0442\u0430\u0441\u044b\u043c\u0430\u043b\u0434\u0430\u0443 \u04d9\u0434\u0456\u0441\u0456\u043d \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u044b\u043f \u043e\u0439\u043d\u0430\u0442\u0443 \u0456\u0441\u0442\u0435 \u049b\u0430\u043b\u0430\u0434\u044b.",
     "ChannelSettingsFormHelp": "\u041f\u043b\u0430\u0433\u0438\u043d \u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0456\u043d\u0434\u0435\u0433\u0456 Trailers \u0436\u04d9\u043d\u0435 Vimeo \u0441\u0438\u044f\u049b\u0442\u044b \u0430\u0440\u043d\u0430\u043b\u0430\u0440\u0434\u044b \u043e\u0440\u043d\u0430\u0442\u044b\u04a3\u044b\u0437.",
@@ -823,7 +823,7 @@
     "LabelProtocolInfo": "\u041f\u0440\u043e\u0442\u043e\u049b\u043e\u043b \u0430\u049b\u043f\u0430\u0440\u0430\u0442\u044b:",
     "LabelProtocolInfoHelp": "\u0411\u04b1\u043b \u043c\u04d9\u043d \u0436\u0430\u0431\u0434\u044b\u049b\u0442\u044b\u04a3 GetProtocolInfo \u0441\u04b1\u0440\u0430\u043d\u044b\u0441\u0442\u0430\u0440\u044b\u043d\u0430 \u0436\u0430\u0443\u0430\u043f \u0431\u0435\u0440\u0433\u0435\u043d\u0434\u0435 \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u044b\u043b\u0430\u0434\u044b.",
     "TabXbmcMetadata": "Xbmc",
-    "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.",
+    "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:",
@@ -880,9 +880,13 @@
     "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:",
+    "LabelPageSize": "\u042d\u043b\u0435\u043c\u0435\u043d\u0442\u0442\u0456\u04a3 \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": "Features",
-    "HeaderAdvanced": "Advanced"
+    "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",
+    "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"
 }
\ 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 e1a405972..f474225fd 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ko.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ko.json
@@ -884,5 +884,9 @@
     "LabelView": "View:",
     "TabUsers": "Users",
     "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "HeaderAdvanced": "Advanced",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "Scheduled Tasks",
+    "HeaderChapters": "Chapters",
+    "HeaderResumeSettings": "Resume Settings"
 }
\ 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 515cd70a2..232e94a72 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ms.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ms.json
@@ -884,5 +884,9 @@
     "LabelView": "View:",
     "TabUsers": "Users",
     "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "HeaderAdvanced": "Advanced",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "Scheduled Tasks",
+    "HeaderChapters": "Chapters",
+    "HeaderResumeSettings": "Resume Settings"
 }
\ 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 c2afde015..c10e19102 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/nb.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/nb.json
@@ -884,5 +884,9 @@
     "LabelView": "View:",
     "TabUsers": "Users",
     "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "HeaderAdvanced": "Advanced",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "Scheduled Tasks",
+    "HeaderChapters": "Chapters",
+    "HeaderResumeSettings": "Resume Settings"
 }
\ 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 4e01acfa1..c1a871095 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/nl.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/nl.json
@@ -627,7 +627,7 @@
     "TabNowPlaying": "Wordt nu afgespeeld",
     "TabNavigation": "Navigatie",
     "TabControls": "Besturing",
-    "ButtonFullscreen": "Toggle fullscreen",
+    "ButtonFullscreen": "Schakelen tussen volledig scherm ",
     "ButtonScenes": "Scenes",
     "ButtonSubtitles": "Ondertitels",
     "ButtonAudioTracks": "Audio tracks",
@@ -883,6 +883,10 @@
     "LabelPageSize": "Schermgrootte:",
     "LabelView": "Weergave:",
     "TabUsers": "Gebruikers",
-    "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "HeaderFeatures": "Functies",
+    "HeaderAdvanced": "Geavanceerd",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "Geplande taken",
+    "HeaderChapters": "Hoofdstukken",
+    "HeaderResumeSettings": "Resume Settings"
 }
\ 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 b5b610654..3032f71f0 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pl.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pl.json
@@ -884,5 +884,9 @@
     "LabelView": "View:",
     "TabUsers": "Users",
     "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "HeaderAdvanced": "Advanced",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "Scheduled Tasks",
+    "HeaderChapters": "Chapters",
+    "HeaderResumeSettings": "Resume Settings"
 }
\ 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 b635d7318..a80d352b9 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
@@ -199,7 +199,7 @@
     "OptionFriday": "Sexta-feira",
     "OptionSaturday": "S\u00e1bado",
     "HeaderManagement": "Gerenciamento:",
-    "LabelManagement": "Management:",
+    "LabelManagement": "Administra\u00e7\u00e3o:",
     "OptionMissingImdbId": "Faltando Id IMDb",
     "OptionMissingTvdbId": "Faltando Id TheTVDB",
     "OptionMissingOverview": "Faltando Sinopse",
@@ -627,10 +627,10 @@
     "TabNowPlaying": "Reproduzindo Agora",
     "TabNavigation": "Navega\u00e7\u00e3o",
     "TabControls": "Controles",
-    "ButtonFullscreen": "Toggle fullscreen",
+    "ButtonFullscreen": "Alternar para tela cheia",
     "ButtonScenes": "Cenas",
     "ButtonSubtitles": "Legendas",
-    "ButtonAudioTracks": "Audio tracks",
+    "ButtonAudioTracks": "Faixas de \u00e1udio",
     "ButtonPreviousTrack": "Faixa anterior",
     "ButtonNextTrack": "Pr\u00f3xima faixa",
     "ButtonStop": "Parar",
@@ -883,6 +883,10 @@
     "LabelPageSize": "Tamanho de exibi\u00e7\u00e3o:",
     "LabelView": "Visualizar:",
     "TabUsers": "Usu\u00e1rios",
-    "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "HeaderFeatures": "Inclui",
+    "HeaderAdvanced": "Avan\u00e7ado",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "Tarefas Agendadas",
+    "HeaderChapters": "Chapters",
+    "HeaderResumeSettings": "Resume Settings"
 }
\ 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 12850f803..83e82070a 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
@@ -884,5 +884,9 @@
     "LabelView": "View:",
     "TabUsers": "Users",
     "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "HeaderAdvanced": "Advanced",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "Scheduled Tasks",
+    "HeaderChapters": "Chapters",
+    "HeaderResumeSettings": "Resume Settings"
 }
\ 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 fcf3756ab..abdb98e97 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ru.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
@@ -122,8 +122,8 @@
     "TabAlbumArtists": "\u0410\u043b\u044c\u0431\u043e\u043c\u043d\u044b\u0435 \u0438\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u0438",
     "TabMusicVideos": "\u041a\u043b\u0438\u043f\u044b",
     "ButtonSort": "\u0421\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c",
-    "HeaderSortBy": "\u041f\u043e \u043a\u0440\u0438\u0442\u0435\u0440\u0438\u044e:",
-    "HeaderSortOrder": "\u041f\u043e \u043f\u043e\u0440\u044f\u0434\u043a\u0443:",
+    "HeaderSortBy": "\u041a\u0440\u0438\u0442\u0435\u0440\u0438\u0439:",
+    "HeaderSortOrder": "\u041f\u043e\u0440\u044f\u0434\u043e\u043a:",
     "OptionPlayed": "\u0412\u043e\u0441\u043f\u0440-\u043d\u043d\u044b\u0435",
     "OptionUnplayed": "\u041d\u0435 \u0432\u043e\u0441\u043f\u0440-\u043d\u043d\u044b\u0435",
     "OptionAscending": "\u0412\u043e\u0437\u0440\u0430\u0441\u0442\u0430\u043d\u0438\u0435",
@@ -167,7 +167,7 @@
     "OptionDvd": "DVD",
     "OptionIso": "ISO",
     "Option3D": "3D",
-    "LabelFeatures": "\u0414\u043b\u044f \u043c\u0430\u0442\u0435\u0440\u0438\u0430\u043b\u043e\u0432:",
+    "LabelFeatures": "\u041c\u0430\u0442\u0435\u0440\u0438\u0430\u043b\u044b:",
     "LabelService": "\u0421\u043b\u0443\u0436\u0431\u0430:",
     "LabelStatus": "\u0421\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435:",
     "LabelVersion": "\u0412\u0435\u0440\u0441\u0438\u044f:",
@@ -185,12 +185,12 @@
     "OptionImdbRating": "\u041e\u0446\u0435\u043d\u043a\u0430 IMDb",
     "OptionParentalRating": "\u0412\u043e\u0437\u0440\u0430\u0441\u0442\u043d\u0430\u044f \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f",
     "OptionPremiereDate": "\u0414\u0430\u0442\u0430 \u043f\u0440\u0435\u043c\u044c\u0435\u0440\u044b",
-    "TabBasic": "\u041e\u0441\u043d\u043e\u0432\u043d\u044b\u0435",
-    "TabAdvanced": "\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u044b\u0435",
+    "TabBasic": "\u041e\u0441\u043d\u043e\u0432\u044b",
+    "TabAdvanced": "\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e",
     "HeaderStatus": "\u0421\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435",
     "OptionContinuing": "\u041f\u0440\u043e\u0434\u043b\u0435\u043d\u043e",
     "OptionEnded": "\u0417\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u043e",
-    "HeaderAirDays": "\u0414\u043d\u0438 \u044d\u0444\u0438\u0440\u0430:",
+    "HeaderAirDays": "\u0414\u043d\u0438 \u044d\u0444\u0438\u0440\u0430",
     "OptionSunday": "\u0432\u043e\u0441\u043a\u0440\u0435\u0441\u0435\u043d\u044c\u0435",
     "OptionMonday": "\u043f\u043e\u043d\u0435\u0434\u0435\u043b\u044c\u043d\u0438\u043a",
     "OptionTuesday": "\u0432\u0442\u043e\u0440\u043d\u0438\u043a",
@@ -198,8 +198,8 @@
     "OptionThursday": "\u0447\u0435\u0442\u0432\u0435\u0440\u0433",
     "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:",
+    "HeaderManagement": "\u041c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0435",
+    "LabelManagement": "\u041c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0435",
     "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",
@@ -210,12 +210,12 @@
     "TabAbout": "\u041e \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0435",
     "TabSupporterKey": "\u041a\u043b\u044e\u0447 \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u0430",
     "TabBecomeSupporter": "\u0421\u0442\u0430\u0442\u044c \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u043e\u043c",
-    "MediaBrowserHasCommunity": "Media Browser \u0438\u043c\u0435\u0435\u0442 \u0440\u0430\u0437\u0432\u0438\u0432\u0430\u044e\u0449\u0435\u0435\u0441\u044f \u0441\u043e\u043e\u0431\u0449\u0435\u0441\u0442\u0432\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 \u0438 \u0443\u0447\u0430\u0441\u0442\u043d\u0438\u043a\u043e\u0432 \u043f\u0440\u043e\u0435\u043a\u0442\u0430.",
-    "CheckoutKnowledgeBase": "\u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 \u0411\u0430\u0437\u043e\u0439 \u0437\u043d\u0430\u043d\u0438\u0439 \u0434\u043b\u044f \u043f\u043e\u043c\u043e\u0449\u0438 \u043f\u043e \u0434\u043e\u0441\u0442\u0438\u0436\u0435\u043d\u0438\u044e \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u043e\u0439 \u043e\u0442\u0434\u0430\u0447\u0438 \u043e\u0442 Media Browser.",
+    "MediaBrowserHasCommunity": "\u0423 Media Browser - \u0440\u0430\u0441\u0442\u0443\u0449\u0435\u0435 \u0441\u043e\u043e\u0431\u0449\u0435\u0441\u0442\u0432\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 \u0438 \u0443\u0447\u0430\u0441\u0442\u043d\u0438\u043a\u043e\u0432.",
+    "CheckoutKnowledgeBase": "\u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 \u0411\u0430\u0437\u043e\u0439 \u0437\u043d\u0430\u043d\u0438\u0439 \u0434\u043b\u044f \u0441\u043f\u0440\u0430\u0432\u043a\u0438 \u043f\u043e \u0434\u043e\u0441\u0442\u0438\u0436\u0435\u043d\u0438\u044e \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u043e\u0439 \u043e\u0442\u0434\u0430\u0447\u0438 \u043e\u0442 Media Browser.",
     "SearchKnowledgeBase": "\u0418\u0441\u043a\u0430\u0442\u044c \u0432 \u0411\u0430\u0437\u0435 \u0437\u043d\u0430\u043d\u0438\u0439",
     "VisitTheCommunity": "\u041f\u043e\u0441\u0435\u0442\u0438\u0442\u044c \u0421\u043e\u043e\u0431\u0449\u0435\u0441\u0442\u0432\u043e",
     "VisitMediaBrowserWebsite": "\u041f\u043e\u0441\u0435\u0442\u0438\u0442\u044c \u0441\u0430\u0439\u0442 Media Browser",
-    "VisitMediaBrowserWebsiteLong": "\u041f\u043e\u0441\u0435\u0449\u0430\u0439\u0442\u0435 \u0441\u0430\u0439\u0442 Media Browser, \u0447\u0442\u043e\u0431\u044b \u043f\u043e\u0441\u043f\u0435\u0432\u0430\u0442\u044c \u0437\u0430 \u043d\u043e\u0432\u043e\u0441\u0442\u044f\u043c\u0438 \u0438 \u0447\u0438\u0442\u0430\u0442\u044c \u0431\u043b\u043e\u0433 \u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u043e\u0432.",
+    "VisitMediaBrowserWebsiteLong": "\u041f\u043e\u0441\u0435\u0442\u0438\u0442\u0435 \u0441\u0430\u0439\u0442 Media Browser, \u0447\u0442\u043e\u0431\u044b \u0441\u043b\u0435\u0434\u0438\u0442\u044c \u0437\u0430 \u043d\u043e\u0432\u043e\u0441\u0442\u044f\u043c\u0438 \u0438 \u0447\u0438\u0442\u0430\u0442\u044c \u0431\u043b\u043e\u0433\u0438 \u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u043e\u0432.",
     "OptionHideUser": "\u0421\u043a\u0440\u044b\u0442\u044c \u044d\u0442\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0441 \u044d\u043a\u0440\u0430\u043d\u043e\u0432 \u0432\u0445\u043e\u0434\u0430",
     "OptionDisableUser": "\u0417\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u044d\u0442\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f",
     "OptionDisableUserHelp": "\u041f\u0440\u0438 \u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0438, \u0441\u0435\u0440\u0432\u0435\u0440 \u043d\u0435 \u0440\u0430\u0437\u0440\u0435\u0448\u0438\u0442 \u043d\u0438\u043a\u0430\u043a\u0438\u0445 \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0439 \u043e\u0442 \u044d\u0442\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f. \u0421\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0435 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f \u0431\u0443\u0434\u0443\u0442 \u0440\u0435\u0437\u043a\u043e \u043e\u0431\u043e\u0440\u0432\u0430\u043d\u044b.",
@@ -238,13 +238,13 @@
     "ButtonAddToCollection": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043a \u043a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u0438",
     "PismoMessage": "Pismo File Mount \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u043f\u043e \u043f\u043e\u0434\u0430\u0440\u0435\u043d\u043d\u043e\u0439 \u043b\u0438\u0446\u0435\u043d\u0437\u0438\u0438.",
     "TangibleSoftwareMessage": "Tangible Solutions Java\/C# \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u043f\u043e \u043f\u043e\u0434\u0430\u0440\u0435\u043d\u043d\u043e\u0439 \u043b\u0438\u0446\u0435\u043d\u0437\u0438\u0438.",
-    "HeaderCredits": "\u0412\u043d\u0451\u0441\u0448\u0438\u0435 \u0432\u043a\u043b\u0430\u0434",
+    "HeaderCredits": "\u0423\u0447\u0430\u0441\u0442\u043d\u0438\u043a\u0438",
     "PleaseSupportOtherProduces": "\u041f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0442\u0435 \u0442\u0430\u043a\u0436\u0435 \u0434\u0440\u0443\u0433\u043e\u0435 \u043e\u0442\u043a\u0440\u044b\u0442\u043e\u0435 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u043d\u043e\u0435 \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0435\u043d\u0438\u0435, \u043a\u043e\u0442\u043e\u0440\u043e\u0435 \u043c\u044b \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u043c:",
     "VersionNumber": "\u0412\u0435\u0440\u0441\u0438\u044f {0}",
     "TabPaths": "\u041f\u0443\u0442\u0438",
     "TabServer": "\u0421\u0435\u0440\u0432\u0435\u0440",
     "TabTranscoding": "\u041f\u0435\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u043e\u0432\u043a\u0430",
-    "TitleAdvanced": "\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u044b\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b",
+    "TitleAdvanced": "\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e",
     "LabelAutomaticUpdateLevel": "\u0421\u0442\u0435\u043f\u0435\u043d\u044c \u0430\u0432\u0442\u043e\u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f",
     "OptionRelease": "\u041e\u0444\u0438\u0446\u0438\u0430\u043b\u044c\u043d\u044b\u0439 \u0432\u044b\u043f\u0443\u0441\u043a",
     "OptionBeta": "\u0411\u0435\u0442\u0430-\u0432\u0435\u0440\u0441\u0438\u044f",
@@ -255,15 +255,15 @@
     "LabelRunServerAtStartup": "\u0417\u0430\u043f\u0443\u0441\u043a\u0430\u0442\u044c \u0441\u0435\u0440\u0432\u0435\u0440 \u043f\u0440\u0438 \u0441\u0442\u0430\u0440\u0442\u0435 \u0441\u0438\u0441\u0442\u0435\u043c\u044b",
     "LabelRunServerAtStartupHelp": "\u0417\u043d\u0430\u0447\u043e\u043a \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u043e\u043c \u043b\u043e\u0442\u043a\u0435 \u0437\u0430\u043f\u0443\u0441\u043a\u0430\u0435\u0442\u0441\u044f \u0432\u043e \u0432\u0440\u0435\u043c\u044f \u0441\u0442\u0430\u0440\u0442\u0430 Windows. \u0427\u0442\u043e\u0431\u044b \u0437\u0430\u043f\u0443\u0441\u043a\u0430\u0442\u044c \u0441\u043b\u0443\u0436\u0431\u0443 Windows, \u0443\u0431\u0435\u0440\u0438\u0442\u0435 \u0433\u0430\u043b\u043e\u0447\u043a\u0443 \u0438 \u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u0435 \u0441\u043b\u0443\u0436\u0431\u0443 \u0438\u0437 \u043a\u043e\u043d\u0441\u043e\u043b\u0438 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f Windows. \u041f\u0440\u0438\u043c\u0438\u0442\u0435 \u043a \u0441\u0432\u0435\u0434\u0435\u043d\u0438\u044e, \u0447\u0442\u043e \u043e\u043d\u0438 \u043e\u0431\u0430 \u043d\u0435 \u043c\u043e\u0433\u0443\u0442 \u0440\u0430\u0431\u043e\u0442\u0430\u0442\u044c \u043e\u0434\u043d\u043e\u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e, \u043f\u043e\u044d\u0442\u043e\u043c\u0443 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u0437\u0430\u043a\u0440\u044b\u0432\u0430\u0442\u044c \u0437\u043d\u0430\u0447\u043e\u043a \u0432 \u043b\u043e\u0442\u043a\u0435 \u0434\u043e \u0437\u0430\u043f\u0443\u0441\u043a\u0430 \u0441\u043b\u0443\u0436\u0431\u044b.",
     "ButtonSelectDirectory": "\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u043a\u0430\u0442\u0430\u043b\u043e\u0433",
-    "LabelCustomPaths": "\u041d\u0430\u0437\u043d\u0430\u0447\u044c\u0442\u0435 \u043f\u0443\u0442\u0438 \u0442\u0443\u0434\u0430, \u043a\u0443\u0434\u0430 \u0436\u0435\u043b\u0430\u0442\u0435\u043b\u044c\u043d\u043e. \u041e\u0441\u0442\u0430\u0432\u043b\u044f\u0439\u0442\u0435 \u043f\u043e\u043b\u044f \u043f\u0443\u0441\u0442\u044b\u043c\u0438 \u0434\u043b\u044f \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439 \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e.",
+    "LabelCustomPaths": "\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u043f\u0440\u043e\u0438\u0437\u0432\u043e\u043b\u044c\u043d\u044b\u0435 \u043f\u0443\u0442\u0438 \u043f\u043e \u0436\u0435\u043b\u0430\u0442\u0435\u043b\u044c\u043d\u044b\u043c \u043d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f\u043c. \u041e\u0441\u0442\u0430\u0432\u043b\u044f\u0439\u0442\u0435 \u043f\u043e\u043b\u044f \u043f\u0443\u0441\u0442\u044b\u043c\u0438 \u0434\u043b\u044f \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439 \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e.",
     "LabelCachePath": "\u041f\u0443\u0442\u044c \u043a \u043f\u0430\u043f\u043a\u0435 Cache:",
-    "LabelCachePathHelp": "\u0412 \u0434\u0430\u043d\u043d\u043e\u0439 \u043f\u0430\u043f\u043a\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0442\u0441\u044f \u0444\u0430\u0439\u043b\u044b \u0441\u0435\u0440\u0432\u0435\u0440\u043d\u043e\u0433\u043e \u043a\u044d\u0448\u0430, \u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, \u0440\u0438\u0441\u0443\u043d\u043a\u0438.",
+    "LabelCachePathHelp": "\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u043f\u0440\u043e\u0438\u0437\u0432\u043e\u043b\u044c\u043d\u043e\u0435 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0434\u043b\u044f \u0444\u0430\u0439\u043b\u043e\u0432 \u0441\u0435\u0440\u0432\u0435\u0440\u043d\u043e\u0433\u043e \u043a\u044d\u0448\u0430, \u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, \u0440\u0438\u0441\u0443\u043d\u043a\u043e\u0432.",
     "LabelImagesByNamePath": "\u041f\u0443\u0442\u044c \u043a \u043f\u0430\u043f\u043a\u0435 Images by name:",
-    "LabelImagesByNamePathHelp": "\u0412 \u0434\u0430\u043d\u043d\u043e\u0439 \u043f\u0430\u043f\u043a\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0442\u0441\u044f \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043d\u043d\u044b\u0435 \u0440\u0438\u0441\u0443\u043d\u043a\u0438 \u0430\u043a\u0442\u0451\u0440\u043e\u0432, \u0438\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u0435\u0439 \u0436\u0430\u043d\u0440\u043e\u0432 \u0438 \u0441\u0442\u0443\u0434\u0438\u0439.",
+    "LabelImagesByNamePathHelp": "\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u043f\u0440\u043e\u0438\u0437\u0432\u043e\u043b\u044c\u043d\u043e\u0435 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0434\u043b\u044f \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0435\u043c\u044b\u0445 \u0440\u0438\u0441\u0443\u043d\u043a\u043e\u0432 \u0430\u043a\u0442\u0451\u0440\u043e\u0432, \u0438\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u0435\u0439, \u0436\u0430\u043d\u0440\u043e\u0432 \u0438 \u0441\u0442\u0443\u0434\u0438\u0439.",
     "LabelMetadataPath": "\u041f\u0443\u0442\u044c \u043a \u043f\u0430\u043f\u043a\u0435 Metadata:",
-    "LabelMetadataPathHelp": "\u0412 \u0434\u0430\u043d\u043d\u043e\u043c \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0438 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0442\u0441\u044f \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043d\u043d\u044b\u0435 \u0438\u043b\u043b\u044e\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u0438 \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0435, \u043d\u0435 \u043f\u0440\u0435\u0434\u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u044b\u0435 \u0434\u043b\u044f \u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f \u0432 \u043c\u0435\u0434\u0438\u0430\u043f\u0430\u043f\u043a\u0430\u0445.",
+    "LabelMetadataPathHelp": "\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u043f\u0440\u043e\u0438\u0437\u0432\u043e\u043b\u044c\u043d\u043e\u0435 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0434\u043b\u044f \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0435\u043c\u044b\u0445 \u0438\u043b\u043b\u044e\u0441\u0442\u0440\u0430\u0446\u0438\u0439 \u0438 \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445, \u0435\u0441\u043b\u0438 \u043e\u043d\u0438 \u043d\u0435 \u0445\u0440\u0430\u043d\u044f\u0442\u0441\u044f \u0432 \u043c\u0435\u0434\u0438\u0430\u043f\u0430\u043f\u043a\u0430\u0445.",
     "LabelTranscodingTempPath": "\u041f\u0443\u0442\u044c \u043a \u043f\u0430\u043f\u043a\u0435 Transcoding temporary:",
-    "LabelTranscodingTempPathHelp": "\u0412 \u0434\u0430\u043d\u043d\u043e\u0439 \u043f\u0430\u043f\u043a\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0442\u0441\u044f \u0440\u0430\u0431\u043e\u0447\u0438\u0435 \u0444\u0430\u0439\u043b\u044b, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u043c\u044b\u0435 \u043f\u0440\u0438 \u043f\u0435\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u043e\u0432\u043a\u0435. \u041d\u0430\u0437\u043d\u0430\u0447\u044c\u0442\u0435 \u043f\u0443\u0442\u044c, \u0438\u043b\u0438 \u043e\u0441\u0442\u0430\u0432\u044c\u0442\u0435 \u043f\u0443\u0441\u0442\u044b\u043c, \u0447\u0442\u043e\u0431\u044b \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e \u0432 \u043f\u0430\u043f\u043a \u0434\u0430\u043d\u043d\u044b\u0445 \u0441\u0435\u0440\u0432\u0435\u0440\u0430.",
+    "LabelTranscodingTempPathHelp": "\u0412 \u0434\u0430\u043d\u043d\u043e\u0439 \u043f\u0430\u043f\u043a\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0442\u0441\u044f \u0440\u0430\u0431\u043e\u0447\u0438\u0435 \u0444\u0430\u0439\u043b\u044b, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u043c\u044b\u0435 \u043f\u0440\u0438 \u043f\u0435\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u043e\u0432\u043a\u0435. \u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u043f\u0440\u043e\u0438\u0437\u0432\u043e\u043b\u044c\u043d\u044b\u0439 \u043f\u0443\u0442\u044c, \u0438\u043b\u0438 \u043e\u0441\u0442\u0430\u0432\u044c\u0442\u0435 \u043f\u0443\u0441\u0442\u044b\u043c, \u0447\u0442\u043e\u0431\u044b \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e \u0432 \u043f\u0430\u043f\u043a\u0435 \u0434\u0430\u043d\u043d\u044b\u0445 \u0441\u0435\u0440\u0432\u0435\u0440\u0430.",
     "TabBasics": "\u041e\u0441\u043d\u043e\u0432\u043d\u044b\u0435",
     "TabTV": "\u0422\u0412",
     "TabGames": "\u0418\u0433\u0440\u044b",
@@ -277,9 +277,9 @@
     "LabelAutomaticUpdatesFanart": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0430\u0432\u0442\u043e\u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f \u0441 FanArt.tv",
     "LabelAutomaticUpdatesTmdb": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0430\u0432\u0442\u043e\u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f \u0441 TheMovieDB.org",
     "LabelAutomaticUpdatesTvdb": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0430\u0432\u0442\u043e\u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f \u0441 TheTVDB.com",
-    "LabelAutomaticUpdatesFanartHelp": "\u041f\u0440\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438, \u043d\u043e\u0432\u044b\u0435 \u0440\u0438\u0441\u0443\u043d\u043a\u0438 \u0431\u0443\u0434\u0443\u0442 \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044c\u0441\u044f \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438, \u0441\u0440\u0430\u0437\u0443 \u043f\u043e\u0441\u043b\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043d\u0430 fanart.tv. \u0421\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0435 \u0440\u0438\u0441\u0443\u043d\u043a\u0438 \u043d\u0435 \u0431\u0443\u0434\u0443\u0442 \u0437\u0430\u043c\u0435\u0449\u0430\u0442\u044c\u0441\u044f.",
-    "LabelAutomaticUpdatesTmdbHelp": "\u041f\u0440\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438, \u043d\u043e\u0432\u044b\u0435 \u0440\u0438\u0441\u0443\u043d\u043a\u0438 \u0431\u0443\u0434\u0443\u0442 \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044c\u0441\u044f \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438, \u0441\u0440\u0430\u0437\u0443 \u043f\u043e\u0441\u043b\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043d\u0430 TheMovieDB.org. \u0421\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0435 \u0440\u0438\u0441\u0443\u043d\u043a\u0438 \u043d\u0435 \u0431\u0443\u0434\u0443\u0442 \u0437\u0430\u043c\u0435\u0449\u0430\u0442\u044c\u0441\u044f.",
-    "LabelAutomaticUpdatesTvdbHelp": "\u041f\u0440\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438, \u043d\u043e\u0432\u044b\u0435 \u0440\u0438\u0441\u0443\u043d\u043a\u0438 \u0431\u0443\u0434\u0443\u0442 \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044c\u0441\u044f \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438, \u0441\u0440\u0430\u0437\u0443 \u043f\u043e\u0441\u043b\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043d\u0430 TheTVDB.com. \u0421\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0435 \u0440\u0438\u0441\u0443\u043d\u043a\u0438 \u043d\u0435 \u0431\u0443\u0434\u0443\u0442 \u0437\u0430\u043c\u0435\u0449\u0430\u0442\u044c\u0441\u044f.",
+    "LabelAutomaticUpdatesFanartHelp": "\u041f\u0440\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438, \u043d\u043e\u0432\u044b\u0435 \u0440\u0438\u0441\u0443\u043d\u043a\u0438 \u0431\u0443\u0434\u0443\u0442 \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043d\u044b \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438, \u0441\u0440\u0430\u0437\u0443 \u043f\u043e\u0441\u043b\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043d\u0430 fanart.tv. \u0421\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0435 \u0440\u0438\u0441\u0443\u043d\u043a\u0438 \u043d\u0435 \u0431\u0443\u0434\u0443\u0442 \u0437\u0430\u043c\u0435\u0449\u0430\u0442\u044c\u0441\u044f.",
+    "LabelAutomaticUpdatesTmdbHelp": "\u041f\u0440\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438, \u043d\u043e\u0432\u044b\u0435 \u0440\u0438\u0441\u0443\u043d\u043a\u0438 \u0431\u0443\u0434\u0443\u0442 \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043d\u044b \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438, \u0441\u0440\u0430\u0437\u0443 \u043f\u043e\u0441\u043b\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043d\u0430 TheMovieDB.org. \u0421\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0435 \u0440\u0438\u0441\u0443\u043d\u043a\u0438 \u043d\u0435 \u0431\u0443\u0434\u0443\u0442 \u0437\u0430\u043c\u0435\u0449\u0430\u0442\u044c\u0441\u044f.",
+    "LabelAutomaticUpdatesTvdbHelp": "\u041f\u0440\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438, \u043d\u043e\u0432\u044b\u0435 \u0440\u0438\u0441\u0443\u043d\u043a\u0438 \u0431\u0443\u0434\u0443\u0442 \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043d\u044b \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438, \u0441\u0440\u0430\u0437\u0443 \u043f\u043e\u0441\u043b\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043d\u0430 TheTVDB.com. \u0421\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0435 \u0440\u0438\u0441\u0443\u043d\u043a\u0438 \u043d\u0435 \u0431\u0443\u0434\u0443\u0442 \u0437\u0430\u043c\u0435\u0449\u0430\u0442\u044c\u0441\u044f.",
     "ExtractChapterImagesHelp": "\u0418\u0437\u0432\u043b\u0435\u0447\u0435\u043d\u0438\u0435 \u0440\u0438\u0441\u0443\u043d\u043a\u043e\u0432 \u0441\u0446\u0435\u043d \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442 \u043a\u043b\u0438\u0435\u043d\u0442\u0430\u043c \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f \u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u0438\u0445 \u043c\u0435\u043d\u044e \u0432\u044b\u0431\u043e\u0440\u0430 \u0441\u0446\u0435\u043d\u044b. \u0414\u0430\u043d\u043d\u044b\u0439 \u043f\u0440\u043e\u0446\u0435\u0441\u0441 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043c\u0435\u0434\u043b\u0435\u043d\u043d\u044b\u043c, \u043d\u0430\u0433\u0440\u0443\u0436\u0430\u0435\u0442 \u043f\u0440\u043e\u0446\u0435\u0441\u0441\u043e\u0440 \u0438 \u043c\u043e\u0436\u0435\u0442 \u043f\u043e\u0442\u0440\u0435\u0431\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u0433\u0438\u0433\u0430\u0431\u0430\u0439\u0442 \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u0430. \u041e\u043d \u0437\u0430\u043f\u0443\u0441\u043a\u0430\u0435\u0442\u0441\u044f, \u043a\u043e\u0433\u0434\u0430 \u043e\u0431\u043d\u0430\u0440\u0443\u0436\u0438\u0432\u0430\u044e\u0442\u0441\u044f \u0432\u0438\u0434\u0435\u043e\u0444\u0430\u0439\u043b\u044b, \u0430 \u0442\u0430\u043a\u0436\u0435 \u043a\u0430\u043a \u0437\u0430\u0434\u0430\u043d\u0438\u0435 \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u043e\u0435 \u043d\u0430 4:00 \u0443\u0442\u0440\u0430, \u0420\u0430\u0441\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u0435\u0440\u0435\u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u0432 \u043e\u0431\u043b\u0430\u0441\u0442\u0438 \u041f\u043b\u0430\u043d\u0438\u0440\u043e\u0432\u0449\u0438\u043a\u0430. \u041d\u0435 \u0440\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u0443\u0435\u0442\u0441\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0442\u044c \u0434\u0430\u043d\u043d\u043e\u0435 \u0437\u0430\u0434\u0430\u043d\u0438\u0435 \u0432 \u0447\u0430\u0441\u044b \u043f\u0438\u043a.",
     "LabelMetadataDownloadLanguage": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044f\u0437\u044b\u043a\u0430 \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445:",
     "ButtonAutoScroll": "\u0410\u0432\u0442\u043e\u043f\u0440\u043e\u043a\u0440\u0443\u0442\u043a\u0430",
@@ -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": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043f\u043e \u0442\u0438\u043f\u0443 \u043d\u043e\u0441\u0438\u0442\u0435\u043b\u044f:",
+    "LabelCustomizeOptionsPerMediaType": "\u041f\u043e\u0434\u0433\u043e\u043d\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",
@@ -411,7 +411,7 @@
     "OptionSpecialEpisode": "\u0421\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u044b\u0435",
     "OptionMissingEpisode": "\u041f\u0440\u043e\u043f\u0443\u0449\u0435\u043d. \u044d\u043f\u0438\u0437\u043e\u0434\u044b",
     "OptionUnairedEpisode": "\u041e\u0436\u0438\u0434\u0430\u0435\u043c\u044b\u0435 \u044d\u043f\u0438\u0437\u043e\u0434\u044b",
-    "OptionEpisodeSortName": "\u0418\u043c\u044f \u0441\u043e\u0440\u0442-\u043a\u0438 \u044d\u043f\u0438\u0437\u043e\u0434\u0430",
+    "OptionEpisodeSortName": "\u0421\u043e\u0440\u0442\u0438\u0440\u0443\u0435\u043c\u043e\u0435 \u043d\u0430\u0437\u0432-\u0438\u0435 \u044d\u043f\u0438\u0437\u043e\u0434\u0430",
     "OptionSeriesSortName": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u0441\u0435\u0440\u0438\u0430\u043b\u0430",
     "OptionTvdbRating": "\u041e\u0446\u0435\u043d\u043a\u0430 TVDb",
     "HeaderTranscodingQualityPreference": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u0430 \u043f\u0435\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u043e\u0432\u043a\u0438:",
@@ -428,16 +428,16 @@
     "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 \u0434\u0430\u043d\u043d\u0443\u044e \u043a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u044e.",
     "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 DLNA-\u0440\u0435\u0436\u0438\u043c \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043d\u0430 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430\u0445",
+    "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 \u0441\u0435\u0442\u0438 \u0438 \u0443\u0434\u0430\u043b\u0451\u043d\u043d\u043e \u0443\u043f\u0440\u0430\u0432\u043b\u044f\u0442\u044c \u0438\u043c\u0438.",
     "LabelEnableDlnaDebugLogging": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u043e\u0442\u043b\u0430\u0434\u043e\u0447\u043d\u044b\u0435 \u0437\u0430\u043f\u0438\u0441\u0438 DLNA \u0432 \u0416\u0443\u0440\u043d\u0430\u043b\u0435",
     "LabelEnableDlnaDebugLoggingHelp": "\u041f\u0440\u0438 \u044d\u0442\u043e\u043c \u0431\u0443\u0434\u0443\u0442 \u0441\u043e\u0437\u0434\u0430\u0432\u0430\u0442\u044c\u0441\u044f \u0444\u0430\u0439\u043b\u044b \u0416\u0443\u0440\u043d\u0430\u043b\u0430 \u043e\u0447\u0435\u043d\u044c \u0431\u043e\u043b\u044c\u0448\u043e\u0433\u043e \u043e\u0431\u044a\u0451\u043c\u0430, \u0430 \u044d\u0442\u043e \u0434\u043e\u043b\u0436\u043d\u043e \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e \u0432 \u0441\u0438\u043b\u0443 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e\u0441\u0442\u0438 \u0434\u043b\u044f \u0443\u0441\u0442\u0440\u0430\u043d\u0435\u043d\u0438\u044f \u043d\u0435\u043f\u043e\u043b\u0430\u0434\u043e\u043a.",
     "LabelEnableDlnaClientDiscoveryInterval": "\u0418\u043d\u0442\u0435\u0440\u0432\u0430\u043b \u043e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u0438\u044f \u043a\u043b\u0438\u0435\u043d\u0442\u043e\u0432, \u0441",
     "LabelEnableDlnaClientDiscoveryIntervalHelp": "\u041e\u043f\u0440\u0435\u0434\u0435\u043b\u044f\u0435\u0442 \u0434\u043b\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c \u0432 \u0441\u0435\u043a\u0443\u043d\u0434\u0430\u0445 \u043c\u0435\u0436\u0434\u0443 \u043f\u043e\u0438\u0441\u043a\u043e\u0432\u044b\u043c\u0438 \u0437\u0430\u043f\u0440\u043e\u0441\u0430\u043c\u0438 SSDP \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u043c\u044b\u043c\u0438 Media Browser.",
-    "HeaderCustomDlnaProfiles": "\u041d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u044b\u0435 \u043f\u0440\u043e\u0444\u0438\u043b\u0438",
+    "HeaderCustomDlnaProfiles": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u043f\u0440\u043e\u0444\u0438\u043b\u0438",
     "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.",
+    "CustomDlnaProfilesHelp": "\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\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 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u043e\u043c \u043f\u0440\u043e\u0444\u0438\u043b\u0435.",
     "TitleDashboard": "\u0418\u043d\u0444\u043e\u043f\u0430\u043d\u0435\u043b\u044c",
     "TabHome": "\u0413\u043b\u0430\u0432\u043d\u0430\u044f",
     "TabInfo": "\u0421\u0432\u0435\u0434\u0435\u043d\u0438\u044f",
@@ -553,7 +553,7 @@
     "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.",
     "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\u0434\u0435\u043d\u0438\u0435 \u043d\u0430 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0435",
+    "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",
     "LabelEnableDlnaServerHelp": "\u041f\u043e\u0437\u0432\u043e\u043b\u044f\u0435\u0442 UPnP-\u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430\u043c \u0432 \u0441\u0435\u0442\u0438 \u043e\u0431\u0437\u043e\u0440 \u0438 \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u044f Media Browser.",
     "LabelEnableBlastAliveMessages": "\u0423\u0447\u0430\u0449\u0430\u0442\u044c \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0438 \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0441\u0442\u0438",
@@ -562,7 +562,7 @@
     "LabelBlastMessageIntervalHelp": "\u041e\u043f\u0440\u0435\u0434\u0435\u043b\u044f\u0435\u0442 \u0434\u043b\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c \u0432 \u0441\u0435\u043a\u0443\u043d\u0434\u0430\u0445 \u043c\u0435\u0436\u0434\u0443 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f\u043c\u0438 \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0438 \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0441\u0442\u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u0430.",
     "LabelDefaultUser": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e",
     "LabelDefaultUserHelp": "\u041e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c, \u0447\u044c\u044f \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0430 \u0434\u043e\u043b\u0436\u043d\u0430 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c\u0441\u044f \u043d\u0430 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u043d\u044b\u0445 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430\u0445. \u041f\u0435\u0440\u0435\u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u0438\u0435 \u044d\u0442\u043e\u0433\u043e \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043b\u044f \u043a\u0430\u0436\u0434\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u043f\u0440\u043e\u0444\u0438\u043b\u0435\u0439.",
-    "TitleDlna": "DLNA-\u0440\u0435\u0436\u0438\u043c",
+    "TitleDlna": "DLNA \u0442\u0435\u0445\u043d\u043e\u043b\u043e\u0433\u0438\u044f",
     "TitleChannels": "\u041a\u0430\u043d\u0430\u043b\u044b",
     "HeaderServerSettings": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0441\u0435\u0440\u0432\u0435\u0440\u0430",
     "LabelWeatherDisplayLocation": "\u041f\u043e\u0433\u043e\u0434\u0430 \u0434\u043b\u044f \u043c\u0435\u0441\u0442\u043d\u043e\u0441\u0442\u0438:",
@@ -606,7 +606,7 @@
     "AdditionalNotificationServices": "\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 \u0441\u043b\u0443\u0436\u0431\u044b \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0439.",
     "OptionAllUsers": "\u0412\u0441\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438",
     "OptionAdminUsers": "\u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u044b",
-    "OptionCustomUsers": "\u041d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u044b\u0435",
+    "OptionCustomUsers": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435",
     "ButtonArrowUp": "\u0412\u0432\u0435\u0440\u0445",
     "ButtonArrowDown": "\u0412\u043d\u0438\u0437",
     "ButtonArrowLeft": "\u0412\u043b\u0435\u0432\u043e",
@@ -627,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": "Toggle fullscreen",
+    "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": "Audio tracks",
+    "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",
@@ -663,7 +663,7 @@
     "OptionProfileVideoAudio": "\u0412\u0438\u0434\u0435\u043e \u0410\u0443\u0434\u0438\u043e",
     "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, \u0447\u0442\u043e\u0431\u044b \u043d\u0430\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443 \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e.",
+    "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, \u0447\u0442\u043e\u0431\u044b \u043d\u0430\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u044c \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440 \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e.",
     "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",
     "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",
@@ -688,7 +688,7 @@
     "LabelIconMaxHeight": "\u041c\u0430\u043a\u0441. \u0432\u044b\u0441\u043e\u0442\u0430 \u0437\u043d\u0430\u0447\u043a\u0430:",
     "LabelIconMaxHeightHelp": "\u041c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u043e\u0435 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u0435 \u0437\u043d\u0430\u0447\u043a\u043e\u0432 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u043c\u044b\u0445 \u0447\u0435\u0440\u0435\u0437 upnp:icon.",
     "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\u0435\u0431\u044f \u043d\u0430 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\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.",
     "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",
@@ -705,7 +705,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 \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0438\u0432\u0430\u044e\u0442 \u043d\u0430\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.",
+    "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.",
     "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:",
@@ -738,7 +738,7 @@
     "ButtonRegister": "\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f",
     "LabelSkipIfAudioTrackPresent": "\u041e\u043f\u0443\u0441\u0442\u0438\u0442\u044c, \u0435\u0441\u043b\u0438 \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0435\u043c\u044b\u0439 \u044f\u0437\u044b\u043a \u0441\u043e\u0432\u043f\u0430\u0434\u0430\u0435\u0442 \u0441 \u044f\u0437\u044b\u043a\u043e\u043c \u0430\u0443\u0434\u0438\u043e\u0434\u043e\u0440\u043e\u0436\u043a\u0438 \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e",
     "LabelSkipIfAudioTrackPresentHelp": "\u0421\u043d\u044f\u0442\u044c \u0444\u043b\u0430\u0436\u043e\u043a, \u0447\u0442\u043e\u0431\u044b \u0434\u043b\u044f \u0432\u0441\u0435\u0433\u043e \u0432\u0438\u0434\u0435\u043e \u0438\u043c\u0435\u043b\u0438\u0441\u044c \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u044b, \u0432\u043d\u0435 \u0437\u0430\u0432\u0438\u0441\u0438\u043c\u043e\u0441\u0442\u0438 \u043e\u0442 \u044f\u0437\u044b\u043a\u0430 \u0430\u0443\u0434\u0438\u043e.",
-    "HeaderSendMessage": "\u041e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u044c \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435",
+    "HeaderSendMessage": "\u041e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f",
     "ButtonSend": "\u041e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u044c",
     "LabelMessageText": "\u0422\u0435\u043a\u0441\u0442 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f:",
     "MessageNoAvailablePlugins": "\u041d\u0435\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0445 \u043f\u043b\u0430\u0433\u0438\u043d\u043e\u0432.",
@@ -763,7 +763,7 @@
     "LabelEnableThemeSongsHelp": "\u041f\u0440\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438, \u043c\u0435\u043b\u043e\u0434\u0438\u0438 \u0442\u0435\u043c \u0431\u0443\u0434\u0443\u0442 \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u043e\u0434\u0438\u0442\u044c\u0441\u044f \u0432 \u0444\u043e\u043d\u043e\u0432\u043e\u043c \u0440\u0435\u0436\u0438\u043c\u0435 \u043f\u0440\u0438 \u043e\u0431\u0437\u043e\u0440\u0435 \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438.",
     "LabelEnableBackdropsHelp": "\u041f\u0440\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438, \u0437\u0430\u0434\u043d\u0438\u043a\u0438 \u0431\u0443\u0434\u0443\u0442 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c\u0441\u044f \u043a\u0430\u043a \u0444\u043e\u043d \u043d\u0435\u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u0441\u0442\u0440\u0430\u043d\u0438\u0446 \u043f\u0440\u0438 \u043e\u0431\u0437\u043e\u0440\u0435 \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438.",
     "HeaderHomePage": "\u0413\u043b\u0430\u0432\u043d\u0430\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430",
-    "HeaderSettingsForThisDevice": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0434\u043b\u044f \u0434\u0430\u043d\u043d\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430",
+    "HeaderSettingsForThisDevice": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0434\u0430\u043d\u043d\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430",
     "OptionAuto": "\u0410\u0432\u0442\u043e",
     "OptionYes": "\u0414\u0430",
     "OptionNo": "\u041d\u0435\u0442",
@@ -792,18 +792,18 @@
     "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": "\u0423\u0437\u043d\u0430\u0439\u0442\u0435, \u043a\u0430\u043a \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u044d\u0442\u0443 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443 \u043f\u043e \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u043c\u0443 \u0432\u043a\u0443\u0441\u0443. \u041d\u0430\u0436\u043c\u0438\u0442\u0435 \u0432\u0430\u0448\u0443 \u0430\u0432\u0430\u0442\u0430\u0440\u0443 \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": "\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.",
     "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.",
     "OptionBestAvailableStreamQuality": "\u041d\u0430\u0438\u043b\u0443\u0447\u0448\u0435\u0435 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u043e\u0435",
     "LabelEnableChannelContentDownloadingFor": "\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u044f \u043a\u0430\u043d\u0430\u043b\u0430 \u0434\u043b\u044f:",
-    "LabelEnableChannelContentDownloadingForHelp": "\u041d\u0435\u043a\u043e\u0442\u043e\u0440\u044b\u043c\u0438 \u043a\u0430\u043d\u0430\u043b\u0430\u043c\u0438 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f \u043f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u0430\u044f \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u044f \u043f\u0440\u0438 \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435. \u0412\u043a\u043b\u044e\u0447\u0430\u0439\u0442\u0435 \u043f\u0440\u0438 \u0441\u0440\u0435\u0434\u0430\u0445 \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, \u0447\u0442\u043e\u0431\u044b \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044c \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u043a\u0430\u043d\u0430\u043b\u0430 \u0432 \u043d\u0435\u0440\u0430\u0431\u043e\u0447\u0435\u0435 \u0432\u0440\u0435\u043c\u044f. \u0421\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u0431\u0443\u0434\u0435\u0442 \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043d\u043e \u043a\u0430\u043a \u0447\u0430\u0441\u0442\u044c \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u043e\u0433\u043e \u0437\u0430\u0434\u0430\u043d\u0438\u044f \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u043a\u0430\u043d\u0430\u043b\u043e\u0432.",
+    "LabelEnableChannelContentDownloadingForHelp": "\u041d\u0435\u043a\u043e\u0442\u043e\u0440\u044b\u043c\u0438 \u043a\u0430\u043d\u0430\u043b\u0430\u043c\u0438 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f \u043f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u0430\u044f \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u044f \u0434\u043e \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0430. \u0412\u043a\u043b\u044e\u0447\u0430\u0439\u0442\u0435 \u043f\u0440\u0438 \u0441\u0440\u0435\u0434\u0430\u0445 \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, \u0447\u0442\u043e\u0431\u044b \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044c \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u043a\u0430\u043d\u0430\u043b\u0430 \u0432 \u043d\u0435\u0440\u0430\u0431\u043e\u0447\u0435\u0435 \u0432\u0440\u0435\u043c\u044f. \u0421\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0435\u0442\u0441\u044f \u043a\u0430\u043a \u0447\u0430\u0441\u0442\u044c \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u043e\u0433\u043e \u0437\u0430\u0434\u0430\u043d\u0438\u044f \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u043a\u0430\u043d\u0430\u043b\u043e\u0432.",
     "LabelChannelDownloadPath": "\u041f\u0443\u0442\u044c \u0434\u043b\u044f \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0435\u043c\u043e\u0433\u043e \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u044f \u043a\u0430\u043d\u0430\u043b\u043e\u0432:",
-    "LabelChannelDownloadPathHelp": "\u041d\u0430\u0437\u043d\u0430\u0447\u044c\u0442\u0435 \u0436\u0435\u043b\u0430\u0435\u043c\u044b\u0439 \u043f\u0443\u0442\u044c \u0434\u043b\u044f \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438. \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.",
+    "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. \u041e\u043d\u043e \u043e\u0441\u0442\u0430\u043d\u0435\u0442\u0441\u044f \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u043e\u0434\u0438\u043c\u044b\u043c \u043f\u0440\u0438 \u043f\u043e\u0441\u0440\u0435\u0434\u0441\u0442\u0432\u0435 \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.",
-    "ChannelSettingsFormHelp": "\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u0435 \u043a\u0430\u043d\u0430\u043b\u044b \u0438\u0437 \u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0430 \u043f\u043b\u0430\u0433\u0438\u043d\u043e\u0432, \u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, Trailers \u0438 Vimeo.",
+    "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.",
     "LabelSelectCollection": "\u0412\u044b\u0431\u043e\u0440 \u043a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u0438:",
     "ViewTypeMovies": "\u041a\u0438\u043d\u043e",
     "ViewTypeTvShows": "\u0422\u0412",
@@ -816,7 +816,7 @@
     "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:",
     "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\u0436\u0430\u0442\u044c \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \"\u0434\u043b\u044f \u0432\u0437\u0440\u043e\u0441\u043b\u044b\u0445\"",
+    "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",
     "TitleRemoteControl": "\u0423\u0434\u0430\u043b\u0451\u043d\u043d\u043e\u0435 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435",
     "OptionLatestTvRecordings": "\u041d\u043e\u0432\u0438\u043d\u043a\u0438 \u0437\u0430\u043f\u0438\u0441\u0435\u0439",
@@ -831,7 +831,7 @@
     "LabelXbmcMetadataSaveImagePaths": "\u0421\u043e\u0445\u0440\u0430\u043d\u044f\u0442\u044c \u043f\u0443\u0442\u0438 \u0440\u0438\u0441\u0443\u043d\u043a\u043e\u0432 \u0432 NFO \u0444\u0430\u0439\u043b\u0430\u0445",
     "LabelXbmcMetadataSaveImagePathsHelp": "\u0420\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u0443\u0435\u0442\u0441\u044f, \u0435\u0441\u043b\u0438 \u0438\u043c\u0435\u043d\u0430 \u0444\u0430\u0439\u043b\u043e\u0432 \u0440\u0438\u0441\u0443\u043d\u043a\u043e\u0432 \u043d\u0435 \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u044e\u0442 \u0440\u0443\u043a\u043e\u0432\u043e\u0434\u044f\u0449\u0438\u043c \u043f\u0440\u0438\u043d\u0446\u0438\u043f\u0430\u043c XBMC.",
     "LabelXbmcMetadataEnablePathSubstitution": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u043f\u043e\u0434\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438 \u043f\u0443\u0442\u0435\u0439",
-    "LabelXbmcMetadataEnablePathSubstitutionHelp": "\u0412\u043a\u043b\u044e\u0447\u0430\u0435\u0442 \u043f\u043e\u0434\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438 \u043f\u0443\u0442\u0435\u0439 \u043a \u0440\u0438\u0441\u0443\u043d\u043a\u0430\u043c \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a \u043f\u043e\u0434\u0441\u0442\u0430\u043d\u043e\u0432\u043e\u043a \u043f\u0443\u0442\u0435\u0439 \u043d\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0435.",
+    "LabelXbmcMetadataEnablePathSubstitutionHelp": "\u0412\u043a\u043b\u044e\u0447\u0430\u0435\u0442 \u043f\u043e\u0434\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438 \u043f\u0443\u0442\u0435\u0439 \u043a \u0440\u0438\u0441\u0443\u043d\u043a\u0430\u043c \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432 \u043f\u043e\u0434\u0441\u0442\u0430\u043d\u043e\u0432\u043e\u043a \u043f\u0443\u0442\u0435\u0439 \u043d\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0435.",
     "LabelXbmcMetadataEnablePathSubstitutionHelp2": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u043f\u043e\u0434\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438 \u043f\u0443\u0442\u0435\u0439.",
     "LabelGroupChannelsIntoViews": "\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c \u043d\u0435\u043f\u043e\u0441\u0440\u0435\u0434\u0441\u0442\u0432\u0435\u043d\u043d\u043e \u0432 \u041c\u043e\u0438\u0445 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f\u0445 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u043a\u0430\u043d\u0430\u043b\u044b:",
     "LabelGroupChannelsIntoViewsHelp": "\u041f\u0440\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438, \u0434\u0430\u043d\u043d\u044b\u0435 \u043a\u0430\u043d\u0430\u043b\u044b \u0431\u0443\u0434\u0443\u0442 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c\u0441\u044f \u043d\u0435\u043f\u043e\u0441\u0440\u0435\u0434\u0441\u0442\u0432\u0435\u043d\u043d\u043e, \u043d\u0430\u0440\u044f\u0434\u0443 \u0441 \u0434\u0440\u0443\u0433\u0438\u043c\u0438 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f\u043c\u0438. \u041f\u0440\u0438 \u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438, \u043e\u043d\u0438 \u0431\u0443\u0434\u0443\u0442 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c\u0441\u044f \u0432 \u043e\u0442\u0434\u0435\u043b\u044c\u043d\u043e\u043c \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0438 \u041a\u0430\u043d\u0430\u043b\u044b.",
@@ -842,7 +842,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": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\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\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",
@@ -856,7 +856,7 @@
     "LabelImagesByName": "Images by name:",
     "LabelTranscodingTemporaryFiles": "Transcoding temporary files:",
     "HeaderLatestMusic": "\u041d\u043e\u0432\u0438\u043d\u043a\u0438 \u043c\u0443\u0437\u044b\u043a\u0438",
-    "HeaderBranding": "\u0411\u0440\u0435\u043d\u0434\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435",
+    "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.",
     "HeaderApiKey": "\u041a\u043b\u044e\u0447 API",
@@ -873,16 +873,20 @@
     "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",
+    "OptionEquals": "\u0420\u0430\u0432\u043d\u043e",
+    "OptionRegex": "\u0420\u0435\u0433. \u0432\u044b\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
     "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",
+    "TabSort": "\u0421\u043e\u0440\u0442-\u043a\u0430",
+    "TabFilter": "\u0424\u0438\u043b\u044c\u0442\u0440-\u043a\u0430",
     "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:",
+    "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:",
     "TabUsers": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438",
-    "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "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",
+    "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"
 }
\ 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 4a23b0c07..3a49024f9 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -900,5 +900,8 @@
     "TabUsers":  "Users",
     "HeaderFeatures":  "Features",
     "HeaderAdvanced":  "Advanced",
-    "ButtonSync":  "Sync"
+    "ButtonSync":  "Sync",
+    "TabScheduledTasks":  "Scheduled Tasks",
+    "HeaderChapters":  "Chapters",
+    "HeaderResumeSettings":  "Resume Settings"
 }
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/sv.json b/MediaBrowser.Server.Implementations/Localization/Server/sv.json
index e28dfe231..9988af0fa 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/sv.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/sv.json
@@ -884,5 +884,9 @@
     "LabelView": "View:",
     "TabUsers": "Users",
     "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "HeaderAdvanced": "Advanced",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "Scheduled Tasks",
+    "HeaderChapters": "Chapters",
+    "HeaderResumeSettings": "Resume Settings"
 }
\ 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 78f308b33..98f108421 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/vi.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/vi.json
@@ -884,5 +884,9 @@
     "LabelView": "View:",
     "TabUsers": "Users",
     "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "HeaderAdvanced": "Advanced",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "Scheduled Tasks",
+    "HeaderChapters": "Chapters",
+    "HeaderResumeSettings": "Resume Settings"
 }
\ 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 e67aa9f58..6511dd7d0 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
@@ -884,5 +884,9 @@
     "LabelView": "View:",
     "TabUsers": "Users",
     "HeaderFeatures": "Features",
-    "HeaderAdvanced": "Advanced"
+    "HeaderAdvanced": "Advanced",
+    "ButtonSync": "Sync",
+    "TabScheduledTasks": "Scheduled Tasks",
+    "HeaderChapters": "Chapters",
+    "HeaderResumeSettings": "Resume Settings"
 }
\ 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 38600922b..38e82db4f 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -224,6 +224,7 @@
     <Compile Include="ScheduledTasks\ChapterImagesTask.cs" />
     <Compile Include="ScheduledTasks\RefreshIntrosTask.cs" />
     <Compile Include="ScheduledTasks\RefreshMediaLibraryTask.cs" />
+    <Compile Include="Security\AuthenticationException.cs" />
     <Compile Include="Security\AuthenticationRepository.cs" />
     <Compile Include="Security\EncryptionManager.cs" />
     <Compile Include="ServerApplicationPaths.cs" />
@@ -269,6 +270,8 @@
     <Compile Include="Persistence\SqliteUserRepository.cs" />
     <Compile Include="Sorting\StudioComparer.cs" />
     <Compile Include="Sorting\VideoBitRateComparer.cs" />
+    <Compile Include="Sync\AppSyncProvider.cs" />
+    <Compile Include="Sync\CloudSyncProvider.cs" />
     <Compile Include="Sync\SyncManager.cs" />
     <Compile Include="Themes\AppThemeManager.cs" />
     <Compile Include="Udp\UdpMessageReceivedEventArgs.cs" />
diff --git a/MediaBrowser.Server.Implementations/Security/AuthenticationException.cs b/MediaBrowser.Server.Implementations/Security/AuthenticationException.cs
new file mode 100644
index 000000000..f4ba2fb63
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Security/AuthenticationException.cs
@@ -0,0 +1,16 @@
+using System;
+
+namespace MediaBrowser.Server.Implementations.Security
+{
+    public class AuthenticationException : Exception
+    {
+        public AuthenticationException(string message)
+            : base(message)
+        {
+        }
+
+        public AuthenticationException()
+        {
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 754f63cbd..168948821 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -27,6 +27,7 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Server.Implementations.Security;
 
 namespace MediaBrowser.Server.Implementations.Session
 {
@@ -232,7 +233,7 @@ namespace MediaBrowser.Server.Implementations.Session
 
             if (user != null && user.Configuration.IsDisabled)
             {
-                throw new UnauthorizedAccessException(string.Format("The {0} account is currently disabled. Please consult with your administrator.", user.Name));
+                throw new AuthenticationException(string.Format("The {0} account is currently disabled. Please consult with your administrator.", user.Name));
             }
 
             var activityDate = DateTime.UtcNow;
@@ -1111,12 +1112,7 @@ namespace MediaBrowser.Server.Implementations.Session
         {
             var session = GetSession(sessionId);
 
-            if (!session.UserId.HasValue)
-            {
-                throw new UnauthorizedAccessException("Cannot modify additional users without authenticating first.");
-            }
-
-            if (session.UserId.Value == userId)
+            if (session.UserId.HasValue && session.UserId.Value == userId)
             {
                 throw new ArgumentException("The requested user is already the primary user of the session.");
             }
@@ -1144,12 +1140,7 @@ namespace MediaBrowser.Server.Implementations.Session
         {
             var session = GetSession(sessionId);
 
-            if (!session.UserId.HasValue)
-            {
-                throw new UnauthorizedAccessException("Cannot modify additional users without authenticating first.");
-            }
-
-            if (session.UserId.Value == userId)
+            if (session.UserId.HasValue && session.UserId.Value == userId)
             {
                 throw new ArgumentException("The requested user is already the primary user of the session.");
             }
@@ -1166,7 +1157,7 @@ namespace MediaBrowser.Server.Implementations.Session
         {
             if (string.IsNullOrWhiteSpace(token))
             {
-                throw new UnauthorizedAccessException();
+                throw new AuthenticationException();
             }
 
             var result = _authRepo.Get(new AuthenticationInfoQuery
@@ -1178,12 +1169,12 @@ namespace MediaBrowser.Server.Implementations.Session
 
             if (info == null)
             {
-                throw new UnauthorizedAccessException();
+                throw new AuthenticationException();
             }
 
             if (!info.IsActive)
             {
-                throw new UnauthorizedAccessException("Access token has expired.");
+                throw new AuthenticationException("Access token has expired.");
             }
 
             if (!string.IsNullOrWhiteSpace(info.UserId))
@@ -1192,7 +1183,7 @@ namespace MediaBrowser.Server.Implementations.Session
 
                 if (user == null || user.Configuration.IsDisabled)
                 {
-                    throw new UnauthorizedAccessException("User account has been disabled.");
+                    throw new AuthenticationException("User account has been disabled.");
                 }
             }
         }
@@ -1225,7 +1216,7 @@ namespace MediaBrowser.Server.Implementations.Session
 
             if (!result)
             {
-                throw new UnauthorizedAccessException("Invalid user or password entered.");
+                throw new AuthenticationException("Invalid user or password entered.");
             }
 
             var user = _userManager.Users
diff --git a/MediaBrowser.Server.Implementations/Sync/AppSyncProvider.cs b/MediaBrowser.Server.Implementations/Sync/AppSyncProvider.cs
new file mode 100644
index 000000000..6dec2b717
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Sync/AppSyncProvider.cs
@@ -0,0 +1,26 @@
+using MediaBrowser.Controller.Sync;
+using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Sync;
+using System;
+using System.Collections.Generic;
+
+namespace MediaBrowser.Server.Implementations.Sync
+{
+    public class AppSyncProvider : ISyncProvider
+    {
+        public IEnumerable<SyncTarget> GetSyncTargets()
+        {
+            throw new NotImplementedException();
+        }
+
+        public DeviceProfile GetDeviceProfile(SyncTarget target)
+        {
+            throw new NotImplementedException();
+        }
+
+        public string Name
+        {
+            get { return "App Sync"; }
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/Sync/CloudSyncProvider.cs b/MediaBrowser.Server.Implementations/Sync/CloudSyncProvider.cs
new file mode 100644
index 000000000..ec3ac1239
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Sync/CloudSyncProvider.cs
@@ -0,0 +1,35 @@
+using MediaBrowser.Common;
+using MediaBrowser.Controller.Sync;
+using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Sync;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace MediaBrowser.Server.Implementations.Sync
+{
+    public class CloudSyncProvider : ISyncProvider
+    {
+        private ICloudSyncProvider[] _providers = new ICloudSyncProvider[] {};
+
+        public CloudSyncProvider(IApplicationHost appHost)
+        {
+            _providers = appHost.GetExports<ICloudSyncProvider>().ToArray();
+        }
+
+        public IEnumerable<SyncTarget> GetSyncTargets()
+        {
+            throw new NotImplementedException();
+        }
+
+        public DeviceProfile GetDeviceProfile(SyncTarget target)
+        {
+            throw new NotImplementedException();
+        }
+
+        public string Name
+        {
+            get { return "Cloud Sync"; }
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
index 373b30a41..508fc188d 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
@@ -3,12 +3,20 @@ using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Sync;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace MediaBrowser.Server.Implementations.Sync
 {
     public class SyncManager : ISyncManager
     {
+        private ISyncProvider[] _providers = new ISyncProvider[]{};
+
+        public void AddParts(IEnumerable<ISyncProvider> providers)
+        {
+            _providers = providers.ToArray();
+        }
+
         public Task<List<SyncJob>> CreateJob(SyncJobRequest request)
         {
             throw new NotImplementedException();
@@ -48,5 +56,10 @@ namespace MediaBrowser.Server.Implementations.Sync
         {
             throw new NotImplementedException();
         }
+
+        public IEnumerable<SyncTarget> GetSyncTargets()
+        {
+            return _providers.SelectMany(i => i.GetSyncTargets());
+        }
     }
 }
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 7c36a7c5e..2208bc217 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -188,6 +188,7 @@ namespace MediaBrowser.ServerApplication
 
         private IEncodingManager EncodingManager { get; set; }
         private IChannelManager ChannelManager { get; set; }
+        private ISyncManager SyncManager { get; set; }
 
         /// <summary>
         /// Gets or sets the user data repository.
@@ -613,7 +614,8 @@ namespace MediaBrowser.ServerApplication
                 MediaEncoder, ChapterManager);
             RegisterSingleInstance(EncodingManager);
 
-            RegisterSingleInstance<ISyncManager>(new SyncManager());
+            SyncManager = new SyncManager();
+            RegisterSingleInstance(SyncManager);
 
             var authContext = new AuthorizationContext();
             RegisterSingleInstance<IAuthorizationContext>(authContext);
@@ -823,6 +825,7 @@ namespace MediaBrowser.ServerApplication
             ChannelManager.AddParts(GetExports<IChannel>(), GetExports<IChannelFactory>());
 
             NotificationManager.AddParts(GetExports<INotificationService>(), GetExports<INotificationTypeFactory>());
+            SyncManager.AddParts(GetExports<ISyncProvider>());
         }
 
         /// <summary>
@@ -1139,15 +1142,16 @@ namespace MediaBrowser.ServerApplication
 
             var versionObject = version == null || string.IsNullOrWhiteSpace(version.versionStr) ? null : new Version(version.versionStr);
 
-            HasUpdateAvailable = versionObject != null && versionObject >= ApplicationVersion;
+            var isUpdateAvailable = versionObject != null && versionObject > ApplicationVersion;
+            HasUpdateAvailable = isUpdateAvailable;
 
-            if (versionObject != null && versionObject >= ApplicationVersion)
+            if (isUpdateAvailable)
             {
                 Logger.Info("New application version is available: {0}", versionObject);
             }
 
-            return versionObject != null ? 
-                new CheckForUpdateResult { AvailableVersion = versionObject.ToString(), IsUpdateAvailable = versionObject > ApplicationVersion, Package = version } :
+            return versionObject != null ?
+                new CheckForUpdateResult { AvailableVersion = versionObject.ToString(), IsUpdateAvailable = isUpdateAvailable, Package = version } :
                 new CheckForUpdateResult { AvailableVersion = ApplicationVersion.ToString(), IsUpdateAvailable = false };
         }
 
diff --git a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs
index 206a04460..eb73966ce 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 "20140612";
+                            return "20140721";
                         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-20140612-git-3a1c895-win32-static.7z",
-                        "https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/ffmpeg/windows/ffmpeg-20140612-git-3a1c895-win32-static.7z"
+                        "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"
                     };
 
                 case PlatformID.Unix:
diff --git a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs
index c550cb27f..a93ed9196 100644
--- a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs
+++ b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs
@@ -26,10 +26,10 @@ namespace MediaBrowser.ServerApplication.FFMpeg
         private readonly IZipClient _zipClient;
         private readonly IFileSystem _fileSystem;
 
-        private readonly string[] _fontUrls = new[]
-            {
-                "https://www.dropbox.com/s/pj847twf7riq0j7/ARIALUNI.7z?dl=1"
-            };
+        private readonly string[] _fontUrls =
+        {
+            "https://www.dropbox.com/s/pj847twf7riq0j7/ARIALUNI.7z?dl=1"
+        };
 
         public FFMpegDownloader(ILogger logger, IApplicationPaths appPaths, IHttpClient httpClient, IZipClient zipClient, IFileSystem fileSystem)
         {
@@ -251,6 +251,7 @@ namespace MediaBrowser.ServerApplication.FFMpeg
                     Task.Run(async () =>
                     {
                         await DownloadFontFile(fontsDirectory, fontFilename, new Progress<double>()).ConfigureAwait(false);
+                        
                         await WriteFontConfigFile(fontsDirectory).ConfigureAwait(false);
                     });
                 }
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 64c055ba0..92487959d 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -450,7 +450,12 @@ namespace MediaBrowser.WebDashboard.Api
             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);
-            await AppendResource(memoryStream, "thirdparty/cast_sender.js", newLineBytes).ConfigureAwait(false);
+
+            // This script produces errors in older versions of safari
+            if ((Request.UserAgent ?? string.Empty).IndexOf("chrome/", StringComparison.OrdinalIgnoreCase) != -1)
+            {
+                await AppendResource(memoryStream, "thirdparty/cast_sender.js", newLineBytes).ConfigureAwait(false);
+            }
             
             await AppendLocalization(memoryStream).ConfigureAwait(false);
             await memoryStream.WriteAsync(newLineBytes, 0, newLineBytes.Length).ConfigureAwait(false);
@@ -535,7 +540,6 @@ namespace MediaBrowser.WebDashboard.Api
                                 "addpluginpage.js",
                                 "advancedconfigurationpage.js",
                                 "metadataadvanced.js",
-                                "appsplayback.js",
                                 "autoorganizetv.js",
                                 "autoorganizelog.js",
                                 "channels.js",
@@ -591,7 +595,6 @@ namespace MediaBrowser.WebDashboard.Api
                                 "metadataconfigurationpage.js",
                                 "metadataimagespage.js",
                                 "metadatasubtitles.js",
-                                "metadatachapters.js",
                                 "metadataxbmc.js",
                                 "moviegenres.js",
                                 "moviecollections.js",
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 06a44d747..25cff11cf 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -89,9 +89,6 @@
     <EmbeddedResource Include="dashboard-ui\thirdparty\mediabrowser.apiclient.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
-    <Content Include="dashboard-ui\appsplayback.html">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\channelitems.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -323,13 +320,13 @@
     <Content Include="dashboard-ui\favorites.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\homelatest.html">
+    <Content Include="dashboard-ui\files\dummy.mp4">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\librarypathmapping.html">
+    <Content Include="dashboard-ui\homelatest.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\metadatachapters.html">
+    <Content Include="dashboard-ui\librarypathmapping.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="dashboard-ui\metadataxbmc.html">
@@ -584,9 +581,6 @@
     <Content Include="dashboard-ui\nowplaying.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\scripts\appsplayback.js">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\scripts\backdrops.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -650,9 +644,6 @@
     <Content Include="dashboard-ui\scripts\librarypathmapping.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\scripts\metadatachapters.js">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\scripts\metadataxbmc.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec
index 92f7fa355..0520e4548 100644
--- a/Nuget/MediaBrowser.Common.Internal.nuspec
+++ b/Nuget/MediaBrowser.Common.Internal.nuspec
@@ -14,7 +14,7 @@
         <dependencies>
             <dependency id="MediaBrowser.Common" version="3.0.418" />
             <dependency id="NLog" version="2.1.0" />
-            <dependency id="SimpleInjector" version="2.5.0" />
+            <dependency id="SimpleInjector" version="2.5.2" />
             <dependency id="sharpcompress" version="0.10.2" />
         </dependencies>
     </metadata>
-- 
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.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/Images/ImageByNameService.cs b/MediaBrowser.Api/Images/ImageByNameService.cs
index d40762964..99d2f144b 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 be9f00a61..e21dc4a73 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 929d0a463..e0dc07cdc 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 dfe93c5c9..2d67ec975 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 de9b7e88a..27307a0e9 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 b891bcfb2..2bdbab084 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 af0ff8319..86699272e 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 5c3f10b54..aee118f9a 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 714e71a1f..1d5ab7d3e 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 000000000..9cce69bdc
--- /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 230b5e145..fc5fd4061 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 000000000..0c62ada80
--- /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 333521bb5..29bd21407 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 ec8527738..461470b7a 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 0d7c450d6..85e18150e 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 29fd76aa5..ccb2acd1d 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 f40020c84..cd9b78201 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 3f84df462..d992e2026 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 8c4f6247c..c126af884 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 5d7762823..f69c261d8 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 681706321..83ef6e424 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 6ba1912a5..fb3a01bf2 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 a892f8bf1..c397cdcd5 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 ab2a99109..1b74fcf51 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 6cdd2b8f5..fd38ff723 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 74dd79497..f69fccae5 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 000000000..797318b2a
--- /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 000000000..141546eb5
--- /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 f41544db9..74b35186e 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 cd833068e..7728aad9b 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 2a216fe04..ef4d8d7bf 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 297cbd145..000000000
--- 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 b704a358c..000000000
--- 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 cf7904e5c..e17a96a43 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 1b2e9fa6d..d7110c1ec 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 9e9936cab..33b69d71a 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 c0313561a..a2e1ba05a 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 c12f74fa6..78d1fac47 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 65fe32a99..32d53db43 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 08499a20b..34656f05b 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 d44811886..594ba9d23 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 d0ea07056..6e0b654fd 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 7f766129e..12106c32e 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 cf756d9f2..b18d0df5e 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 8229c8a2f..7b58dd7c4 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 64e0a6662..8310895e6 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 64d2db2e4..2ee3d49a4 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 4fa97fc9d..19a284d15 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 594277ef7..166465f72 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 10ee3586d..b483f7c42 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 f3e6fcdba..215cff22f 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 a756dc794..519d775de 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 dbe020908..43c9f3b9c 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 53047104c..d9855c52f 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 6bcb5aed5..5086dcfac 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 191a89000..37cff9888 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 51559053d..622ad2c05 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 2fa7f2ea7..80bdc43f7 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 05de4d65a..1f993f0d4 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 81922f713..667245839 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 a56ccf4de..bcca3aeb9 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 729768b78..71ca6fc49 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 c2fafba45..7a5bd7632 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 5ffff96dd..ea1b4a1bc 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 fe7451fed..2edf37326 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 5044e6d95..7ff88733a 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 dc4ac80cb..930401e5c 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 9c43a9c9e..94c6c9ec4 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 98a36f8dd..f1a323e6d 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 f5f3d9387..275cd20c3 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 43135ec81..51a27549e 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 e76d47a04..dba80e2b4 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 9a1847ea4..a3120ffe4 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 f474225fd..c558cbe8d 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 232e94a72..134ff44d8 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 c10e19102..165bf3f66 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 c1a871095..5862688a6 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 3032f71f0..135b640f2 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 a80d352b9..55d76aa8b 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 83e82070a..966365f7c 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 abdb98e97..c5ea589e8 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 3a49024f9..8b3a5e8c9 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 9988af0fa..c6c042640 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 98f108421..17748ecc7 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 6511dd7d0..352a031e1 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 9655771c6..ef6730b75 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 50f1030f3..a8d723ce3 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 000000000..bb22e992b
--- /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 907500ae3..18739ddb3 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 55843bbdb..5c086c8cc 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 a93ed9196..2642ffde7 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 768e4ee5c..af24609e8 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 92487959d..9235beacf 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 25cff11cf..73174dacf 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 a45a44904..6071db6b5 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 d51c44ad4..c4edfb461 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 b23473295..210c743bf 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.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 5cae4c3f7..df85ca3cb 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 fc1c627e9..ccaa918ec 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 28c0219fc..1dffa5411 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 bedacc0d2..cdaa99130 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 38b6b4ad6..78f60632f 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 f6ac0ab68..84e578579 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 744eab96e..252e2aee5 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 e1383923f..fa2b49a60 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 619a497f5..be426d99e 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 86699272e..6ef1fb6f7 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 cc5cb1b1a..78db68f63 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 f594b4471..f5731b893 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 b4f918e68..1553435ae 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 739793c03..649ba2c8f 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 1de803c8f..394c8e137 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 2dd04d468..97bdef818 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 000000000..c80552351
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 000000000..532f12317
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 f1e7302aa..52b985354 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 3b13d141c..29d4a0528 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 461470b7a..962c2a211 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 85e18150e..f67094554 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 a5b816919..a52c38086 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 0696b2691..badb37cfc 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 8d7b5ea2a..549bea59e 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 4cc1eca5d..2ac840f44 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 e25224727..891353f32 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 26183da03..2acee1306 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 0c736cbff..e5e726cc6 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 39174d85a..fe1a987ab 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 016616014..9b59393b4 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 749b7a133..f3ffd438c 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 aa73bc91d..2ddb362ac 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 1b133d890..00f94455a 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 29e2a3d71..c985b041e 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 9805485a3..8b44b67a6 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 e3068f23e..843dc7819 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 98c781915..b9e7c62a3 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 fedc1db6a..b2b4c31d3 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 384a27ca5..766bfdecd 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 aec5b44cb..3c9528dc2 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 17dd473be..339b8debd 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 e23ad9213..63223fea7 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 53d43a7e4..865d343b2 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 9efce5bb3..f4f724d07 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 7002e566d..4c7c0d60c 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 944d50486..600a2f58e 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 d219ab027..af1bd9427 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 28cbd20e0..c7ca6bb30 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 04ddb4c4b..a27755d75 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 9191e0bea..3b4379e37 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 2ee3d49a4..7f533d416 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 19a284d15..2417d5dcb 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 519d775de..a17c33845 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 73afa22e3..b8cb955fc 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 56e92f82c..bed9458ec 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 4c17357ff..3a5b91abd 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 083f02665..a3f636e62 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 473d75cb5..50391496b 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 80bdc43f7..2fd2d8ae9 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 667245839..056b31c92 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 bcca3aeb9..ac4c13b01 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 71ca6fc49..f591af735 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 7a5bd7632..e32fb18f8 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 ea1b4a1bc..ef7b00c35 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 2edf37326..eb0cd1b87 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 7ff88733a..43c9bd211 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 930401e5c..a0238b020 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 94c6c9ec4..e4d008631 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 f1a323e6d..d6e96d1ed 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 275cd20c3..4626f659b 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 51a27549e..a44b45ae0 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 dba80e2b4..2101e854a 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 a3120ffe4..aabaffb51 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 c558cbe8d..19b5c8b1d 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 134ff44d8..6cfd966a4 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 165bf3f66..733c92f7b 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 5862688a6..bb014d6c1 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 135b640f2..8e07ffe22 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 55d76aa8b..dec101dfd 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 966365f7c..01e446591 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 c5ea589e8..aa6dd94f3 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 c6c042640..5e76f85c9 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 17748ecc7..4ddd7a7d1 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 352a031e1..d79d48099 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 a65184f61..3d0781e91 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 e1d77c268..2d5a30f3d 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 f78f983dc..e4626bec6 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 6f43a12c0..bd456c88b 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 5c3c3e907..e584a950c 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 eb73966ce..97a3ee190 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 2642ffde7..4f94ebd67 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 104e63447..5e6add528 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.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index df85ca3cb..1963ad10a 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 ccaa918ec..c00e0c18b 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 6ef1fb6f7..5e43eb644 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 649ba2c8f..f1377727b 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 d81e46049..9e8d8213f 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 e55d3eec9..f374ed529 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 603eecbae..5385ee036 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 575f0b863..000000000
--- 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 00f7add14..4734e2af7 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 fe32d4a80..000000000
--- 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 b6d9d9f77..5417c5b82 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 000000000..ae701ea68
--- /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 000000000..973ecf6e7
--- /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 000000000..05fdc00b1
--- /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 f57c3b95d..efd8c2a0a 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 594ba9d23..cf9571824 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 000000000..e43ab3665
--- /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 7cf38b0a0..7c5269678 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 fbb743f94..4e182ea88 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 a17c33845..d3aad582a 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 fefe6401d..57d1d79e1 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 79d15039b..5cc22ac64 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 e584a950c..7dc70627b 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 f0464dfa17d146f34849e45097085b891e51ebc8 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 1 Aug 2014 22:34:45 -0400
Subject: improve poster sizing

---
 MediaBrowser.Api/MediaBrowser.Api.csproj           |   1 +
 MediaBrowser.Api/Movies/CollectionService.cs       |   6 +-
 MediaBrowser.Api/PlaylistService.cs                |  84 +++++++++++++
 .../MediaBrowser.Controller.csproj                 |   3 +
 .../Playlists/IPlaylistManager.cs                  |  47 +++++++
 MediaBrowser.Controller/Playlists/Playlist.cs      |  20 +++
 .../Playlists/PlaylistCreationOptions.cs           |  16 +++
 .../MediaBrowser.Model.Portable.csproj             |   6 +
 .../MediaBrowser.Model.net35.csproj                |   6 +
 .../Collections/CollectionCreationResult.cs        |   8 ++
 MediaBrowser.Model/Entities/CollectionType.cs      |   1 +
 MediaBrowser.Model/MediaBrowser.Model.csproj       |   2 +
 .../Playlists/PlaylistCreationResult.cs            |   8 ++
 .../MediaBrowser.Providers.csproj                  |   1 -
 .../Music/SoundtrackPostScanTask.cs                |  32 -----
 .../Collections/CollectionManager.cs               |   2 +-
 .../Library/UserViewManager.cs                     |  15 ++-
 .../MediaBrowser.Server.Implementations.csproj     |   2 +
 .../Playlists/ManualPlaylistsFolder.cs             |  62 ++++++++++
 .../Playlists/PlaylistManager.cs                   | 137 +++++++++++++++++++++
 MediaBrowser.ServerApplication/ApplicationHost.cs  |   7 +-
 21 files changed, 422 insertions(+), 44 deletions(-)
 create mode 100644 MediaBrowser.Api/PlaylistService.cs
 create mode 100644 MediaBrowser.Controller/Playlists/IPlaylistManager.cs
 create mode 100644 MediaBrowser.Controller/Playlists/Playlist.cs
 create mode 100644 MediaBrowser.Controller/Playlists/PlaylistCreationOptions.cs
 create mode 100644 MediaBrowser.Model/Collections/CollectionCreationResult.cs
 create mode 100644 MediaBrowser.Model/Playlists/PlaylistCreationResult.cs
 delete mode 100644 MediaBrowser.Providers/Music/SoundtrackPostScanTask.cs
 create mode 100644 MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
 create mode 100644 MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index f3857ce30..f2f0ec790 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -70,6 +70,7 @@
     <Compile Include="Dlna\DlnaServerService.cs" />
     <Compile Include="Dlna\DlnaService.cs" />
     <Compile Include="Library\ChapterService.cs" />
+    <Compile Include="PlaylistService.cs" />
     <Compile Include="Subtitles\SubtitleService.cs" />
     <Compile Include="Movies\CollectionService.cs" />
     <Compile Include="Music\AlbumsService.cs" />
diff --git a/MediaBrowser.Api/Movies/CollectionService.cs b/MediaBrowser.Api/Movies/CollectionService.cs
index 19e47eb85..e3816aa51 100644
--- a/MediaBrowser.Api/Movies/CollectionService.cs
+++ b/MediaBrowser.Api/Movies/CollectionService.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Controller.Collections;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Collections;
 using MediaBrowser.Model.Querying;
 using ServiceStack;
 using System;
@@ -92,9 +93,4 @@ namespace MediaBrowser.Api.Movies
             Task.WaitAll(task);
         }
     }
-
-    public class CollectionCreationResult
-    {
-        public string Id { get; set; }
-    }
 }
diff --git a/MediaBrowser.Api/PlaylistService.cs b/MediaBrowser.Api/PlaylistService.cs
new file mode 100644
index 000000000..475183dea
--- /dev/null
+++ b/MediaBrowser.Api/PlaylistService.cs
@@ -0,0 +1,84 @@
+using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Controller.Playlists;
+using MediaBrowser.Model.Playlists;
+using MediaBrowser.Model.Querying;
+using ServiceStack;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Api
+{
+    [Route("/Playlists", "POST", Summary = "Creates a new playlist")]
+    public class CreatePlaylist : IReturn<PlaylistCreationResult>
+    {
+        [ApiMember(Name = "Name", Description = "The name of the new playlist.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
+        public string Name { get; set; }
+
+        [ApiMember(Name = "Ids", Description = "Item Ids to add to the playlist", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST", AllowMultiple = true)]
+        public string Ids { get; set; }
+    }
+
+    [Route("/Playlists/{Id}/Items", "POST", Summary = "Adds items to a playlist")]
+    public class AddToPlaylist : IReturnVoid
+    {
+        [ApiMember(Name = "Ids", Description = "Item id, comma delimited", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
+        public string Ids { get; set; }
+
+        [ApiMember(Name = "Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public string Id { get; set; }
+    }
+
+    [Route("/Playlists/{Id}/Items", "DELETE", Summary = "Removes items from a playlist")]
+    public class RemoveFromPlaylist : IReturnVoid
+    {
+        [ApiMember(Name = "Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "DELETE")]
+        public string Id { get; set; }
+    }
+
+    [Authenticated]
+    public class PlaylistService : BaseApiService
+    {
+        private readonly IPlaylistManager _playlistManager;
+        private readonly IDtoService _dtoService;
+
+        public PlaylistService(IDtoService dtoService, IPlaylistManager playlistManager)
+        {
+            _dtoService = dtoService;
+            _playlistManager = playlistManager;
+        }
+
+        public object Post(CreatePlaylist request)
+        {
+            var task = _playlistManager.CreatePlaylist(new PlaylistCreationOptions
+            {
+                Name = request.Name,
+                ItemIdList = (request.Ids ?? string.Empty).Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToList()
+            });
+
+            var item = task.Result;
+
+            var dto = _dtoService.GetBaseItemDto(item, new List<ItemFields>());
+
+            return ToOptimizedResult(new PlaylistCreationResult
+            {
+                Id = dto.Id
+            });
+        }
+
+        public void Post(AddToPlaylist request)
+        {
+            var task = _playlistManager.AddToPlaylist(request.Id, request.Ids.Split(','));
+
+            Task.WaitAll(task);
+        }
+
+        public void Delete(RemoveFromPlaylist request)
+        {
+            //var task = _playlistManager.RemoveFromPlaylist(request.Id, request.Ids.Split(',').Select(i => new Guid(i)));
+
+            //Task.WaitAll(task);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index aee118f9a..b4b7b3650 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -217,6 +217,9 @@
     <Compile Include="Notifications\UserNotification.cs" />
     <Compile Include="Persistence\IFileOrganizationRepository.cs" />
     <Compile Include="Persistence\MediaStreamQuery.cs" />
+    <Compile Include="Playlists\IPlaylistManager.cs" />
+    <Compile Include="Playlists\Playlist.cs" />
+    <Compile Include="Playlists\PlaylistCreationOptions.cs" />
     <Compile Include="Providers\DirectoryService.cs" />
     <Compile Include="Providers\ICustomMetadataProvider.cs" />
     <Compile Include="Providers\IExternalId.cs" />
diff --git a/MediaBrowser.Controller/Playlists/IPlaylistManager.cs b/MediaBrowser.Controller/Playlists/IPlaylistManager.cs
new file mode 100644
index 000000000..2923c11c5
--- /dev/null
+++ b/MediaBrowser.Controller/Playlists/IPlaylistManager.cs
@@ -0,0 +1,47 @@
+using MediaBrowser.Controller.Entities;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Controller.Playlists
+{
+    public interface IPlaylistManager
+    {
+        /// <summary>
+        /// Gets the playlists.
+        /// </summary>
+        /// <param name="userId">The user identifier.</param>
+        /// <returns>IEnumerable&lt;Playlist&gt;.</returns>
+        IEnumerable<Playlist> GetPlaylists(string userId);
+
+        /// <summary>
+        /// Creates the playlist.
+        /// </summary>
+        /// <param name="options">The options.</param>
+        /// <returns>Task&lt;Playlist&gt;.</returns>
+        Task<Playlist> CreatePlaylist(PlaylistCreationOptions options);
+
+        /// <summary>
+        /// Adds to playlist.
+        /// </summary>
+        /// <param name="playlistId">The playlist identifier.</param>
+        /// <param name="itemIds">The item ids.</param>
+        /// <returns>Task.</returns>
+        Task AddToPlaylist(string playlistId, IEnumerable<string> itemIds);
+
+        /// <summary>
+        /// Removes from playlist.
+        /// </summary>
+        /// <param name="playlistId">The playlist identifier.</param>
+        /// <param name="indeces">The indeces.</param>
+        /// <returns>Task.</returns>
+        Task RemoveFromPlaylist(string playlistId, IEnumerable<int> indeces);
+
+        /// <summary>
+        /// Gets the playlists folder.
+        /// </summary>
+        /// <param name="userId">The user identifier.</param>
+        /// <returns>Folder.</returns>
+        Folder GetPlaylistsFolder(string userId);
+
+    }
+}
diff --git a/MediaBrowser.Controller/Playlists/Playlist.cs b/MediaBrowser.Controller/Playlists/Playlist.cs
new file mode 100644
index 000000000..e20387eba
--- /dev/null
+++ b/MediaBrowser.Controller/Playlists/Playlist.cs
@@ -0,0 +1,20 @@
+using MediaBrowser.Controller.Entities;
+using System.Collections.Generic;
+
+namespace MediaBrowser.Controller.Playlists
+{
+    public class Playlist : Folder
+    {
+        public List<string> ItemIds { get; set; }
+
+        public Playlist()
+        {
+            ItemIds = new List<string>();
+        }
+
+        public override IEnumerable<BaseItem> GetChildren(User user, bool includeLinkedChildren)
+        {
+            return base.GetChildren(user, includeLinkedChildren);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/Playlists/PlaylistCreationOptions.cs b/MediaBrowser.Controller/Playlists/PlaylistCreationOptions.cs
new file mode 100644
index 000000000..a62cbe12e
--- /dev/null
+++ b/MediaBrowser.Controller/Playlists/PlaylistCreationOptions.cs
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+
+namespace MediaBrowser.Controller.Playlists
+{
+    public class PlaylistCreationOptions
+    {
+        public string Name { get; set; }
+
+        public List<string> ItemIdList { get; set; }
+
+        public PlaylistCreationOptions()
+        {
+            ItemIdList = new List<string>();
+        }
+    }
+}
diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
index f374ed529..ca48b8889 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -131,6 +131,9 @@
     <Compile Include="..\MediaBrowser.Model\Chapters\RemoteChapterResult.cs">
       <Link>Chapters\RemoteChapterResult.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Collections\CollectionCreationResult.cs">
+      <Link>Collections\CollectionCreationResult.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Configuration\BaseApplicationConfiguration.cs">
       <Link>Configuration\BaseApplicationConfiguration.cs</Link>
     </Compile>
@@ -692,6 +695,9 @@
     <Compile Include="..\MediaBrowser.Model\Notifications\SendToUserType.cs">
       <Link>Notifications\SendToUserType.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Playlists\PlaylistCreationResult.cs">
+      <Link>Playlists\PlaylistCreationResult.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Plugins\BasePluginConfiguration.cs">
       <Link>Plugins\BasePluginConfiguration.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
index 5385ee036..1adf83d36 100644
--- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
+++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
@@ -94,6 +94,9 @@
     <Compile Include="..\MediaBrowser.Model\Chapters\RemoteChapterResult.cs">
       <Link>Chapters\RemoteChapterResult.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Collections\CollectionCreationResult.cs">
+      <Link>Collections\CollectionCreationResult.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Configuration\BaseApplicationConfiguration.cs">
       <Link>Configuration\BaseApplicationConfiguration.cs</Link>
     </Compile>
@@ -649,6 +652,9 @@
     <Compile Include="..\MediaBrowser.Model\Notifications\SendToUserType.cs">
       <Link>Notifications\SendToUserType.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Playlists\PlaylistCreationResult.cs">
+      <Link>Playlists\PlaylistCreationResult.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Plugins\BasePluginConfiguration.cs">
       <Link>Plugins\BasePluginConfiguration.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model/Collections/CollectionCreationResult.cs b/MediaBrowser.Model/Collections/CollectionCreationResult.cs
new file mode 100644
index 000000000..ad7ac9553
--- /dev/null
+++ b/MediaBrowser.Model/Collections/CollectionCreationResult.cs
@@ -0,0 +1,8 @@
+
+namespace MediaBrowser.Model.Collections
+{
+    public class CollectionCreationResult
+    {
+        public string Id { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Entities/CollectionType.cs b/MediaBrowser.Model/Entities/CollectionType.cs
index 5a9526d95..31cda8303 100644
--- a/MediaBrowser.Model/Entities/CollectionType.cs
+++ b/MediaBrowser.Model/Entities/CollectionType.cs
@@ -23,5 +23,6 @@
         public const string Games = "games";
         public const string Channels = "channels";
         public const string LiveTv = "livetv";
+        public const string Playlists = "playlists";
     }
 }
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index efd8c2a0a..94629048c 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -75,6 +75,7 @@
     <Compile Include="Channels\ChannelQuery.cs" />
     <Compile Include="Chapters\RemoteChapterInfo.cs" />
     <Compile Include="Chapters\RemoteChapterResult.cs" />
+    <Compile Include="Collections\CollectionCreationResult.cs" />
     <Compile Include="Configuration\ChannelOptions.cs" />
     <Compile Include="Configuration\ChapterOptions.cs" />
     <Compile Include="Configuration\XbmcMetadataOptions.cs" />
@@ -204,6 +205,7 @@
     <Compile Include="Notifications\NotificationRequest.cs" />
     <Compile Include="Notifications\NotificationServiceInfo.cs" />
     <Compile Include="Notifications\NotificationTypeInfo.cs" />
+    <Compile Include="Playlists\PlaylistCreationResult.cs" />
     <Compile Include="Providers\ExternalIdInfo.cs" />
     <Compile Include="Providers\ExternalUrl.cs" />
     <Compile Include="Providers\ImageProviderInfo.cs" />
diff --git a/MediaBrowser.Model/Playlists/PlaylistCreationResult.cs b/MediaBrowser.Model/Playlists/PlaylistCreationResult.cs
new file mode 100644
index 000000000..bbab8a18d
--- /dev/null
+++ b/MediaBrowser.Model/Playlists/PlaylistCreationResult.cs
@@ -0,0 +1,8 @@
+
+namespace MediaBrowser.Model.Playlists
+{
+    public class PlaylistCreationResult
+    {
+        public string Id { get; set; }
+    }
+}
diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
index 9a26101a1..5fb7ef11b 100644
--- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj
+++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
@@ -140,7 +140,6 @@
     <Compile Include="Music\FanArtAlbumProvider.cs" />
     <Compile Include="Music\FanArtArtistProvider.cs" />
     <Compile Include="Music\MusicBrainzAlbumProvider.cs" />
-    <Compile Include="Music\SoundtrackPostScanTask.cs" />
     <Compile Include="People\PersonMetadataService.cs" />
     <Compile Include="People\MovieDbPersonProvider.cs" />
     <Compile Include="Photos\ExifReader.cs" />
diff --git a/MediaBrowser.Providers/Music/SoundtrackPostScanTask.cs b/MediaBrowser.Providers/Music/SoundtrackPostScanTask.cs
deleted file mode 100644
index dc94460f4..000000000
--- a/MediaBrowser.Providers/Music/SoundtrackPostScanTask.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using MediaBrowser.Controller.Library;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Providers.Music
-{
-    public class SoundtrackPostScanTask : ILibraryPostScanTask
-    {
-        private readonly ILibraryManager _libraryManager;
-
-        public SoundtrackPostScanTask(ILibraryManager libraryManager)
-        {
-            _libraryManager = libraryManager;
-        }
-
-        private readonly Task _cachedTask = Task.FromResult(true);
-        public Task Run(IProgress<double> progress, CancellationToken cancellationToken)
-        {
-            RunInternal(progress, cancellationToken);
-
-            return _cachedTask;
-        }
-
-        private void RunInternal(IProgress<double> progress, CancellationToken cancellationToken)
-        {
-            // Reimplement this when more kinds of associations are supported.
-
-            progress.Report(100);
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs b/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs
index 8e51e1d7d..6a87453ab 100644
--- a/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs
+++ b/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs
@@ -37,7 +37,7 @@ namespace MediaBrowser.Server.Implementations.Collections
 
         public Folder GetCollectionsFolder(string userId)
         {
-            return _libraryManager.RootFolder.Children.Concat(_libraryManager.RootFolder).OfType<ManualCollectionsFolder>()
+            return _libraryManager.RootFolder.Children.OfType<ManualCollectionsFolder>()
                 .FirstOrDefault();
         }
 
diff --git a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
index b8cb955fc..0d54d94e8 100644
--- a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
@@ -1,5 +1,4 @@
-using System.IO;
-using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Channels;
@@ -10,16 +9,17 @@ using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Localization;
+using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Model.Channels;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Library;
 using MediaBrowser.Model.Querying;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Server.Implementations.Configuration;
 
 namespace MediaBrowser.Server.Implementations.Library
 {
@@ -33,8 +33,9 @@ namespace MediaBrowser.Server.Implementations.Library
         private readonly IChannelManager _channelManager;
         private readonly ILiveTvManager _liveTvManager;
         private readonly IServerApplicationPaths _appPaths;
+        private readonly IPlaylistManager _playlists;
 
-        public UserViewManager(ILibraryManager libraryManager, ILocalizationManager localizationManager, IFileSystem fileSystem, IUserManager userManager, IChannelManager channelManager, ILiveTvManager liveTvManager, IServerApplicationPaths appPaths)
+        public UserViewManager(ILibraryManager libraryManager, ILocalizationManager localizationManager, IFileSystem fileSystem, IUserManager userManager, IChannelManager channelManager, ILiveTvManager liveTvManager, IServerApplicationPaths appPaths, IPlaylistManager playlists)
         {
             _libraryManager = libraryManager;
             _localizationManager = localizationManager;
@@ -43,6 +44,7 @@ namespace MediaBrowser.Server.Implementations.Library
             _channelManager = channelManager;
             _liveTvManager = liveTvManager;
             _appPaths = appPaths;
+            _playlists = playlists;
         }
 
         public async Task<IEnumerable<Folder>> GetUserViews(UserViewQuery query, CancellationToken cancellationToken)
@@ -94,6 +96,11 @@ namespace MediaBrowser.Server.Implementations.Library
                 list.Add(await GetUserView(CollectionType.BoxSets, user, CollectionType.BoxSets, cancellationToken).ConfigureAwait(false));
             }
 
+            if (recursiveChildren.OfType<Playlist>().Any())
+            {
+                list.Add(_playlists.GetPlaylistsFolder(user.Id.ToString("N")));
+            }
+
             if (query.IncludeExternalContent)
             {
                 var channelResult = await _channelManager.GetChannels(new ChannelQuery
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 214d4c6c7..8bfbc0855 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -221,6 +221,8 @@
     <Compile Include="Persistence\SqliteProviderInfoRepository.cs" />
     <Compile Include="Persistence\SqliteShrinkMemoryTimer.cs" />
     <Compile Include="Persistence\TypeMapper.cs" />
+    <Compile Include="Playlists\ManualPlaylistsFolder.cs" />
+    <Compile Include="Playlists\PlaylistManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ScheduledTasks\PeopleValidationTask.cs" />
     <Compile Include="ScheduledTasks\ChapterImagesTask.cs" />
diff --git a/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs b/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
new file mode 100644
index 000000000..3b46191b1
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
@@ -0,0 +1,62 @@
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Controller.Entities;
+using System.IO;
+using System.Linq;
+
+namespace MediaBrowser.Server.Implementations.Playlists
+{
+    public class PlaylistsFolder : BasePluginFolder
+    {
+        public PlaylistsFolder()
+        {
+            Name = "Playlists";
+        }
+
+        public override bool IsVisible(User user)
+        {
+            return GetChildren(user, true).Any() &&
+                base.IsVisible(user);
+        }
+
+        public override bool IsHidden
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        public override bool IsHiddenFromUser(User user)
+        {
+            return false;
+        }
+
+        public override string CollectionType
+        {
+            get { return Model.Entities.CollectionType.Playlists; }
+        }
+    }
+
+    public class PlaylistssDynamicFolder : IVirtualFolderCreator
+    {
+        private readonly IApplicationPaths _appPaths;
+
+        public PlaylistssDynamicFolder(IApplicationPaths appPaths)
+        {
+            _appPaths = appPaths;
+        }
+
+        public BasePluginFolder GetFolder()
+        {
+            var path = Path.Combine(_appPaths.DataPath, "playlists");
+
+            Directory.CreateDirectory(path);
+
+            return new PlaylistsFolder
+            {
+                Path = path
+            };
+        }
+    }
+}
+
diff --git a/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs b/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
new file mode 100644
index 000000000..92f01305c
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
@@ -0,0 +1,137 @@
+using MediaBrowser.Common.IO;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Playlists;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Logging;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Server.Implementations.Playlists
+{
+    public class PlaylistManager : IPlaylistManager
+    {
+        private readonly ILibraryManager _libraryManager;
+        private readonly IFileSystem _fileSystem;
+        private readonly ILibraryMonitor _iLibraryMonitor;
+        private readonly ILogger _logger;
+        private readonly IUserManager _userManager;
+
+        public PlaylistManager(ILibraryManager libraryManager, IFileSystem fileSystem, ILibraryMonitor iLibraryMonitor, ILogger logger, IUserManager userManager)
+        {
+            _libraryManager = libraryManager;
+            _fileSystem = fileSystem;
+            _iLibraryMonitor = iLibraryMonitor;
+            _logger = logger;
+            _userManager = userManager;
+        }
+
+        public IEnumerable<Playlist> GetPlaylists(string userId)
+        {
+            var user = _userManager.GetUserById(new Guid(userId));
+
+            return GetPlaylistsFolder(userId).GetChildren(user, true).OfType<Playlist>();
+        }
+
+        public async Task<Playlist> CreatePlaylist(PlaylistCreationOptions options)
+        {
+            var name = options.Name;
+
+            // Need to use the [boxset] suffix
+            // If internet metadata is not found, or if xml saving is off there will be no collection.xml
+            // This could cause it to get re-resolved as a plain folder
+            var folderName = _fileSystem.GetValidFilename(name) + " [playlist]";
+
+            var parentFolder = GetPlaylistsFolder(null);
+
+            if (parentFolder == null)
+            {
+                throw new ArgumentException();
+            }
+
+            var path = Path.Combine(parentFolder.Path, folderName);
+
+            _iLibraryMonitor.ReportFileSystemChangeBeginning(path);
+
+            try
+            {
+                Directory.CreateDirectory(path);
+
+                var collection = new Playlist
+                {
+                    Name = name,
+                    Parent = parentFolder,
+                    Path = path
+                };
+
+                await parentFolder.AddChild(collection, CancellationToken.None).ConfigureAwait(false);
+
+                await collection.RefreshMetadata(new MetadataRefreshOptions(), CancellationToken.None)
+                    .ConfigureAwait(false);
+
+                if (options.ItemIdList.Count > 0)
+                {
+                    await AddToPlaylist(collection.Id.ToString("N"), options.ItemIdList);
+                }
+
+                return collection;
+            }
+            finally
+            {
+                // Refresh handled internally
+                _iLibraryMonitor.ReportFileSystemChangeComplete(path, false);
+            }
+        }
+
+        public async Task AddToPlaylist(string playlistId, IEnumerable<string> itemIds)
+        {
+            var collection = _libraryManager.GetItemById(playlistId) as Playlist;
+
+            if (collection == null)
+            {
+                throw new ArgumentException("No Playlist exists with the supplied Id");
+            }
+
+            var list = new List<LinkedChild>();
+            var itemList = new List<BaseItem>();
+
+            foreach (var itemId in itemIds)
+            {
+                var item = _libraryManager.GetItemById(itemId);
+
+                if (item == null)
+                {
+                    throw new ArgumentException("No item exists with the supplied Id");
+                }
+
+                itemList.Add(item);
+
+                list.Add(new LinkedChild
+                {
+                    Type = LinkedChildType.Manual,
+                    ItemId = item.Id
+                });
+            }
+
+            collection.LinkedChildren.AddRange(list);
+
+            await collection.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
+            await collection.RefreshMetadata(CancellationToken.None).ConfigureAwait(false);
+        }
+
+        public Task RemoveFromPlaylist(string playlistId, IEnumerable<int> indeces)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Folder GetPlaylistsFolder(string userId)
+        {
+            return _libraryManager.RootFolder.Children.OfType<PlaylistsFolder>()
+                .FirstOrDefault();
+        }
+    }
+}
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 7dc70627b..993cc4e1a 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -26,6 +26,7 @@ using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.News;
 using MediaBrowser.Controller.Notifications;
 using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Resolvers;
@@ -68,6 +69,7 @@ using MediaBrowser.Server.Implementations.Localization;
 using MediaBrowser.Server.Implementations.MediaEncoder;
 using MediaBrowser.Server.Implementations.Notifications;
 using MediaBrowser.Server.Implementations.Persistence;
+using MediaBrowser.Server.Implementations.Playlists;
 using MediaBrowser.Server.Implementations.Security;
 using MediaBrowser.Server.Implementations.ServerManager;
 using MediaBrowser.Server.Implementations.Session;
@@ -612,10 +614,13 @@ namespace MediaBrowser.ServerApplication
             var collectionManager = new CollectionManager(LibraryManager, FileSystemManager, LibraryMonitor, LogManager.GetLogger("CollectionManager"));
             RegisterSingleInstance<ICollectionManager>(collectionManager);
 
+            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);
             RegisterSingleInstance(LiveTvManager);
 
-            UserViewManager = new UserViewManager(LibraryManager, LocalizationManager, FileSystemManager, UserManager, ChannelManager, LiveTvManager, ApplicationPaths);
+            UserViewManager = new UserViewManager(LibraryManager, LocalizationManager, FileSystemManager, UserManager, ChannelManager, LiveTvManager, ApplicationPaths, playlistManager);
             RegisterSingleInstance(UserViewManager);
 
             var contentDirectory = new ContentDirectory(dlnaManager, UserDataManager, ImageProcessor, LibraryManager, ServerConfigurationManager, UserManager, LogManager.GetLogger("UpnpContentDirectory"), HttpClient, UserViewManager, ChannelManager);
-- 
cgit v1.2.3


From 2714127d2b663b735048da6d9def08efa38f2b5f Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 2 Aug 2014 22:16:37 -0400
Subject: fixes #791 - Support server-side playlists

---
 MediaBrowser.Api/PlaylistService.cs                |  81 +++++++++++++++-
 MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs   |   6 +-
 MediaBrowser.Controller/Entities/BaseItem.cs       |  24 ++++-
 .../Entities/BasePluginFolder.cs                   |   5 -
 MediaBrowser.Controller/Entities/Folder.cs         |   8 +-
 MediaBrowser.Controller/Entities/LinkedChild.cs    |  13 +++
 MediaBrowser.Controller/Entities/Movies/BoxSet.cs  |  12 ++-
 MediaBrowser.Controller/Entities/TV/Season.cs      |   9 ++
 MediaBrowser.Controller/Entities/TV/Series.cs      |   9 ++
 MediaBrowser.Controller/Entities/UserView.cs       |   1 -
 MediaBrowser.Controller/Playlists/Playlist.cs      |  77 ++++++++++++++-
 .../Playlists/PlaylistCreationOptions.cs           |   4 +
 .../Providers/BaseItemXmlParser.cs                 |  72 ++++++++++++++
 .../ContentDirectory/ControlHandler.cs             |   2 +-
 .../MediaBrowser.LocalMetadata.csproj              |   1 +
 .../Parsers/BoxSetXmlParser.cs                     |  54 -----------
 .../Savers/FolderXmlSaver.cs                       |  14 +--
 .../Savers/PlaylistXmlSaver.cs                     |  68 +++++++++++++
 .../Savers/XmlSaverHelpers.cs                      |  31 ++++--
 MediaBrowser.Model/Dto/BaseItemDto.cs              |  14 ++-
 .../Channels/ChannelDownloadScheduledTask.cs       |   2 +-
 .../Collections/CollectionManager.cs               |   8 +-
 .../Collections/ManualCollectionsFolder.cs         |   1 +
 .../Dto/DtoService.cs                              |  47 ++++++++-
 .../FileOrganization/OrganizerScheduledTask.cs     |   2 +-
 .../Library/Resolvers/PlaylistResolver.cs          |  38 ++++++++
 .../Localization/JavaScript/javascript.json        |  11 ++-
 .../Localization/Server/server.json                |   6 +-
 .../MediaBrowser.Server.Implementations.csproj     |   1 +
 .../Playlists/ManualPlaylistsFolder.cs             |  17 +++-
 .../Playlists/PlaylistManager.cs                   | 105 +++++++++++++++++----
 MediaBrowser.WebDashboard/Api/DashboardService.cs  |   5 +-
 .../MediaBrowser.WebDashboard.csproj               |  18 +++-
 33 files changed, 636 insertions(+), 130 deletions(-)
 create mode 100644 MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs
 create mode 100644 MediaBrowser.Server.Implementations/Library/Resolvers/PlaylistResolver.cs

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/PlaylistService.cs b/MediaBrowser.Api/PlaylistService.cs
index 475183dea..b4d2e2f0f 100644
--- a/MediaBrowser.Api/PlaylistService.cs
+++ b/MediaBrowser.Api/PlaylistService.cs
@@ -1,9 +1,12 @@
 using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Playlists;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Playlists;
 using MediaBrowser.Model.Querying;
 using ServiceStack;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -18,6 +21,9 @@ namespace MediaBrowser.Api
 
         [ApiMember(Name = "Ids", Description = "Item Ids to add to the playlist", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST", AllowMultiple = true)]
         public string Ids { get; set; }
+
+        [ApiMember(Name = "UserId", Description = "User Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
+        public string UserId { get; set; }
     }
 
     [Route("/Playlists/{Id}/Items", "POST", Summary = "Adds items to a playlist")]
@@ -37,16 +43,55 @@ namespace MediaBrowser.Api
         public string Id { get; set; }
     }
 
+    [Route("/Playlists/{Id}/Items", "GET", Summary = "Gets the original items of a playlist")]
+    public class GetPlaylistItems : IReturn<QueryResult<BaseItemDto>>, IHasItemFields
+    {
+        [ApiMember(Name = "Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "DELETE")]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets the user id.
+        /// </summary>
+        /// <value>The user id.</value>
+        [ApiMember(Name = "UserId", Description = "User Id", IsRequired = false, DataType = "string", ParameterType = "path", Verb = "GET")]
+        public Guid? UserId { get; set; }
+
+        /// <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; }
+
+        /// <summary>
+        /// Fields to return within the items, in addition to basic information
+        /// </summary>
+        /// <value>The fields.</value>
+        [ApiMember(Name = "Fields", Description = "Optional. Specify additional fields of information to return in the output. This allows multiple, comma delimeted. Options: Budget, Chapters, CriticRatingSummary, DateCreated, Genres, HomePageUrl, IndexOptions, MediaStreams, Overview, ParentId, Path, People, ProviderIds, PrimaryImageAspectRatio, Revenue, SortName, Studios, Taglines", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
+        public string Fields { get; set; }
+    }
+
     [Authenticated]
     public class PlaylistService : BaseApiService
     {
         private readonly IPlaylistManager _playlistManager;
         private readonly IDtoService _dtoService;
+        private readonly IUserManager _userManager;
+        private readonly ILibraryManager _libraryManager;
 
-        public PlaylistService(IDtoService dtoService, IPlaylistManager playlistManager)
+        public PlaylistService(IDtoService dtoService, IPlaylistManager playlistManager, IUserManager userManager, ILibraryManager libraryManager)
         {
             _dtoService = dtoService;
             _playlistManager = playlistManager;
+            _userManager = userManager;
+            _libraryManager = libraryManager;
         }
 
         public object Post(CreatePlaylist request)
@@ -54,7 +99,8 @@ namespace MediaBrowser.Api
             var task = _playlistManager.CreatePlaylist(new PlaylistCreationOptions
             {
                 Name = request.Name,
-                ItemIdList = (request.Ids ?? string.Empty).Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToList()
+                ItemIdList = (request.Ids ?? string.Empty).Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToList(),
+                UserId = request.UserId
             });
 
             var item = task.Result;
@@ -80,5 +126,36 @@ namespace MediaBrowser.Api
 
             //Task.WaitAll(task);
         }
+
+        public object Get(GetPlaylistItems request)
+        {
+            var playlist = (Playlist)_libraryManager.GetItemById(request.Id);
+            var user = request.UserId.HasValue ? _userManager.GetUserById(request.UserId.Value) : null;
+            var items = playlist.GetManageableItems().ToArray();
+
+            var count = items.Length;
+
+            if (request.StartIndex.HasValue)
+            {
+                items = items.Skip(request.StartIndex.Value).ToArray();
+            }
+
+            if (request.Limit.HasValue)
+            {
+                items = items.Take(request.Limit.Value).ToArray();
+            }
+
+            var dtos = items
+                   .Select(i => _dtoService.GetBaseItemDto(i, request.GetItemFields().ToList(), user))
+                   .ToArray();
+
+            var result = new ItemsResult
+            {
+                Items = dtos,
+                TotalRecordCount = count
+            };
+
+            return ToOptimizedResult(result);
+        }
     }
 }
diff --git a/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs b/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs
index 7cd518a18..f23610014 100644
--- a/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs
+++ b/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs
@@ -1,9 +1,9 @@
-using System.Collections.Generic;
-using System.Linq;
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Querying;
 using ServiceStack;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace MediaBrowser.Api.UserLibrary
 {
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 2bdbab084..36e65f5f5 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1006,6 +1006,18 @@ namespace MediaBrowser.Controller.Entities
 
         private BaseItem FindLinkedChild(LinkedChild info)
         {
+            if (!string.IsNullOrWhiteSpace(info.ItemName))
+            {
+                if (string.Equals(info.ItemType, "musicgenre", StringComparison.OrdinalIgnoreCase))
+                {
+                    return LibraryManager.GetMusicGenre(info.ItemName);
+                }
+                if (string.Equals(info.ItemType, "musicartist", StringComparison.OrdinalIgnoreCase))
+                {
+                    return LibraryManager.GetArtist(info.ItemName);
+                }
+            }
+
             if (!string.IsNullOrEmpty(info.Path))
             {
                 var itemByPath = LibraryManager.RootFolder.FindByPath(info.Path);
@@ -1028,7 +1040,17 @@ namespace MediaBrowser.Controller.Entities
                         {
                             if (info.ItemYear.HasValue)
                             {
-                                return info.ItemYear.Value == (i.ProductionYear ?? -1);
+                                if (info.ItemYear.Value != (i.ProductionYear ?? -1))
+                                {
+                                    return false;
+                                }
+                            }
+                            if (info.ItemIndexNumber.HasValue)
+                            {
+                                if (info.ItemIndexNumber.Value != (i.IndexNumber ?? -1))
+                                {
+                                    return false;
+                                }
                             }
                             return true;
                         }
diff --git a/MediaBrowser.Controller/Entities/BasePluginFolder.cs b/MediaBrowser.Controller/Entities/BasePluginFolder.cs
index fa2b49a60..b30bd81b9 100644
--- a/MediaBrowser.Controller/Entities/BasePluginFolder.cs
+++ b/MediaBrowser.Controller/Entities/BasePluginFolder.cs
@@ -7,11 +7,6 @@ namespace MediaBrowser.Controller.Entities
     /// </summary>
     public abstract class BasePluginFolder : Folder, ICollectionFolder, IByReferenceItem
     {
-        protected BasePluginFolder()
-        {
-            DisplayMediaType = "CollectionFolder";
-        }
-
         public virtual string CollectionType
         {
             get { return null; }
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 12afe26b6..2013b926c 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -38,6 +38,12 @@ namespace MediaBrowser.Controller.Entities
             Tags = new List<string>();
         }
 
+        [IgnoreDataMember]
+        public virtual bool IsPreSorted
+        {
+            get { return false; }
+        }
+
         /// <summary>
         /// Gets a value indicating whether this instance is folder.
         /// </summary>
@@ -855,7 +861,7 @@ namespace MediaBrowser.Controller.Entities
         /// <param name="includeLinkedChildren">if set to <c>true</c> [include linked children].</param>
         /// <returns>IEnumerable{BaseItem}.</returns>
         /// <exception cref="System.ArgumentNullException"></exception>
-        public IEnumerable<BaseItem> GetRecursiveChildren(User user, bool includeLinkedChildren = true)
+        public virtual IEnumerable<BaseItem> GetRecursiveChildren(User user, bool includeLinkedChildren = true)
         {
             if (user == null)
             {
diff --git a/MediaBrowser.Controller/Entities/LinkedChild.cs b/MediaBrowser.Controller/Entities/LinkedChild.cs
index 1ae04e40f..3fc0ab716 100644
--- a/MediaBrowser.Controller/Entities/LinkedChild.cs
+++ b/MediaBrowser.Controller/Entities/LinkedChild.cs
@@ -12,12 +12,25 @@ 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
         /// </summary>
         [IgnoreDataMember]
         public Guid? ItemId { get; set; }
+
+        public static LinkedChild Create(BaseItem item)
+        {
+            return new LinkedChild
+            {
+                ItemName = item.Name,
+                ItemYear = item.ProductionYear,
+                ItemType = item.GetType().Name,
+                Type = LinkedChildType.Manual,
+                ItemIndexNumber = item.IndexNumber
+            };
+        }
     }
 
     public enum LinkedChildType
diff --git a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
index 0d2be9f74..5e6bd9707 100644
--- a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
+++ b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.Progress;
+using System.Runtime.Serialization;
+using MediaBrowser.Common.Progress;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
@@ -58,6 +59,15 @@ namespace MediaBrowser.Controller.Entities.Movies
             return config.BlockUnratedItems.Contains(UnratedItem.Movie);
         }
 
+        [IgnoreDataMember]
+        public override bool IsPreSorted
+        {
+            get
+            {
+                return true;
+            }
+        }
+
         public override IEnumerable<BaseItem> GetChildren(User user, bool includeLinkedChildren)
         {
             var children = base.GetChildren(user, includeLinkedChildren);
diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs
index cf39cda89..3977d869c 100644
--- a/MediaBrowser.Controller/Entities/TV/Season.cs
+++ b/MediaBrowser.Controller/Entities/TV/Season.cs
@@ -29,6 +29,15 @@ namespace MediaBrowser.Controller.Entities.TV
             }
         }
 
+        [IgnoreDataMember]
+        public override bool IsPreSorted
+        {
+            get
+            {
+                return true;
+            }
+        }
+
         /// <summary>
         /// We want to group into our Series
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index 9c2ed27bb..27ca8b18d 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -39,6 +39,15 @@ namespace MediaBrowser.Controller.Entities.TV
             DisplaySpecialsWithSeasons = true;
         }
 
+        [IgnoreDataMember]
+        public override bool IsPreSorted
+        {
+            get
+            {
+                return true;
+            }
+        }
+
         public bool DisplaySpecialsWithSeasons { get; set; }
 
         public List<Guid> LocalTrailerIds { get; set; }
diff --git a/MediaBrowser.Controller/Entities/UserView.cs b/MediaBrowser.Controller/Entities/UserView.cs
index f8ca56fa8..34ca85d1d 100644
--- a/MediaBrowser.Controller/Entities/UserView.cs
+++ b/MediaBrowser.Controller/Entities/UserView.cs
@@ -1,7 +1,6 @@
 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;
diff --git a/MediaBrowser.Controller/Playlists/Playlist.cs b/MediaBrowser.Controller/Playlists/Playlist.cs
index e20387eba..5ea535f4d 100644
--- a/MediaBrowser.Controller/Playlists/Playlist.cs
+++ b/MediaBrowser.Controller/Playlists/Playlist.cs
@@ -1,20 +1,87 @@
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
+using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
 
 namespace MediaBrowser.Controller.Playlists
 {
     public class Playlist : Folder
     {
-        public List<string> ItemIds { get; set; }
+        public string OwnerUserId { get; set; }
 
-        public Playlist()
+        public override IEnumerable<BaseItem> GetChildren(User user, bool includeLinkedChildren)
         {
-            ItemIds = new List<string>();
+            return GetPlayableItems(user);
         }
 
-        public override IEnumerable<BaseItem> GetChildren(User user, bool includeLinkedChildren)
+        public override IEnumerable<BaseItem> GetRecursiveChildren(User user, bool includeLinkedChildren = true)
+        {
+            return GetPlayableItems(user);
+        }
+
+        public IEnumerable<BaseItem> GetManageableItems()
+        {
+            return GetLinkedChildren();
+        }
+
+        private IEnumerable<BaseItem> GetPlayableItems(User user)
+        {
+            return GetPlaylistItems(MediaType, base.GetChildren(user, true), user);
+        }
+
+        public static IEnumerable<BaseItem> GetPlaylistItems(string playlistMediaType, IEnumerable<BaseItem> inputItems, User user)
+        {
+            return inputItems.SelectMany(i =>
+            {
+                var folder = i as Folder;
+
+                if (folder != null)
+                {
+                    var items = folder.GetRecursiveChildren(user, true)
+                        .Where(m => !m.IsFolder && string.Equals(m.MediaType, playlistMediaType, StringComparison.OrdinalIgnoreCase));
+
+                    if (!folder.IsPreSorted)
+                    {
+                        items = LibraryManager.Sort(items, user, new[] { ItemSortBy.SortName }, SortOrder.Ascending);
+                    }
+
+                    return items;
+                }
+
+                return new[] { i };
+            });
+        }
+
+        [IgnoreDataMember]
+        public override bool IsPreSorted
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        public string PlaylistMediaType { get; set; }
+
+        public override string MediaType
+        {
+            get
+            {
+                return PlaylistMediaType;
+            }
+        }
+
+        public void SetMediaType(string value)
+        {
+            PlaylistMediaType = value;
+        }
+
+        public override bool IsVisible(User user)
         {
-            return base.GetChildren(user, includeLinkedChildren);
+            return base.IsVisible(user) && string.Equals(user.Id.ToString("N"), OwnerUserId);
         }
     }
 }
diff --git a/MediaBrowser.Controller/Playlists/PlaylistCreationOptions.cs b/MediaBrowser.Controller/Playlists/PlaylistCreationOptions.cs
index a62cbe12e..1766ba75c 100644
--- a/MediaBrowser.Controller/Playlists/PlaylistCreationOptions.cs
+++ b/MediaBrowser.Controller/Playlists/PlaylistCreationOptions.cs
@@ -8,6 +8,10 @@ namespace MediaBrowser.Controller.Playlists
 
         public List<string> ItemIdList { get; set; }
 
+        public string MediaType { get; set; }
+
+        public string UserId { get; set; }
+
         public PlaylistCreationOptions()
         {
             ItemIdList = new List<string>();
diff --git a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
index 3cb90d360..7e6895ec5 100644
--- a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
+++ b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
@@ -1283,6 +1283,78 @@ namespace MediaBrowser.Controller.Providers
             return new[] { personInfo };
         }
 
+        protected LinkedChild GetLinkedChild(XmlReader reader)
+        {
+            reader.MoveToContent();
+
+            var linkedItem = new LinkedChild
+            {
+                Type = LinkedChildType.Manual
+            };
+
+            while (reader.Read())
+            {
+                if (reader.NodeType == XmlNodeType.Element)
+                {
+                    switch (reader.Name)
+                    {
+                        case "Name":
+                            {
+                                linkedItem.ItemName = reader.ReadElementContentAsString();
+                                break;
+                            }
+
+                        case "Type":
+                            {
+                                linkedItem.ItemType = reader.ReadElementContentAsString();
+                                break;
+                            }
+
+                        case "Year":
+                            {
+                                var val = reader.ReadElementContentAsString();
+
+                                if (!string.IsNullOrWhiteSpace(val))
+                                {
+                                    int rval;
+
+                                    if (int.TryParse(val, NumberStyles.Integer, _usCulture, out rval))
+                                    {
+                                        linkedItem.ItemYear = rval;
+                                    }
+                                }
+
+                                break;
+                            }
+
+                        case "IndexNumber":
+                            {
+                                var val = reader.ReadElementContentAsString();
+
+                                if (!string.IsNullOrWhiteSpace(val))
+                                {
+                                    int rval;
+
+                                    if (int.TryParse(val, NumberStyles.Integer, _usCulture, out rval))
+                                    {
+                                        linkedItem.ItemIndexNumber = rval;
+                                    }
+                                }
+
+                                break;
+                            }
+
+                        default:
+                            reader.Skip();
+                            break;
+                    }
+                }
+            }
+
+            return string.IsNullOrWhiteSpace(linkedItem.ItemName) || string.IsNullOrWhiteSpace(linkedItem.ItemType) ? null : linkedItem;
+        }
+
+
         /// <summary>
         /// Used to split names of comma or pipe delimeted genres and people
         /// </summary>
diff --git a/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs b/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
index aced2009d..4eb6baeed 100644
--- a/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
+++ b/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
@@ -462,7 +462,7 @@ namespace MediaBrowser.Dlna.ContentDirectory
 
             items = FilterUnsupportedContent(items);
 
-            if (folder is Series || folder is Season || folder is BoxSet)
+            if (folder.IsPreSorted)
             {
                 return items;
             }
diff --git a/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj b/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj
index 2cc7e989b..b103d9f5a 100644
--- a/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj
+++ b/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj
@@ -83,6 +83,7 @@
     <Compile Include="Savers\GameXmlSaver.cs" />
     <Compile Include="Savers\MovieXmlSaver.cs" />
     <Compile Include="Savers\PersonXmlSaver.cs" />
+    <Compile Include="Savers\PlaylistXmlSaver.cs" />
     <Compile Include="Savers\SeasonXmlSaver.cs" />
     <Compile Include="Savers\SeriesXmlSaver.cs" />
     <Compile Include="Savers\XmlSaverHelpers.cs" />
diff --git a/MediaBrowser.LocalMetadata/Parsers/BoxSetXmlParser.cs b/MediaBrowser.LocalMetadata/Parsers/BoxSetXmlParser.cs
index 51a4684d7..85a72cf28 100644
--- a/MediaBrowser.LocalMetadata/Parsers/BoxSetXmlParser.cs
+++ b/MediaBrowser.LocalMetadata/Parsers/BoxSetXmlParser.cs
@@ -71,59 +71,5 @@ namespace MediaBrowser.LocalMetadata.Parsers
 
             item.LinkedChildren = list;
         }
-
-        private LinkedChild GetLinkedChild(XmlReader reader)
-        {
-            reader.MoveToContent();
-
-            var linkedItem = new LinkedChild
-            {
-                Type = LinkedChildType.Manual
-            };
-
-            while (reader.Read())
-            {
-                if (reader.NodeType == XmlNodeType.Element)
-                {
-                    switch (reader.Name)
-                    {
-                        case "Name":
-                            {
-                                linkedItem.ItemName = reader.ReadElementContentAsString();
-                                break;
-                            }
-
-                        case "Type":
-                            {
-                                linkedItem.ItemType = reader.ReadElementContentAsString();
-                                break;
-                            }
-
-                        case "Year":
-                            {
-                                var val = reader.ReadElementContentAsString();
-
-                                if (!string.IsNullOrWhiteSpace(val))
-                                {
-                                    int rval;
-
-                                    if (int.TryParse(val, NumberStyles.Integer, UsCulture, out rval))
-                                    {
-                                        linkedItem.ItemYear = rval;
-                                    }
-                                }
-
-                                break;
-                            }
-
-                        default:
-                            reader.Skip();
-                            break;
-                    }
-                }
-            }
-
-            return string.IsNullOrWhiteSpace(linkedItem.ItemName) || string.IsNullOrWhiteSpace(linkedItem.ItemType) ? null : linkedItem;
-        }
     }
 }
diff --git a/MediaBrowser.LocalMetadata/Savers/FolderXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/FolderXmlSaver.cs
index 6dd65b69c..c38a33c40 100644
--- a/MediaBrowser.LocalMetadata/Savers/FolderXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/FolderXmlSaver.cs
@@ -1,12 +1,13 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Threading;
-using MediaBrowser.Controller.Entities;
+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.Playlists;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading;
 
 namespace MediaBrowser.LocalMetadata.Savers
 {
@@ -37,7 +38,8 @@ namespace MediaBrowser.LocalMetadata.Savers
             {
                 if (!(item is Series) && !(item is BoxSet) && !(item is MusicArtist) && !(item is MusicAlbum) &&
                     !(item is Season) &&
-                    !(item is GameSystem))
+                    !(item is GameSystem) &&
+                    !(item is Playlist))
                 {
                     return updateType >= ItemUpdateType.MetadataDownload;
                 }
diff --git a/MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs
new file mode 100644
index 000000000..cdb3a2500
--- /dev/null
+++ b/MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs
@@ -0,0 +1,68 @@
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.Library;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading;
+
+namespace MediaBrowser.LocalMetadata.Savers
+{
+    public class PlaylistXmlSaver : IMetadataFileSaver
+    {
+        public string Name
+        {
+            get
+            {
+                return "Media Browser Xml";
+            }
+        }
+
+        /// <summary>
+        /// Determines whether [is enabled for] [the specified item].
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <param name="updateType">Type of the update.</param>
+        /// <returns><c>true</c> if [is enabled for] [the specified item]; otherwise, <c>false</c>.</returns>
+        public bool IsEnabledFor(IHasMetadata item, ItemUpdateType updateType)
+        {
+            if (!item.SupportsLocalMetadata)
+            {
+                return false;
+            }
+
+            return item is BoxSet && updateType >= ItemUpdateType.MetadataDownload;
+        }
+
+        /// <summary>
+        /// Saves the specified item.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        public void Save(IHasMetadata item, CancellationToken cancellationToken)
+        {
+            var builder = new StringBuilder();
+
+            builder.Append("<Item>");
+
+            XmlSaverHelpers.AddCommonNodes((BoxSet)item, builder);
+
+            builder.Append("</Item>");
+
+            var xmlFilePath = GetSavePath(item);
+
+            XmlSaverHelpers.Save(builder, xmlFilePath, new List<string> { });
+        }
+
+        /// <summary>
+        /// Gets the save path.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <returns>System.String.</returns>
+        public string GetSavePath(IHasMetadata item)
+        {
+            return Path.Combine(item.Path, "playlist.xml");
+        }
+    }
+}
diff --git a/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs b/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs
index 1a2c341da..491592989 100644
--- a/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs
+++ b/MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs
@@ -10,6 +10,7 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.LocalMetadata.Savers
@@ -109,7 +110,8 @@ namespace MediaBrowser.LocalMetadata.Savers
                     "VoteCount",
                     "Website",
                     "Zap2ItId",
-                    "CollectionItems"
+                    "CollectionItems",
+                    "PlaylistItems"
 
         }.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
 
@@ -631,10 +633,16 @@ namespace MediaBrowser.LocalMetadata.Savers
                 builder.Append("</Persons>");
             }
 
-            var folder = item as BoxSet;
-            if (folder != null)
+            var boxset = item as BoxSet;
+            if (boxset != null)
             {
-                AddCollectionItems(folder, builder);
+                AddLinkedChildren(boxset, builder, "CollectionItems", "CollectionItem");
+            }
+
+            var playlist = item as Playlist;
+            if (playlist != null)
+            {
+                AddLinkedChildren(playlist, builder, "PlaylistItems", "PlaylistItem");
             }
         }
 
@@ -693,7 +701,7 @@ namespace MediaBrowser.LocalMetadata.Savers
             }
         }
 
-        public static void AddCollectionItems(Folder item, StringBuilder builder)
+        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))
@@ -704,10 +712,10 @@ namespace MediaBrowser.LocalMetadata.Savers
                 return;
             }
 
-            builder.Append("<CollectionItems>");
+            builder.Append("<" + pluralNodeName + ">");
             foreach (var link in items)
             {
-                builder.Append("<CollectionItem>");
+                builder.Append("<" + singularNodeName + ">");
 
                 builder.Append("<Name>" + SecurityElement.Escape(link.ItemName) + "</Name>");
                 builder.Append("<Type>" + SecurityElement.Escape(link.ItemType) + "</Type>");
@@ -717,9 +725,14 @@ namespace MediaBrowser.LocalMetadata.Savers
                     builder.Append("<Year>" + SecurityElement.Escape(link.ItemYear.Value.ToString(UsCulture)) + "</Year>");
                 }
 
-                builder.Append("</CollectionItem>");
+                if (link.ItemIndexNumber.HasValue)
+                {
+                    builder.Append("<IndexNumber>" + SecurityElement.Escape(link.ItemIndexNumber.Value.ToString(UsCulture)) + "</IndexNumber>");
+                }
+
+                builder.Append("</" + singularNodeName + ">");
             }
-            builder.Append("</CollectionItems>");
+            builder.Append("</" + pluralNodeName + ">");
         }
     }
 }
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index d138ddf9b..9581b5740 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -594,7 +594,19 @@ namespace MediaBrowser.Model.Dto
         /// </summary>
         /// <value>The parent thumb image tag.</value>
         public string ParentThumbImageTag { get; set; }
-        
+
+        /// <summary>
+        /// Gets or sets the parent primary image item identifier.
+        /// </summary>
+        /// <value>The parent primary image item identifier.</value>
+        public string ParentPrimaryImageItemId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the parent primary image tag.
+        /// </summary>
+        /// <value>The parent primary image tag.</value>
+        public string ParentPrimaryImageTag { get; set; }
+
         /// <summary>
         /// Gets or sets the chapters.
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs b/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
index af1bd9427..567092cae 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelDownloadScheduledTask.cs
@@ -239,7 +239,7 @@ namespace MediaBrowser.Server.Implementations.Channels
                 throw new ApplicationException("Unexpected response type encountered: " + response.ContentType);
             }
 
-            File.Move(response.TempFilePath, destination);
+            File.Copy(response.TempFilePath, destination, true);
 
             await RefreshMediaSourceItem(destination, cancellationToken).ConfigureAwait(false);
 
diff --git a/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs b/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs
index 6a87453ab..fe4b16645 100644
--- a/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs
+++ b/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs
@@ -162,13 +162,7 @@ namespace MediaBrowser.Server.Implementations.Collections
                     throw new ArgumentException("Item already exists in collection");
                 }
 
-                list.Add(new LinkedChild
-                {
-                    ItemName = item.Name,
-                    ItemYear = item.ProductionYear,
-                    ItemType = item.GetType().Name,
-                    Type = LinkedChildType.Manual
-                });
+                list.Add(LinkedChild.Create(item));
 
                 var supportsGrouping = item as ISupportsBoxSetGrouping;
 
diff --git a/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs b/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs
index aaa02c720..b02c52874 100644
--- a/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs
+++ b/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs
@@ -8,6 +8,7 @@ namespace MediaBrowser.Server.Implementations.Collections
         public ManualCollectionsFolder()
         {
             Name = "Collections";
+            DisplayMediaType = "CollectionFolder";
         }
 
         public override bool IsVisible(User user)
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index afcfde556..e3a386841 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -11,6 +11,7 @@ using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Sync;
 using MediaBrowser.Model.Drawing;
@@ -179,6 +180,11 @@ namespace MediaBrowser.Server.Implementations.Dto
                 }
             }
 
+            if (item is Playlist)
+            {
+                AttachLinkedChildImages(dto, (Folder)item, user);
+            }
+
             return dto;
         }
 
@@ -819,7 +825,7 @@ namespace MediaBrowser.Server.Implementations.Dto
                 dto.DisplayOrder = hasDisplayOrder.DisplayOrder;
             }
 
-            var collectionFolder = item as CollectionFolder;
+            var collectionFolder = item as ICollectionFolder;
             if (collectionFolder != null)
             {
                 dto.CollectionType = collectionFolder.CollectionType;
@@ -1211,6 +1217,45 @@ namespace MediaBrowser.Server.Implementations.Dto
             }
         }
 
+        private void AttachLinkedChildImages(BaseItemDto dto, Folder folder, User user)
+        {
+            List<BaseItem> linkedChildren = null;
+
+            if (dto.BackdropImageTags.Count == 0)
+            {
+                if (linkedChildren == null)
+                {
+                    linkedChildren = user == null
+                        ? folder.GetRecursiveChildren().ToList()
+                        : folder.GetRecursiveChildren(user, true).ToList();
+                }
+                var parentWithBackdrop = linkedChildren.FirstOrDefault(i => i.GetImages(ImageType.Backdrop).Any());
+
+                if (parentWithBackdrop != null)
+                {
+                    dto.ParentBackdropItemId = GetDtoId(parentWithBackdrop);
+                    dto.ParentBackdropImageTags = GetBackdropImageTags(parentWithBackdrop);
+                }
+            }
+
+            if (!dto.ImageTags.ContainsKey(ImageType.Primary))
+            {
+                if (linkedChildren == null)
+                {
+                    linkedChildren = user == null
+                        ? folder.GetRecursiveChildren().ToList()
+                        : folder.GetRecursiveChildren(user, true).ToList();
+                }
+                var parentWithImage = linkedChildren.FirstOrDefault(i => i.GetImages(ImageType.Primary).Any());
+
+                if (parentWithImage != null)
+                {
+                    dto.ParentPrimaryImageItemId = GetDtoId(parentWithImage);
+                    dto.ParentPrimaryImageTag = GetImageCacheTag(parentWithImage, ImageType.Primary);
+                }
+            }
+        }
+
         private string GetMappedPath(IHasMetadata item)
         {
             var path = item.Path;
diff --git a/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs b/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
index 4e182ea88..1c4ccb141 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs
@@ -75,7 +75,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
 
         public bool IsEnabled
         {
-            get { return !GetTvOptions().IsEnabled; }
+            get { return GetTvOptions().IsEnabled; }
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/PlaylistResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/PlaylistResolver.cs
new file mode 100644
index 000000000..7eff53ce1
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/PlaylistResolver.cs
@@ -0,0 +1,38 @@
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Playlists;
+using System;
+using System.IO;
+
+namespace MediaBrowser.Server.Implementations.Library.Resolvers
+{
+    public class PlaylistResolver : FolderResolver<Playlist>
+    {
+        /// <summary>
+        /// Resolves the specified args.
+        /// </summary>
+        /// <param name="args">The args.</param>
+        /// <returns>BoxSet.</returns>
+        protected override Playlist Resolve(ItemResolveArgs args)
+        {
+            // It's a boxset if all of the following conditions are met:
+            // Is a Directory
+            // Contains [playlist] in the path
+            if (args.IsDirectory)
+            {
+                var filename = Path.GetFileName(args.Path);
+
+                if (string.IsNullOrEmpty(filename))
+                {
+                    return null;
+                }
+
+                if (filename.IndexOf("[playlist]", StringComparison.OrdinalIgnoreCase) != -1)
+                {
+                    return new Playlist { Path = args.Path };
+                }
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
index 3a5b91abd..3c1748ef1 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -323,6 +323,13 @@
     "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 plugin for IE.",
+    "HeaderVideoError": "Video Error",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "LabelName": "Name:",
+    "ButtonSubmit": "Submit",
+    "LabelSelectPlaylist":  "Playlist:",
+    "OptionNewPlaylist":  "New playlist...",
+    "MessageAddedToPlaylistSuccess":  "Ok"
 }
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index caf8860fc..471620948 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -808,6 +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.",
     "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.",
@@ -915,5 +917,7 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sync"
+    "OptionContextStatic": "Sync",
+    "ButtonAddToPlaylist":  "Add to playlist",
+    "TabPlaylists":  "Playlists"
 }
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 8bfbc0855..c60835ee6 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -166,6 +166,7 @@
     <Compile Include="Library\LibraryManager.cs" />
     <Compile Include="Library\MusicManager.cs" />
     <Compile Include="Library\Resolvers\PhotoResolver.cs" />
+    <Compile Include="Library\Resolvers\PlaylistResolver.cs" />
     <Compile Include="Library\SearchEngine.cs" />
     <Compile Include="Library\ResolverHelper.cs" />
     <Compile Include="Library\Resolvers\Audio\AudioResolver.cs" />
diff --git a/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs b/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
index 3b46191b1..a87edde7b 100644
--- a/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
+++ b/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
@@ -1,5 +1,7 @@
-using MediaBrowser.Common.Configuration;
+using System.Collections.Generic;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Playlists;
 using System.IO;
 using System.Linq;
 
@@ -14,8 +16,15 @@ namespace MediaBrowser.Server.Implementations.Playlists
 
         public override bool IsVisible(User user)
         {
-            return GetChildren(user, true).Any() &&
-                base.IsVisible(user);
+            return base.IsVisible(user) && GetRecursiveChildren(user, false)
+                .OfType<Playlist>()
+                .Any(i => string.Equals(i.OwnerUserId, user.Id.ToString("N")));
+        }
+
+        protected override IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
+        {
+            return RecursiveChildren
+                .OfType<Playlist>();
         }
 
         public override bool IsHidden
@@ -48,7 +57,7 @@ namespace MediaBrowser.Server.Implementations.Playlists
 
         public BasePluginFolder GetFolder()
         {
-            var path = Path.Combine(_appPaths.DataPath, "playlists");
+            var path = Path.Combine(_appPaths.CachePath, "playlists");
 
             Directory.CreateDirectory(path);
 
diff --git a/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs b/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
index 92f01305c..79b673283 100644
--- a/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
+++ b/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
@@ -1,8 +1,10 @@
 using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Generic;
@@ -41,9 +43,6 @@ namespace MediaBrowser.Server.Implementations.Playlists
         {
             var name = options.Name;
 
-            // Need to use the [boxset] suffix
-            // If internet metadata is not found, or if xml saving is off there will be no collection.xml
-            // This could cause it to get re-resolved as a plain folder
             var folderName = _fileSystem.GetValidFilename(name) + " [playlist]";
 
             var parentFolder = GetPlaylistsFolder(null);
@@ -53,7 +52,55 @@ namespace MediaBrowser.Server.Implementations.Playlists
                 throw new ArgumentException();
             }
 
+            if (string.IsNullOrWhiteSpace(options.MediaType))
+            {
+                foreach (var itemId in options.ItemIdList)
+                {
+                    var item = _libraryManager.GetItemById(itemId);
+
+                    if (item == null)
+                    {
+                        throw new ArgumentException("No item exists with the supplied Id");
+                    }
+
+                    if (!string.IsNullOrWhiteSpace(item.MediaType))
+                    {
+                        options.MediaType = item.MediaType;
+                    }
+                    else if (item is MusicArtist || item is MusicAlbum || item is MusicGenre)
+                    {
+                        options.MediaType = MediaType.Audio;
+                    }
+                    else if (item is Genre)
+                    {
+                        options.MediaType = MediaType.Video;
+                    }
+                    else
+                    {
+                        var folder = item as Folder;
+                        if (folder != null)
+                        {
+                            options.MediaType = folder.GetRecursiveChildren()
+                                .Where(i => !i.IsFolder)
+                                .Select(i => i.MediaType)
+                                .FirstOrDefault(i => !string.IsNullOrWhiteSpace(i));
+                        }
+                    }
+
+                    if (!string.IsNullOrWhiteSpace(options.MediaType))
+                    {
+                        break;
+                    }
+                }
+            }
+
+            if (string.IsNullOrWhiteSpace(options.MediaType))
+            {
+                throw new ArgumentException("A playlist media type is required.");
+            }
+
             var path = Path.Combine(parentFolder.Path, folderName);
+            path = GetTargetPath(path);
 
             _iLibraryMonitor.ReportFileSystemChangeBeginning(path);
 
@@ -61,24 +108,27 @@ namespace MediaBrowser.Server.Implementations.Playlists
             {
                 Directory.CreateDirectory(path);
 
-                var collection = new Playlist
+                var playlist = new Playlist
                 {
                     Name = name,
                     Parent = parentFolder,
-                    Path = path
+                    Path = path,
+                    OwnerUserId = options.UserId
                 };
 
-                await parentFolder.AddChild(collection, CancellationToken.None).ConfigureAwait(false);
+                playlist.SetMediaType(options.MediaType);
+
+                await parentFolder.AddChild(playlist, CancellationToken.None).ConfigureAwait(false);
 
-                await collection.RefreshMetadata(new MetadataRefreshOptions(), CancellationToken.None)
+                await playlist.RefreshMetadata(new MetadataRefreshOptions { ForceSave = true }, CancellationToken.None)
                     .ConfigureAwait(false);
 
                 if (options.ItemIdList.Count > 0)
                 {
-                    await AddToPlaylist(collection.Id.ToString("N"), options.ItemIdList);
+                    await AddToPlaylist(playlist.Id.ToString("N"), options.ItemIdList);
                 }
 
-                return collection;
+                return playlist;
             }
             finally
             {
@@ -87,11 +137,28 @@ namespace MediaBrowser.Server.Implementations.Playlists
             }
         }
 
+        private string GetTargetPath(string path)
+        {
+            while (Directory.Exists(path))
+            {
+                path += "1";
+            }
+
+            return path;
+        }
+
+        private IEnumerable<BaseItem> GetPlaylistItems(IEnumerable<string> itemIds, string playlistMediaType, User user)
+        {
+            var items = itemIds.Select(i => _libraryManager.GetItemById(i)).Where(i => i != null);
+
+            return Playlist.GetPlaylistItems(playlistMediaType, items, user);
+        }
+
         public async Task AddToPlaylist(string playlistId, IEnumerable<string> itemIds)
         {
-            var collection = _libraryManager.GetItemById(playlistId) as Playlist;
+            var playlist = _libraryManager.GetItemById(playlistId) as Playlist;
 
-            if (collection == null)
+            if (playlist == null)
             {
                 throw new ArgumentException("No Playlist exists with the supplied Id");
             }
@@ -110,17 +177,17 @@ namespace MediaBrowser.Server.Implementations.Playlists
 
                 itemList.Add(item);
 
-                list.Add(new LinkedChild
-                {
-                    Type = LinkedChildType.Manual,
-                    ItemId = item.Id
-                });
+                list.Add(LinkedChild.Create(item));
             }
 
-            collection.LinkedChildren.AddRange(list);
+            playlist.LinkedChildren.AddRange(list);
+
+            await playlist.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
+            await playlist.RefreshMetadata(new MetadataRefreshOptions{
+            
+                ForceSave = true
 
-            await collection.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
-            await collection.RefreshMetadata(CancellationToken.None).ConfigureAwait(false);
+            }, CancellationToken.None).ConfigureAwait(false);
         }
 
         public Task RemoveFromPlaylist(string playlistId, IEnumerable<int> indeces)
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 9235beacf..c05819361 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -528,6 +528,7 @@ namespace MediaBrowser.WebDashboard.Api
                                 "chromecast.js",
                                 "backdrops.js",
                                 "sync.js",
+                                "playlistmanager.js",
 
                                 "mediaplayer.js",
                                 "mediaplayer-video.js",
@@ -621,6 +622,9 @@ namespace MediaBrowser.WebDashboard.Api
                                 "notificationsetting.js",
                                 "notificationsettings.js",
                                 "playlist.js",
+                                "playlists.js",
+                                "playlistedit.js",
+
                                 "plugincatalogpage.js",
                                 "pluginspage.js",
                                 "remotecontrol.js",
@@ -676,7 +680,6 @@ namespace MediaBrowser.WebDashboard.Api
                                       "librarymenu.css",
                                       "librarybrowser.css",
                                       "detailtable.css",
-                                      "posteritem.css",
                                       "card.css",
                                       "tileitem.css",
                                       "metadataeditor.css",
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 4bc05e0c1..c0fe0261b 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -347,6 +347,12 @@
     <Content Include="dashboard-ui\notificationlist.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\playlistedit.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="dashboard-ui\playlists.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\reports.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -527,9 +533,6 @@
     <Content Include="dashboard-ui\css\pluginupdates.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\css\posteritem.css">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\css\remotecontrol.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -665,6 +668,15 @@
     <Content Include="dashboard-ui\scripts\notificationlist.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\scripts\playlistedit.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="dashboard-ui\scripts\playlistmanager.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="dashboard-ui\scripts\playlists.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\scripts\reports.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-- 
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.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/ChannelService.cs b/MediaBrowser.Api/ChannelService.cs
index 2cc046f1d..3736814e5 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 ea7eaa947..43e9ad3ef 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 9a7d28ec4..df689cb24 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 000000000..e6b525e53
--- /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 000000000..e2c95eba9
--- /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 8017f3523..000000000
--- 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 000000000..0ccc28c6f
--- /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 000000000..c20cef3b3
--- /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 000000000..3913275ee
--- /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 259b1d892..000000000
--- 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 f5a1f54cb..4ffe5b391 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 600d9e405..000000000
--- 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 2940bcef0..000000000
--- 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 60abc14f1..cb6121c9f 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 68222d843..0dc67f8c0 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 25698d972..d826a3ee7 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 fc6963070..6989dea06 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 000000000..0c565ae36
--- /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 000000000..29e60ff1f
--- /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 aac8cda2e..13c9f8d84 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 5e6bd9707..19c960167 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 0da5f9272..c6bbf02ae 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 d8d836597..34486182b 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 5243e1a2a..28e1ffb1c 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 87b89e79c..254e56e05 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 000000000..38871e814
--- /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 e37a13923..f715ce770 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 1d66d1505..0c814c0d4 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 000000000..1d204f2cb
--- /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 62aec5ecb..25778d036 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 ca48b8889..2a99076d4 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 1adf83d36..72414d454 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 000000000..8fad57461
--- /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 363500954..98b765e6b 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 a76c6cd2d..4aacc1619 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 4734e2af7..6600a3e91 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 d50dba1b2..000000000
--- 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 5a83419e1..3c558577a 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 042828887..75694cb04 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 000000000..84f01e0b7
--- /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 e73b4c9a1..956d68ae4 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 76a1e52f5..66188f796 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 a2e1ba05a..f48707582 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 361cc317c..63df3f50d 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 000000000..f520915d8
--- /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 c25fbee6f..722d0d3f3 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 34656f05b..179ab425b 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 000000000..46eaa7f21
--- /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 000000000..787cbcc5b
--- /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 000000000..7af2a1c84
--- /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 b10b64c3e..6a0bb780c 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 42aadf62e..5f1db03c6 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 305f2800f..b969d551a 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 1c4ccb141..8dfdfdaec 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 b18d0df5e..cd871d8eb 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 43c9f3b9c..139f8629c 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 605bbea0d..973089795 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 9ee00dd42..58c8ef995 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 2424a6652..d34d5a293 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 3d0781e91..7a23d8e08 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 61c65cfd6..7db6d0191 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 a50a6f02e..ed590a1f2 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 bb22e992b..65da74f9e 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 d44ac250d..357395e72 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.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/System/ActivityLogService.cs b/MediaBrowser.Api/System/ActivityLogService.cs
index 0ccc28c6f..8dc3079c7 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 de2801dcc..d746d47ff 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 0c565ae36..728548911 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 29e60ff1f..7ccbc2e99 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 d6e315fd1..077138f3c 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 fdffa60d0..e718a53ff 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 243d7fd2d..96a8c579e 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 bac226369..67acc1cae 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 da040f296..d487362f5 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 eb94b37db..78e8e4959 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 19c960167..5d8fff38f 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 8a554c1d5..70577bbfd 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 34ca85d1d..2abc71752 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 7c352d97a..908525a2f 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 d40ecb463..b1c6ebffc 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 000000000..7bd810b8d
--- /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 28e1ffb1c..d12c36fba 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 ec3e03339..7822623a9 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 866f87776..35522dd06 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 279a40a73..296c968bb 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 ff5b3a046..5c317d94d 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 efab21021..642f93c14 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 164ea943d..61aebdb89 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 9a4322b68..b9b7b6e8e 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 ee18a5efa..fd5363529 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 43516a378..d2cfae46b 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 1d63d3885..b8360d95c 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 2ae5524fa..de767b932 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 1ce80339c..25dac2f84 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 c3c13cdc3..65f3393ff 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 d48fc34b1..c47e5045e 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 319936e0a..c0164ae53 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 541ecf828..454c7b794 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 a99dc6b4e..f9e20531a 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 40e55e98a..68e35184c 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 4499b905d..103c8ad27 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 4e0231a53..3717b07c4 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 dec3d02ef..284166fa3 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 7c3414b25..d1f415291 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 b629fa518..3a7eddc1f 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 5f86a94a9..13c368328 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 40ad2bc78..09886210c 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 d72462812..beeeb31c0 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 2a99076d4..dfc7b55d8 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 72414d454..63dc137ce 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 98b765e6b..7e8773c5b 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 f0fc4d47c..26fb1c9bd 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 6600a3e91..d96412335 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 1afc9a191..8f55fde4b 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 9b54f7e16..309b67543 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 ff9e1d6a3..67cfa0208 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 ad82cdc13..5a3e267e6 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 31cda8303..a97cc3b12 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 75694cb04..f3360fe52 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 000000000..ccf5ab087
--- /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 9e69d0857..ef5c30975 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 d7615eb02..41c4dcb0d 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 ef3778450..d10517470 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 46eaa7f21..7b123bad2 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 787cbcc5b..f491a5c44 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 567092cae..65e5a0549 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 b8290fda7..0bd772a56 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 90b77828b..044ed25f9 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 cd871d8eb..477aa3878 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 8310895e6..297d5e032 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 0d54d94e8..e3ac2025f 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 05c972a4e..059ad2481 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 ad2b50365..710781462 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 10f84a8b1..15c953171 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 3b607c105..5522a2970 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 41f3c3181..40d3aadbe 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 76aa151ca..7a029af44 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 a6a6f929a..9b48db51d 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 2690aee1a..0b28351ca 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 3210756b9..6a4dfe037 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 0a4031fd2..d8ed66489 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 08e8f6ade..c2bca5298 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 c9925a171..a5d9e5280 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 3ed57d473..bef7dcbf6 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 68bb3bd48..1e1356408 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 885c0e58b..542c8eff3 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 0c6058190..ef49504e2 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 c169a30cd..08055fdf5 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 14d99a62d..ea9c0eb0a 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 a85e19581..03638ac4b 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 6df18ed31..4bf6e7714 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 b5e03e50b..20ad67cde 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 802cf8122..bdf866bda 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 706914be5..89207f4e8 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 e9b5c42d9..815789e92 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 8d8904f52..07f577724 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 1e7e9bcfb..6b5a38dc7 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 a72dbdf75..95b5be3e2 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 30215cb92..227ac09c0 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 46e7e4512..8e243a682 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 bb40d7be8..75a2ae657 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 4fcef706b..0eb48f1c0 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 84e255525..cef64513d 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 5c05bda3b..3f656b60c 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 17fef888a..b8ac892e4 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 86dbc98a1..7765f843f 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 9db84f032..2324e6fe6 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 1685edf96..4ab79f420 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 c8dd0cb08..9a3535791 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 c1055c77f..c98fb435c 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 49081ab60..568d26fd2 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 445e86e7a..6ccd60090 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 84a4e2ae7..31cb033a8 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 455492feb..da8b6364d 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 973089795..d09548bab 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 6b46d9c2d..e06a5d94a 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 8b29b4da8..98218bb77 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 47ed8e035..ef9f681b5 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 723c792dc..c541c80bd 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 af9c7563b..3ff164443 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 e7e53181c..3d0e36ead 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 768d37264..6b3170e42 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 43a960ea2..cd20ad74d 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 357395e72..f28b027d2 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 36bce0dfd..cc9198349 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 03fc888db..3f023c5ef 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 7048a961d..908d06954 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 aa7bec8fd..6a9c203ce 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 52523d8bb..3cbad00b7 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.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 9d54458a6..b77c6fd01 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 4ffe5b391..6fe428274 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 b5f1c8294..979dae49c 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 434e896da..fc15eedf0 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 96a8c579e..79c96dd5e 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 5d8fff38f..705cf9057 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 b9c419722..e4fd929ff 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 c6bbf02ae..a5d949c8a 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 7822623a9..05a894223 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 29bd21407..2dd863c80 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 962c2a211..466c99009 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 2f2d4f3ce..f8451bdfd 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 000000000..aeb11c38b
--- /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 000000000..115ee1b4e
--- /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 8f55fde4b..4c39c8183 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 fec22e11c..787f55ec0 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 305f2800f..1b29971da 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 139f8629c..94cc61240 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 710781462..cc06c6c50 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 15c953171..9cfd5b4d2 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 5522a2970..4468615a9 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 40d3aadbe..341206c4b 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 7a029af44..3b28ca62f 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 f5212eeac..11fb1d308 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 9b48db51d..81ebf49c9 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 0b28351ca..a2e79058d 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 6a4dfe037..a7524ba82 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 f263d4af1..ad1757900 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 d8ed66489..885109fcb 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 c2bca5298..49a5803d0 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 a5d9e5280..0f40dac0b 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 bef7dcbf6..b21b3172b 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 df852476a..ef979a2c9 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 1e1356408..9520907ac 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 542c8eff3..ec46aa6f0 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 64e98dde0..af32a0f6a 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 ef49504e2..781ef70cf 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 08055fdf5..6c72a9aa7 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 ea9c0eb0a..6bd271756 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 03ffa3c80..620a71c71 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 03638ac4b..25c2731e9 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 823534b35..a49dda0dc 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 505f75692..dadfecdf1 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 4bf6e7714..2cda3c98d 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 20ad67cde..04dec9446 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 bdf866bda..c11f87dc4 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 89207f4e8..c3bb3a00a 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 815789e92..0631352ef 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 07f577724..c45a36e9d 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 6b5a38dc7..6aaecd48f 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 95b5be3e2..95ec3ed35 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 227ac09c0..68662e282 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 8e243a682..8b035525e 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 75a2ae657..31ddbbbed 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 0eb48f1c0..af3dcc765 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 cef64513d..9e9c42197 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 3f656b60c..280830e3c 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 b8ac892e4..618038868 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 7765f843f..e466c7300 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 2324e6fe6..ac8fe87c9 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 4ab79f420..23d47bd0f 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 9a3535791..8639c63de 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 c98fb435c..9286fa711 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 568d26fd2..1a3c180bd 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 6ccd60090..b252ef6be 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 31cb033a8..1f6eaa0f2 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 da8b6364d..afd3cf5bb 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 d09548bab..c790b7b0f 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 e06a5d94a..6fb0398fc 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 98218bb77..8a78ef919 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 ef9f681b5..acb8bb0d0 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 c541c80bd..784a96f18 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 7db6d0191..d55d26e44 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 f28b027d2..9f9cd8e75 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 e80c8ff3f..7a2e184b6 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


From b48d15296c1708545f358dc0ccbc48fea9b2cf00 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 18 Aug 2014 21:42:53 -0400
Subject: support custom ordering of user views

---
 MediaBrowser.Api/Images/RemoteImageService.cs      | 17 ++--
 MediaBrowser.Api/Session/SessionsService.cs        | 48 ++++++++----
 MediaBrowser.Api/UserLibrary/UserLibraryService.cs |  3 +-
 MediaBrowser.Controller/Playlists/Playlist.cs      | 59 +++++++++-----
 .../Providers/ItemIdentities.cs                    |  5 +-
 MediaBrowser.Dlna/Didl/DidlBuilder.cs              | 10 +--
 MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml  |  1 +
 .../Configuration/UserConfiguration.cs             |  3 +
 MediaBrowser.Providers/Manager/ProviderManager.cs  |  9 ++-
 .../MediaInfo/VideoImageProvider.cs                |  2 +-
 MediaBrowser.Providers/TV/TvdbSeriesProvider.cs    | 90 ++++++++++++++++++----
 .../Library/MusicManager.cs                        |  4 +-
 .../Library/UserViewManager.cs                     | 14 +++-
 .../Localization/Server/server.json                |  4 +-
 14 files changed, 193 insertions(+), 76 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/Images/RemoteImageService.cs b/MediaBrowser.Api/Images/RemoteImageService.cs
index 06b99e175..235f18296 100644
--- a/MediaBrowser.Api/Images/RemoteImageService.cs
+++ b/MediaBrowser.Api/Images/RemoteImageService.cs
@@ -199,21 +199,21 @@ namespace MediaBrowser.Api.Images
             return _providerManager.GetRemoteImageProviderInfo(item).ToList();
         }
 
-        public object Get(GetRemoteImages request)
+        public async Task<object> Get(GetRemoteImages request)
         {
             var item = _libraryManager.GetItemById(request.Id);
 
-            return GetRemoteImageResult(item, request);
+            return await GetRemoteImageResult(item, request).ConfigureAwait(false);
         }
 
-        public object Get(GetItemByNameRemoteImages request)
+        public async Task<object> Get(GetItemByNameRemoteImages request)
         {
             var pathInfo = PathInfo.Parse(Request.PathInfo);
             var type = pathInfo.GetArgumentValue<string>(0);
 
             var item = GetItemByName(request.Name, type, _libraryManager);
 
-            return GetRemoteImageResult(item, request);
+            return await GetRemoteImageResult(item, request).ConfigureAwait(false);
         }
 
         private async Task<RemoteImageResult> GetRemoteImageResult(BaseItem item, BaseRemoteImageRequest request)
@@ -304,7 +304,12 @@ namespace MediaBrowser.Api.Images
         /// </summary>
         /// <param name="request">The request.</param>
         /// <returns>System.Object.</returns>
-        public async Task<object> Get(GetRemoteImage request)
+        public object Get(GetRemoteImage request)
+        {
+            return GetAsync(request).Result;
+        }
+
+        public async Task<object> GetAsync(GetRemoteImage request)
         {
             var urlHash = request.ImageUrl.GetMD5();
             var pointerCachePath = GetFullCachePath(urlHash.ToString());
@@ -342,7 +347,7 @@ namespace MediaBrowser.Api.Images
 
             return ToStaticFileResult(contentPath);
         }
-
+        
         /// <summary>
         /// Downloads the image.
         /// </summary>
diff --git a/MediaBrowser.Api/Session/SessionsService.cs b/MediaBrowser.Api/Session/SessionsService.cs
index 8e97e2f3e..e2c10c0c8 100644
--- a/MediaBrowser.Api/Session/SessionsService.cs
+++ b/MediaBrowser.Api/Session/SessionsService.cs
@@ -297,9 +297,9 @@ namespace MediaBrowser.Api.Session
             Task.WaitAll(task);
         }
 
-        public Task Post(CreateKey request)
+        public void Post(CreateKey request)
         {
-            return _authRepo.Create(new AuthenticationInfo
+            var task = _authRepo.Create(new AuthenticationInfo
             {
                 AppName = request.App,
                 IsActive = true,
@@ -307,6 +307,8 @@ namespace MediaBrowser.Api.Session
                 DateCreated = DateTime.UtcNow
 
             }, CancellationToken.None);
+
+            Task.WaitAll(task);
         }
 
         public void Post(ReportSessionEnded request)
@@ -355,7 +357,7 @@ namespace MediaBrowser.Api.Session
             return ToOptimizedResult(result.Select(_sessionManager.GetSessionInfoDto).ToList());
         }
 
-        public Task Post(SendPlaystateCommand request)
+        public void Post(SendPlaystateCommand request)
         {
             var command = new PlaystateRequest
             {
@@ -363,14 +365,16 @@ namespace MediaBrowser.Api.Session
                 SeekPositionTicks = request.SeekPositionTicks
             };
 
-            return _sessionManager.SendPlaystateCommand(GetSession().Id, request.Id, command, CancellationToken.None);
+            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 Task Post(DisplayContent request)
+        public void Post(DisplayContent request)
         {
             var command = new BrowseRequest
             {
@@ -379,14 +383,16 @@ namespace MediaBrowser.Api.Session
                 ItemType = request.ItemType
             };
 
-            return _sessionManager.SendBrowseCommand(GetSession().Id, request.Id, command, CancellationToken.None);
+            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 Task Post(SendSystemCommand request)
+        public void Post(SendSystemCommand request)
         {
             GeneralCommandType commandType;
             var name = request.Command;
@@ -404,14 +410,16 @@ namespace MediaBrowser.Api.Session
                 ControllingUserId = currentSession.UserId.HasValue ? currentSession.UserId.Value.ToString("N") : null
             };
 
-            return _sessionManager.SendGeneralCommand(currentSession.Id, request.Id, command, CancellationToken.None);
+            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 Task Post(SendMessageCommand request)
+        public void Post(SendMessageCommand request)
         {
             var command = new MessageCommand
             {
@@ -420,14 +428,16 @@ namespace MediaBrowser.Api.Session
                 Text = request.Text
             };
 
-            return _sessionManager.SendMessageCommand(GetSession().Id, request.Id, command, CancellationToken.None);
+            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 Task Post(Play request)
+        public void Post(Play request)
         {
             var command = new PlayRequest
             {
@@ -437,10 +447,12 @@ namespace MediaBrowser.Api.Session
                 StartPositionTicks = request.StartPositionTicks
             };
 
-            return _sessionManager.SendPlayCommand(GetSession().Id, request.Id, command, CancellationToken.None);
+            var task = _sessionManager.SendPlayCommand(GetSession().Id, request.Id, command, CancellationToken.None);
+
+            Task.WaitAll(task);
         }
 
-        public Task Post(SendGeneralCommand request)
+        public void Post(SendGeneralCommand request)
         {
             var currentSession = GetSession();
 
@@ -450,16 +462,20 @@ namespace MediaBrowser.Api.Session
                 ControllingUserId = currentSession.UserId.HasValue ? currentSession.UserId.Value.ToString("N") : null
             };
 
-            return _sessionManager.SendGeneralCommand(currentSession.Id, request.Id, command, CancellationToken.None);
+            var task = _sessionManager.SendGeneralCommand(currentSession.Id, request.Id, command, CancellationToken.None);
+
+            Task.WaitAll(task);
         }
 
-        public Task Post(SendFullGeneralCommand request)
+        public void Post(SendFullGeneralCommand request)
         {
             var currentSession = GetSession();
 
             request.ControllingUserId = currentSession.UserId.HasValue ? currentSession.UserId.Value.ToString("N") : null;
 
-            return _sessionManager.SendGeneralCommand(currentSession.Id, request.Id, request, CancellationToken.None);
+            var task = _sessionManager.SendGeneralCommand(currentSession.Id, request.Id, request, CancellationToken.None);
+
+            Task.WaitAll(task);
         }
 
         public void Post(AddUserToSession request)
diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
index 16ed0ee29..44b5b0e9b 100644
--- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
@@ -420,8 +420,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             var folders = await _userViewManager.GetUserViews(query, CancellationToken.None).ConfigureAwait(false);
 
-            var dtos = folders.OrderBy(i => i.SortName)
-                .Select(i => _dtoService.GetBaseItemDto(i, fields, user))
+            var dtos = folders.Select(i => _dtoService.GetBaseItemDto(i, fields, user))
                 .ToArray();
 
             var result = new QueryResult<BaseItemDto>
diff --git a/MediaBrowser.Controller/Playlists/Playlist.cs b/MediaBrowser.Controller/Playlists/Playlist.cs
index 05a894223..84fcbb91a 100644
--- a/MediaBrowser.Controller/Playlists/Playlist.cs
+++ b/MediaBrowser.Controller/Playlists/Playlist.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Querying;
 using System;
@@ -47,32 +48,54 @@ namespace MediaBrowser.Controller.Playlists
                 inputItems = inputItems.Where(i => i.IsVisible(user));
             }
 
-            inputItems = inputItems.SelectMany(i =>
+            return inputItems.SelectMany(i => GetPlaylistItems(i, user))
+                .Where(m =>  string.Equals(m.MediaType, playlistMediaType, StringComparison.OrdinalIgnoreCase));
+        }
+
+        private static IEnumerable<BaseItem> GetPlaylistItems(BaseItem i, User user)
+        {
+            var musicGenre = i as MusicGenre;
+            if (musicGenre != null)
             {
-                var folder = i as Folder;
+                var songs = user.RootFolder
+                    .GetRecursiveChildren(user)
+                    .OfType<Audio>()
+                    .Where(a => a.Genres.Contains(musicGenre.Name, StringComparer.OrdinalIgnoreCase));
 
-                if (folder != null)
-                {
-                    var items = user == null
-                        ? folder.GetRecursiveChildren()
-                        : folder.GetRecursiveChildren(user, true);
+                return LibraryManager.Sort(songs, user, new[] { ItemSortBy.SortName }, SortOrder.Ascending);
+            }
 
-                    items = items
-                       .Where(m => !m.IsFolder);
+            var musicArtist = i as MusicArtist;
+            if (musicArtist != null)
+            {
+                var songs = user.RootFolder
+                    .GetRecursiveChildren(user)
+                    .OfType<Audio>()
+                    .Where(a => a.HasArtist(musicArtist.Name));
 
-                    if (!folder.IsPreSorted)
-                    {
-                        items = LibraryManager.Sort(items, user, new[] { ItemSortBy.SortName }, SortOrder.Ascending);
-                    }
+                return LibraryManager.Sort(songs, user, new[] { ItemSortBy.SortName }, SortOrder.Ascending);
+            }
+            
+            var folder = i as Folder;
 
-                    return items;
-                }
+            if (folder != null)
+            {
+                var items = user == null
+                    ? folder.GetRecursiveChildren()
+                    : folder.GetRecursiveChildren(user, true);
+
+                items = items
+                   .Where(m => !m.IsFolder);
 
-                return new[] { i };
+                if (!folder.IsPreSorted)
+                {
+                    items = LibraryManager.Sort(items, user, new[] { ItemSortBy.SortName }, SortOrder.Ascending);
+                }
 
-            }).Where(m =>  string.Equals(m.MediaType, playlistMediaType, StringComparison.OrdinalIgnoreCase));
+                return items;
+            }
 
-            return inputItems;
+            return new[] { i };
         }
 
         [IgnoreDataMember]
diff --git a/MediaBrowser.Controller/Providers/ItemIdentities.cs b/MediaBrowser.Controller/Providers/ItemIdentities.cs
index 93d468af0..8d24f6c1f 100644
--- a/MediaBrowser.Controller/Providers/ItemIdentities.cs
+++ b/MediaBrowser.Controller/Providers/ItemIdentities.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/MediaBrowser.Dlna/Didl/DidlBuilder.cs b/MediaBrowser.Dlna/Didl/DidlBuilder.cs
index 5cf4222a8..69fec1e44 100644
--- a/MediaBrowser.Dlna/Didl/DidlBuilder.cs
+++ b/MediaBrowser.Dlna/Didl/DidlBuilder.cs
@@ -163,13 +163,13 @@ namespace MediaBrowser.Dlna.Didl
 
             if (string.Equals(subtitleMode, "CaptionInfoEx", StringComparison.OrdinalIgnoreCase))
             {
-                var res = container.OwnerDocument.CreateElement("SEC", "CaptionInfoEx");
+                //var res = container.OwnerDocument.CreateElement("SEC", "CaptionInfoEx");
 
-                res.InnerText = info.Url;
+                //res.InnerText = info.Url;
 
-                // TODO: attribute needs SEC:
-                res.SetAttribute("type", info.Format.ToLower());
-                container.AppendChild(res);
+                //// TODO: attribute needs SEC:
+                //res.SetAttribute("type", info.Format.ToLower());
+                //container.AppendChild(res);
             }
             else
             {
diff --git a/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml b/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml
index 115ee1b4e..c6ca13e04 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml	
@@ -2,6 +2,7 @@
 <Profile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Name>DirecTV HD-DVR</Name>
   <Identification>
+    <FriendlyName>^DIRECTV.*$</FriendlyName>
     <Headers>
       <HttpHeaderInfo name="User-Agent" value="DIRECTV" match="Substring" />
     </Headers>
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 4c39c8183..b48018c9a 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -77,6 +77,8 @@ namespace MediaBrowser.Model.Configuration
 
         public bool EnableLocalPassword { get; set; }
 
+        public string[] OrderedViews { get; set; }
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="UserConfiguration" /> class.
         /// </summary>
@@ -90,6 +92,7 @@ namespace MediaBrowser.Model.Configuration
             EnableMediaPlayback = true;
             EnableLiveTvAccess = true;
 
+            OrderedViews = new string[] { };
             BlockedMediaFolders = new string[] { };
             DisplayChannelsWithinViews = new string[] { };
             BlockedChannels = new string[] { };
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index 3377d1535..f2ec85cfa 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -342,14 +342,17 @@ namespace MediaBrowser.Providers.Manager
 
                 if (provider is IRemoteImageProvider || provider is IDynamicImageProvider)
                 {
-                    if (!ConfigurationManager.Configuration.EnableInternetProviders)
+                    if (Array.IndexOf(options.DisabledImageFetchers, provider.Name) != -1)
                     {
                         return false;
                     }
 
-                    if (Array.IndexOf(options.DisabledImageFetchers, provider.Name) != -1)
+                    if (provider is IRemoteImageProvider)
                     {
-                        return false;
+                        if (!ConfigurationManager.Configuration.EnableInternetProviders)
+                        {
+                            return false;
+                        }
                     }
                 }
             }
diff --git a/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs b/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs
index a2ec897a1..82ccdc4ac 100644
--- a/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs
@@ -5,11 +5,11 @@ using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
+using MediaBrowser.Model.MediaInfo;
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Model.MediaInfo;
 
 namespace MediaBrowser.Providers.MediaInfo
 {
diff --git a/MediaBrowser.Providers/TV/TvdbSeriesProvider.cs b/MediaBrowser.Providers/TV/TvdbSeriesProvider.cs
index acff0231f..97eabcfa9 100644
--- a/MediaBrowser.Providers/TV/TvdbSeriesProvider.cs
+++ b/MediaBrowser.Providers/TV/TvdbSeriesProvider.cs
@@ -57,11 +57,30 @@ namespace MediaBrowser.Providers.TV
         {
             var seriesId = searchInfo.GetProviderId(MetadataProviders.Tvdb);
 
-            if (!string.IsNullOrEmpty(seriesId))
+            if (string.IsNullOrEmpty(seriesId))
             {
+                return await FindSeries(searchInfo.Name, cancellationToken).ConfigureAwait(false);
             }
-            
-            return new List<RemoteSearchResult>();
+
+            var metadata = await GetMetadata(searchInfo, cancellationToken).ConfigureAwait(false);
+
+            var list = new List<RemoteSearchResult>();
+
+            if (metadata.HasMetadata)
+            {
+                var res = new RemoteSearchResult
+                {
+                    Name = metadata.Item.Name,
+                    PremiereDate = metadata.Item.PremiereDate,
+                    ProductionYear = metadata.Item.ProductionYear,
+                    ProviderIds = metadata.Item.ProviderIds,
+                    SearchProviderName = Name
+                };
+
+                list.Add(res);
+            }
+
+            return list;
         }
 
         public async Task<MetadataResult<Series>> GetMetadata(SeriesInfo itemId, CancellationToken cancellationToken)
@@ -79,18 +98,13 @@ namespace MediaBrowser.Providers.TV
 
                 if (string.IsNullOrEmpty(seriesId))
                 {
-                    seriesId = await FindSeries(itemId.Name, cancellationToken).ConfigureAwait(false);
-                }
+                    var srch = await GetSearchResults(itemId, cancellationToken).ConfigureAwait(false);
 
-                if (string.IsNullOrEmpty(seriesId))
-                {
-                    int? yearInName = null;
-                    string nameWithoutYear;
-                    NameParser.ParseName(itemId.Name, out nameWithoutYear, out yearInName);
+                    var entry = srch.FirstOrDefault();
 
-                    if (!string.IsNullOrEmpty(nameWithoutYear) && !string.Equals(nameWithoutYear, itemId.Name, StringComparison.OrdinalIgnoreCase))
+                    if (entry != null)
                     {
-                        seriesId = await FindSeries(nameWithoutYear, cancellationToken).ConfigureAwait(false);
+                        seriesId = entry.GetProviderId(MetadataProviders.Tvdb);
                     }
                 }
             }
@@ -262,8 +276,29 @@ namespace MediaBrowser.Providers.TV
         /// <param name="name">The name.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{System.String}.</returns>
-        private async Task<string> FindSeries(string name, CancellationToken cancellationToken)
+        private async Task<IEnumerable<RemoteSearchResult>> FindSeries(string name, CancellationToken cancellationToken)
+        {
+            var results = (await FindSeriesInternal(name, cancellationToken).ConfigureAwait(false)).ToList();
+
+            if (results.Count == 0)
+            {
+                int? yearInName = null;
+                string nameWithoutYear;
+                NameParser.ParseName(name, out nameWithoutYear, out yearInName);
+
+                if (!string.IsNullOrEmpty(nameWithoutYear) && !string.Equals(nameWithoutYear, name, StringComparison.OrdinalIgnoreCase))
+                {
+                    results = (await FindSeriesInternal(nameWithoutYear, cancellationToken).ConfigureAwait(false)).ToList();
+                }
+            }
+
+            return results;
+        }
+
+        private async Task<IEnumerable<RemoteSearchResult>> FindSeriesInternal(string name, CancellationToken cancellationToken)
         {
+            // TODO: Support returning more data, including image url's for the identify function
+
             var url = string.Format(RootUrl + SeriesQuery, WebUtility.UrlEncode(name));
             var doc = new XmlDocument();
 
@@ -278,6 +313,8 @@ namespace MediaBrowser.Providers.TV
                 doc.Load(results);
             }
 
+            var searchResults = new List<RemoteSearchResult>();
+
             if (doc.HasChildNodes)
             {
                 var nodes = doc.SelectNodes("//Series");
@@ -305,7 +342,17 @@ namespace MediaBrowser.Providers.TV
                         {
                             var id = node.SelectSingleNode("./seriesid");
                             if (id != null)
-                                return id.InnerText;
+                            {
+                                var searchResult = new RemoteSearchResult
+                                {
+                                    Name = titles.FirstOrDefault(),
+                                    SearchProviderName = Name
+                                };
+
+                                searchResult.SetProviderId(MetadataProviders.Tvdb, id.InnerText);
+
+                                searchResults.Add(searchResult);
+                            }
                         }
 
                         foreach (var title in titles)
@@ -317,7 +364,7 @@ namespace MediaBrowser.Providers.TV
             }
 
             _logger.Info("TVDb Provider - Could not find " + name + ". Check name on Thetvdb.org.");
-            return null;
+            return searchResults;
         }
 
         /// <summary>
@@ -1133,11 +1180,20 @@ namespace MediaBrowser.Providers.TV
         {
             string tvdbId;
             if (!info.ProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out tvdbId))
-                tvdbId = await FindSeries(info.Name, CancellationToken.None);
+            {
+                var srch = await GetSearchResults(info, CancellationToken.None).ConfigureAwait(false);
+
+                var entry = srch.FirstOrDefault();
+
+                if (entry != null)
+                {
+                    tvdbId = entry.GetProviderId(MetadataProviders.Tvdb);
+                }
+            }
 
             if (!string.IsNullOrEmpty(tvdbId))
             {
-                return new SeriesIdentity {Type = MetadataProviders.Tvdb.ToString(), Id = tvdbId};
+                return new SeriesIdentity { Type = MetadataProviders.Tvdb.ToString(), Id = tvdbId };
             }
 
             return null;
diff --git a/MediaBrowser.Server.Implementations/Library/MusicManager.cs b/MediaBrowser.Server.Implementations/Library/MusicManager.cs
index df122e166..7ffbab860 100644
--- a/MediaBrowser.Server.Implementations/Library/MusicManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MusicManager.cs
@@ -30,8 +30,8 @@ namespace MediaBrowser.Server.Implementations.Library
         {
             var artist = _libraryManager.GetArtist(name);
 
-            var genres = _libraryManager.RootFolder
-                .RecursiveChildren
+            var genres = user.RootFolder
+                .GetRecursiveChildren(user)
                 .OfType<Audio>()
                 .Where(i => i.HasArtist(name))
                 .SelectMany(i => i.Genres)
diff --git a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
index e3ac2025f..63aa3764c 100644
--- a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
@@ -133,7 +133,19 @@ namespace MediaBrowser.Server.Implementations.Library
                 }
             }
 
-            return _libraryManager.Sort(list, user, new[] { ItemSortBy.SortName }, SortOrder.Ascending).Cast<Folder>();
+            var sorted = _libraryManager.Sort(list, user, new[] { ItemSortBy.SortName }, SortOrder.Ascending).ToList();
+
+            var orders = user.Configuration.OrderedViews.ToList();
+
+            return list
+                .OrderBy(i =>
+                {
+                    var index = orders.IndexOf(i.Id.ToString("N"));
+
+                    return index == -1 ? int.MaxValue : index;
+                })
+                .ThenBy(sorted.IndexOf)
+                .ThenBy(i => i.SortName);
         }
 
         public Task<UserView> GetUserView(string type, User user, string sortName, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 8b392f812..64d6460ee 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -1018,5 +1018,7 @@
     "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"
+    "HeaderLocalAccess": "Local Access",
+    "HeaderViewOrder": "View Order",
+    "LabelSelectUserViewOrder":  "Choose the order your views will be displayed in within Media Browser apps"
 }
-- 
cgit v1.2.3


From 809e4629c09821e7373bff79e0d0be86df11ce2c Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 26 Aug 2014 23:25:39 -0400
Subject: update translations

---
 .../MediaEncoding/MediaEncoderHelpers.cs           |   5 +-
 .../Resolvers/EntityResolutionHelper.cs            |  41 +++-
 .../Configuration/ServerConfiguration.cs           |   4 -
 .../FolderImages/DefaultImageProvider.cs           |  12 +-
 .../EntryPoints/Notifications/Notifications.cs     |  41 ++--
 .../Library/Resolvers/Audio/MusicAlbumResolver.cs  |  15 +-
 .../Localization/JavaScript/ar.json                |   4 +-
 .../Localization/JavaScript/ca.json                |   4 +-
 .../Localization/JavaScript/cs.json                |   2 +-
 .../Localization/JavaScript/da.json                |   4 +-
 .../Localization/JavaScript/de.json                |  10 +-
 .../Localization/JavaScript/el.json                |   4 +-
 .../Localization/JavaScript/en_GB.json             |   4 +-
 .../Localization/JavaScript/en_US.json             |   4 +-
 .../Localization/JavaScript/fr.json                |  18 +-
 .../Localization/JavaScript/he.json                |   4 +-
 .../Localization/JavaScript/kk.json                |  84 ++++----
 .../Localization/JavaScript/ms.json                |   4 +-
 .../Localization/JavaScript/nl.json                |  72 +++----
 .../Localization/JavaScript/pl.json                |   4 +-
 .../Localization/JavaScript/sv.json                |   4 +-
 .../Localization/JavaScript/vi.json                |   4 +-
 .../Localization/JavaScript/zh_TW.json             |   4 +-
 .../Localization/Server/ar.json                    | 195 +++++++++---------
 .../Localization/Server/ca.json                    | 193 +++++++++---------
 .../Localization/Server/cs.json                    | 199 +++++++++---------
 .../Localization/Server/da.json                    | 199 +++++++++---------
 .../Localization/Server/de.json                    | 225 +++++++++++----------
 .../Localization/Server/el.json                    | 195 +++++++++---------
 .../Localization/Server/en_GB.json                 | 193 +++++++++---------
 .../Localization/Server/en_US.json                 | 193 +++++++++---------
 .../Localization/Server/es.json                    | 201 +++++++++---------
 .../Localization/Server/es_MX.json                 | 199 +++++++++---------
 .../Localization/Server/fr.json                    | 201 +++++++++---------
 .../Localization/Server/he.json                    | 199 +++++++++---------
 .../Localization/Server/it.json                    | 201 +++++++++---------
 .../Localization/Server/kk.json                    | 215 ++++++++++----------
 .../Localization/Server/ko.json                    | 193 +++++++++---------
 .../Localization/Server/ms.json                    | 193 +++++++++---------
 .../Localization/Server/nb.json                    | 201 +++++++++---------
 .../Localization/Server/nl.json                    | 219 ++++++++++----------
 .../Localization/Server/pl.json                    | 195 +++++++++---------
 .../Localization/Server/pt_BR.json                 | 193 +++++++++---------
 .../Localization/Server/pt_PT.json                 | 201 +++++++++---------
 .../Localization/Server/ru.json                    | 191 ++++++++---------
 .../Localization/Server/sv.json                    | 221 ++++++++++----------
 .../Localization/Server/tr.json                    | 199 +++++++++---------
 .../Localization/Server/vi.json                    | 195 +++++++++---------
 .../Localization/Server/zh_TW.json                 | 197 +++++++++---------
 .../Playlists/PlaylistImageEnhancer.cs             |  95 ++++++++-
 .../Session/HttpSessionController.cs               |   4 +-
 MediaBrowser.ServerApplication/ApplicationHost.cs  |  14 --
 MediaBrowser.Tests/MediaBrowser.Tests.csproj       |   1 +
 MediaBrowser.Tests/Resolvers/MusicResolverTests.cs |  30 +++
 54 files changed, 3034 insertions(+), 2668 deletions(-)
 create mode 100644 MediaBrowser.Tests/Resolvers/MusicResolverTests.cs

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Controller/MediaEncoding/MediaEncoderHelpers.cs b/MediaBrowser.Controller/MediaEncoding/MediaEncoderHelpers.cs
index 17ab0f31c..50a1c4e4f 100644
--- a/MediaBrowser.Controller/MediaEncoding/MediaEncoderHelpers.cs
+++ b/MediaBrowser.Controller/MediaEncoding/MediaEncoderHelpers.cs
@@ -127,8 +127,9 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 stream.BitDepth = GetBitDepth(stream.PixelFormat);
 
-                stream.IsAnamorphic = string.Equals(streamInfo.sample_aspect_ratio, "0:1",
-                    StringComparison.OrdinalIgnoreCase);
+                stream.IsAnamorphic = string.Equals(streamInfo.sample_aspect_ratio, "0:1", StringComparison.OrdinalIgnoreCase) ||
+                    string.Equals(stream.AspectRatio, "2.35:1", StringComparison.OrdinalIgnoreCase) ||
+                    string.Equals(stream.AspectRatio, "2.40:1", StringComparison.OrdinalIgnoreCase);
             }
             else
             {
diff --git a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
index ff94ceff3..7c68448e5 100644
--- a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
+++ b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.IO;
+using System.Globalization;
+using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using System;
@@ -188,6 +189,44 @@ namespace MediaBrowser.Controller.Resolvers
             return string.Equals(extension, ".disc", StringComparison.OrdinalIgnoreCase);
         }
 
+        /// <summary>
+        /// Determines whether [is multi disc album folder] [the specified path].
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns><c>true</c> if [is multi disc album folder] [the specified path]; otherwise, <c>false</c>.</returns>
+        public static bool IsMultiDiscAlbumFolder(string path)
+        {
+            var filename = Path.GetFileName(path);
+
+            if (string.IsNullOrWhiteSpace(filename))
+            {
+                return false;
+            }
+
+            // Normalize
+            // Remove whitespace
+            filename = filename.Replace("-", string.Empty);
+            filename = Regex.Replace(filename, @"\s+", "");
+
+            var prefixes = new[] { "disc", "cd", "disk" };
+
+            foreach (var prefix in prefixes)
+            {
+                if (filename.IndexOf(prefix, StringComparison.OrdinalIgnoreCase) == 0)
+                {
+                    var tmp = filename.Substring(prefix.Length);
+
+                    int val;
+                    if (int.TryParse(tmp, NumberStyles.Any, CultureInfo.InvariantCulture, out val))
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
         /// <summary>
         /// Ensures DateCreated and DateModified have values
         /// </summary>
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 8363afc38..1572c50dc 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -176,10 +176,6 @@ namespace MediaBrowser.Model.Configuration
 
         public double DownMixAudioBoost { get; set; }
 
-        public NotificationOptions NotificationOptions { get; set; }
-
-        public SubtitleOptions SubtitleOptions { get; set; }
-
         public bool DefaultMetadataSettingsApplied { get; set; }
 
         public bool EnableTokenAuthentication { get; set; }
diff --git a/MediaBrowser.Providers/FolderImages/DefaultImageProvider.cs b/MediaBrowser.Providers/FolderImages/DefaultImageProvider.cs
index 36815d18c..0f7e6d10a 100644
--- a/MediaBrowser.Providers/FolderImages/DefaultImageProvider.cs
+++ b/MediaBrowser.Providers/FolderImages/DefaultImageProvider.cs
@@ -35,17 +35,7 @@ namespace MediaBrowser.Providers.FolderImages
             var playlist = item as Playlist;
             if (playlist != null)
             {
-                var url = GetImageUrl(null);
-
-                return Task.FromResult<IEnumerable<RemoteImageInfo>>(new List<RemoteImageInfo>
-                {
-                         new RemoteImageInfo
-                         {
-                              ProviderName = Name,
-                              Url = url,
-                              Type = ImageType.Primary
-                         }
-                 });
+                return GetImages(string.Empty, cancellationToken);
             }
 
             var view = item as UserView;
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
index 065b5e95d..2d824f36c 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.Plugins;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Plugins;
 using MediaBrowser.Common.ScheduledTasks;
 using MediaBrowser.Common.Updates;
 using MediaBrowser.Controller;
@@ -42,7 +43,9 @@ 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, ILibraryManager libraryManager, ISessionManager sessionManager, IServerApplicationHost appHost)
+        private readonly IConfigurationManager _config;
+
+        public Notifications(IInstallationManager installationManager, IUserManager userManager, ILogger logger, ITaskManager taskManager, INotificationManager notificationManager, ILibraryManager libraryManager, ISessionManager sessionManager, IServerApplicationHost appHost, IConfigurationManager config)
         {
             _installationManager = installationManager;
             _userManager = userManager;
@@ -52,6 +55,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
             _libraryManager = libraryManager;
             _sessionManager = sessionManager;
             _appHost = appHost;
+            _config = config;
         }
 
         public void Run()
@@ -160,20 +164,25 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
             await SendNotification(notification).ConfigureAwait(false);
         }
 
-         void _sessionManager_PlaybackStart(object sender, PlaybackProgressEventArgs e)
-         {
-             var item = e.MediaInfo;
+        private NotificationOptions GetOptions()
+        {
+            return _config.GetConfiguration<NotificationOptions>("notifications");
+        }
 
-             if (item == null)
-             {
-                 _logger.Warn("PlaybackStart reported with null media info.");
-                 return;
-             }
+        void _sessionManager_PlaybackStart(object sender, PlaybackProgressEventArgs e)
+        {
+            var item = e.MediaInfo;
 
-             var type = GetPlaybackNotificationType(item.MediaType);
+            if (item == null)
+            {
+                _logger.Warn("PlaybackStart reported with null media info.");
+                return;
+            }
 
-             SendPlaybackNotification(type, e);
-         }
+            var type = GetPlaybackNotificationType(item.MediaType);
+
+            SendPlaybackNotification(type, e);
+        }
 
         void _sessionManager_PlaybackStopped(object sender, PlaybackStopEventArgs e)
         {
@@ -194,6 +203,11 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
         {
             var user = e.Users.FirstOrDefault();
 
+            if (user != null && !GetOptions().IsEnabledToMonitorUser(type, user.Id.ToString("N")))
+            {
+                return;
+            }
+
             var item = e.MediaInfo;
             var themeMedia = item as IThemeMedia;
 
@@ -203,6 +217,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
                 return;
             }
 
+
             var notification = new NotificationRequest
             {
                 NotificationType = type
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
index 7f533d416..1f9dc56f9 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
@@ -114,11 +114,11 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
         /// <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, 
+        private static bool ContainsMusic(IEnumerable<FileSystemInfo> list,
             bool isMusicMediaFolder,
-            bool allowSubfolders, 
-            IDirectoryService directoryService, 
-            ILogger logger, 
+            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
@@ -154,7 +154,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
                 }
                 else if (EntityResolutionHelper.IsVideoFile(fullName)) return false;
                 else if (EntityResolutionHelper.IsVideoPlaceHolder(fullName)) return false;
-                
+
                 if (foundAudio >= 2)
                 {
                     return true;
@@ -179,10 +179,9 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
             return false;
         }
 
-        private static bool IsMultiDiscFolder(string path)
+        public static bool IsMultiDiscFolder(string path)
         {
-            return false;
-            //return EntityResolutionHelper.IsMultiPartFolder(path);
+            return EntityResolutionHelper.IsMultiDiscAlbumFolder(path);
         }
 
         private static bool IsAdditionalSubfolderAllowed(FileSystemInfo directory)
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json
index 91796d5dc..84053217e 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 1440a079c..20c82acef 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 5cc9c8aa6..6e3b2e718 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 4703d6b9f..63a04fea9 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/de.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
index 23784f56f..5057acf92 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
@@ -227,8 +227,8 @@
     "OptionBlockMovies": "Filme",
     "OptionBlockBooks": "B\u00fccher",
     "OptionBlockGames": "Spiele",
-    "OptionBlockLiveTvPrograms": "Live TV Programm",
-    "OptionBlockLiveTvChannels": "Live TV Kan\u00e4le",
+    "OptionBlockLiveTvPrograms": "Live-TV Programm",
+    "OptionBlockLiveTvChannels": "Live-TV Kan\u00e4le",
     "OptionBlockChannelContent": "Internet Channelinhalte",
     "ButtonRevoke": "Zur\u00fccknehmen",
     "MessageConfirmRevokeApiKey": "Bist du dir sicher den API Schl\u00fcssel zur\u00fccknehmen zu wollen? Anwendungen die mit Media Browser verbunden sind werden umgehend gestoppt.",
@@ -258,7 +258,7 @@
     "OptionOn": "Ein",
     "HeaderFields": "Felder",
     "HeaderFieldsHelp": "Verschiebe ein Feld zu \"Aus\" um es zu sperren und \u00c4nderungen an dessen Daten zu verhindern.",
-    "HeaderLiveTV": "Live TV",
+    "HeaderLiveTV": "Live-TV",
     "MissingLocalTrailer": "Fehlender lokaler Trailer.",
     "MissingPrimaryImage": "Fehlendes Hauptbild.",
     "MissingBackdropImage": "Fehlendes Hintergrundbild.",
@@ -278,7 +278,7 @@
     "OptionRuntime": "Dauer",
     "OptionProductionLocations": "Produktionsst\u00e4tten",
     "OptionBirthLocation": "Geburtsort",
-    "LabelAllChannels": "Alle Channel",
+    "LabelAllChannels": "Alle Kan\u00e4le",
     "LabelLiveProgram": "LIVE",
     "LabelNewProgram": "NEU",
     "LabelPremiereProgram": "PREMIERE",
@@ -304,7 +304,7 @@
     "TabLibrary": "Bibliothek",
     "TabMetadata": "Metadata",
     "TabDLNA": "DLNA",
-    "TabLiveTV": "Live TV",
+    "TabLiveTV": "Live-TV",
     "TabAutoOrganize": "Automatische Organisation",
     "TabPlugins": "Plugins",
     "TabAdvanced": "Erweitert",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/el.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/el.json
index f961db055..1cf04c13f 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 f5debc37e..9ec2719a7 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 dd6e416e1..dce1edb2d 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/fr.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
index 329fa6ce4..6483af21c 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
@@ -392,32 +392,32 @@
     "LabelReleaseDate": "Release date:",
     "LabelEndDate": "End date:",
     "LabelYear": "Year:",
-    "LabelDateOfBirth": "Date of birth:",
+    "LabelDateOfBirth": "Date de naissance:",
     "LabelBirthYear": "Birth year:",
     "LabelDeathDate": "Death date:",
     "HeaderRemoveMediaLocation": "Remove Media Location",
     "MessageConfirmRemoveMediaLocation": "Are you sure you wish to remove this location?",
-    "HeaderRenameMediaFolder": "Rename Media Folder",
+    "HeaderRenameMediaFolder": "Renommer le r\u00e9pertoire de m\u00e9dia",
     "LabelNewName": "New name:",
     "HeaderAddMediaFolder": "Add Media Folder",
     "HeaderAddMediaFolderHelp": "Name (Movies, Music, TV, etc):",
-    "HeaderRemoveMediaFolder": "Remove Media Folder",
+    "HeaderRemoveMediaFolder": "Supprimer le r\u00e9pertoire de m\u00e9dia",
     "MessageTheFollowingLocationWillBeRemovedFromLibrary": "The following media locations will be removed from your library:",
-    "MessageAreYouSureYouWishToRemoveMediaFolder": "Are you sure you wish to remove this media folder?",
-    "ButtonRename": "Rename",
+    "MessageAreYouSureYouWishToRemoveMediaFolder": "\u00cates-vous s\u00fbr de vouloir supprimer ce r\u00e9pertoire de m\u00e9dia?",
+    "ButtonRename": "Renommer",
     "ButtonChangeType": "Change type",
     "HeaderMediaLocations": "Media Locations",
     "LabelFolderTypeValue": "Folder type: {0}",
     "LabelPathSubstitutionHelp": "Optional: Path substitution can map server paths to network shares that clients can access for direct playback.",
     "FolderTypeMixed": "Mixed movies & tv",
-    "FolderTypeMovies": "Movies",
-    "FolderTypeMusic": "Music",
+    "FolderTypeMovies": "Films",
+    "FolderTypeMusic": "Musique",
     "FolderTypeAdultVideos": "Adult videos",
     "FolderTypePhotos": "Photos",
     "FolderTypeMusicVideos": "Music videos",
     "FolderTypeHomeVideos": "Home videos",
-    "FolderTypeGames": "Games",
-    "FolderTypeBooks": "Books",
+    "FolderTypeGames": "Jeux",
+    "FolderTypeBooks": "Livres",
     "FolderTypeTvShows": "TV shows",
     "TabMovies": "Films",
     "TabSeries": "S\u00e9ries",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/he.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/he.json
index 0183524b0..32076a8cd 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/kk.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
index b856a4884..1a6a9fb6d 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
@@ -189,7 +189,7 @@
     "HeaderLatestTvRecordings": "\u0415\u04a3 \u043a\u0435\u0439\u0456\u043d\u0433\u0456 \u0436\u0430\u0437\u0431\u0430\u043b\u0430\u0440",
     "ButtonOk": "\u0416\u0430\u0440\u0430\u0439\u0434\u044b",
     "ButtonCancel": "\u0411\u043e\u043b\u0434\u044b\u0440\u043c\u0430\u0443",
-    "ButtonRefresh": "\u0416\u0430\u04a3\u0430\u0440\u0442\u0443",
+    "ButtonRefresh": "\u041a\u04e9\u043a\u0435\u0439\u0442\u0435\u0441\u0442\u0456 \u0435\u0442\u0443",
     "LabelCurrentPath": "\u0410\u0493\u044b\u043c\u0434\u044b\u049b \u0436\u043e\u043b:",
     "HeaderSelectMediaPath": "\u0422\u0430\u0441\u0443\u0448\u044b \u0436\u043e\u043b\u044b\u043d \u0442\u0430\u04a3\u0434\u0430\u0443",
     "ButtonNetwork": "\u0416\u0435\u043b\u0456",
@@ -288,7 +288,7 @@
     "HeaderAlert": "\u0415\u0441\u043a\u0435\u0440\u0442\u0443",
     "MessagePleaseRestart": "\u0416\u0430\u04a3\u0430\u0440\u0442\u0443\u0434\u044b \u0430\u044f\u049b\u0442\u0430\u0443 \u04af\u0448\u0456\u043d \u049b\u0430\u0439\u0442\u0430 \u0456\u0441\u043a\u0435 \u049b\u043e\u0441\u044b\u04a3\u044b\u0437.",
     "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.",
+    "MessagePleaseRefreshPage": "\u0421\u0435\u0440\u0432\u0435\u0440\u0434\u0435\u043d \u0436\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 \u043a\u04e9\u043a\u0435\u0439\u0442\u0435\u0441\u0442\u0456 \u0435\u0442\u0456\u04a3\u0456\u0437.",
     "ButtonHide": "\u0416\u0430\u0441\u044b\u0440\u0443",
     "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",
@@ -378,47 +378,47 @@
     "ButtonQueueAllFromHere": "Queue all from here",
     "ButtonPlayAllFromHere": "Play all from here",
     "LabelDynamicExternalId": "{0} Id:",
-    "HeaderIdentify": "Identify Item",
-    "PersonTypePerson": "Person",
-    "LabelTitleDisplayOrder": "Title display order:",
-    "OptionSortName": "Sort name",
-    "OptionReleaseDate": "Release date",
-    "LabelSeasonNumber": "Season number:",
-    "LabelDiscNumber": "Disc number",
-    "LabelParentNumber": "Parent number",
-    "LabelEpisodeNumber": "Episode number:",
-    "LabelTrackNumber": "Track number:",
-    "LabelNumber": "Number:",
-    "LabelReleaseDate": "Release date:",
-    "LabelEndDate": "End date:",
-    "LabelYear": "Year:",
-    "LabelDateOfBirth": "Date of birth:",
-    "LabelBirthYear": "Birth year:",
-    "LabelDeathDate": "Death date:",
-    "HeaderRemoveMediaLocation": "Remove Media Location",
+    "HeaderIdentify": "\u042d\u043b\u0435\u043c\u0435\u043d\u0442\u0442\u0456 \u0430\u043d\u044b\u049b\u0442\u0430\u0443",
+    "PersonTypePerson": "\u0422\u04b1\u043b\u0493\u0430",
+    "LabelTitleDisplayOrder": "\u0422\u0443\u044b\u043d\u0434\u044b \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0443 \u0440\u0435\u0442\u0456:",
+    "OptionSortName": "\u0421\u04b1\u0440\u044b\u043f\u0442\u0430\u043b\u0430\u0442\u044b\u043d \u0430\u0442\u044b",
+    "OptionReleaseDate": "\u0428\u044b\u0493\u0430\u0440\u0443 \u043a\u04af\u043d-\u0430\u0439\u044b",
+    "LabelSeasonNumber": "\u041c\u0430\u0443\u0441\u044b\u043c \u043d\u04e9\u043c\u0456\u0440\u0456:",
+    "LabelDiscNumber": "\u0414\u0438\u0441\u043a\u0456 \u043d\u04e9\u043c\u0456\u0440\u0456",
+    "LabelParentNumber": "\u0422\u0435\u043a\u0442\u0456\u043a \u043d\u04e9\u043c\u0456\u0440:",
+    "LabelEpisodeNumber": "\u042d\u043f\u0438\u0437\u043e\u0434 \u043d\u04e9\u043c\u0456\u0440\u0456:",
+    "LabelTrackNumber": "\u0416\u043e\u043b\u0448\u044b\u049b \u043d\u04e9\u043c\u0456\u0440\u0456:",
+    "LabelNumber": "\u041d\u04e9\u043c\u0456\u0440\u0456:",
+    "LabelReleaseDate": "\u0428\u044b\u0493\u0430\u0440\u0443 \u043a\u04af\u043d-\u0430\u0439\u044b:",
+    "LabelEndDate": "\u0410\u044f\u049b\u0442\u0430\u043b\u0443 \u043a\u04af\u043d-\u0430\u0439\u044b:",
+    "LabelYear": "\u0416\u044b\u043b\u044b:",
+    "LabelDateOfBirth": "\u0422\u0443\u0493\u0430\u043d \u043a\u04af\u043d-\u0430\u0439\u044b:",
+    "LabelBirthYear": "\u0422\u0443\u0493\u0430\u043d \u0436\u044b\u043b\u044b:",
+    "LabelDeathDate": "\u04e8\u043b\u0433\u0435\u043d \u0436\u044b\u043b\u044b:",
+    "HeaderRemoveMediaLocation": "\u0422\u0430\u0441\u0443\u0448\u044b\u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440 \u043e\u0440\u043d\u0430\u043b\u0430\u0441\u0443\u044b\u043d \u0430\u043b\u0430\u0441\u0442\u0430\u0443",
     "MessageConfirmRemoveMediaLocation": "Are you sure you wish to remove this location?",
-    "HeaderRenameMediaFolder": "Rename Media Folder",
-    "LabelNewName": "New name:",
-    "HeaderAddMediaFolder": "Add Media Folder",
-    "HeaderAddMediaFolderHelp": "Name (Movies, Music, TV, etc):",
-    "HeaderRemoveMediaFolder": "Remove Media Folder",
+    "HeaderRenameMediaFolder": "\u0422\u0430\u0441\u0443\u0448\u044b \u049b\u0430\u043b\u0442\u0430\u0441\u044b\u043d \u049b\u0430\u0439\u0442\u0430 \u0430\u0442\u0430\u0443",
+    "LabelNewName": "\u0416\u0430\u04a3\u0430 \u0430\u0442\u044b",
+    "HeaderAddMediaFolder": "\u0422\u0430\u0441\u0443\u0448\u044b \u049b\u0430\u043b\u0442\u0430\u0441\u044b\u043d \u04af\u0441\u0442\u0435\u0443",
+    "HeaderAddMediaFolderHelp": "\u0410\u0442\u044b (\u041a\u0438\u043d\u043e, \u041c\u0443\u0437\u044b\u043a\u0430, \u0422\u0414, \u0442.\u0431.):",
+    "HeaderRemoveMediaFolder": "\u0422\u0430\u0441\u0443\u0448\u044b \u049b\u0430\u043b\u0442\u0430\u0441\u044b\u043d \u0430\u043b\u0430\u0441\u0442\u0430\u0443",
     "MessageTheFollowingLocationWillBeRemovedFromLibrary": "The following media locations will be removed from your library:",
     "MessageAreYouSureYouWishToRemoveMediaFolder": "Are you sure you wish to remove this media folder?",
-    "ButtonRename": "Rename",
-    "ButtonChangeType": "Change type",
-    "HeaderMediaLocations": "Media Locations",
-    "LabelFolderTypeValue": "Folder type: {0}",
+    "ButtonRename": "\u049a\u0430\u0439\u0442\u0430 \u0430\u0442\u0430\u0443",
+    "ButtonChangeType": "\u0422\u04af\u0440\u0456\u043d \u04e9\u0437\u0433\u0435\u0440\u0442\u0443",
+    "HeaderMediaLocations": "\u0422\u0430\u0441\u0443\u0448\u044b \u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440 \u043e\u0440\u043d\u0430\u043b\u0430\u0441\u0443\u043b\u0430\u0440\u044b",
+    "LabelFolderTypeValue": "\u049a\u0430\u043b\u0442\u0430 \u0442\u04af\u0440\u0456: {0}",
     "LabelPathSubstitutionHelp": "Optional: Path substitution can map server paths to network shares that clients can access for direct playback.",
-    "FolderTypeMixed": "Mixed movies & tv",
-    "FolderTypeMovies": "Movies",
-    "FolderTypeMusic": "Music",
-    "FolderTypeAdultVideos": "Adult videos",
-    "FolderTypePhotos": "Photos",
-    "FolderTypeMusicVideos": "Music videos",
-    "FolderTypeHomeVideos": "Home videos",
-    "FolderTypeGames": "Games",
-    "FolderTypeBooks": "Books",
-    "FolderTypeTvShows": "TV shows",
+    "FolderTypeMixed": "\u0410\u0440\u0430\u043b\u0430\u0441 (\u043a\u0438\u043d\u043e \u0436\u04d9\u043d\u0435 \u0442\u0434)",
+    "FolderTypeMovies": "\u0424\u0438\u043b\u044c\u043c\u0434\u0435\u0440",
+    "FolderTypeMusic": "\u041c\u0443\u0437\u044b\u043a\u0430",
+    "FolderTypeAdultVideos": "\u0415\u0440\u0435\u0441\u0435\u043a\u0442\u0456\u043a \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0440",
+    "FolderTypePhotos": "\u0424\u043e\u0442\u043e\u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440",
+    "FolderTypeMusicVideos": "\u041c\u0443\u0437\u044b\u043a\u0430\u043b\u044b\u049b \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0440",
+    "FolderTypeHomeVideos": "\u04ae\u0439 \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0440\u0456",
+    "FolderTypeGames": "\u041e\u0439\u044b\u043d\u0434\u0430\u0440",
+    "FolderTypeBooks": "\u041a\u0456\u0442\u0430\u043f\u0442\u0430\u0440",
+    "FolderTypeTvShows": "\u0422\u0414 \u043a\u04e9\u0440\u0441\u0435\u0442\u0456\u043c\u0434\u0435\u0440\u0456",
     "TabMovies": "\u0424\u0438\u043b\u044c\u043c\u0434\u0435\u0440",
     "TabSeries": "\u0421\u0435\u0440\u0438\u0430\u043b",
     "TabEpisodes": "\u042d\u043f\u0438\u0437\u043e\u0434\u0442\u0430\u0440",
@@ -427,7 +427,7 @@
     "TabAlbums": "\u0410\u043b\u044c\u0431\u043e\u043c\u0434\u0435\u0440",
     "TabSongs": "\u04d8\u0443\u0435\u043d\u0434\u0435\u0440",
     "TabMusicVideos": "\u0411\u0435\u0439\u043d\u0435\u043a\u043b\u0438\u043f\u0442\u0435\u0440",
-    "BirthPlaceValue": "Birth place: {0}",
-    "DeathDateValue": "Died: {0}",
-    "BirthDateValue": "Born: {0}"
+    "BirthPlaceValue": "\u0422\u0443\u0493\u0430\u043d \u043e\u0440\u043d\u044b: {0}",
+    "DeathDateValue": "\u04e8\u043b\u0433\u0435\u043d\u0456: {0}",
+    "BirthDateValue": "\u0422\u0443\u0493\u0430\u043d\u044b: {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 b6d5e50e5..b60e68178 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 2f65429d0..cf711539c 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
@@ -338,7 +338,7 @@
     "HeaderVideo": "Video",
     "HeaderRuntime": "Speelduur",
     "HeaderCommunityRating": "Gemeenschap cijfer",
-    "HeaderParentalRating": "Kijkwijzer classificering",
+    "HeaderParentalRating": "Kijkwijzer classificatie",
     "HeaderReleaseDate": "Releasedatum ",
     "HeaderDateAdded": "Datum toegevoegd",
     "HeaderSeries": "Series",
@@ -375,50 +375,50 @@
     "LabelMetadataSaversHelp": "Kies de bestandsindeling om uw metadata op te slaan.",
     "LabelImageFetchers": "Afbeeldingen Downloaders:",
     "LabelImageFetchersHelp": "Schakelen in en rangschik uw voorkeurs Afbeeldingen downloader, gerangschikt in volgorde van prioriteit.",
-    "ButtonQueueAllFromHere": "Queue all from here",
-    "ButtonPlayAllFromHere": "Play all from here",
+    "ButtonQueueAllFromHere": "Plaats in de wachtrij vanaf hier",
+    "ButtonPlayAllFromHere": "Speel allemaal vanaf hier",
     "LabelDynamicExternalId": "{0} Id:",
-    "HeaderIdentify": "Identify Item",
-    "PersonTypePerson": "Person",
+    "HeaderIdentify": "Identificeer item",
+    "PersonTypePerson": "Persoon",
     "LabelTitleDisplayOrder": "Titel weergave volgorde:",
     "OptionSortName": "Sorteerbaar",
-    "OptionReleaseDate": "Release date",
+    "OptionReleaseDate": "Uitgave datum",
     "LabelSeasonNumber": "Seizoennummer:",
-    "LabelDiscNumber": "Disc number",
-    "LabelParentNumber": "Parent number",
+    "LabelDiscNumber": "Disc nummer",
+    "LabelParentNumber": "Bovenliggend nummer",
     "LabelEpisodeNumber": "Afleveringsnummer:",
     "LabelTrackNumber": "Tracknummer:",
-    "LabelNumber": "Number:",
-    "LabelReleaseDate": "Release date:",
+    "LabelNumber": "Nummer:",
+    "LabelReleaseDate": "Uitgave datum:",
     "LabelEndDate": "Eind datum|",
     "LabelYear": "Jaar:",
     "LabelDateOfBirth": "Geboortedatum:",
     "LabelBirthYear": "Geboorte jaar:",
     "LabelDeathDate": "Overlijdens datum:",
-    "HeaderRemoveMediaLocation": "Remove Media Location",
-    "MessageConfirmRemoveMediaLocation": "Are you sure you wish to remove this location?",
-    "HeaderRenameMediaFolder": "Rename Media Folder",
-    "LabelNewName": "New name:",
-    "HeaderAddMediaFolder": "Add Media Folder",
-    "HeaderAddMediaFolderHelp": "Name (Movies, Music, TV, etc):",
-    "HeaderRemoveMediaFolder": "Remove Media Folder",
-    "MessageTheFollowingLocationWillBeRemovedFromLibrary": "The following media locations will be removed from your library:",
-    "MessageAreYouSureYouWishToRemoveMediaFolder": "Are you sure you wish to remove this media folder?",
-    "ButtonRename": "Rename",
-    "ButtonChangeType": "Change type",
-    "HeaderMediaLocations": "Media Locations",
-    "LabelFolderTypeValue": "Folder type: {0}",
-    "LabelPathSubstitutionHelp": "Optional: Path substitution can map server paths to network shares that clients can access for direct playback.",
-    "FolderTypeMixed": "Mixed movies & tv",
-    "FolderTypeMovies": "Movies",
-    "FolderTypeMusic": "Music",
-    "FolderTypeAdultVideos": "Adult videos",
-    "FolderTypePhotos": "Photos",
-    "FolderTypeMusicVideos": "Music videos",
-    "FolderTypeHomeVideos": "Home videos",
+    "HeaderRemoveMediaLocation": "Verwijder media locatie",
+    "MessageConfirmRemoveMediaLocation": "Weet je zeker dat je deze locatie wilt verwijderen?",
+    "HeaderRenameMediaFolder": "Hernoem media map",
+    "LabelNewName": "Nieuwe naam:",
+    "HeaderAddMediaFolder": "Voeg media map toe",
+    "HeaderAddMediaFolderHelp": "Naam (Films, Muziek, TV etc):",
+    "HeaderRemoveMediaFolder": "Verwijder media map",
+    "MessageTheFollowingLocationWillBeRemovedFromLibrary": "De volgende media locaties worden uit de bibliotheek verwijderd:",
+    "MessageAreYouSureYouWishToRemoveMediaFolder": "Weet je zeker dat je deze media map wilt verwijderen?",
+    "ButtonRename": "Hernoem",
+    "ButtonChangeType": "Verander soort",
+    "HeaderMediaLocations": "Media Locaties",
+    "LabelFolderTypeValue": "Map type: {0}",
+    "LabelPathSubstitutionHelp": "Optioneel: Pad vervanging kan server paden naar netwerk locaties verwijzen zodat clients direct kunnen afspelen.",
+    "FolderTypeMixed": "Gemixte films en TV",
+    "FolderTypeMovies": "Films",
+    "FolderTypeMusic": "Muziek",
+    "FolderTypeAdultVideos": "Adult video's",
+    "FolderTypePhotos": "Foto's",
+    "FolderTypeMusicVideos": "Muziek video's",
+    "FolderTypeHomeVideos": "Thuis video's",
     "FolderTypeGames": "Games",
-    "FolderTypeBooks": "Books",
-    "FolderTypeTvShows": "TV shows",
+    "FolderTypeBooks": "Boeken",
+    "FolderTypeTvShows": "TV programma's",
     "TabMovies": "Films",
     "TabSeries": "Serie",
     "TabEpisodes": "Afleveringen",
@@ -427,7 +427,7 @@
     "TabAlbums": "Albums",
     "TabSongs": "Songs",
     "TabMusicVideos": "Music Videos",
-    "BirthPlaceValue": "Birth place: {0}",
-    "DeathDateValue": "Died: {0}",
-    "BirthDateValue": "Born: {0}"
+    "BirthPlaceValue": "Geboorte plaats: {0})",
+    "DeathDateValue": "Overleden: {0}",
+    "BirthDateValue": "Geboren: {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 b9238b554..53a8341b1 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/sv.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/sv.json
index 1cd6349ea..efbaa6f12 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/sv.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/sv.json
@@ -328,8 +328,8 @@
     "LabelSelectPlaylist": "Spellista:",
     "OptionNewPlaylist": "Ny spellista...",
     "MessageAddedToPlaylistSuccess": "Ok",
-    "ButtonViewSeriesRecording": "View series recording",
-    "ValueOriginalAirDate": "Original air date: {0}",
+    "ButtonViewSeriesRecording": "Visa serieinspelning",
+    "ValueOriginalAirDate": "Ursprungligt s\u00e4ndningsdatum: {0}",
     "ButtonRemoveFromPlaylist": "Remove from playlist",
     "HeaderSpecials": "Specials",
     "HeaderTrailers": "Trailers",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/vi.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/vi.json
index b62b24367..3619f3176 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 dc4e7eb84..c69d1e933 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 5c0489d41..94e7729e8 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ar.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ar.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Composers",
+    "HeaderRecentActivity": "Recent Activity",
     "LabelExit": "\u062e\u0631\u0648\u062c",
-    "OptionOthers": "Others",
+    "HeaderPeople": "People",
     "LabelVisitCommunity": "\u0632\u064a\u0627\u0631\u0629 \u0627\u0644\u0645\u062c\u062a\u0645\u0639",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
     "LabelGithubWiki": "Github Wiki",
-    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "OptionComposers": "Composers",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "Folders",
+    "OptionOthers": "Others",
     "LabelStandard": "\u0642\u064a\u0627\u0633\u0649",
-    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelViewApiDocumentation": "\u0645\u0634\u0627\u0647\u062f\u0629 \u0645\u0631\u0627\u062c\u0639 \u0627\u0644\u0640 Api",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
     "LabelBrowseLibrary": "\u062a\u0635\u0641\u062d \u0627\u0644\u0645\u0643\u062a\u0628\u0629",
-    "ViewTypeLiveTvChannels": "Channels",
+    "ViewTypeFolders": "Folders",
     "LabelConfigureMediaBrowser": "\u0627\u0639\u062f\u0627\u062f\u0627\u062a \u0645\u064a\u062f\u064a\u0627 \u0628\u0631\u0627\u0648\u0632\u0631",
-    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelOpenLibraryViewer": "\u0641\u062a\u062d \u0645\u062a\u0635\u062d\u0641 \u0627\u0644\u0645\u0643\u062a\u0628\u0629",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
     "LabelRestartServer": "\u0627\u0639\u0627\u062f\u0629 \u062a\u0634\u063a\u064a\u0644 \u0627\u0644\u062e\u0627\u062f\u0645",
-    "HeaderPassword": "Password",
+    "ViewTypeLiveTvChannels": "Channels",
     "LabelShowLogWindow": "\u0639\u0631\u0636 \u0646\u0627\u0641\u0630\u0629 \u0627\u0644\u0633\u062c\u0644",
-    "HeaderLocalAccess": "Local Access",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
     "LabelPrevious": "\u0627\u0644\u0633\u0627\u0628\u0642",
-    "HeaderViewOrder": "View Order",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
     "LabelFinish": "\u0627\u0646\u062a\u0647\u0627\u0621",
-    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
+    "HeaderPassword": "Password",
     "LabelNext": "\u0627\u0644\u062a\u0627\u0644\u0649",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "HeaderLocalAccess": "Local Access",
     "LabelYoureDone": "\u062a\u0645 \u0627\u0644\u0627\u0646\u062a\u0647\u0627\u0621!",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "HeaderViewOrder": "View Order",
     "WelcomeToMediaBrowser": "\u0645\u0631\u062d\u0628\u0627 \u0628\u0643 \u0644\u0644\u0645\u062f\u064a\u0627 \u0628\u0631\u0627\u0648\u0632\u0631!",
-    "OptionDownloadMissingImages": "Download missing images",
+    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "TitleMediaBrowser": "\u0645\u064a\u062f\u064a\u0627 \u0628\u0631\u0627\u0648\u0632\u0631",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "ThisWizardWillGuideYou": "\u0645\u0631\u0634\u062f \u0627\u0644\u0627\u0639\u062f\u0627\u062f\u0627\u062a \u0633\u064a\u0633\u0627\u0639\u062f\u0643 \u062e\u0644\u0627\u0644 \u062e\u0637\u0648\u0627\u062a \u0639\u0645\u0644\u064a\u0629 \u0627\u0644\u0627\u0639\u062f\u0627\u062f\u0627\u062a.",
-    "OptionRefreshAllData": "Refresh all data",
+    "LabelImageRefreshMode": "Image refresh mode:",
     "TellUsAboutYourself": "\u0627\u062e\u0628\u0631\u0646\u0627 \u0639\u0646 \u0646\u0641\u0633\u0643",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionDownloadMissingImages": "Download missing images",
     "LabelYourFirstName": "\u0627\u0633\u0645\u0643 \u0627\u0644\u0627\u0648\u0644:",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionReplaceExistingImages": "Replace existing images",
     "MoreUsersCanBeAddedLater": "\u0627\u0644\u0645\u0632\u064a\u062f \u0645\u0646 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645\u064a\u0646 \u064a\u0645\u0643\u0646 \u0627\u0636\u0627\u0641\u062a\u0647\u0645 \u0644\u0627\u062d\u0642\u0627 \u0645\u0646 \u0644\u0648\u062d\u0629 \u0627\u0644\u0627\u0639\u062f\u0627\u062f\u0627\u062a.",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "OptionRefreshAllData": "Refresh all data",
     "UserProfilesIntro": "\u0645\u064a\u062f\u064a\u0627 \u0628\u0631\u0627\u0648\u0632\u0631 \u0645\u062f\u0645\u062c \u0628\u0647 \u062f\u0639\u0645 \u0644\u0645\u0644\u0641\u0627\u062a \u062a\u0639\u0631\u064a\u0641 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645\u064a\u0646, \u0648\u062a\u0645\u0643\u064a\u0646 \u0643\u0644 \u0645\u0633\u062a\u062e\u062f\u0645 \u0645\u0646 \u062d\u0635\u0648\u0644\u0647 \u0639\u0644\u0649 \u0627\u0639\u062f\u0627\u062f\u0627\u062a \u0627\u0644\u0639\u0631\u0636 \u0627\u0644\u062e\u0627\u0635\u0647 \u0628\u0647\u0645, \u0648\u0627\u0644\u0640 playstate \u0648\u0627\u0644\u0631\u0642\u0627\u0628\u0629 \u0627\u0644\u0627\u0628\u0648\u064a\u0629.",
-    "HeaderPersonInfo": "Person Info",
+    "OptionAddMissingDataOnly": "Add missing data only",
     "LabelWindowsService": "\u062e\u062f\u0645\u0629 \u0627\u0644\u0648\u0646\u062f\u0648\u0632",
-    "HeaderIdentifyItem": "Identify Item",
+    "OptionLocalRefreshOnly": "Local refresh only",
     "AWindowsServiceHasBeenInstalled": "\u062a\u0645 \u062a\u062b\u0628\u064a\u062a \u062e\u062f\u0645\u0629 \u0627\u0644\u0648\u0646\u062f\u0648\u0632",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderRefreshMetadata": "Refresh Metadata",
     "WindowsServiceIntro1": "\u0645\u064a\u062f\u064a\u0627 \u0628\u0631\u0627\u0648\u0632\u0631 \u0639\u0627\u062f\u0629 \u064a\u0639\u0645\u0644 \u0643\u0628\u0631\u0646\u0627\u0645\u062c \u0639\u0644\u0649 \u0633\u0637\u062d \u0627\u0644\u0645\u0643\u062a\u0628 \u0645\u0639 \u0627\u064a\u0642\u0648\u0646\u0629 \u0644\u0648\u062d\u0629 \u0627\u0644\u0646\u0638\u0627\u0645, \u0648\u0644\u0643\u0646 \u0627\u0630\u0627 \u0627\u062d\u0628\u0628\u062a \u0645\u0645\u0643\u0646 \u062a\u0634\u063a\u064a\u0644\u0647 \u0643\u062e\u062f\u0645\u0629 \u062e\u0644\u0641\u064a\u0629, \u064a\u0645\u0643\u0646 \u0627\u0646 \u064a\u0628\u062f\u0623 \u0645\u0646 \u062e\u062f\u0645\u0627\u062a \u0627\u0644\u0648\u0646\u062f\u0648\u0632 \u0645\u0646 \u0644\u0648\u062d\u0629 \u0627\u0644\u062a\u062d\u0643\u0645 \u0628\u062f\u0644\u0627 \u0645\u0646 \u0630\u0644\u0643.",
-    "HeaderConfirmDeletion": "Confirm Deletion",
+    "HeaderPersonInfo": "Person Info",
     "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.",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "HeaderIdentifyItem": "Identify Item",
     "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>.",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
     "LabelConfigureSettings": "\u0636\u0628\u0637 \u0627\u0644\u0627\u0639\u062f\u0627\u062f\u0627\u062a",
-    "ButtonIdentify": "Identify",
+    "HeaderConfirmDeletion": "Confirm Deletion",
     "LabelEnableVideoImageExtraction": "\u062a\u0641\u0639\u064a\u0644 \u0627\u0633\u062a\u062e\u0631\u0627\u062c \u0635\u0648\u0631 \u0627\u0644\u0641\u064a\u062f\u064a\u0648",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
     "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.",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
     "LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
-    "LabelCommunityRating": "Community rating:",
+    "ButtonIdentify": "Identify",
     "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.",
-    "LabelVoteCount": "Vote count:",
+    "LabelAlbumArtist": "Album artist:",
     "LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCommunityRating": "Community rating:",
     "ButtonOk": "\u0645\u0648\u0627\u0641\u0642",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelVoteCount": "Vote count:",
     "ButtonCancel": "\u0627\u0644\u063a\u0627\u0621",
-    "LabelAwardSummary": "Award summary:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "New",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Critic rating:",
     "HeaderSetupLibrary": "\u0627\u0639\u062f\u0627\u062f \u0645\u0643\u062a\u0628\u0629 \u0627\u0644\u0648\u0633\u0627\u0626\u0637",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Critic rating summary:",
     "ButtonAddMediaFolder": "\u0627\u0636\u0627\u0641\u0629 \u0645\u062c\u0644\u062f \u0644\u0644\u0648\u0633\u0627\u0626\u0637",
-    "LabelOverview": "Overview:",
+    "LabelAwardSummary": "Award summary:",
     "LabelFolderType": "\u0646\u0648\u0639 \u0627\u0644\u0645\u062c\u0644\u062f:",
-    "LabelShortOverview": "Short overview:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
-    "LabelReleaseDate": "Release date:",
+    "LabelTagline": "Tagline:",
     "ReferToMediaLibraryWiki": "\u0627\u0644\u0631\u062c\u0648\u0639 \u0627\u0644\u0649 wiki \u0644\u0645\u0643\u062a\u0628\u0629 \u0627\u0644\u0648\u0633\u0627\u0626\u0637",
-    "LabelYear": "Year:",
+    "LabelOverview": "Overview:",
     "LabelCountry": "\u0627\u0644\u0628\u0644\u062f:",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelShortOverview": "Short overview:",
     "LabelLanguage": "\u0627\u0644\u0644\u063a\u0629:",
-    "LabelEndDate": "End date:",
+    "LabelReleaseDate": "Release date:",
     "HeaderPreferredMetadataLanguage": "\u0627\u0644\u0644\u063a\u0629 \u0627\u0644\u0645\u0641\u0636\u0644\u0629 \u0644\u0648\u0627\u0635\u0641\u0627\u062a \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a:",
-    "LabelAirDate": "Air days:",
+    "LabelYear": "Year:",
     "LabelSaveLocalMetadata": "\u062d\u0641\u0638 \u0627\u0644\u0627\u0639\u0645\u0627\u0644 \u0627\u0644\u0641\u0646\u064a\u0629 \u0648\u0648\u0627\u0635\u0641\u0627\u062a \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a \u0641\u0649 \u0645\u062c\u0644\u062f\u0627\u062a \u0627\u0644\u0648\u0633\u0627\u0626\u0637",
-    "LabelAirTime:": "Air time:",
+    "LabelPlaceOfBirth": "Place of birth:",
     "LabelSaveLocalMetadataHelp": "\u0628\u062d\u0642\u0638 \u0627\u0644\u0627\u0639\u0645\u0627\u0644 \u0627\u0644\u0641\u0646\u064a\u0629 \u0648\u0648\u0627\u0635\u0641\u0627\u062a \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a \u0645\u0628\u0627\u0634\u0631\u0629 \u0641\u0649 \u0645\u062c\u0644\u062f\u0627\u062a \u0627\u0644\u0648\u0633\u0627\u0626\u0637 \u0633\u064a\u0633\u0647\u0644 \u0639\u0644\u064a\u0643 \u0627\u0644\u0648\u0635\u0648\u0644 \u0648\u0639\u0645\u0644 \u0627\u0644\u062a\u0639\u062f\u064a\u0644\u0627\u0627\u062a \u0639\u0644\u064a\u0647\u0627.",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelEndDate": "End date:",
     "LabelDownloadInternetMetadata": "\u062a\u062d\u0645\u064a\u0644 \u0627\u0644\u0627\u0639\u0645\u0627\u0644 \u0627\u0644\u0641\u0646\u064a\u0629 \u0648\u0648\u0627\u0635\u0641\u0627\u062a \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a \u0645\u0646 \u0627\u0644\u0627\u0646\u062a\u0631\u0646\u062a",
-    "LabelParentalRating": "Parental rating:",
+    "LabelAirDate": "Air days:",
     "LabelDownloadInternetMetadataHelp": "\u064a\u0645\u0643\u0646 \u0644\u0644\u0645\u064a\u062f\u064a\u0627 \u0628\u0631\u0627\u0648\u0632\u0631 \u062a\u062d\u0645\u064a\u0644 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062a \u0639\u0646 \u0648\u0633\u0627\u0626\u0637\u0643 \u0644\u062a\u0641\u0639\u064a\u0644 \u0627\u0644\u0639\u0631\u0648\u0636 \u0627\u0644\u063a\u0646\u064a\u0629.",
-    "LabelCustomRating": "Custom rating:",
+    "LabelAirTime:": "Air time:",
     "TabPreferences": "\u062a\u0641\u0636\u064a\u0644\u0627\u062a",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Run time (minutes):",
     "TabPassword": "\u0643\u0644\u0645\u0629 \u0627\u0644\u0633\u0631",
-    "LabelRevenue": "Revenue ($):",
+    "LabelParentalRating": "Parental rating:",
     "TabLibraryAccess": "\u0627\u0644\u062f\u062e\u0648\u0644 \u0627\u0644\u0649 \u0627\u0644\u0645\u0643\u062a\u0628\u0629",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelCustomRating": "Custom rating:",
     "TabImage": "\u0635\u0648\u0631\u0629",
-    "LabelPlayers": "Players:",
+    "LabelBudget": "Budget",
     "TabProfile": "\u0633\u062c\u0644",
-    "Label3DFormat": "3D format:",
+    "LabelRevenue": "Revenue ($):",
     "TabMetadata": "Metadata",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "LabelOriginalAspectRatio": "Original aspect ratio:",
     "TabImages": "Images",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "LabelPlayers": "Players:",
     "TabNotifications": "Notifications",
-    "HeaderExternalIds": "External Id's:",
+    "Label3DFormat": "3D format:",
     "TabCollectionTitles": "Titles",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
     "LabelDisplayMissingEpisodesWithinSeasons": "Display missing episodes within seasons",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "HeaderSpecialEpisodeInfo": "Special Episode Info",
     "LabelUnairedMissingEpisodesWithinSeasons": "Display unaired episodes within seasons",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "HeaderExternalIds": "External Id's:",
     "HeaderVideoPlaybackSettings": "\u0627\u0639\u062f\u0627\u062f\u0627\u062a \u062a\u0634\u063a\u064a\u0644 \u0627\u0644\u0641\u064a\u062f\u064a\u0648",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "Dvd season number:",
     "HeaderPlaybackSettings": "Playback Settings",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "Dvd episode number:",
     "LabelAudioLanguagePreference": "\u0627\u0644\u0644\u063a\u0629 \u0627\u0644\u0645\u0641\u0636\u0644\u0629 \u0644\u0644\u0635\u0648\u062a:",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
     "LabelSubtitleLanguagePreference": "\u0627\u0644\u0644\u063a\u0629 \u0627\u0644\u0645\u0641\u0636\u0644\u0629 \u0644\u0644\u062a\u0631\u062c\u0645\u0629:",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelAirsBeforeSeason": "Airs before season:",
     "OptionDefaultSubtitles": "Default",
-    "LabelDisplayOrder": "Display order:",
+    "LabelAirsAfterSeason": "Airs after season:",
     "OptionOnlyForcedSubtitles": "Only forced subtitles",
-    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelAirsBeforeEpisode": "Airs before episode:",
     "OptionAlwaysPlaySubtitles": "Always play subtitles",
-    "HeaderCountries": "Countries",
+    "LabelTreatImageAs": "Treat image as:",
     "OptionNoSubtitles": "No Subtitles",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "Display order:",
     "OptionDefaultSubtitlesHelp": "Subtitles matching the language preference will be loaded when the audio is in a foreign language.",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
     "OptionOnlyForcedSubtitlesHelp": "Only subtitles marked as forced will be loaded.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "Countries",
     "OptionAlwaysPlaySubtitlesHelp": "Subtitles matching the language preference will be loaded regardless of the audio language.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "Genres",
     "OptionNoSubtitlesHelp": "Subtitles will not be loaded by default.",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderPlotKeywords": "Plot Keywords",
     "TabProfiles": "\u0633\u062c\u0644 (\u0646\u0628\u0630\u0629)",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "HeaderStudios": "Studios",
     "TabSecurity": "\u062d\u0645\u0627\u064a\u0629",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "\u0627\u0636\u0627\u0641\u0629 \u0645\u0633\u062a\u062e\u062f\u0645",
-    "TabSupporterClub": "Supporter Club",
+    "HeaderMetadataSettings": "Metadata Settings",
     "ButtonSave": "\u062a\u062e\u0632\u064a\u0646",
-    "HeaderDonationType": "Donation type:",
+    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
     "ButtonResetPassword": "\u0645\u0633\u062d \u0643\u0644\u0645\u0629 \u0627\u0644\u0633\u0631",
-    "OptionMakeOneTimeDonation": "Make a one-time donation",
+    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
     "LabelNewPassword": "\u0643\u0644\u0645\u0629 \u0627\u0644\u0633\u0631 \u062c\u062f\u064a\u062f\u0629:",
-    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
+    "TabSupporterClub": "Supporter Club",
     "LabelNewPasswordConfirm": "\u062a\u0627\u0643\u064a\u062f \u0643\u0644\u0645\u0629 \u0627\u0644\u0633\u0631 \u0627\u0644\u062c\u062f\u064a\u062f\u0629:",
-    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderDonationType": "Donation type:",
     "HeaderCreatePassword": "\u0627\u0646\u0634\u0627\u0621 \u0643\u0644\u0645\u0629 \u0627\u0644\u0633\u0631",
-    "OptionNoTrailer": "No Trailer",
+    "OptionMakeOneTimeDonation": "Make a one-time donation",
     "LabelCurrentPassword": "\u0643\u0644\u0645\u0629 \u0627\u0644\u0633\u0631 \u0627\u0644\u062d\u0627\u0644\u064a\u0629",
-    "OptionNoThemeSong": "No Theme Song",
+    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
     "LabelMaxParentalRating": "\u0627\u0644\u062d\u062f \u0627\u0644\u0627\u0642\u0635\u0649 \u0644\u0644\u062a\u0635\u0646\u064a\u0641 \u0627\u0644\u0645\u0633\u0645\u0648\u062d \u0628\u0647 \u0644\u0644\u0631\u0642\u0627\u0628\u0629 \u0627\u0644\u0627\u0628\u0648\u064a\u0629:",
-    "OptionNoThemeVideo": "No Theme Video",
+    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
     "MaxParentalRatingHelp": "Content with a higher rating will be hidden from this user.",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "OptionNoTrailer": "No Trailer",
     "LibraryAccessHelp": "Select the media folders to share with this user. Administrators will be able to edit all folders using the metadata manager.",
+    "OptionNoThemeSong": "No Theme Song",
     "ChannelAccessHelp": "Select the channels to share with this user. Administrators will be able to edit all channels using the metadata manager.",
+    "OptionNoThemeVideo": "No Theme Video",
     "ButtonDeleteImage": "\u0627\u0632\u0627\u0644\u0629 \u0635\u0648\u0631\u0629",
+    "LabelOneTimeDonationAmount": "Donation amount:",
     "LabelSelectUsers": "Select users:",
+    "OptionActor": "Actor",
     "ButtonUpload": "\u062a\u062d\u0645\u064a\u0644",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "\u062a\u062d\u0645\u064a\u0644 \u0635\u0648\u0631\u0629 \u062c\u062f\u064a\u062f\u0629",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "\u0627\u0633\u0642\u0627\u0637 \u0627\u0644\u0635\u0648\u0631\u0629 \u0647\u0646\u0627",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG\/PNG only.",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "\u0644\u0627 \u0634\u0649\u0621 \u0647\u0646\u0627.",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "Please ensure downloading of internet metadata is enabled.",
     "TabSuggested": "\u0645\u0642\u062a\u0631\u062d",
     "TabLatest": "\u0627\u0644\u0627\u062e\u064a\u0631",
@@ -212,7 +221,7 @@
     "OptionAscending": "\u062a\u0635\u0627\u0639\u062f\u0649",
     "OptionDescending": "\u062a\u0646\u0627\u0632\u0644\u0649",
     "OptionRuntime": "\u0632\u0645\u0646 \u0627\u0644\u062a\u0634\u063a\u064a\u0644",
-    "OptionReleaseDate": "Release Date",
+    "OptionReleaseDate": "\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u0627\u0635\u062f\u0627\u0631",
     "OptionPlayCount": "\u0639\u062f\u062f \u0627\u0644\u062a\u0634\u063a\u064a\u0644",
     "OptionDatePlayed": "\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u062a\u0634\u063a\u064a\u0644",
     "OptionDateAdded": "\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u0627\u0636\u0627\u0641\u0629",
@@ -570,9 +579,9 @@
     "LabelSkipped": "Skipped",
     "HeaderEpisodeOrganization": "Episode Organization",
     "LabelSeries": "Series:",
-    "LabelSeasonNumber": "Season number",
-    "LabelEpisodeNumber": "Episode number",
-    "LabelEndingEpisodeNumber": "Ending episode number",
+    "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)",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Display plugins for:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Episode name",
-    "LabelSeriesName": "Series name",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Series.name",
     "ValueSeriesNameUnderscore": "Series_name",
     "ValueEpisodeNamePeriod": "Episode.name",
     "ValueEpisodeNameUnderscore": "Episode_name",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Enter Text",
     "LabelTypeText": "Text",
     "HeaderSearchForSubtitles": "Search for Subtitles",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "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:"
+    "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 9a572af09..fadbe5809 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ca.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ca.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Composers",
+    "HeaderRecentActivity": "Recent Activity",
     "LabelExit": "Sortir",
-    "OptionOthers": "Others",
+    "HeaderPeople": "People",
     "LabelVisitCommunity": "Visitar la comunitat",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
     "LabelGithubWiki": "Github Wiki",
-    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "OptionComposers": "Composers",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "Folders",
+    "OptionOthers": "Others",
     "LabelStandard": "Est\u00e0ndard",
-    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelViewApiDocumentation": "Veure la documentaci\u00f3 de l'API",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
     "LabelBrowseLibrary": "Examinar la biblioteca",
-    "ViewTypeLiveTvChannels": "Channels",
+    "ViewTypeFolders": "Folders",
     "LabelConfigureMediaBrowser": "Configurar Media Browser",
-    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelOpenLibraryViewer": "Obrir el visor de la biblioteca",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
     "LabelRestartServer": "Reiniciar el servidor",
-    "HeaderPassword": "Password",
+    "ViewTypeLiveTvChannels": "Channels",
     "LabelShowLogWindow": "Veure la finestra del registre",
-    "HeaderLocalAccess": "Local Access",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
     "LabelPrevious": "Anterior",
-    "HeaderViewOrder": "View Order",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
     "LabelFinish": "Finalitzar",
-    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
+    "HeaderPassword": "Password",
     "LabelNext": "Seg\u00fcent",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "HeaderLocalAccess": "Local Access",
     "LabelYoureDone": "Ja est\u00e0!",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "HeaderViewOrder": "View Order",
     "WelcomeToMediaBrowser": "Benvingut a Meida Browser!",
-    "OptionDownloadMissingImages": "Download missing images",
+    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "TitleMediaBrowser": "Media Browser",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "ThisWizardWillGuideYou": "Aquest assistent us guiar\u00e0 a trav\u00e9s del proc\u00e9s de configuraci\u00f3.",
-    "OptionRefreshAllData": "Refresh all data",
+    "LabelImageRefreshMode": "Image refresh mode:",
     "TellUsAboutYourself": "Expliqui'ns sobre vost\u00e8",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionDownloadMissingImages": "Download missing images",
     "LabelYourFirstName": "El seu nom:",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionReplaceExistingImages": "Replace existing images",
     "MoreUsersCanBeAddedLater": "M\u00e9s usuaris es poden afegir m\u00e9s tard en el tauler d'instruments.",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "OptionRefreshAllData": "Refresh all data",
     "UserProfilesIntro": "Media Browser inclou suport integrat per als perfils d'usuari, la qual cosa permet que cada usuari tingui la seva pr\u00f2pia configuraci\u00f3 de pantalla, estat de reproducci\u00f3  i controls dels pares.",
-    "HeaderPersonInfo": "Person Info",
+    "OptionAddMissingDataOnly": "Add missing data only",
     "LabelWindowsService": "Servei de Windows",
-    "HeaderIdentifyItem": "Identify Item",
+    "OptionLocalRefreshOnly": "Local refresh only",
     "AWindowsServiceHasBeenInstalled": "El servei de Windows s'ha instal \u00b7 lat.",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderRefreshMetadata": "Refresh Metadata",
     "WindowsServiceIntro1": "Media Browser Server s'executa normalment com una aplicaci\u00f3 d'escriptori amb una icona de la safata, per\u00f2 si ho prefereix, per executar com un servei en segon pla, es pot iniciar des del panell de control de serveis de Windows.",
-    "HeaderConfirmDeletion": "Confirm Deletion",
+    "HeaderPersonInfo": "Person Info",
     "WindowsServiceIntro2": "Si s'utilitza el servei de Windows, tingui en compte que no es pot executar a la vegada que la icona de la safata, de manera que haur\u00e0 de sortir de la safata per tal d'executar el servei. Tamb\u00e9 haur\u00e0 de ser configurat amb privilegis administratius a trav\u00e9s del panell de control del servei. Tingueu en compte que en aquest moment el servei no \u00e9s capa\u00e7 d'auto-actualitzaci\u00f3, de manera que les noves versions requereixen la interacci\u00f3 manual.",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "HeaderIdentifyItem": "Identify Item",
     "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>.",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
     "LabelConfigureSettings": "Configure settings",
-    "ButtonIdentify": "Identify",
+    "HeaderConfirmDeletion": "Confirm Deletion",
     "LabelEnableVideoImageExtraction": "Enable video image extraction",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
     "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.",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
     "LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
-    "LabelCommunityRating": "Community rating:",
+    "ButtonIdentify": "Identify",
     "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.",
-    "LabelVoteCount": "Vote count:",
+    "LabelAlbumArtist": "Album artist:",
     "LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCommunityRating": "Community rating:",
     "ButtonOk": "Ok",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelVoteCount": "Vote count:",
     "ButtonCancel": "Cancel",
-    "LabelAwardSummary": "Award summary:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "New",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Critic rating:",
     "HeaderSetupLibrary": "Setup your media library",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Critic rating summary:",
     "ButtonAddMediaFolder": "Add media folder",
-    "LabelOverview": "Overview:",
+    "LabelAwardSummary": "Award summary:",
     "LabelFolderType": "Folder type:",
-    "LabelShortOverview": "Short overview:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
-    "LabelReleaseDate": "Release date:",
+    "LabelTagline": "Tagline:",
     "ReferToMediaLibraryWiki": "Refer to the media library wiki.",
-    "LabelYear": "Year:",
+    "LabelOverview": "Overview:",
     "LabelCountry": "Country:",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelShortOverview": "Short overview:",
     "LabelLanguage": "Language:",
-    "LabelEndDate": "End date:",
+    "LabelReleaseDate": "Release date:",
     "HeaderPreferredMetadataLanguage": "Preferred metadata language:",
-    "LabelAirDate": "Air days:",
+    "LabelYear": "Year:",
     "LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
-    "LabelAirTime:": "Air time:",
+    "LabelPlaceOfBirth": "Place of birth:",
     "LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelEndDate": "End date:",
     "LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
-    "LabelParentalRating": "Parental rating:",
+    "LabelAirDate": "Air days:",
     "LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations.",
-    "LabelCustomRating": "Custom rating:",
+    "LabelAirTime:": "Air time:",
     "TabPreferences": "Preferences",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Run time (minutes):",
     "TabPassword": "Password",
-    "LabelRevenue": "Revenue ($):",
+    "LabelParentalRating": "Parental rating:",
     "TabLibraryAccess": "Library Access",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelCustomRating": "Custom rating:",
     "TabImage": "Image",
-    "LabelPlayers": "Players:",
+    "LabelBudget": "Budget",
     "TabProfile": "Profile",
-    "Label3DFormat": "3D format:",
+    "LabelRevenue": "Revenue ($):",
     "TabMetadata": "Metadata",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "LabelOriginalAspectRatio": "Original aspect ratio:",
     "TabImages": "Images",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "LabelPlayers": "Players:",
     "TabNotifications": "Notifications",
-    "HeaderExternalIds": "External Id's:",
+    "Label3DFormat": "3D format:",
     "TabCollectionTitles": "Titles",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
     "LabelDisplayMissingEpisodesWithinSeasons": "Display missing episodes within seasons",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "HeaderSpecialEpisodeInfo": "Special Episode Info",
     "LabelUnairedMissingEpisodesWithinSeasons": "Display unaired episodes within seasons",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "HeaderExternalIds": "External Id's:",
     "HeaderVideoPlaybackSettings": "Video Playback Settings",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "Dvd season number:",
     "HeaderPlaybackSettings": "Playback Settings",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "Dvd episode number:",
     "LabelAudioLanguagePreference": "Audio language preference:",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
     "LabelSubtitleLanguagePreference": "Subtitle language preference:",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelAirsBeforeSeason": "Airs before season:",
     "OptionDefaultSubtitles": "Default",
-    "LabelDisplayOrder": "Display order:",
+    "LabelAirsAfterSeason": "Airs after season:",
     "OptionOnlyForcedSubtitles": "Only forced subtitles",
-    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelAirsBeforeEpisode": "Airs before episode:",
     "OptionAlwaysPlaySubtitles": "Always play subtitles",
-    "HeaderCountries": "Countries",
+    "LabelTreatImageAs": "Treat image as:",
     "OptionNoSubtitles": "No Subtitles",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "Display order:",
     "OptionDefaultSubtitlesHelp": "Subtitles matching the language preference will be loaded when the audio is in a foreign language.",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
     "OptionOnlyForcedSubtitlesHelp": "Only subtitles marked as forced will be loaded.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "Countries",
     "OptionAlwaysPlaySubtitlesHelp": "Subtitles matching the language preference will be loaded regardless of the audio language.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "Genres",
     "OptionNoSubtitlesHelp": "Subtitles will not be loaded by default.",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderPlotKeywords": "Plot Keywords",
     "TabProfiles": "Profiles",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "HeaderStudios": "Studios",
     "TabSecurity": "Security",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "Add User",
-    "TabSupporterClub": "Supporter Club",
+    "HeaderMetadataSettings": "Metadata Settings",
     "ButtonSave": "Save",
-    "HeaderDonationType": "Donation type:",
+    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
     "ButtonResetPassword": "Reset Password",
-    "OptionMakeOneTimeDonation": "Make a one-time donation",
+    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
     "LabelNewPassword": "New password:",
-    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
+    "TabSupporterClub": "Supporter Club",
     "LabelNewPasswordConfirm": "New password confirm:",
-    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderDonationType": "Donation type:",
     "HeaderCreatePassword": "Create Password",
-    "OptionNoTrailer": "No Trailer",
+    "OptionMakeOneTimeDonation": "Make a one-time donation",
     "LabelCurrentPassword": "Current password:",
-    "OptionNoThemeSong": "No Theme Song",
+    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
     "LabelMaxParentalRating": "Maximum allowed parental rating:",
-    "OptionNoThemeVideo": "No Theme Video",
+    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
     "MaxParentalRatingHelp": "Content with a higher rating will be hidden from this user.",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "OptionNoTrailer": "No Trailer",
     "LibraryAccessHelp": "Select the media folders to share with this user. Administrators will be able to edit all folders using the metadata manager.",
+    "OptionNoThemeSong": "No Theme Song",
     "ChannelAccessHelp": "Select the channels to share with this user. Administrators will be able to edit all channels using the metadata manager.",
+    "OptionNoThemeVideo": "No Theme Video",
     "ButtonDeleteImage": "Delete Image",
+    "LabelOneTimeDonationAmount": "Donation amount:",
     "LabelSelectUsers": "Select users:",
+    "OptionActor": "Actor",
     "ButtonUpload": "Upload",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "Upload New Image",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "Drop image here",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG\/PNG only.",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "Nothing here.",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "Please ensure downloading of internet metadata is enabled.",
     "TabSuggested": "Suggested",
     "TabLatest": "Latest",
@@ -570,9 +579,9 @@
     "LabelSkipped": "Skipped",
     "HeaderEpisodeOrganization": "Episode Organization",
     "LabelSeries": "Series:",
-    "LabelSeasonNumber": "Season number",
-    "LabelEpisodeNumber": "Episode number",
-    "LabelEndingEpisodeNumber": "Ending episode number",
+    "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)",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Display plugins for:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Episode name",
-    "LabelSeriesName": "Series name",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Series.name",
     "ValueSeriesNameUnderscore": "Series_name",
     "ValueEpisodeNamePeriod": "Episode.name",
     "ValueEpisodeNameUnderscore": "Episode_name",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Enter Text",
     "LabelTypeText": "Text",
     "HeaderSearchForSubtitles": "Search for Subtitles",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "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:"
+    "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 f163c9b2d..cd0ae2363 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/cs.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/cs.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Composers",
+    "HeaderRecentActivity": "Recent Activity",
     "LabelExit": "Zav\u0159\u00edt",
-    "OptionOthers": "Others",
+    "HeaderPeople": "People",
     "LabelVisitCommunity": "Nav\u0161t\u00edvit komunitu",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
     "LabelGithubWiki": "Github Wiki",
-    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "OptionComposers": "Composers",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "Folders",
+    "OptionOthers": "Others",
     "LabelStandard": "Standardn\u00ed",
-    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelViewApiDocumentation": "Zobrazit dokumentaci API",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
     "LabelBrowseLibrary": "Proch\u00e1zet knihovnu",
-    "ViewTypeLiveTvChannels": "Channels",
+    "ViewTypeFolders": "Folders",
     "LabelConfigureMediaBrowser": "Konfigurovat Media Browser",
-    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelOpenLibraryViewer": "Otev\u0159\u00edt knihovnu",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
     "LabelRestartServer": "Restartovat server",
-    "HeaderPassword": "Password",
+    "ViewTypeLiveTvChannels": "Channels",
     "LabelShowLogWindow": "Zobrazit okno z\u00e1znam\u016f",
-    "HeaderLocalAccess": "Local Access",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
     "LabelPrevious": "P\u0159edchoz\u00ed",
-    "HeaderViewOrder": "View Order",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
     "LabelFinish": "Dokon\u010dit",
-    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
+    "HeaderPassword": "Password",
     "LabelNext": "Dal\u0161\u00ed",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "HeaderLocalAccess": "Local Access",
     "LabelYoureDone": "Hotovo!",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "HeaderViewOrder": "View Order",
     "WelcomeToMediaBrowser": "V\u00edtejte v programu Media Browser!",
-    "OptionDownloadMissingImages": "Download missing images",
+    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "TitleMediaBrowser": "Media Browser",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "ThisWizardWillGuideYou": "Tento pr\u016fvodce V\u00e1m pom\u016f\u017ee proj\u00edt procesem nastaven\u00ed. Pro za\u010d\u00e1tek vyberte jazyk.",
-    "OptionRefreshAllData": "Refresh all data",
+    "LabelImageRefreshMode": "Image refresh mode:",
     "TellUsAboutYourself": "\u0158ekn\u011bte n\u00e1m n\u011bco o sob\u011b",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionDownloadMissingImages": "Download missing images",
     "LabelYourFirstName": "Va\u0161e k\u0159estn\u00ed jm\u00e9no:",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionReplaceExistingImages": "Replace existing images",
     "MoreUsersCanBeAddedLater": "Dal\u0161\u00ed u\u017eivatele m\u016f\u017eete p\u0159idat pozd\u011bji na n\u00e1st\u011bnce.",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "OptionRefreshAllData": "Refresh all data",
     "UserProfilesIntro": "Media Browser obsahuje zabudovanou podporu u\u017eivatelsk\u00fdch profil\u016f dovoluj\u00edc\u00ed ka\u017ed\u00e9mu u\u017eivateli konfigurovat nastaven\u00ed zobrazen\u00ed, p\u0159ehr\u00e1v\u00e1n\u00ed a rodi\u010dovskou kontrolu.",
-    "HeaderPersonInfo": "Person Info",
+    "OptionAddMissingDataOnly": "Add missing data only",
     "LabelWindowsService": "Slu\u017eba Windows",
-    "HeaderIdentifyItem": "Identify Item",
+    "OptionLocalRefreshOnly": "Local refresh only",
     "AWindowsServiceHasBeenInstalled": "Slu\u017eba Windows byla nainstalov\u00e1na.",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderRefreshMetadata": "Refresh Metadata",
     "WindowsServiceIntro1": "Media Browser b\u011b\u017e\u00ed standardn\u011b jako desktopov\u00e1 aplikace s ikonou v oznamovac\u00ed oblasti, pokud ov\u0161em preferujete nastaven\u00ed jako slu\u017eby na pozad\u00ed, m\u016f\u017eete tak u\u010dinit v ovl\u00e1dac\u00edch panelech Va\u0161eho syst\u00e9mu pod polo\u017ekou Slu\u017eby Windows.",
-    "HeaderConfirmDeletion": "Potvrdit smaz\u00e1n\u00ed",
+    "HeaderPersonInfo": "Person Info",
     "WindowsServiceIntro2": "Pokud pou\u017e\u00edv\u00e1te Slu\u017ebu Windows berte na v\u011bdom\u00ed, \u017ee nem\u016f\u017ee b\u00fdt spu\u0161t\u011bna z\u00e1rove\u0148 s programem v oznamovac\u00ed oblasti. Bude nutn\u00e9 b\u011b\u017e\u00edc\u00ed aplikaci v oznamovac\u00ed oblasti ukon\u010dit. Slu\u017eba Windows mus\u00ed b\u00fdt z\u00e1rove\u0148 nakonfigurov\u00e1na s pr\u00e1vy administr\u00e1tora v ovl\u00e1dac\u00edch panelech. V tuto chv\u00edli slu\u017eba neumo\u017e\u0148uje automatickou aktualizaci, bude proto nutn\u00e9 novou verzi nainstalovat ru\u010dn\u011b.",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "HeaderIdentifyItem": "Identify Item",
     "WizardCompleted": "To je v\u0161e co prozat\u00edm pot\u0159ebujeme. Media Browser za\u010dne shroma\u017e\u010fovat informace o m\u00e9di\u00edch ve Va\u0161\u00ed knihovn\u011b. Pod\u00edvejte se na n\u011bkter\u00e9 z na\u0161ich aplikac\u00ed, a potom klepn\u011bte na tla\u010d\u00edtko <b>Dokon\u010dit<\/b> pro zobrazen\u00ed <b>Hlavn\u00edho panelu<\/b>",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
     "LabelConfigureSettings": "Konfigurovat nastaven\u00ed",
-    "ButtonIdentify": "Identify",
+    "HeaderConfirmDeletion": "Potvrdit smaz\u00e1n\u00ed",
     "LabelEnableVideoImageExtraction": "Povolit extrahov\u00e1n\u00ed obr\u00e1zku ze souboru",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
     "VideoImageExtractionHelp": "Pro videa, kter\u00e9 je\u0161t\u011b nemaj\u00ed obr\u00e1zky obalu, a zat\u00edm nejsme schopni je dohledat. Tato operace vy\u017eaduje n\u011bjak\u00fd ten \u010das nav\u00edc, ve v\u00fdsledku ale p\u0159isp\u011bje k hez\u010d\u00edmu zobrazen\u00ed knihovny.",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
     "LabelEnableChapterImageExtractionForMovies": "Extrahov\u00e1n\u00ed obr\u00e1zk\u016f sc\u00e9n pro Filmy",
-    "LabelCommunityRating": "Community rating:",
+    "ButtonIdentify": "Identify",
     "LabelChapterImageExtractionForMoviesHelp": "Extrahov\u00e1n\u00ed obr\u00e1zk\u016f sc\u00e9n pro Filmy dovol\u00ed klientovi graficky zobrazit v\u00fdb\u011br sc\u00e9n v menu. Proces m\u016f\u017ee b\u00fdt pomal\u00fd a n\u00e1ro\u010dn\u00fd na v\u00fdkon procesoru, z\u00e1rove\u0148 m\u016f\u017ee vy\u017eadovat n\u011bkolik gigabyt\u016f prostoru. Tento proces b\u011b\u017e\u00ed pl\u00e1novan\u011b ve 4 hodiny r\u00e1no (mo\u017en\u00e9 nastavit). Nen\u00ed doporu\u010deno nastavovat v dob\u011b vyu\u017e\u00edv\u00e1n\u00ed knihovny.",
-    "LabelVoteCount": "Vote count:",
+    "LabelAlbumArtist": "Album artist:",
     "LabelEnableAutomaticPortMapping": "Povolit automatick\u00e9 mapov\u00e1n\u00ed port\u016f",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP umo\u017e\u0148uje automatick\u00e9 nastaven\u00ed routeru pro vzd\u00e1len\u00fd p\u0159\u00edstup. Nemus\u00ed fungovat s n\u011bkter\u00fdmi typy router\u016f.",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCommunityRating": "Community rating:",
     "ButtonOk": "Ok",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelVoteCount": "Vote count:",
     "ButtonCancel": "Zru\u0161it",
-    "LabelAwardSummary": "Award summary:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "Nov\u00e9",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Critic rating:",
     "HeaderSetupLibrary": "Nastaven\u00ed Va\u0161i knihovny m\u00e9di\u00ed",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Critic rating summary:",
     "ButtonAddMediaFolder": "P\u0159idat slo\u017eku m\u00e9di\u00ed",
-    "LabelOverview": "Overview:",
+    "LabelAwardSummary": "Award summary:",
     "LabelFolderType": "Typ slo\u017eky:",
-    "LabelShortOverview": "Short overview:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "* Vy\u017eaduje pou\u017eit\u00ed pluginu, nap\u0159. GameBrowser nebo MB Bookshelf",
-    "LabelReleaseDate": "Release date:",
+    "LabelTagline": "Tagline:",
     "ReferToMediaLibraryWiki": "Pod\u00edvejte se na wiki knihovny m\u00e9di\u00ed.",
-    "LabelYear": "Year:",
+    "LabelOverview": "Overview:",
     "LabelCountry": "Zem\u011b:",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelShortOverview": "Short overview:",
     "LabelLanguage": "Jazyk:",
-    "LabelEndDate": "End date:",
+    "LabelReleaseDate": "Release date:",
     "HeaderPreferredMetadataLanguage": "Preferovan\u00fd jazyk metadat:",
-    "LabelAirDate": "Air days:",
+    "LabelYear": "Year:",
     "LabelSaveLocalMetadata": "Ulo\u017eit p\u0159ebaly a metadata do slo\u017eky s m\u00e9dii",
-    "LabelAirTime:": "Air time:",
+    "LabelPlaceOfBirth": "Place of birth:",
     "LabelSaveLocalMetadataHelp": "Povol\u00edte-li ulo\u017een\u00ed p\u0159ebal\u016f a metadat do slo\u017eky s m\u00e9dii bude mo\u017en\u00e9 je jednodu\u0161e upravovat.",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelEndDate": "End date:",
     "LabelDownloadInternetMetadata": "St\u00e1hnout p\u0159ebal a metadata z internetu",
-    "LabelParentalRating": "Parental rating:",
+    "LabelAirDate": "Air days:",
     "LabelDownloadInternetMetadataHelp": "Media Browser m\u016f\u017ee st\u00e1hnout informace o Va\u0161ich m\u00e9di\u00edch z internetu pro bohat\u0161\u00ed prezentaci.",
-    "LabelCustomRating": "Custom rating:",
+    "LabelAirTime:": "Air time:",
     "TabPreferences": "P\u0159edvolby",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Run time (minutes):",
     "TabPassword": "Heslo",
-    "LabelRevenue": "Revenue ($):",
+    "LabelParentalRating": "Parental rating:",
     "TabLibraryAccess": "P\u0159\u00edstup ke knihovn\u011b",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelCustomRating": "Custom rating:",
     "TabImage": "Obr\u00e1zek",
-    "LabelPlayers": "Players:",
+    "LabelBudget": "Budget",
     "TabProfile": "Profil",
-    "Label3DFormat": "3D format:",
+    "LabelRevenue": "Revenue ($):",
     "TabMetadata": "Metadata",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "LabelOriginalAspectRatio": "Original aspect ratio:",
     "TabImages": "Obr\u00e1zky",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "LabelPlayers": "Players:",
     "TabNotifications": "Notifications",
-    "HeaderExternalIds": "External Id's:",
+    "Label3DFormat": "3D format:",
     "TabCollectionTitles": "N\u00e1zvy",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
     "LabelDisplayMissingEpisodesWithinSeasons": "Zobrazit chyb\u011bj\u00edc\u00ed epizody",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "HeaderSpecialEpisodeInfo": "Special Episode Info",
     "LabelUnairedMissingEpisodesWithinSeasons": "Zobrazit neprov\u011btran\u00e9 epizody v r\u00e1mci sez\u00f3n",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "HeaderExternalIds": "External Id's:",
     "HeaderVideoPlaybackSettings": "Nastaven\u00ed p\u0159ehr\u00e1v\u00e1n\u00ed videa",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "Dvd season number:",
     "HeaderPlaybackSettings": "Playback Settings",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "Dvd episode number:",
     "LabelAudioLanguagePreference": "Up\u0159ednost\u0148ovan\u00fd jazyk videa:",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
     "LabelSubtitleLanguagePreference": "Up\u0159ednost\u0148ovan\u00fd jazyk titulk\u016f:",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelAirsBeforeSeason": "Airs before season:",
     "OptionDefaultSubtitles": "Default",
-    "LabelDisplayOrder": "Display order:",
+    "LabelAirsAfterSeason": "Airs after season:",
     "OptionOnlyForcedSubtitles": "Pouze vynucen\u00e9 titulky",
-    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelAirsBeforeEpisode": "Airs before episode:",
     "OptionAlwaysPlaySubtitles": "Always play subtitles",
-    "HeaderCountries": "Countries",
+    "LabelTreatImageAs": "Treat image as:",
     "OptionNoSubtitles": "No Subtitles",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "Display order:",
     "OptionDefaultSubtitlesHelp": "Subtitles matching the language preference will be loaded when the audio is in a foreign language.",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
     "OptionOnlyForcedSubtitlesHelp": "Only subtitles marked as forced will be loaded.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "Countries",
     "OptionAlwaysPlaySubtitlesHelp": "Subtitles matching the language preference will be loaded regardless of the audio language.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "Genres",
     "OptionNoSubtitlesHelp": "Subtitles will not be loaded by default.",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderPlotKeywords": "Plot Keywords",
     "TabProfiles": "Profily",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "HeaderStudios": "Studios",
     "TabSecurity": "Zabezpe\u010den\u00ed",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "P\u0159idat u\u017eivatele",
-    "TabSupporterClub": "Supporter Club",
+    "HeaderMetadataSettings": "Metadata Settings",
     "ButtonSave": "Ulo\u017eit",
-    "HeaderDonationType": "Donation type:",
+    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
     "ButtonResetPassword": "Obnovit heslo",
-    "OptionMakeOneTimeDonation": "Make a one-time donation",
+    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
     "LabelNewPassword": "Nov\u00e9 heslo:",
-    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
+    "TabSupporterClub": "Supporter Club",
     "LabelNewPasswordConfirm": "Potvrzen\u00ed nov\u00e9ho heslo:",
-    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderDonationType": "Donation type:",
     "HeaderCreatePassword": "Vytvo\u0159it heslo",
-    "OptionNoTrailer": "No Trailer",
+    "OptionMakeOneTimeDonation": "Make a one-time donation",
     "LabelCurrentPassword": "Aktu\u00e1ln\u00ed heslo:",
-    "OptionNoThemeSong": "No Theme Song",
+    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
     "LabelMaxParentalRating": "Maxim\u00e1ln\u00ed povolen\u00e9 rodi\u010dovsk\u00e9 hodnocen\u00ed:",
-    "OptionNoThemeVideo": "No Theme Video",
+    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
     "MaxParentalRatingHelp": "Obsah s vy\u0161\u0161\u00edm hodnocen\u00edm bude tomuto u\u017eivateli blokov\u00e1n.",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "OptionNoTrailer": "No Trailer",
     "LibraryAccessHelp": "Vyberte slo\u017eky m\u00e9di\u00ed pro sd\u00edlen\u00ed s t\u00edmto u\u017eivatelem. Administr\u00e1to\u0159i budou moci editovat v\u0161echny slo\u017eky pomoc\u00ed metadata mana\u017eeru.",
+    "OptionNoThemeSong": "No Theme Song",
     "ChannelAccessHelp": "Select the channels to share with this user. Administrators will be able to edit all channels using the metadata manager.",
+    "OptionNoThemeVideo": "No Theme Video",
     "ButtonDeleteImage": "Odstranit obr\u00e1zek",
+    "LabelOneTimeDonationAmount": "Donation amount:",
     "LabelSelectUsers": "Vyberte u\u017eivatele:",
+    "OptionActor": "Actor",
     "ButtonUpload": "Nahr\u00e1t",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "Nahr\u00e1t nov\u00fd obr\u00e1zek",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "P\u0159esu\u0148te obr\u00e1zek zde",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "Doporu\u010den pom\u011br 1:1. Pouze JPG\/PNG.",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "Tady nic nen\u00ed.",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "Pros\u00edm zkontrolujte, zda m\u00e1te povoleno stahov\u00e1n\u00ed metadat z internetu.",
     "TabSuggested": "Doporu\u010den\u00e9",
     "TabLatest": "Posledn\u00ed",
@@ -212,7 +221,7 @@
     "OptionAscending": "Vzestupn\u011b",
     "OptionDescending": "Sestupn\u011b",
     "OptionRuntime": "D\u00e9lka",
-    "OptionReleaseDate": "Release Date",
+    "OptionReleaseDate": "Datum vyd\u00e1n\u00ed",
     "OptionPlayCount": "Po\u010det p\u0159ehr\u00e1n\u00ed",
     "OptionDatePlayed": "Datum p\u0159ehr\u00e1n\u00ed",
     "OptionDateAdded": "Datum p\u0159id\u00e1n\u00ed",
@@ -566,12 +575,12 @@
     "HeaderProgram": "Program",
     "HeaderClients": "Klienti",
     "LabelCompleted": "Hotovo",
-    "LabelFailed": "Failed",
+    "LabelFailed": "Chyba",
     "LabelSkipped": "P\u0159esko\u010deno",
     "HeaderEpisodeOrganization": "Organizace epizod",
     "LabelSeries": "Series:",
-    "LabelSeasonNumber": "Season number",
-    "LabelEpisodeNumber": "Episode number",
+    "LabelSeasonNumber": "\u010c\u00edslo s\u00e9rie",
+    "LabelEpisodeNumber": "\u010c\u00edslo epizody",
     "LabelEndingEpisodeNumber": "\u010c\u00edslo posledn\u00ed epizody",
     "LabelEndingEpisodeNumberHelp": "Vy\u017eadovan\u00e9 jenom pro s\u00fabory s v\u00edce epizodami",
     "HeaderSupportTheTeam": "Podpo\u0159te t\u00edm Media Browser",
@@ -717,8 +726,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",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Display plugins for:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Episode name",
-    "LabelSeriesName": "Series name",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Series.name",
     "ValueSeriesNameUnderscore": "Series_name",
     "ValueEpisodeNamePeriod": "Episode.name",
     "ValueEpisodeNameUnderscore": "Episode_name",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Vlo\u017ete text",
     "LabelTypeText": "Text",
     "HeaderSearchForSubtitles": "Vyhledat titulky",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "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:"
+    "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 1f0394874..20e035244 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/da.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/da.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Composers",
+    "HeaderRecentActivity": "Recent Activity",
     "LabelExit": "Afslut",
-    "OptionOthers": "Others",
+    "HeaderPeople": "People",
     "LabelVisitCommunity": "Bes\u00f8g F\u00e6lleskab",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
     "LabelGithubWiki": "Github Wiki",
-    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "OptionComposers": "Composers",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "Folders",
+    "OptionOthers": "Others",
     "LabelStandard": "Standard",
-    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelViewApiDocumentation": "Se Api dokumentation",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
     "LabelBrowseLibrary": "Gennemse biblitek",
-    "ViewTypeLiveTvChannels": "Channels",
+    "ViewTypeFolders": "Folders",
     "LabelConfigureMediaBrowser": "Konfigurere Media Browser",
-    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelOpenLibraryViewer": "\u00c5ben Biblioteks Fremviser",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
     "LabelRestartServer": "Genstart Server",
-    "HeaderPassword": "Password",
+    "ViewTypeLiveTvChannels": "Channels",
     "LabelShowLogWindow": "Vis Log",
-    "HeaderLocalAccess": "Local Access",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
     "LabelPrevious": "Tidligere",
-    "HeaderViewOrder": "View Order",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
     "LabelFinish": "Slut",
-    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
+    "HeaderPassword": "Password",
     "LabelNext": "N\u00e6ste",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "HeaderLocalAccess": "Local Access",
     "LabelYoureDone": "Du er f\u00e6rdig!",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "HeaderViewOrder": "View Order",
     "WelcomeToMediaBrowser": "Velkommen til Media Browser!",
-    "OptionDownloadMissingImages": "Download missing images",
+    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "TitleMediaBrowser": "Media Browser",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "ThisWizardWillGuideYou": "Denne guide vil hj\u00e6lpe dig igennem ops\u00e6tningen. For at begynde, venligst v\u00e6lg dit fortrukne sprog.",
-    "OptionRefreshAllData": "Refresh all data",
+    "LabelImageRefreshMode": "Image refresh mode:",
     "TellUsAboutYourself": "Fort\u00e6l os lidt om dig selv",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionDownloadMissingImages": "Download missing images",
     "LabelYourFirstName": "Dit fornavn",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionReplaceExistingImages": "Replace existing images",
     "MoreUsersCanBeAddedLater": "Flere brugere kan tilf\u00f8jes senere i Betjeningspanelet.",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "OptionRefreshAllData": "Refresh all data",
     "UserProfilesIntro": "Media Browser inkludere indbygget underst\u00f8ttelse af bruger profiler, der giver den enkelte bruger mulighed for individuelle visningsindstillinger, Afspilningsstatus og for\u00e6ldre kontrol.",
-    "HeaderPersonInfo": "Person Info",
+    "OptionAddMissingDataOnly": "Add missing data only",
     "LabelWindowsService": "Windows Service",
-    "HeaderIdentifyItem": "Identify Item",
+    "OptionLocalRefreshOnly": "Local refresh only",
     "AWindowsServiceHasBeenInstalled": "Der er blevet installeret en Windows Service.",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderRefreshMetadata": "Refresh Metadata",
     "WindowsServiceIntro1": "Media Browser Server k\u00f8rer normalt som et skrivebords program med et tray ikon, men hvis du foretr\u00e6kker at k\u00f8re det som en service i baggrunden, kan den startes fra kontrolpanelet Windows services i stedet for.",
-    "HeaderConfirmDeletion": "Confirm Deletion",
+    "HeaderPersonInfo": "Person Info",
     "WindowsServiceIntro2": "Hvis windows servicen bruges skal du v\u00e6re opm\u00e6rksom p\u00e5, at servicen ikke kan k\u00f8re p\u00e5 samme tid som tray ikonet. Det er derfor n\u00f8dvendigt at afslutte tray ikonet f\u00f8r servicen startes. Det er n\u00f8dvendigt at konfigurere servicen til at k\u00f8re med administrative privileger, som kan g\u00f8res via Windows Service kontrol panelet. V\u00e6r opm\u00e6rksom p\u00e5 at servicen p\u00e5 nuv\u00e6rende tidspunkt ikke er i stand til at auto opdatere, s\u00e5 opdatering vil kr\u00e6ve manuel handling.",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "HeaderIdentifyItem": "Identify Item",
     "WizardCompleted": "Det var alt vi havde brug for lige nu. Media Browser er i gang med at indsamle information om dit medie bibliotek. Se nogle af vores programmer, og klik <b>F\u00e6rdig<\/b> for at se <b>Betjeningspanelet<\/b>.",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
     "LabelConfigureSettings": "Konfigurer indstillinger",
-    "ButtonIdentify": "Identify",
+    "HeaderConfirmDeletion": "Confirm Deletion",
     "LabelEnableVideoImageExtraction": "Aktiver udtr\u00e6kning af video billede",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
     "VideoImageExtractionHelp": "For videoer der ikke allerede har billeder, og som vi ikke kan finde internet billeder til. Dette vil g\u00f8re den indledende biblioteks skanning l\u00e6ngere, men vil resulterer i en p\u00e6nere pr\u00e6sentation.",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
     "LabelEnableChapterImageExtractionForMovies": "Aktiver udtr\u00e6kning af kapitel billeder for Film",
-    "LabelCommunityRating": "Community rating:",
+    "ButtonIdentify": "Identify",
     "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.",
-    "LabelVoteCount": "Vote count:",
+    "LabelAlbumArtist": "Album artist:",
     "LabelEnableAutomaticPortMapping": "Aktiver automatisk port kortl\u00e6gning",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP tillader automatisk router konfiguration for nem fjern adgang. Dette virker muligvis ikke med alle routere.",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCommunityRating": "Community rating:",
     "ButtonOk": "Ok",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelVoteCount": "Vote count:",
     "ButtonCancel": "Annuller",
-    "LabelAwardSummary": "Award summary:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "Ny",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Critic rating:",
     "HeaderSetupLibrary": "Konfigurer dit medie bibliotek",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Critic rating summary:",
     "ButtonAddMediaFolder": "Tilf\u00f8j medie mappe",
-    "LabelOverview": "Overview:",
+    "LabelAwardSummary": "Award summary:",
     "LabelFolderType": "Mappe type:",
-    "LabelShortOverview": "Short overview:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "* Kr\u00e6ver brug af en tilf\u00f8jelse, fx GameBrowser eller MB Bookshelf.",
-    "LabelReleaseDate": "Release date:",
+    "LabelTagline": "Tagline:",
     "ReferToMediaLibraryWiki": "Der henvises til medie bibliotekets wiki.",
-    "LabelYear": "Year:",
+    "LabelOverview": "Overview:",
     "LabelCountry": "Land:",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelShortOverview": "Short overview:",
     "LabelLanguage": "Sprog:",
-    "LabelEndDate": "End date:",
+    "LabelReleaseDate": "Release date:",
     "HeaderPreferredMetadataLanguage": "Foretrukket metadata sprog:",
-    "LabelAirDate": "Air days:",
+    "LabelYear": "Year:",
     "LabelSaveLocalMetadata": "Gem illustrationer og metadata i medie mapper",
-    "LabelAirTime:": "Air time:",
+    "LabelPlaceOfBirth": "Place of birth:",
     "LabelSaveLocalMetadataHelp": "Lagring af illustrationer og metadata i medie mapper, vil placerer dem et sted hvor de nemt kan redigeres.",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelEndDate": "End date:",
     "LabelDownloadInternetMetadata": "Hent illustrationer og metadata fra internettet",
-    "LabelParentalRating": "Parental rating:",
+    "LabelAirDate": "Air days:",
     "LabelDownloadInternetMetadataHelp": "Media Browser kan hente information omkring dine medier som vil g\u00f8re pr\u00e6sentationen mere omfattende.",
-    "LabelCustomRating": "Custom rating:",
+    "LabelAirTime:": "Air time:",
     "TabPreferences": "Indstillinger",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Run time (minutes):",
     "TabPassword": "Kode",
-    "LabelRevenue": "Revenue ($):",
+    "LabelParentalRating": "Parental rating:",
     "TabLibraryAccess": "Bibliotek adgang",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelCustomRating": "Custom rating:",
     "TabImage": "Billede",
-    "LabelPlayers": "Players:",
+    "LabelBudget": "Budget",
     "TabProfile": "Profil",
-    "Label3DFormat": "3D format:",
+    "LabelRevenue": "Revenue ($):",
     "TabMetadata": "Metadata",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "LabelOriginalAspectRatio": "Original aspect ratio:",
     "TabImages": "Billeder",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "LabelPlayers": "Players:",
     "TabNotifications": "Notifications",
-    "HeaderExternalIds": "External Id's:",
+    "Label3DFormat": "3D format:",
     "TabCollectionTitles": "Titler",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
     "LabelDisplayMissingEpisodesWithinSeasons": "Vis manglende episoder i s\u00e6soner",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "HeaderSpecialEpisodeInfo": "Special Episode Info",
     "LabelUnairedMissingEpisodesWithinSeasons": "Vis endnu ikke sendte episoder i s\u00e6soner",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "HeaderExternalIds": "External Id's:",
     "HeaderVideoPlaybackSettings": "Video afspilnings indstillinger",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "Dvd season number:",
     "HeaderPlaybackSettings": "Playback Settings",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "Dvd episode number:",
     "LabelAudioLanguagePreference": "Foretrukket lyd sprog:",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
     "LabelSubtitleLanguagePreference": "Foretrukket undertekst sprog:",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelAirsBeforeSeason": "Airs before season:",
     "OptionDefaultSubtitles": "Default",
-    "LabelDisplayOrder": "Display order:",
+    "LabelAirsAfterSeason": "Airs after season:",
     "OptionOnlyForcedSubtitles": "Only forced subtitles",
-    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelAirsBeforeEpisode": "Airs before episode:",
     "OptionAlwaysPlaySubtitles": "Always play subtitles",
-    "HeaderCountries": "Countries",
+    "LabelTreatImageAs": "Treat image as:",
     "OptionNoSubtitles": "Ingen undertekster",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "Display order:",
     "OptionDefaultSubtitlesHelp": "Subtitles matching the language preference will be loaded when the audio is in a foreign language.",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
     "OptionOnlyForcedSubtitlesHelp": "Only subtitles marked as forced will be loaded.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "Countries",
     "OptionAlwaysPlaySubtitlesHelp": "Subtitles matching the language preference will be loaded regardless of the audio language.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "Genres",
     "OptionNoSubtitlesHelp": "Subtitles will not be loaded by default.",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderPlotKeywords": "Plot Keywords",
     "TabProfiles": "Profiler",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "HeaderStudios": "Studios",
     "TabSecurity": "Sikkerhed",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "Tilf\u00f8j bruger",
-    "TabSupporterClub": "Supporter Club",
+    "HeaderMetadataSettings": "Metadata Settings",
     "ButtonSave": "Gem",
-    "HeaderDonationType": "Donation type:",
+    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
     "ButtonResetPassword": "Nulstil kode",
-    "OptionMakeOneTimeDonation": "Make a one-time donation",
+    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
     "LabelNewPassword": "Ny kode:",
-    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
+    "TabSupporterClub": "Supporter Club",
     "LabelNewPasswordConfirm": "Bekr\u00e6ft ny kode:",
-    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderDonationType": "Donation type:",
     "HeaderCreatePassword": "Opret kode",
-    "OptionNoTrailer": "No Trailer",
+    "OptionMakeOneTimeDonation": "Make a one-time donation",
     "LabelCurrentPassword": "Nuv\u00e6rende kode:",
-    "OptionNoThemeSong": "No Theme Song",
+    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
     "LabelMaxParentalRating": "Maximum allowed parental rating:",
-    "OptionNoThemeVideo": "No Theme Video",
+    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
     "MaxParentalRatingHelp": "Content with a higher rating will be hidden from this user.",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "OptionNoTrailer": "No Trailer",
     "LibraryAccessHelp": "V\u00e6lg hvilke medie mapper der skal deles med denne bruger. Administratorer vil kunne redigere alle mapper ved hj\u00e6lp af metadata administratoren.",
+    "OptionNoThemeSong": "No Theme Song",
     "ChannelAccessHelp": "Select the channels to share with this user. Administrators will be able to edit all channels using the metadata manager.",
+    "OptionNoThemeVideo": "No Theme Video",
     "ButtonDeleteImage": "Slet Billede",
+    "LabelOneTimeDonationAmount": "Donation amount:",
     "LabelSelectUsers": "Select users:",
+    "OptionActor": "Actor",
     "ButtonUpload": "Upload",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "Upload Nyt Billede",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "Slip Billede Her",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "1:1 formatforhold anbefalet. Kun JPG\/PNG.",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "Her er ingenting.",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "V\u00e6r venligst sikker p\u00e5 at hentning af internet metadata er aktiveret.",
     "TabSuggested": "Foresl\u00e5et",
     "TabLatest": "Seneste",
@@ -212,7 +221,7 @@
     "OptionAscending": "Stigende",
     "OptionDescending": "Faldende",
     "OptionRuntime": "Varighed",
-    "OptionReleaseDate": "Release Date",
+    "OptionReleaseDate": "Udgivelsesdato",
     "OptionPlayCount": "Gange Afspillet",
     "OptionDatePlayed": "Dato Afspillet",
     "OptionDateAdded": "Dato Tilf\u00f8jet",
@@ -570,9 +579,9 @@
     "LabelSkipped": "Skipped",
     "HeaderEpisodeOrganization": "Episode Organization",
     "LabelSeries": "Series:",
-    "LabelSeasonNumber": "Season number",
-    "LabelEpisodeNumber": "Episode number",
-    "LabelEndingEpisodeNumber": "Ending episode number",
+    "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)",
@@ -714,10 +723,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",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Display plugins for:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Episode name",
-    "LabelSeriesName": "Series name",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Series.name",
     "ValueSeriesNameUnderscore": "Series_name",
     "ValueEpisodeNamePeriod": "Episode.name",
     "ValueEpisodeNameUnderscore": "Episode_name",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Enter Text",
     "LabelTypeText": "Text",
     "HeaderSearchForSubtitles": "Search for Subtitles",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "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:"
+    "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 1ca7c9b0b..17fec8c94 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/de.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/de.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Komponisten",
+    "HeaderRecentActivity": "K\u00fcrzliche Aktivit\u00e4ten",
     "LabelExit": "Ende",
-    "OptionOthers": "Andere",
+    "HeaderPeople": "Personen",
     "LabelVisitCommunity": "Besuche die Community",
+    "HeaderDownloadPeopleMetadataFor": "Lade Biografien und Bilder herunter f\u00fcr:",
     "LabelGithubWiki": "Github Wiki",
-    "HeaderDownloadPeopleMetadataForHelp": "Die Aktivierung von zus\u00e4tzlichen Optionen wird mehr Informationen zur Verf\u00fcgung stellen, aber das scannen der Bibliothek verlangsamen.",
+    "OptionComposers": "Komponisten",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "Verzeichnisse",
+    "OptionOthers": "Andere",
     "LabelStandard": "Standard",
-    "LabelDisplayFoldersView": "Nutze die Verzeichnissansicht f\u00fcr die Darstellung der reinen Medienordner",
     "LabelViewApiDocumentation": "Zeige API Dokumentation",
-    "ViewTypeLiveTvRecordingGroups": "Aufnahmen",
+    "HeaderDownloadPeopleMetadataForHelp": "Die Aktivierung von zus\u00e4tzlichen Optionen wird mehr Informationen zur Verf\u00fcgung stellen, aber das scannen der Bibliothek verlangsamen.",
     "LabelBrowseLibrary": "Durchsuche Bibliothek",
-    "ViewTypeLiveTvChannels": "Kan\u00e4le",
+    "ViewTypeFolders": "Verzeichnisse",
     "LabelConfigureMediaBrowser": "Konfiguriere Media Browser",
-    "LabelAllowLocalAccessWithoutPassword": "Erlaube lokalen Zugriff ohne Passwort",
+    "LabelDisplayFoldersView": "Nutze die Verzeichnissansicht f\u00fcr die Darstellung der reinen Medienordner",
     "LabelOpenLibraryViewer": "\u00d6ffne Bibliothekenansicht",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "Fall aktiviert, wird kein Passwort f\u00fcr einen Zugriff innerhalb deines Heimnetzwerks ben\u00f6tigt.",
+    "ViewTypeLiveTvRecordingGroups": "Aufnahmen",
     "LabelRestartServer": "Server neustarten",
-    "HeaderPassword": "Passwort",
+    "ViewTypeLiveTvChannels": "Kan\u00e4le",
     "LabelShowLogWindow": "Zeige Log Fenster",
-    "HeaderLocalAccess": "Lokaler Zugriff",
+    "LabelAllowLocalAccessWithoutPassword": "Erlaube lokalen Zugriff ohne Passwort",
     "LabelPrevious": "Vorheriges",
-    "HeaderViewOrder": "Reihenfolge f\u00fcr Ansichten",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "Fall aktiviert, wird kein Passwort f\u00fcr einen Zugriff innerhalb deines Heimnetzwerks ben\u00f6tigt.",
     "LabelFinish": "Ende",
-    "LabelSelectUserViewOrder": "W\u00e4hle die Reihenfolge in der die Ansichten innerhalb von Media Browser Apps angezeigt werden.",
+    "HeaderPassword": "Passwort",
     "LabelNext": "N\u00e4chstes",
-    "LabelMetadataRefreshMode": "Metadaten Aktualisierungsmethode:",
+    "HeaderLocalAccess": "Lokaler Zugriff",
     "LabelYoureDone": "Du bist fertig!",
-    "LabelImageRefreshMode": "Aktualisierungsmethode f\u00fcr Bilder:",
+    "HeaderViewOrder": "Reihenfolge f\u00fcr Ansichten",
     "WelcomeToMediaBrowser": "Willkommen zu Media Browser!",
-    "OptionDownloadMissingImages": "Lade fehlende Bilder herunter",
+    "LabelSelectUserViewOrder": "W\u00e4hle die Reihenfolge in der die Ansichten innerhalb von Media Browser Apps angezeigt werden.",
     "TitleMediaBrowser": "Media Browser",
-    "OptionReplaceExistingImages": "Ersetze vorhandene Bilder",
+    "LabelMetadataRefreshMode": "Metadaten Aktualisierungsmethode:",
     "ThisWizardWillGuideYou": "Dieser Assistent wird Sie durch den Einrichtungsprozess f\u00fchren. Um zu beginnen, w\u00e4hlen Sie bitte ihre bevorzugte Sprache.",
-    "OptionRefreshAllData": "Aktualisiere alle Daten",
+    "LabelImageRefreshMode": "Aktualisierungsmethode f\u00fcr Bilder:",
     "TellUsAboutYourself": "Sagen Sie uns etwas \u00fcber sich selbst",
-    "OptionAddMissingDataOnly": "F\u00fcge nur fehlende Daten hinzu",
+    "OptionDownloadMissingImages": "Lade fehlende Bilder herunter",
     "LabelYourFirstName": "Ihr Vorname:",
-    "OptionLocalRefreshOnly": "Nur lokale Aktualisierung",
+    "OptionReplaceExistingImages": "Ersetze vorhandene Bilder",
     "MoreUsersCanBeAddedLater": "Weitere Benutzer k\u00f6nnen Sie sp\u00e4ter \u00fcber die Optionsleiste hinzuf\u00fcgen.",
-    "HeaderRefreshMetadata": "Aktualisiere Metadaten",
+    "OptionRefreshAllData": "Aktualisiere alle Daten",
     "UserProfilesIntro": "Media Browser verf\u00fcgt \u00fcber integrierte Benutzer Profile. Verwenden Sie diese Profile um Anzeigeeinstellungen, Abspielstatus und Kinder- und Jugendschutzverwaltung pro Benutzer zu speichern und zu verwalten.",
-    "HeaderPersonInfo": "Informationen zur Person",
+    "OptionAddMissingDataOnly": "F\u00fcge nur fehlende Daten hinzu",
     "LabelWindowsService": "Windows Service",
-    "HeaderIdentifyItem": "Identifiziere Element",
+    "OptionLocalRefreshOnly": "Nur lokale Aktualisierung",
     "AWindowsServiceHasBeenInstalled": "Ein Windows Dienst wurde installiert.",
-    "HeaderIdentifyItemHelp": "Gib ein oder mehrere Suchkriterien ein. Entferne Kriterien um die Suchergebnisse zu erweitern.",
+    "HeaderRefreshMetadata": "Aktualisiere Metadaten",
     "WindowsServiceIntro1": "Media Browser Server l\u00e4uft normalerweise als Desktop Applikation mit einem Symbol im System Tray. Sie k\u00f6nnen den Server aber auch als Hintergrunddienst starten. Verwenden Sie die dazu das Windows Service Control Panel..",
-    "HeaderConfirmDeletion": "Best\u00e4tige L\u00f6schung",
+    "HeaderPersonInfo": "Informationen zur Person",
     "WindowsServiceIntro2": "Das Service kann nicht zu gleichen Zeit wie die Desktop Applikation laufen. Schliessen Sie daher die Desktop Applikation, bevor Sie das Service starten. Das Service ben\u00f6tigt administrative Privilegien, die Sie \u00fcber die Systemsteuerung einstellen m\u00fcssen. Beachten Sie bitte auch, dass das Service zur Zeit nicht automatisch aktualisiert wird. Neue Versionen m\u00fcssen daher manuell installiert werden.",
-    "LabelFollowingFileWillBeDeleted": "Die folgende Datei wird gel\u00f6scht werden:",
+    "HeaderIdentifyItem": "Identifiziere Element",
     "WizardCompleted": "Das war's f\u00fcrs Erste. Media Browser hat gerade mit dem Sammeln von Informationen \u00fcber Ihre Medien Bibliothek begonnen. Probieren Sie auch unsere anderen Programme aus. Klicken Sie danach auf <b>Abschliessen<\/b> um die <b>Optionsleiste<\/b> anzuzeigen.",
-    "LabelIfYouWishToContinueWithDeletion": "Falls du fortfahren m\u00f6chtest, gibt bitte das Ergebnis aus folgender Rechnung an:",
+    "HeaderIdentifyItemHelp": "Gib ein oder mehrere Suchkriterien ein. Entferne Kriterien um die Suchergebnisse zu erweitern.",
     "LabelConfigureSettings": "Konfiguriere Einstellungen",
-    "ButtonIdentify": "Identifizieren",
+    "HeaderConfirmDeletion": "Best\u00e4tige L\u00f6schung",
     "LabelEnableVideoImageExtraction": "Aktiviere Videobild-Extrahierung",
-    "LabelAlbumArtist": "Album-Interpret:",
+    "LabelFollowingFileWillBeDeleted": "Die folgende Datei wird gel\u00f6scht werden:",
     "VideoImageExtractionHelp": "F\u00fcr Videos die noch keien Bilder haben, und f\u00fcr die wir keine Internetbilder finden k\u00f6nnen. Hierdurch wird der erste Bibliothekenscan etwas mehr Zeit beanspruchen, f\u00fchrt aber zu einer ansprechenderen Pr\u00e4sentation.",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "Falls du fortfahren m\u00f6chtest, gibt bitte das Ergebnis aus folgender Rechnung an:",
     "LabelEnableChapterImageExtractionForMovies": "Extrahiere Kapitelbilder f\u00fcr Filme",
-    "LabelCommunityRating": "Community Bewertung:",
+    "ButtonIdentify": "Identifizieren",
     "LabelChapterImageExtractionForMoviesHelp": "Das Auslesen von Kapitelbildern erlaubt es den Clients grafische Szenenauswahlmen\u00fcs anzuzeigen. Der Prozess kann langsam, prozessorintensiv sein und mehrere Gigabyte an Speicherplatz erfordern. Er wird nachts um 4:00 Uhr als geplante Aufgabe ausgef\u00fchrt, dies l\u00e4sst sich im \"Geplante Aufgaben\" Bereich konfigurieren. Es ist nicht ratsam, diese Aufgabe in der Hauptbelastungszeit auszuf\u00fchren.",
-    "LabelVoteCount": "Stimmen:",
+    "LabelAlbumArtist": "Album-Interpret:",
     "LabelEnableAutomaticPortMapping": "Aktiviere automatische Portweiterleitung",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP erm\u00f6glicht die automatische Routerkonfiguration f\u00fcr den einfachen Remote-Zugriff. Diese Option ist nicht f\u00fcr jeden Router verf\u00fcgbar.",
-    "LabelCriticRating": "Kritiker Bewertung:",
+    "LabelCommunityRating": "Community Bewertung:",
     "ButtonOk": "Ok",
-    "LabelCriticRatingSummary": "Kritiker Bewertungszusammenfassung:",
+    "LabelVoteCount": "Stimmen:",
     "ButtonCancel": "Abbrechen",
-    "LabelAwardSummary": "Auszeichnungszusammenfassung:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "Neu",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Kritiker Bewertung:",
     "HeaderSetupLibrary": "Medienbibliothek einrichten",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Kritiker Bewertungszusammenfassung:",
     "ButtonAddMediaFolder": "Medienverzeichnis hinzuf\u00fcgen",
-    "LabelOverview": "\u00dcbersicht:",
+    "LabelAwardSummary": "Auszeichnungszusammenfassung:",
     "LabelFolderType": "Verzeichnistyp:",
-    "LabelShortOverview": "Kurz\u00fcbersicht:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "* Ben\u00f6tigt ein Plugin, wie GameBrowser oder MB Bookshelf.",
-    "LabelReleaseDate": "Ver\u00f6ffentlichungsdatum:",
+    "LabelTagline": "Tagline:",
     "ReferToMediaLibraryWiki": "Siehe die Medienbibliothek Wiki",
-    "LabelYear": "Jahr:",
+    "LabelOverview": "\u00dcbersicht:",
     "LabelCountry": "Land:",
-    "LabelPlaceOfBirth": "Geburtsort:",
+    "LabelShortOverview": "Kurz\u00fcbersicht:",
     "LabelLanguage": "Sprache:",
-    "LabelEndDate": "Endzeit:",
+    "LabelReleaseDate": "Ver\u00f6ffentlichungsdatum:",
     "HeaderPreferredMetadataLanguage": "Bevorzugte Metadata Sprache:",
-    "LabelAirDate": "Ausstrahlungstage:",
+    "LabelYear": "Jahr:",
     "LabelSaveLocalMetadata": "Speichere Bildmaterial und Metadaten in den Medienverzeichnissen",
-    "LabelAirTime:": "Ausstrahlungszeit:",
+    "LabelPlaceOfBirth": "Geburtsort:",
     "LabelSaveLocalMetadataHelp": "Durch die Speicherung von Bildmaterial und Metadaten direkt in den Medienverzeichnissen, befinden sie sich an einem Ort, wo sie sehr leicht bearbeitet werden k\u00f6nnen.",
-    "LabelRuntimeMinutes": "Laufzeit (Minuten):",
+    "LabelEndDate": "Endzeit:",
     "LabelDownloadInternetMetadata": "Lade Bildmaterial und Metadaten aus dem Internet",
-    "LabelParentalRating": "Altersfreigabe:",
+    "LabelAirDate": "Ausstrahlungstage:",
     "LabelDownloadInternetMetadataHelp": "Media Browser kann Informationen \u00fcber ihre Medien aus dem Internet abrufen um eine optisch ansprechende Darstellung zu erm\u00f6glichen.",
-    "LabelCustomRating": "Eigene Bewertung:",
+    "LabelAirTime:": "Ausstrahlungszeit:",
     "TabPreferences": "Einstellungen",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Laufzeit (Minuten):",
     "TabPassword": "Passwort",
-    "LabelRevenue": "Einnahmen ($):",
+    "LabelParentalRating": "Altersfreigabe:",
     "TabLibraryAccess": "Bibliothekenzugriff",
-    "LabelOriginalAspectRatio": "Originales Seitenverh\u00e4ltnis:",
+    "LabelCustomRating": "Eigene Bewertung:",
     "TabImage": "Bild",
-    "LabelPlayers": "Schauspieler:",
+    "LabelBudget": "Budget",
     "TabProfile": "Profil",
-    "Label3DFormat": "3D Format:",
+    "LabelRevenue": "Einnahmen ($):",
     "TabMetadata": "Metadata",
-    "HeaderAlternateEpisodeNumbers": "Alternative Episodennummern",
+    "LabelOriginalAspectRatio": "Originales Seitenverh\u00e4ltnis:",
     "TabImages": "Bilder",
-    "HeaderSpecialEpisodeInfo": "Spezialepisoden Information",
+    "LabelPlayers": "Schauspieler:",
     "TabNotifications": "Benachrichtigungen",
-    "HeaderExternalIds": "Externe Id's:",
+    "Label3DFormat": "3D Format:",
     "TabCollectionTitles": "Titel",
-    "LabelDvdSeasonNumber": "DVD Staffelnummer:",
+    "HeaderAlternateEpisodeNumbers": "Alternative Episodennummern",
     "LabelDisplayMissingEpisodesWithinSeasons": "Zeige fehlende Episoden innerhalb von Staffeln",
-    "LabelDvdEpisodeNumber": "DVD Episodennummer:",
+    "HeaderSpecialEpisodeInfo": "Spezialepisoden Information",
     "LabelUnairedMissingEpisodesWithinSeasons": "Zeige noch nicht ausgestahlte Episoden innerhalb von Staffeln",
-    "LabelAbsoluteEpisodeNumber": "Absolute Episodennummer:",
+    "HeaderExternalIds": "Externe Id's:",
     "HeaderVideoPlaybackSettings": "Videowiedergabe Einstellungen",
-    "LabelAirsBeforeSeason": "Ausstrahlungen vor Staffel:",
+    "LabelDvdSeasonNumber": "DVD Staffelnummer:",
     "HeaderPlaybackSettings": "Wiedergabe Einstellungen",
-    "LabelAirsAfterSeason": "Ausstrahlungen nach Staffel:",
+    "LabelDvdEpisodeNumber": "DVD Episodennummer:",
     "LabelAudioLanguagePreference": "Audiosprache Einstellungen:",
-    "LabelAirsBeforeEpisode": "Ausstrahlungen vor Episode:",
+    "LabelAbsoluteEpisodeNumber": "Absolute Episodennummer:",
     "LabelSubtitleLanguagePreference": "Untertitelsprache Einstellungen:",
-    "LabelTreatImageAs": "Bild behandeln, wie:",
+    "LabelAirsBeforeSeason": "Ausstrahlungen vor Staffel:",
     "OptionDefaultSubtitles": "Standard",
-    "LabelDisplayOrder": "Anzeigereihenfolge:",
+    "LabelAirsAfterSeason": "Ausstrahlungen nach Staffel:",
     "OptionOnlyForcedSubtitles": "Nur erzwungene Untertitel",
-    "LabelDisplaySpecialsWithinSeasons": "Zeige Sonderinhalt innerhalb der Staffel in der er ausgestrahlt wurde",
+    "LabelAirsBeforeEpisode": "Ausstrahlungen vor Episode:",
     "OptionAlwaysPlaySubtitles": "Untertitel immer anzeigen",
-    "HeaderCountries": "L\u00e4nder",
+    "LabelTreatImageAs": "Bild behandeln, wie:",
     "OptionNoSubtitles": "Keine Untertitel",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "Anzeigereihenfolge:",
     "OptionDefaultSubtitlesHelp": "Untertitel die den Spracheinstellungen entsprechen werden nur bei einer Tonspur in fremder Sprache heruntergeladen.",
-    "HeaderPlotKeywords": "Handlungsstichworte",
+    "LabelDisplaySpecialsWithinSeasons": "Zeige Sonderinhalt innerhalb der Staffel in der er ausgestrahlt wurde",
     "OptionOnlyForcedSubtitlesHelp": "Nur Untertitel, die als erzwungener Download markiert wurden, werden heruntergeladen.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "L\u00e4nder",
     "OptionAlwaysPlaySubtitlesHelp": "Untertitel die den Spracheinstellungen entsprechen werden unabh\u00e4ngig von der Tonspur Sprache heruntergeladen.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "Genres",
     "OptionNoSubtitlesHelp": "Untertitel wird standardm\u00e4\u00dfig nicht geladen.",
-    "HeaderMetadataSettings": "Metadaten Einstellungen",
+    "HeaderPlotKeywords": "Handlungsstichworte",
     "TabProfiles": "Profile",
-    "LabelLockItemToPreventChanges": "Sperre diesen Eintrag um zuk\u00fcnftige \u00c4nderungen zu verhindern",
+    "HeaderStudios": "Studios",
     "TabSecurity": "Sicherheit",
-    "MessageLeaveEmptyToInherit": "Freilassen f\u00fcr die Vererbung von Berechtigungen oder dem systemweiten Standardwert.",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "User hinzuf\u00fcgen",
-    "TabSupporterClub": "Unterst\u00fctzer Club",
+    "HeaderMetadataSettings": "Metadaten Einstellungen",
     "ButtonSave": "Speichern",
-    "HeaderDonationType": "Spendentyp:",
+    "LabelLockItemToPreventChanges": "Sperre diesen Eintrag um zuk\u00fcnftige \u00c4nderungen zu verhindern",
     "ButtonResetPassword": "Passwort zur\u00fccksetzten",
-    "OptionMakeOneTimeDonation": "Mache eine einmalige Spende",
+    "MessageLeaveEmptyToInherit": "Freilassen f\u00fcr die Vererbung von Berechtigungen oder dem systemweiten Standardwert.",
     "LabelNewPassword": "Neues Passwort:",
-    "OptionLifeTimeSupporterClubMembership": "Lebensl\u00e4ngliche Unterst\u00fctzer Club Mitgliedschaft",
+    "TabSupporterClub": "Unterst\u00fctzer Club",
     "LabelNewPasswordConfirm": "Neues Passwort wiederhohlen:",
-    "HeaderSupporterBenefit": "Eine Mitgliedschaft im Unterst\u00fctzer Club erm\u00f6glicht den Zugang zu Premium Plugins, Internet Kanalinhalten und mehr.",
+    "HeaderDonationType": "Spendentyp:",
     "HeaderCreatePassword": "Erstelle Passwort",
-    "OptionNoTrailer": "Kein Trailer",
+    "OptionMakeOneTimeDonation": "Mache eine einmalige Spende",
     "LabelCurrentPassword": "Aktuelles Passwort:",
-    "OptionNoThemeSong": "Kein Theme Song",
+    "OptionLifeTimeSupporterClubMembership": "Lebensl\u00e4ngliche Unterst\u00fctzer Club Mitgliedschaft",
     "LabelMaxParentalRating": "H\u00f6chste erlaubte elterlich Bewertung:",
-    "OptionNoThemeVideo": "Kein Theme Video",
+    "HeaderSupporterBenefit": "Eine Mitgliedschaft im Unterst\u00fctzer Club erm\u00f6glicht den Zugang zu Premium Plugins, Internet Kanalinhalten und mehr.",
     "MaxParentalRatingHelp": "Inhalt mit einer h\u00f6heren Bewertung wird dem User nicht angezeigt.",
-    "LabelOneTimeDonationAmount": "Spendenbetrag:",
+    "OptionNoTrailer": "Kein Trailer",
     "LibraryAccessHelp": "W\u00e4hlen Sie die Medienverzeichnisse die Sie mit diesem Benutzer teilen m\u00f6chten. Administratoren k\u00f6nnen den Metadata-Manager verwenden um alle Ordner zu bearbeiten.",
+    "OptionNoThemeSong": "Kein Theme Song",
     "ChannelAccessHelp": "W\u00e4hlen Sie die Kan\u00e4le, die mit diesem Benutzer geteilt werden sollen. Administratoren sind in der Lage alle K\u00e4nale \u00fcber den Metadata Manager zu bearbeiten.",
+    "OptionNoThemeVideo": "Kein Theme Video",
     "ButtonDeleteImage": "L\u00f6sche Bild",
+    "LabelOneTimeDonationAmount": "Spendenbetrag:",
     "LabelSelectUsers": "W\u00e4hle Benutzer:",
+    "OptionActor": "Actor",
     "ButtonUpload": "Hochladen",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "Neues Bild hochladen",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "Fotos hierher ziehen",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "1:1 Seitenverh\u00e4ltnis empfohlen. Nur JPG\/PNG.",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "Nichts hier.",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "Bitte sicherstellen, dass das Herunterladen von Internet Metadaten aktiviert ist.",
     "TabSuggested": "Vorgeschlagen",
     "TabLatest": "Neueste",
@@ -212,7 +221,7 @@
     "OptionAscending": "Aufsteigend",
     "OptionDescending": "Absteigend",
     "OptionRuntime": "Dauer",
-    "OptionReleaseDate": "Ver\u00f6ffentlichungsdatum",
+    "OptionReleaseDate": "Erscheinungstermin",
     "OptionPlayCount": "Z\u00e4hler",
     "OptionDatePlayed": "Abgespielt am",
     "OptionDateAdded": "Hinzugef\u00fcgt am",
@@ -309,9 +318,9 @@
     "OptionAllowUserToManageServer": "Dieser Benutzer kann den Server managen",
     "HeaderFeatureAccess": "Funktionszugriff",
     "OptionAllowMediaPlayback": "Erlaube das Abspielen von Medien",
-    "OptionAllowBrowsingLiveTv": "Erlaube das durchsuchen von Live TV",
+    "OptionAllowBrowsingLiveTv": "Erlaube das durchsuchen von Live-TV",
     "OptionAllowDeleteLibraryContent": "Erlaube diesem Benutzer das L\u00f6schen von Bibliothelkeninhalten",
-    "OptionAllowManageLiveTv": "Erlaube die Verwaltung von Live TV Aufnahmen",
+    "OptionAllowManageLiveTv": "Erlaube die Verwaltung von Live-TV Aufnahmen",
     "OptionAllowRemoteControlOthers": "Erlaube diesem Benutzer, andere Benutzer fernzusteuern",
     "OptionMissingTmdbId": "Fehlende Tmdb Id",
     "OptionIsHD": "HD",
@@ -401,7 +410,7 @@
     "ButtonRefresh": "Aktualisieren",
     "ButtonAdvancedRefresh": "Erweiterte Aktualiserung",
     "OptionPriority": "Priorit\u00e4t",
-    "OptionRecordOnAllChannels": "Neme Programm auf allen Kan\u00e4len auf",
+    "OptionRecordOnAllChannels": "Nehme Programm auf allen Kan\u00e4len auf",
     "OptionRecordAnytime": "Neme Programm zu jeder Zeit auf",
     "OptionRecordOnlyNewEpisodes": "Nehme nur neue Episoden auf",
     "HeaderDays": "Tage",
@@ -415,13 +424,13 @@
     "ButtonRemove": "Entfernen",
     "OptionRecordSeries": "Nehme Serie auf",
     "HeaderDetails": "Details",
-    "TitleLiveTV": "Live TV",
+    "TitleLiveTV": "Live-TV",
     "LabelNumberOfGuideDays": "Anzahl von Tagen f\u00fcr die Programminformationen geladen werden sollen:",
-    "LabelNumberOfGuideDaysHelp": "Laden Sie weitere Tage von F\u00fchrungs Daten bietet die M\u00f6glichkeit, weiter in die Zukunft zu planen und einen besseren \u00dcberblick, aber es wird l\u00e4nger dauern alles herunter zu laden. Auto w\u00e4hlt auf der Grundlage der Anzahl der Kan\u00e4le.",
+    "LabelNumberOfGuideDaysHelp": "Das laden von zus\u00e4tzlichen Programmdaten bietet einen besseren \u00dcberblick und die M\u00f6glichkeit weiter in die Zukunft zu planen. Aber es wird l\u00e4nger dauern alles herunterzuladen. Auto w\u00e4hlt auf der Grundlage der Anzahl der Kan\u00e4le.",
     "LabelActiveService": "Aktiver Service:",
     "LabelActiveServiceHelp": "Mehrere TV Plugins k\u00f6nnen installiert sein, aber nur eines kann aktiv sein.",
     "OptionAutomatic": "Auto",
-    "LiveTvPluginRequired": "Ein Live TV Serviceproviderplugin ist notwendig um fortzufahren.",
+    "LiveTvPluginRequired": "Ein Live-TV Serviceproviderplugin ist notwendig um fortzufahren.",
     "LiveTvPluginRequiredHelp": "Bitte installieren Sie eines der verf\u00fcgbaren Plugins, wie z.B. Next Pvr oder ServerWmc.",
     "LabelCustomizeOptionsPerMediaType": "Anpassungen f\u00fcr Medientyp:",
     "OptionDownloadThumbImage": "Thumb",
@@ -566,7 +575,7 @@
     "HeaderProgram": "Programm",
     "HeaderClients": "Clients",
     "LabelCompleted": "Fertiggestellt",
-    "LabelFailed": "Fehlgeschlagen",
+    "LabelFailed": "Gescheitert",
     "LabelSkipped": "\u00dcbersprungen",
     "HeaderEpisodeOrganization": "Episodensortierung",
     "LabelSeries": "Serien:",
@@ -649,7 +658,7 @@
     "LabelDefaultUser": "Standardbenutzer",
     "LabelDefaultUserHelp": "Legt fest, welche Benutzerbibliothek auf verbundenen Ger\u00e4ten angezeigt werden soll. Dies kann f\u00fcr jedes Ger\u00e4t durch Profile \u00fcberschrieben werden.",
     "TitleDlna": "DLNA",
-    "TitleChannels": "Channel",
+    "TitleChannels": "Kanal",
     "HeaderServerSettings": "Server Einstellungen",
     "LabelWeatherDisplayLocation": "Wetteranzeige Ort:",
     "LabelWeatherDisplayLocationHelp": "US Postleitzahl \/ Stadt, Staat, Land \/ Stadt, Land",
@@ -714,7 +723,7 @@
     "TabNowPlaying": "Aktuelle Wiedergabe",
     "TabNavigation": "Navigation",
     "TabControls": "Controls",
-    "ButtonFullscreen": "Vollbild umschalten",
+    "ButtonFullscreen": "Schalte Vollbild um",
     "ButtonScenes": "Szenen",
     "ButtonSubtitles": "Untertitel",
     "ButtonAudioTracks": "Audiospuren",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Zeige Plugins f\u00fcr:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Episodentitel",
-    "LabelSeriesName": "Serientitel",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Serien.Name",
     "ValueSeriesNameUnderscore": "Serien_Name",
     "ValueEpisodeNamePeriod": "Episodentitel",
     "ValueEpisodeNameUnderscore": "Episoden_Name",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Texteingabe",
     "LabelTypeText": "Text",
     "HeaderSearchForSubtitles": "Suche nach Untertiteln",
@@ -876,11 +888,11 @@
     "OptionLatestChannelMedia": "Neueste Channel Inhalte:",
     "HeaderLatestChannelItems": "Neueste Channel Inhalte:",
     "OptionNone": "Keines",
-    "HeaderLiveTv": "Live Fernsehn",
+    "HeaderLiveTv": "Live-TV",
     "HeaderReports": "Meldungen",
     "HeaderMetadataManager": "Metadaten-Manager",
     "HeaderPreferences": "Einstellungen",
-    "MessageLoadingChannels": "Lade Channel Inhalt...",
+    "MessageLoadingChannels": "Lade Kanalinhalt...",
     "MessageLoadingContent": "Lade Inhalt...",
     "ButtonMarkRead": "Als gelesen markieren",
     "OptionDefaultSort": "Default",
@@ -895,23 +907,23 @@
     "MessageLearnHowToCustomize": "Lerne wie du diese Seite deinen pers\u00f6nlichen Vorlieben anpassen kannst. Klicke auf dein Benutzerbild in der oberen rechten Ecke des Bildschirms f\u00fcr die Anzeige und \u00c4nderung von Einstellungen.",
     "ButtonEditOtherUserPreferences": "Bearbeite die pers\u00f6nlichen Einstellungen dieses Benutzers",
     "LabelChannelStreamQuality": "Bevorzugte Qualit\u00e4t des Internetstreams",
-    "LabelChannelStreamQualityHelp": "In einer Umgebung mit langsamer Bandbreite kann die Beschr\u00e4nkung der Wiedergabequalit\u00e4t die fl\u00fcssige Darstellung sichern.",
+    "LabelChannelStreamQualityHelp": "In einer Umgebung mit langsamer Bandbreite kann die Beschr\u00e4nkung der Wiedergabequalit\u00e4t eine fl\u00fcssige Darstellung sichern.",
     "OptionBestAvailableStreamQuality": "Die besten verf\u00fcgbaren",
     "LabelEnableChannelContentDownloadingFor": "Aktiviere das herunterladen von Channel Inhalten f\u00fcr:",
-    "LabelEnableChannelContentDownloadingForHelp": "Manche Channels unterst\u00fctzen das herunterladen von Inhalten vor dem eigentlichen ansehen. Aktiviere diese Funktion in Umgebungen mit langsamer Bandbreite um Inhalte herunterzuladen w\u00e4hrend keine aktive Nutzung stattfindet. Die Inhalte werden dabei im Zuge der automatisierten Channel Download Aufgabe heruntergeladen.",
+    "LabelEnableChannelContentDownloadingForHelp": "Manche Kan\u00e4le unterst\u00fctzen das herunterladen von Inhalten vor dem eigentlichen ansehen. Aktiviere diese Funktion in Umgebungen mit langsamer Bandbreite um Inhalte herunterzuladen w\u00e4hrend keine aktive Nutzung stattfindet. Die Inhalte werden dabei im Zuge der automatisierten Channel Download Aufgabe heruntergeladen.",
     "LabelChannelDownloadPath": "Channel Inhalt Downloadverzeichnis:",
     "LabelChannelDownloadPathHelp": "Lege, falls gew\u00fcnscht, einen eigenen Pfad f\u00fcr Downloads fest. Lasse das Feld frei, wenn in den internen Programmdatenordner heruntergeladen werden soll.",
     "LabelChannelDownloadAge": "L\u00f6sche Inhalt nach: (Tagen)",
     "LabelChannelDownloadAgeHelp": "Heruntergeladene Inhalte die \u00e4lter als dieser Wert sind werden gel\u00f6scht. Sie werden aber weiterhin \u00fcber das Internetstreaming verf\u00fcgbar sein.",
-    "ChannelSettingsFormHelp": "Installiere Channels wie beispielsweise \"Trailers\" oder \"Vimeo\" aus dem Plugin Katalog.",
+    "ChannelSettingsFormHelp": "Installiere Kan\u00e4le wie beispielsweise \"Trailers\" oder \"Vimeo\" aus dem Plugin Katalog.",
     "LabelSelectCollection": "W\u00e4hle Zusammenstellung:",
     "ViewTypeMovies": "Filme",
     "ViewTypeTvShows": "TV",
     "ViewTypeGames": "Spiele",
     "ViewTypeMusic": "Musik",
     "ViewTypeBoxSets": "Sammlungen",
-    "ViewTypeChannels": "Channels",
-    "ViewTypeLiveTV": "Live TV",
+    "ViewTypeChannels": "Kan\u00e4le",
+    "ViewTypeLiveTV": "Live-TV",
     "HeaderOtherDisplaySettings": "Anzeige Einstellungen",
     "HeaderMyViews": "Meine Ansichten",
     "LabelSelectFolderGroups": "Gruppiere Inhalte von folgenden Verzeichnissen automatisch zu Ansichten wie beispielsweise  Filme, Musik und TV:",
@@ -933,8 +945,8 @@
     "LabelXbmcMetadataEnablePathSubstitution": "Aktiviere Pfadersetzung",
     "LabelXbmcMetadataEnablePathSubstitutionHelp": "Aktiviert die Pfadersetzung f\u00fcr Bildpfade mit Hilfe der Server Pfadersetzungseinstellungen.",
     "LabelXbmcMetadataEnablePathSubstitutionHelp2": "Siehe Pfadersetzung.",
-    "LabelGroupChannelsIntoViews": "Zeige die folgenden Channels direkt innerhalb meiner Ansichten:",
-    "LabelGroupChannelsIntoViewsHelp": "Falls aktiviert, werden diese Channels direkt neben den anderen Ansichten angezeigt. Falls deaktiviert, werden sie innerhalb einer separaten Channel Ansicht angezeigt.",
+    "LabelGroupChannelsIntoViews": "Zeige die folgenden Kan\u00e4le direkt innerhalb meiner Ansichten:",
+    "LabelGroupChannelsIntoViewsHelp": "Falls aktiviert, werden diese Kan\u00e4le direkt neben den anderen Ansichten angezeigt. Falls deaktiviert, werden sie innerhalb einer separaten Kanalansicht angezeigt.",
     "LabelDisplayCollectionsView": "Zeigt eine Ansicht f\u00fcr Sammlungen, um Filmsammlungen darzustellen",
     "LabelXbmcMetadataEnableExtraThumbs": "Kopiere extrafanart in extrathumbs",
     "LabelXbmcMetadataEnableExtraThumbsHelp": "Wenn Bilder heruntergeladen werden, k\u00f6nnen sie sowohl in extrafanart als auch in extrathumbs gespeichert werden, um die maximale Kompatibilit\u00e4t mit XBMC Skins zu gew\u00e4hrleisten.",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "App: {0}, Ger\u00e4t: {1}",
     "ProviderValue": "Anbieter: {0}",
     "LabelChannelDownloadSizeLimit": "Download Gr\u00f6\u00dfenlimit (GB):",
-    "LabelChannelDownloadSizeLimitHelp": "Beschr\u00e4nkt die Gr\u00f6\u00dfe der Channel Downloadverzeichnisse",
-    "HeaderRecentActivity": "K\u00fcrzliche Aktivit\u00e4ten",
-    "HeaderPeople": "Personen",
-    "HeaderDownloadPeopleMetadataFor": "Lade Biografien und Bilder herunter f\u00fcr:"
+    "LabelChannelDownloadSizeLimitHelp": "Beschr\u00e4nkt die Gr\u00f6\u00dfe der Channel Downloadverzeichnisse"
 }
\ 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 274300a70..2636443ff 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/el.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/el.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Composers",
+    "HeaderRecentActivity": "Recent Activity",
     "LabelExit": "\u03ad\u03be\u03bf\u03b4\u03bf\u03c2",
-    "OptionOthers": "Others",
+    "HeaderPeople": "People",
     "LabelVisitCommunity": "\u0395\u03c0\u03af\u03c3\u03ba\u03b5\u03c8\u03b7 \u039a\u03bf\u03b9\u03bd\u03cc\u03c4\u03b7\u03c4\u03b1",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
     "LabelGithubWiki": "Github Wiki",
-    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "OptionComposers": "Composers",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "Folders",
+    "OptionOthers": "Others",
     "LabelStandard": "\u03c0\u03c1\u03cc\u03c4\u03c5\u03c0\u03bf",
-    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelViewApiDocumentation": "\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae Api \u03a4\u03b5\u03ba\u03bc\u03b7\u03c1\u03af\u03c9\u03c3\u03b7",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
     "LabelBrowseLibrary": "\u03c0\u03b5\u03c1\u03b9\u03b7\u03b3\u03b7\u03b8\u03b5\u03af\u03c4\u03b5 \u03c3\u03c4\u03b7 \u03b2\u03b9\u03b2\u03bb\u03b9\u03bf\u03b8\u03ae\u03ba\u03b7",
-    "ViewTypeLiveTvChannels": "Channels",
+    "ViewTypeFolders": "Folders",
     "LabelConfigureMediaBrowser": "\u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf Media Browser",
-    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelOpenLibraryViewer": "\u03b1\u03bd\u03bf\u03af\u03be\u03b5\u03c4\u03b5 \u03c4\u03b7\u03bd  \u0392\u03b9\u03b2\u03bb\u03b9\u03bf\u03b8\u03ae\u03ba\u03b7 \u03b8\u03b5\u03b1\u03c4\u03ae",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
     "LabelRestartServer": "\u03b5\u03c0\u03b1\u03bd\u03b5\u03ba\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03b4\u03b9\u03b1\u03ba\u03bf\u03bc\u03b9\u03c3\u03c4\u03ae",
-    "HeaderPassword": "Password",
+    "ViewTypeLiveTvChannels": "Channels",
     "LabelShowLogWindow": "\u0394\u03b5\u03af\u03c7\u03bd\u03bf\u03c5\u03bd \u03c4\u03bf \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf \u03c0\u03b1\u03c1\u03ac\u03b8\u03c5\u03c1\u03bf",
-    "HeaderLocalAccess": "Local Access",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
     "LabelPrevious": "\u03c0\u03c1\u03bf\u03b7\u03b3\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf\u03c2",
-    "HeaderViewOrder": "View Order",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
     "LabelFinish": "\u03c4\u03ad\u03bb\u03bf\u03c2",
-    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
+    "HeaderPassword": "Password",
     "LabelNext": "\u03b5\u03c0\u03cc\u03bc\u03b5\u03bd\u03bf\u03c2 ",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "HeaderLocalAccess": "Local Access",
     "LabelYoureDone": "\u03a4\u03b5\u03bb\u03b5\u03b9\u03ce\u03c3\u03b1\u03c4\u03b5",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "HeaderViewOrder": "View Order",
     "WelcomeToMediaBrowser": "\u039a\u03b1\u03bb\u03ce\u03c2 \u03ae\u03c1\u03b8\u03b1\u03c4\u03b5 \u03c3\u03c4\u03bf Media Browser",
-    "OptionDownloadMissingImages": "Download missing images",
+    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "TitleMediaBrowser": "Media Browser",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "ThisWizardWillGuideYou": "\u0391\u03c5\u03c4\u03cc\u03c2 \u03bf \u03bf\u03b4\u03b7\u03b3\u03cc\u03c2 \u03b8\u03b1 \u03c3\u03b1\u03c2 \u03ba\u03b1\u03b8\u03bf\u03b4\u03b7\u03b3\u03ae\u03c3\u03b5\u03b9 \u03bc\u03ad\u03c3\u03c9 \u03c4\u03b7\u03c2 \u03b4\u03b9\u03b1\u03b4\u03b9\u03ba\u03b1\u03c3\u03af\u03b1\u03c2 \u03b5\u03b3\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7\u03c2. \u0393\u03b9\u03b1 \u03bd\u03b1 \u03be\u03b5\u03ba\u03b9\u03bd\u03ae\u03c3\u03b5\u03c4\u03b5, \u03b5\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03c4\u03b7 \u03b3\u03bb\u03ce\u03c3\u03c3\u03b1 \u03c4\u03b7\u03c2 \u03c0\u03c1\u03bf\u03c4\u03af\u03bc\u03b7\u03c3\u03ae\u03c2 \u03c3\u03b1\u03c2.",
-    "OptionRefreshAllData": "Refresh all data",
+    "LabelImageRefreshMode": "Image refresh mode:",
     "TellUsAboutYourself": "\u03a0\u03b5\u03af\u03c4\u03b5 \u03bc\u03b1\u03c2 \u03b3\u03b9\u03b1 \u03b5\u03c3\u03ac\u03c2",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionDownloadMissingImages": "Download missing images",
     "LabelYourFirstName": "\u03a4\u03bf \u03cc\u03bd\u03bf\u03bc\u03ac \u03c3\u03b1\u03c2",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionReplaceExistingImages": "Replace existing images",
     "MoreUsersCanBeAddedLater": "\u03a0\u03b5\u03c1\u03b9\u03c3\u03c3\u03cc\u03c4\u03b5\u03c1\u03bf\u03c5\u03c2 \u03c7\u03c1\u03ae\u03c3\u03c4\u03b5\u03c2 \u03bc\u03c0\u03bf\u03c1\u03bf\u03cd\u03bd \u03bd\u03b1 \u03c0\u03c1\u03bf\u03c3\u03c4\u03b5\u03b8\u03bf\u03cd\u03bd \u03b1\u03c1\u03b3\u03cc\u03c4\u03b5\u03c1\u03b1 \u03bc\u03b5 \u03c4\u03bf \u03c4\u03b1\u03bc\u03c0\u03bb\u03cc",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "OptionRefreshAllData": "Refresh all data",
     "UserProfilesIntro": "Media Browser \u03c0\u03b5\u03c1\u03b9\u03bb\u03b1\u03bc\u03b2\u03ac\u03bd\u03b5\u03b9 \u03b5\u03bd\u03c3\u03c9\u03bc\u03b1\u03c4\u03c9\u03bc\u03ad\u03bd\u03b7 \u03c5\u03c0\u03bf\u03c3\u03c4\u03ae\u03c1\u03b9\u03be\u03b7 \u03b3\u03b9\u03b1 \u03c0\u03c1\u03bf\u03c6\u03af\u03bb \u03c7\u03c1\u03ae\u03c3\u03c4\u03b7, \u03c0\u03bf\u03c5 \u03b5\u03c0\u03b9\u03c4\u03c1\u03ad\u03c0\u03bf\u03c5\u03bd \u03c3\u03b5 \u03ba\u03ac\u03b8\u03b5 \u03c7\u03c1\u03ae\u03c3\u03c4\u03b7 \u03bd\u03b1 \u03ad\u03c7\u03b5\u03b9 \u03c4\u03b9\u03c2 \u03b4\u03b9\u03ba\u03ad\u03c2 \u03c4\u03bf\u03c5\u03c2 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03bf\u03b8\u03cc\u03bd\u03b7\u03c2, playstate \u03ba\u03b1\u03b9 \u03b3\u03bf\u03bd\u03b9\u03ba\u03bf\u03cd \u03b5\u03bb\u03ad\u03b3\u03c7\u03bf\u03c5.\n",
-    "HeaderPersonInfo": "Person Info",
+    "OptionAddMissingDataOnly": "Add missing data only",
     "LabelWindowsService": "Windows \u03c5\u03c0\u03b7\u03c1\u03b5\u03c3\u03af\u03b1 ",
-    "HeaderIdentifyItem": "Identify Item",
+    "OptionLocalRefreshOnly": "Local refresh only",
     "AWindowsServiceHasBeenInstalled": "\u039c\u03b9\u03b1 \u03c5\u03c0\u03b7\u03c1\u03b5\u03c3\u03af\u03b1 Windows \u03ad\u03c7\u03bf\u03c5\u03bd \u03b5\u03b3\u03ba\u03b1\u03c4\u03b1\u03c3\u03c4\u03b1\u03b8\u03b5\u03af",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderRefreshMetadata": "Refresh Metadata",
     "WindowsServiceIntro1": "Media Browser Server \u03b5\u03ba\u03c4\u03b5\u03bb\u03b5\u03af \u03c3\u03c5\u03bd\u03ae\u03b8\u03c9\u03c2 \u03c9\u03c2 \u03ad\u03bd\u03b1 desktop \u03b5\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae \u03bc\u03b5 \u03ad\u03bd\u03b1 \u03b5\u03b9\u03ba\u03bf\u03bd\u03af\u03b4\u03b9\u03bf \u03c4\u03bf\u03c5 \u03b4\u03af\u03c3\u03ba\u03bf\u03c5, \u03b1\u03bb\u03bb\u03ac \u03b1\u03bd \u03c0\u03c1\u03bf\u03c4\u03b9\u03bc\u03ac\u03c4\u03b5 \u03bd\u03b1 \u03c4\u03c1\u03ad\u03be\u03b5\u03b9 \u03c9\u03c2 \u03c5\u03c0\u03b7\u03c1\u03b5\u03c3\u03af\u03b1 \u03c5\u03c0\u03cc\u03b2\u03b1\u03b8\u03c1\u03bf, \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03be\u03b5\u03ba\u03b9\u03bd\u03ae\u03c3\u03b5\u03b9 \u03b1\u03c0\u03cc \u03c4\u03bf\u03bd \u03c0\u03af\u03bd\u03b1\u03ba\u03b1 \u03b5\u03bb\u03ad\u03b3\u03c7\u03bf\u03c5 \u03c4\u03c9\u03bd Windows \u03c5\u03c0\u03b7\u03c1\u03b5\u03c3\u03b9\u03ce\u03bd \u03b1\u03bd\u03c4 '\u03b1\u03c5\u03c4\u03bf\u03cd. ",
-    "HeaderConfirmDeletion": "Confirm Deletion",
+    "HeaderPersonInfo": "Person Info",
     "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.",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "HeaderIdentifyItem": "Identify Item",
     "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>.",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
     "LabelConfigureSettings": "\u03b4\u03b9\u03b1\u03bc\u03bf\u03c1\u03c6\u03ce\u03c3\u03b5\u03c4\u03b5 \u03c4\u03b9\u03c2 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2",
-    "ButtonIdentify": "Identify",
+    "HeaderConfirmDeletion": "Confirm Deletion",
     "LabelEnableVideoImageExtraction": "Enable video image extraction",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
     "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.",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
     "LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
-    "LabelCommunityRating": "Community rating:",
+    "ButtonIdentify": "Identify",
     "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.",
-    "LabelVoteCount": "Vote count:",
+    "LabelAlbumArtist": "Album artist:",
     "LabelEnableAutomaticPortMapping": "\u0395\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03bb\u03b9\u03bc\u03ac\u03bd\u03b9 \u03b1\u03c5\u03c4\u03cc\u03bc\u03b1\u03c4\u03b7 \u03c7\u03b1\u03c1\u03c4\u03bf\u03b3\u03c1\u03ac\u03c6\u03b7\u03c3\u03b7",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCommunityRating": "Community rating:",
     "ButtonOk": "\u03b5\u03bd\u03c4\u03ac\u03be\u03b5\u03b9",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelVoteCount": "Vote count:",
     "ButtonCancel": "\u0391\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7 ",
-    "LabelAwardSummary": "Award summary:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "New",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Critic rating:",
     "HeaderSetupLibrary": "Setup your media library",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Critic rating summary:",
     "ButtonAddMediaFolder": "\u03a0\u03c1\u03bf\u03c3\u03b8\u03ad\u03c3\u03c4\u03b5 \u03c4\u03bf \u03c6\u03ac\u03ba\u03b5\u03bb\u03bf \u03c4\u03bf\u03c5 Media",
-    "LabelOverview": "Overview:",
+    "LabelAwardSummary": "Award summary:",
     "LabelFolderType": "\u03a4\u03cd\u03c0\u03bf \u03c6\u03b1\u03ba\u03ad\u03bb\u03bf\u03c5 ",
-    "LabelShortOverview": "Short overview:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "\u0391\u03c0\u03b1\u03b9\u03c4\u03b5\u03af \u03c4\u03b7 \u03c7\u03c1\u03ae\u03c3\u03b7 \u03b5\u03bd\u03cc\u03c2 plugin.\u03c0.\u03c7. Gamebrowser \u03ae  MB Bookshelf.",
-    "LabelReleaseDate": "Release date:",
+    "LabelTagline": "Tagline:",
     "ReferToMediaLibraryWiki": "\u0391\u03bd\u03b1\u03c4\u03c1\u03b5\u03be\u03c4\u03b5 \u03c3\u03c4\u03bf media  \u03b2\u03b9\u03b2\u03bb\u03b9\u03bf\u03b8\u03ae\u03ba\u03b7 wiki",
-    "LabelYear": "Year:",
+    "LabelOverview": "Overview:",
     "LabelCountry": "T\u03b7 \u03c7\u03ce\u03c1\u03b1",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelShortOverview": "Short overview:",
     "LabelLanguage": "\u03a4\u03b7 \u03b3\u03bb\u03ce\u03c3\u03c3\u03b1",
-    "LabelEndDate": "End date:",
+    "LabelReleaseDate": "Release date:",
     "HeaderPreferredMetadataLanguage": "\u03a0\u03c1\u03bf\u03c4\u03b9\u03bc\u03ce\u03bc\u03b5\u03bd\u03b7 \u03b3\u03bb\u03ce\u03c3\u03c3\u03b1 \u03bc\u03b5\u03c4\u03b1",
-    "LabelAirDate": "Air days:",
+    "LabelYear": "Year:",
     "LabelSaveLocalMetadata": "\u0391\u03c0\u03bf\u03b8\u03b7\u03ba\u03b5\u03cd\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf \u03ad\u03c1\u03b3\u03bf \u03c4\u03ad\u03c7\u03bd\u03b7\u03c2 \u03ba\u03b1\u03b9 \u03c4\u03b1 \u03bc\u03b5\u03c4\u03b1\u03b4\u03b5\u03b4\u03bf\u03bc\u03ad\u03bd\u03b1 \u03c3\u03b5 \u03c6\u03b1\u03ba\u03ad\u03bb\u03bf\u03c5\u03c2 \u03c0\u03bf\u03bb\u03c5\u03bc\u03ad\u03c3\u03c9\u03bd",
-    "LabelAirTime:": "Air time:",
+    "LabelPlaceOfBirth": "Place of birth:",
     "LabelSaveLocalMetadataHelp": "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 artwork \u03ba\u03b1\u03b9 \u03bc\u03b5\u03c4\u03b1-\u03b4\u03b5\u03b4\u03bf\u03bc\u03ad\u03bd\u03b1 \u03b1\u03c0\u03b5\u03c5\u03b8\u03b5\u03af\u03b1\u03c2 \u03c3\u03b5 \u03c6\u03b1\u03ba\u03ad\u03bb\u03bf\u03c5\u03c2 \u03bc\u03ad\u03c3\u03c9\u03bd \u03b8\u03b1 \u03c4\u03bf\u03c5\u03c2 \u03b8\u03ad\u03c3\u03b5\u03b9 \u03c3\u03b5 \u03ad\u03bd\u03b1 \u03c4\u03cc\u03c0\u03bf \u03cc\u03c0\u03bf\u03c5 \u03bc\u03c0\u03bf\u03c1\u03bf\u03cd\u03bd \u03b5\u03cd\u03ba\u03bf\u03bb\u03b1 \u03bd\u03b1 \u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03c4\u03b5\u03af\u03c4\u03b5.",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelEndDate": "End date:",
     "LabelDownloadInternetMetadata": "\u039a\u03b1\u03c4\u03b5\u03b2\u03ac\u03c3\u03c4\u03b5 \u03ad\u03c1\u03b3\u03b1 \u03c4\u03ad\u03c7\u03bd\u03b7\u03c2 \u03ba\u03b1\u03b9 \u03c4\u03b1 \u03bc\u03b5\u03c4\u03b1-\u03b4\u03b5\u03b4\u03bf\u03bc\u03ad\u03bd\u03b1 \u03b1\u03c0\u03cc \u03c4\u03bf internet ",
-    "LabelParentalRating": "Parental rating:",
+    "LabelAirDate": "Air days:",
     "LabelDownloadInternetMetadataHelp": "Media Browser \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03ba\u03b1\u03c4\u03b5\u03b2\u03ac\u03c3\u03b5\u03b9 \u03c0\u03bb\u03b7\u03c1\u03bf\u03c6\u03bf\u03c1\u03af\u03b5\u03c2 \u03c3\u03c7\u03b5\u03c4\u03b9\u03ba\u03ac \u03bc\u03b5 \u03c4\u03b1 \u03bc\u03ad\u03c3\u03b1 \u03c3\u03b1\u03c2 \u03b3\u03b9\u03b1 \u03bd\u03b1 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03b5\u03c4\u03b5 \u03c4\u03b7\u03bd \u03c0\u03bb\u03bf\u03cd\u03c3\u03b9\u03b1 \u03c0\u03b1\u03c1\u03bf\u03c5\u03c3\u03b9\u03ac\u03c3\u03b5\u03b9\u03c2.",
-    "LabelCustomRating": "Custom rating:",
+    "LabelAirTime:": "Air time:",
     "TabPreferences": "\u03a0\u03c1\u03bf\u03c4\u03b9\u03bc\u03ae\u03c3\u03b5\u03b9\u03c2 ",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Run time (minutes):",
     "TabPassword": "\u03c4\u03bf\u03bd \u03ba\u03c9\u03b4\u03b9\u03ba\u03cc",
-    "LabelRevenue": "Revenue ($):",
+    "LabelParentalRating": "Parental rating:",
     "TabLibraryAccess": "\u03a0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7 \u03c3\u03c4\u03b7 \u03b2\u03b9\u03b2\u03bb\u03b9\u03bf\u03b8\u03ae\u03ba\u03b7",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelCustomRating": "Custom rating:",
     "TabImage": "\u03b5\u03b9\u03ba\u03cc\u03bd\u03b1",
-    "LabelPlayers": "Players:",
+    "LabelBudget": "Budget",
     "TabProfile": "\u03c0\u03c1\u03bf\u03c6\u03af\u03bb ",
-    "Label3DFormat": "3D format:",
+    "LabelRevenue": "Revenue ($):",
     "TabMetadata": "Metadata",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "LabelOriginalAspectRatio": "Original aspect ratio:",
     "TabImages": "Images",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "LabelPlayers": "Players:",
     "TabNotifications": "Notifications",
-    "HeaderExternalIds": "External Id's:",
+    "Label3DFormat": "3D format:",
     "TabCollectionTitles": "Titles",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
     "LabelDisplayMissingEpisodesWithinSeasons": "\u03b4\u03b5\u03af\u03c7\u03bd\u03bf\u03c5\u03bd  \u03bb\u03b5\u03af\u03c0\u03b5\u03b9 \u03b5\u03c0\u03b5\u03b9\u03c3\u03cc\u03b4\u03b9\u03b1  \u03b5\u03bd\u03c4\u03cc\u03c2  \u03b5\u03c0\u03bf\u03c7\u03ad\u03c2",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "HeaderSpecialEpisodeInfo": "Special Episode Info",
     "LabelUnairedMissingEpisodesWithinSeasons": "\u03b4\u03b5\u03af\u03c7\u03bd\u03bf\u03c5\u03bd unaired \u03b5\u03c0\u03b5\u03b9\u03c3\u03cc\u03b4\u03b9\u03b1 \u03b5\u03bd\u03c4\u03cc\u03c2 \u03b5\u03c0\u03bf\u03c7\u03ad\u03c2",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "HeaderExternalIds": "External Id's:",
     "HeaderVideoPlaybackSettings": "\u0391\u03bd\u03b1\u03c0\u03b1\u03c1\u03b1\u03b3\u03c9\u03b3\u03ae \u03b2\u03af\u03bd\u03c4\u03b5\u03bf \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2.",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "Dvd season number:",
     "HeaderPlaybackSettings": "Playback Settings",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "Dvd episode number:",
     "LabelAudioLanguagePreference": "\u039f\u03bc\u03b9\u03bb\u03bf\u03cd\u03bc\u03b5\u03bd\u03b7 \u03b3\u03bb\u03ce\u03c3\u03c3\u03b1 \u03c0\u03c1\u03bf\u03c4\u03af\u03bc\u03b7\u03c3\u03b7\u03c2",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
     "LabelSubtitleLanguagePreference": "\u0393\u03bb\u03ce\u03c3\u03c3\u03b1 \u03c5\u03c0\u03cc\u03c4\u03b9\u03c4\u03bb\u03c9\u03bd \u03c0\u03c1\u03bf\u03c4\u03af\u03bc\u03b7\u03c3\u03b7\u03c2",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelAirsBeforeSeason": "Airs before season:",
     "OptionDefaultSubtitles": "Default",
-    "LabelDisplayOrder": "Display order:",
+    "LabelAirsAfterSeason": "Airs after season:",
     "OptionOnlyForcedSubtitles": "Only forced subtitles",
-    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelAirsBeforeEpisode": "Airs before episode:",
     "OptionAlwaysPlaySubtitles": "Always play subtitles",
-    "HeaderCountries": "Countries",
+    "LabelTreatImageAs": "Treat image as:",
     "OptionNoSubtitles": "No Subtitles",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "Display order:",
     "OptionDefaultSubtitlesHelp": "Subtitles matching the language preference will be loaded when the audio is in a foreign language.",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
     "OptionOnlyForcedSubtitlesHelp": "Only subtitles marked as forced will be loaded.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "Countries",
     "OptionAlwaysPlaySubtitlesHelp": "Subtitles matching the language preference will be loaded regardless of the audio language.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "Genres",
     "OptionNoSubtitlesHelp": "Subtitles will not be loaded by default.",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderPlotKeywords": "Plot Keywords",
     "TabProfiles": "\u03c4\u03b1 \u03c0\u03c1\u03bf\u03c6\u03af\u03bb",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "HeaderStudios": "Studios",
     "TabSecurity": "A\u03c3\u03c6\u03ac\u03bb\u03b5\u03b9\u03b1 ",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "\u03a0\u03c1\u03bf\u03c3\u03b8\u03ae\u03ba\u03b7 \u03c7\u03c1\u03ae\u03c3\u03c4\u03b7",
-    "TabSupporterClub": "Supporter Club",
+    "HeaderMetadataSettings": "Metadata Settings",
     "ButtonSave": "\u0391\u03c0\u03bf\u03b8\u03b7\u03ba\u03b5\u03cd\u03c3\u03c4\u03b5",
-    "HeaderDonationType": "Donation type:",
+    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
     "ButtonResetPassword": "\u0395\u03c0\u03b1\u03bd\u03b1\u03c6\u03bf\u03c1\u03ac \u03c4\u03bf\u03c5 \u03ba\u03c9\u03b4\u03b9\u03ba\u03bf\u03cd \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7\u03c2",
-    "OptionMakeOneTimeDonation": "Make a one-time donation",
+    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
     "LabelNewPassword": "\u039d\u03ad\u03bf \u03ba\u03c9\u03b4\u03b9\u03ba\u03cc \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7\u03c2 ",
-    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
+    "TabSupporterClub": "Supporter Club",
     "LabelNewPasswordConfirm": "\u0395\u03c0\u03b9\u03b2\u03b5\u03b2\u03b1\u03b9\u03ce\u03c3\u03c4\u03b5 \u03c4\u03bf \u03bd\u03ad\u03bf \u03ba\u03c9\u03b4\u03b9\u03ba\u03cc \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7\u03c2 ",
-    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderDonationType": "Donation type:",
     "HeaderCreatePassword": "\u0394\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u03ba\u03c9\u03b4\u03b9\u03ba\u03bf\u03cd \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7\u03c2 ",
-    "OptionNoTrailer": "No Trailer",
+    "OptionMakeOneTimeDonation": "Make a one-time donation",
     "LabelCurrentPassword": "\u03a4\u03c1\u03ad\u03c7\u03bf\u03bd\u03c4\u03b1 \u03ba\u03c9\u03b4\u03b9\u03ba\u03cc \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7\u03c2",
-    "OptionNoThemeSong": "No Theme Song",
+    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
     "LabelMaxParentalRating": "\u039c\u03ad\u03b3\u03b9\u03c3\u03c4\u03bf \u03b5\u03c0\u03b9\u03c4\u03c1\u03b5\u03c0\u03cc\u03bc\u03b5\u03bd\u03bf \u03b3\u03bf\u03bd\u03b9\u03ba\u03ae \u03b2\u03b1\u03b8\u03bc\u03bf\u03bb\u03bf\u03b3\u03af\u03b1:",
-    "OptionNoThemeVideo": "No Theme Video",
+    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
     "MaxParentalRatingHelp": "\u03a4\u03bf \u03c0\u03b5\u03c1\u03b9\u03b5\u03c7\u03cc\u03bc\u03b5\u03bd\u03bf \u03bc\u03b5 \u03c4\u03b7\u03bd \u03c5\u03c8\u03b7\u03bb\u03cc\u03c4\u03b5\u03c1\u03b7 \u03b2\u03b1\u03b8\u03bc\u03bf\u03bb\u03bf\u03b3\u03af\u03b1 \u03b8\u03b1 \u03b5\u03af\u03bd\u03b1\u03b9 \u03ba\u03c1\u03c5\u03bc\u03bc\u03ad\u03bd\u03b1 \u03b1\u03c0\u03cc \u03b1\u03c5\u03c4\u03cc\u03bd \u03c4\u03bf\u03bd \u03c7\u03c1\u03ae\u03c3\u03c4\u03b7",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "OptionNoTrailer": "No Trailer",
     "LibraryAccessHelp": "\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03c4\u03bf\u03c5\u03c2 \u03c6\u03b1\u03ba\u03ad\u03bb\u03bf\u03c5\u03c2 \u03bc\u03ad\u03c3\u03c9\u03bd \u03b3\u03b9\u03b1 \u03bd\u03b1 \u03c4\u03bf \u03bc\u03bf\u03b9\u03c1\u03b1\u03c3\u03c4\u03b5\u03af\u03c4\u03b5 \u03bc\u03b5 \u03b1\u03c5\u03c4\u03cc\u03bd \u03c4\u03bf \u03c7\u03c1\u03ae\u03c3\u03c4\u03b7. \u039f\u03b9 \u03b4\u03b9\u03b1\u03c7\u03b5\u03b9\u03c1\u03b9\u03c3\u03c4\u03ad\u03c2 \u03b8\u03b1 \u03ad\u03c7\u03bf\u03c5\u03bd \u03c4\u03b7 \u03b4\u03c5\u03bd\u03b1\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1 \u03bd\u03b1 \u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03ac\u03b6\u03b5\u03c3\u03c4\u03b5 \u03cc\u03bb\u03b1 \u03c6\u03b1\u03ba\u03ad\u03bb\u03bf\u03c5\u03c2 \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03ce\u03bd\u03c4\u03b1\u03c2 \u03c4\u03b1 \u03bc\u03b5\u03c4\u03b1\u03b4\u03b5\u03b4\u03bf\u03bc\u03ad\u03bd\u03b1 manager.",
+    "OptionNoThemeSong": "No Theme Song",
     "ChannelAccessHelp": "Select the channels to share with this user. Administrators will be able to edit all channels using the metadata manager.",
+    "OptionNoThemeVideo": "No Theme Video",
     "ButtonDeleteImage": "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
+    "LabelOneTimeDonationAmount": "Donation amount:",
     "LabelSelectUsers": "Select users:",
+    "OptionActor": "Actor",
     "ButtonUpload": "\u0391\u03bd\u03b5\u03b2\u03ac\u03c3\u03c4\u03b5 ",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "\u0391\u03bd\u03b5\u03b2\u03ac\u03c3\u03c4\u03b5 \u03bd\u03ad\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "\u03c1\u03af\u03c7\u03bd\u03b5\u03c4\u03b5 \u03c4\u03b7\u03bd \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1 \u03b5\u03b4\u03ce",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG\/PNG only",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "\u03a4\u03af\u03c0\u03bf\u03c4\u03b1 \u03b5\u03b4\u03ce ",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "\u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03ce \u03b5\u03be\u03b1\u03c3\u03c6\u03b1\u03bb\u03af\u03c3\u03c4\u03b5 \u03c4\u03b7 \u03bb\u03ae\u03c8\u03b7 \u03bc\u03b5\u03c4\u03b1\u03b4\u03b5\u03b4\u03bf\u03bc\u03ad\u03bd\u03c9\u03bd \u03c3\u03c4\u03bf internet \u03b5\u03af\u03bd\u03b1\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03b7.\n",
     "TabSuggested": "\u03a0\u03c1\u03bf\u03c4\u03b5\u03b9\u03bd\u03cc\u03bc\u03b5\u03bd\u03b7",
     "TabLatest": "\u03c4\u03b5\u03bb\u03b5\u03c5\u03c4\u03b1\u03af\u03bf\u03c2",
@@ -212,7 +221,7 @@
     "OptionAscending": "\u03b1\u03cd\u03be\u03bf\u03c5\u03c3\u03b1",
     "OptionDescending": "\u03c6\u03b8\u03af\u03bd\u03bf\u03c5\u03c3\u03b1 ",
     "OptionRuntime": "Runtime",
-    "OptionReleaseDate": "Release Date",
+    "OptionReleaseDate": "\u03b7\u03bc\u03b5\u03c1\u03bf\u03bc\u03b7\u03bd\u03af\u03b1 \u03ba\u03c5\u03ba\u03bb\u03bf\u03c6\u03bf\u03c1\u03af\u03b1\u03c2",
     "OptionPlayCount": "Play Count",
     "OptionDatePlayed": "Date Played",
     "OptionDateAdded": "\u03b7\u03bc\u03b5\u03c1\u03bf\u03bc\u03b7\u03bd\u03af\u03b1 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ae\u03ba\u03b7\u03c2",
@@ -570,9 +579,9 @@
     "LabelSkipped": "Skipped",
     "HeaderEpisodeOrganization": "Episode Organization",
     "LabelSeries": "Series:",
-    "LabelSeasonNumber": "Season number",
-    "LabelEpisodeNumber": "Episode number",
-    "LabelEndingEpisodeNumber": "Ending episode number",
+    "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)",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Display plugins for:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Episode name",
-    "LabelSeriesName": "Series name",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Series.name",
     "ValueSeriesNameUnderscore": "Series_name",
     "ValueEpisodeNamePeriod": "Episode.name",
     "ValueEpisodeNameUnderscore": "Episode_name",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Enter Text",
     "LabelTypeText": "Text",
     "HeaderSearchForSubtitles": "Search for Subtitles",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "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:"
+    "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 6f51797b2..d53c45e40 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Composers",
+    "HeaderRecentActivity": "Recent Activity",
     "LabelExit": "Exit",
-    "OptionOthers": "Others",
+    "HeaderPeople": "People",
     "LabelVisitCommunity": "Visit Community",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
     "LabelGithubWiki": "Github Wiki",
-    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "OptionComposers": "Composers",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "Folders",
+    "OptionOthers": "Others",
     "LabelStandard": "Standard",
-    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelViewApiDocumentation": "View Api Documentation",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
     "LabelBrowseLibrary": "Browse Library",
-    "ViewTypeLiveTvChannels": "Channels",
+    "ViewTypeFolders": "Folders",
     "LabelConfigureMediaBrowser": "Configure Media Browser",
-    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelOpenLibraryViewer": "Open Library Viewer",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
     "LabelRestartServer": "Restart Server",
-    "HeaderPassword": "Password",
+    "ViewTypeLiveTvChannels": "Channels",
     "LabelShowLogWindow": "Show Log Window",
-    "HeaderLocalAccess": "Local Access",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
     "LabelPrevious": "Previous",
-    "HeaderViewOrder": "View Order",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
     "LabelFinish": "Finish",
-    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
+    "HeaderPassword": "Password",
     "LabelNext": "Next",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "HeaderLocalAccess": "Local Access",
     "LabelYoureDone": "You're Done!",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "HeaderViewOrder": "View Order",
     "WelcomeToMediaBrowser": "Welcome to Media Browser!",
-    "OptionDownloadMissingImages": "Download missing images",
+    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "TitleMediaBrowser": "Media Browser",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "ThisWizardWillGuideYou": "This wizard will help guide you through the setup process. To begin, please select your preferred language.",
-    "OptionRefreshAllData": "Refresh all data",
+    "LabelImageRefreshMode": "Image refresh mode:",
     "TellUsAboutYourself": "Tell us about yourself",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionDownloadMissingImages": "Download missing images",
     "LabelYourFirstName": "Your first name:",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionReplaceExistingImages": "Replace existing images",
     "MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "OptionRefreshAllData": "Refresh all data",
     "UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
-    "HeaderPersonInfo": "Person Info",
+    "OptionAddMissingDataOnly": "Add missing data only",
     "LabelWindowsService": "Windows Service",
-    "HeaderIdentifyItem": "Identify Item",
+    "OptionLocalRefreshOnly": "Local refresh only",
     "AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderRefreshMetadata": "Refresh Metadata",
     "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.",
-    "HeaderConfirmDeletion": "Confirm Deletion",
+    "HeaderPersonInfo": "Person Info",
     "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.",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "HeaderIdentifyItem": "Identify Item",
     "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>.",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
     "LabelConfigureSettings": "Configure settings",
-    "ButtonIdentify": "Identify",
+    "HeaderConfirmDeletion": "Confirm Deletion",
     "LabelEnableVideoImageExtraction": "Enable video image extraction",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
     "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.",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
     "LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
-    "LabelCommunityRating": "Community rating:",
+    "ButtonIdentify": "Identify",
     "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.",
-    "LabelVoteCount": "Vote count:",
+    "LabelAlbumArtist": "Album artist:",
     "LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCommunityRating": "Community rating:",
     "ButtonOk": "Ok",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelVoteCount": "Vote count:",
     "ButtonCancel": "Cancel",
-    "LabelAwardSummary": "Award summary:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "New",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Critic rating:",
     "HeaderSetupLibrary": "Setup your media library",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Critic rating summary:",
     "ButtonAddMediaFolder": "Add media folder",
-    "LabelOverview": "Overview:",
+    "LabelAwardSummary": "Award summary:",
     "LabelFolderType": "Folder type:",
-    "LabelShortOverview": "Short overview:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
-    "LabelReleaseDate": "Release date:",
+    "LabelTagline": "Tagline:",
     "ReferToMediaLibraryWiki": "Refer to the media library wiki.",
-    "LabelYear": "Year:",
+    "LabelOverview": "Overview:",
     "LabelCountry": "Country:",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelShortOverview": "Short overview:",
     "LabelLanguage": "Language:",
-    "LabelEndDate": "End date:",
+    "LabelReleaseDate": "Release date:",
     "HeaderPreferredMetadataLanguage": "Preferred metadata language:",
-    "LabelAirDate": "Air days:",
+    "LabelYear": "Year:",
     "LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
-    "LabelAirTime:": "Air time:",
+    "LabelPlaceOfBirth": "Place of birth:",
     "LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelEndDate": "End date:",
     "LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
-    "LabelParentalRating": "Parental rating:",
+    "LabelAirDate": "Air days:",
     "LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations.",
-    "LabelCustomRating": "Custom rating:",
+    "LabelAirTime:": "Air time:",
     "TabPreferences": "Preferences",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Run time (minutes):",
     "TabPassword": "Password",
-    "LabelRevenue": "Revenue ($):",
+    "LabelParentalRating": "Parental rating:",
     "TabLibraryAccess": "Library Access",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelCustomRating": "Custom rating:",
     "TabImage": "Image",
-    "LabelPlayers": "Players:",
+    "LabelBudget": "Budget",
     "TabProfile": "Profile",
-    "Label3DFormat": "3D format:",
+    "LabelRevenue": "Revenue ($):",
     "TabMetadata": "Metadata",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "LabelOriginalAspectRatio": "Original aspect ratio:",
     "TabImages": "Images",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "LabelPlayers": "Players:",
     "TabNotifications": "Notifications",
-    "HeaderExternalIds": "External Id's:",
+    "Label3DFormat": "3D format:",
     "TabCollectionTitles": "Titles",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
     "LabelDisplayMissingEpisodesWithinSeasons": "Display missing episodes within seasons",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "HeaderSpecialEpisodeInfo": "Special Episode Info",
     "LabelUnairedMissingEpisodesWithinSeasons": "Display unaired episodes within seasons",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "HeaderExternalIds": "External Id's:",
     "HeaderVideoPlaybackSettings": "Video Playback Settings",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "Dvd season number:",
     "HeaderPlaybackSettings": "Playback Settings",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "Dvd episode number:",
     "LabelAudioLanguagePreference": "Audio language preference:",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
     "LabelSubtitleLanguagePreference": "Subtitle language preference:",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelAirsBeforeSeason": "Airs before season:",
     "OptionDefaultSubtitles": "Default",
-    "LabelDisplayOrder": "Display order:",
+    "LabelAirsAfterSeason": "Airs after season:",
     "OptionOnlyForcedSubtitles": "Only forced subtitles",
-    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelAirsBeforeEpisode": "Airs before episode:",
     "OptionAlwaysPlaySubtitles": "Always play subtitles",
-    "HeaderCountries": "Countries",
+    "LabelTreatImageAs": "Treat image as:",
     "OptionNoSubtitles": "No Subtitles",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "Display order:",
     "OptionDefaultSubtitlesHelp": "Subtitles matching the language preference will be loaded when the audio is in a foreign language.",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
     "OptionOnlyForcedSubtitlesHelp": "Only subtitles marked as forced will be loaded.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "Countries",
     "OptionAlwaysPlaySubtitlesHelp": "Subtitles matching the language preference will be loaded regardless of the audio language.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "Genres",
     "OptionNoSubtitlesHelp": "Subtitles will not be loaded by default.",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderPlotKeywords": "Plot Keywords",
     "TabProfiles": "Profiles",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "HeaderStudios": "Studios",
     "TabSecurity": "Security",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "Add User",
-    "TabSupporterClub": "Supporter Club",
+    "HeaderMetadataSettings": "Metadata Settings",
     "ButtonSave": "Save",
-    "HeaderDonationType": "Donation type:",
+    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
     "ButtonResetPassword": "Reset Password",
-    "OptionMakeOneTimeDonation": "Make a one-time donation",
+    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
     "LabelNewPassword": "New password:",
-    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
+    "TabSupporterClub": "Supporter Club",
     "LabelNewPasswordConfirm": "New password confirm:",
-    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderDonationType": "Donation type:",
     "HeaderCreatePassword": "Create Password",
-    "OptionNoTrailer": "No Trailer",
+    "OptionMakeOneTimeDonation": "Make a one-time donation",
     "LabelCurrentPassword": "Current password:",
-    "OptionNoThemeSong": "No Theme Song",
+    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
     "LabelMaxParentalRating": "Maximum allowed parental rating:",
-    "OptionNoThemeVideo": "No Theme Video",
+    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
     "MaxParentalRatingHelp": "Content with a higher rating will be hidden from this user.",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "OptionNoTrailer": "No Trailer",
     "LibraryAccessHelp": "Select the media folders to share with this user. Administrators will be able to edit all folders using the metadata manager.",
+    "OptionNoThemeSong": "No Theme Song",
     "ChannelAccessHelp": "Select the channels to share with this user. Administrators will be able to edit all channels using the metadata manager.",
+    "OptionNoThemeVideo": "No Theme Video",
     "ButtonDeleteImage": "Delete Image",
+    "LabelOneTimeDonationAmount": "Donation amount:",
     "LabelSelectUsers": "Select users:",
+    "OptionActor": "Actor",
     "ButtonUpload": "Upload",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "Upload New Image",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "Drop image here",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG\/PNG only.",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "Nothing here.",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "Please ensure downloading of internet metadata is enabled.",
     "TabSuggested": "Suggested",
     "TabLatest": "Latest",
@@ -570,9 +579,9 @@
     "LabelSkipped": "Skipped",
     "HeaderEpisodeOrganization": "Episode Organization",
     "LabelSeries": "Series:",
-    "LabelSeasonNumber": "Season number",
-    "LabelEpisodeNumber": "Episode number",
-    "LabelEndingEpisodeNumber": "Ending episode number",
+    "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)",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Display plugins for:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Episode name",
-    "LabelSeriesName": "Series name",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Series.name",
     "ValueSeriesNameUnderscore": "Series_name",
     "ValueEpisodeNamePeriod": "Episode.name",
     "ValueEpisodeNameUnderscore": "Episode_name",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Enter Text",
     "LabelTypeText": "Text",
     "HeaderSearchForSubtitles": "Search for Subtitles",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "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:"
+    "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 2ffe8f47e..9b1d446cf 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Composers",
+    "HeaderRecentActivity": "Recent Activity",
     "LabelExit": "Exit",
-    "OptionOthers": "Others",
+    "HeaderPeople": "People",
     "LabelVisitCommunity": "Visit Community",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
     "LabelGithubWiki": "Github Wiki",
-    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "OptionComposers": "Composers",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "Folders",
+    "OptionOthers": "Others",
     "LabelStandard": "Standard",
-    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelViewApiDocumentation": "View Api Documentation",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
     "LabelBrowseLibrary": "Browse Library",
-    "ViewTypeLiveTvChannels": "Channels",
+    "ViewTypeFolders": "Folders",
     "LabelConfigureMediaBrowser": "Configure Media Browser",
-    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelOpenLibraryViewer": "Open Library Viewer",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
     "LabelRestartServer": "Restart Server",
-    "HeaderPassword": "Password",
+    "ViewTypeLiveTvChannels": "Channels",
     "LabelShowLogWindow": "Show Log Window",
-    "HeaderLocalAccess": "Local Access",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
     "LabelPrevious": "Previous",
-    "HeaderViewOrder": "View Order",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
     "LabelFinish": "Finish",
-    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
+    "HeaderPassword": "Password",
     "LabelNext": "Next",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "HeaderLocalAccess": "Local Access",
     "LabelYoureDone": "You're Done!",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "HeaderViewOrder": "View Order",
     "WelcomeToMediaBrowser": "Welcome to Media Browser!",
-    "OptionDownloadMissingImages": "Download missing images",
+    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "TitleMediaBrowser": "Media Browser",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "ThisWizardWillGuideYou": "This wizard will help guide you through the setup process. To begin, please select your preferred language.",
-    "OptionRefreshAllData": "Refresh all data",
+    "LabelImageRefreshMode": "Image refresh mode:",
     "TellUsAboutYourself": "Tell us about yourself",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionDownloadMissingImages": "Download missing images",
     "LabelYourFirstName": "Your first name:",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionReplaceExistingImages": "Replace existing images",
     "MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "OptionRefreshAllData": "Refresh all data",
     "UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
-    "HeaderPersonInfo": "Person Info",
+    "OptionAddMissingDataOnly": "Add missing data only",
     "LabelWindowsService": "Windows Service",
-    "HeaderIdentifyItem": "Identify Item",
+    "OptionLocalRefreshOnly": "Local refresh only",
     "AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderRefreshMetadata": "Refresh Metadata",
     "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.",
-    "HeaderConfirmDeletion": "Confirm Deletion",
+    "HeaderPersonInfo": "Person Info",
     "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.",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "HeaderIdentifyItem": "Identify Item",
     "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>.",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
     "LabelConfigureSettings": "Configure settings",
-    "ButtonIdentify": "Identify",
+    "HeaderConfirmDeletion": "Confirm Deletion",
     "LabelEnableVideoImageExtraction": "Enable video image extraction",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
     "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.",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
     "LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
-    "LabelCommunityRating": "Community rating:",
+    "ButtonIdentify": "Identify",
     "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.",
-    "LabelVoteCount": "Vote count:",
+    "LabelAlbumArtist": "Album artist:",
     "LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCommunityRating": "Community rating:",
     "ButtonOk": "Ok",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelVoteCount": "Vote count:",
     "ButtonCancel": "Cancel",
-    "LabelAwardSummary": "Award summary:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "New",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Critic rating:",
     "HeaderSetupLibrary": "Setup your media library",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Critic rating summary:",
     "ButtonAddMediaFolder": "Add media folder",
-    "LabelOverview": "Overview:",
+    "LabelAwardSummary": "Award summary:",
     "LabelFolderType": "Folder type:",
-    "LabelShortOverview": "Short overview:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
-    "LabelReleaseDate": "Release date:",
+    "LabelTagline": "Tagline:",
     "ReferToMediaLibraryWiki": "Refer to the media library wiki.",
-    "LabelYear": "Year:",
+    "LabelOverview": "Overview:",
     "LabelCountry": "Country:",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelShortOverview": "Short overview:",
     "LabelLanguage": "Language:",
-    "LabelEndDate": "End date:",
+    "LabelReleaseDate": "Release date:",
     "HeaderPreferredMetadataLanguage": "Preferred metadata language:",
-    "LabelAirDate": "Air days:",
+    "LabelYear": "Year:",
     "LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
-    "LabelAirTime:": "Air time:",
+    "LabelPlaceOfBirth": "Place of birth:",
     "LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelEndDate": "End date:",
     "LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
-    "LabelParentalRating": "Parental rating:",
+    "LabelAirDate": "Air days:",
     "LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations.",
-    "LabelCustomRating": "Custom rating:",
+    "LabelAirTime:": "Air time:",
     "TabPreferences": "Preferences",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Run time (minutes):",
     "TabPassword": "Password",
-    "LabelRevenue": "Revenue ($):",
+    "LabelParentalRating": "Parental rating:",
     "TabLibraryAccess": "Library Access",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelCustomRating": "Custom rating:",
     "TabImage": "Image",
-    "LabelPlayers": "Players:",
+    "LabelBudget": "Budget",
     "TabProfile": "Profile",
-    "Label3DFormat": "3D format:",
+    "LabelRevenue": "Revenue ($):",
     "TabMetadata": "Metadata",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "LabelOriginalAspectRatio": "Original aspect ratio:",
     "TabImages": "Images",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "LabelPlayers": "Players:",
     "TabNotifications": "Notifications",
-    "HeaderExternalIds": "External Id's:",
+    "Label3DFormat": "3D format:",
     "TabCollectionTitles": "Titles",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
     "LabelDisplayMissingEpisodesWithinSeasons": "Display missing episodes within seasons",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "HeaderSpecialEpisodeInfo": "Special Episode Info",
     "LabelUnairedMissingEpisodesWithinSeasons": "Display unaired episodes within seasons",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "HeaderExternalIds": "External Id's:",
     "HeaderVideoPlaybackSettings": "Video Playback Settings",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "Dvd season number:",
     "HeaderPlaybackSettings": "Playback Settings",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "Dvd episode number:",
     "LabelAudioLanguagePreference": "Audio language preference:",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
     "LabelSubtitleLanguagePreference": "Subtitle language preference:",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelAirsBeforeSeason": "Airs before season:",
     "OptionDefaultSubtitles": "Default",
-    "LabelDisplayOrder": "Display order:",
+    "LabelAirsAfterSeason": "Airs after season:",
     "OptionOnlyForcedSubtitles": "Only forced subtitles",
-    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelAirsBeforeEpisode": "Airs before episode:",
     "OptionAlwaysPlaySubtitles": "Always play subtitles",
-    "HeaderCountries": "Countries",
+    "LabelTreatImageAs": "Treat image as:",
     "OptionNoSubtitles": "No Subtitles",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "Display order:",
     "OptionDefaultSubtitlesHelp": "Subtitles matching the language preference will be loaded when the audio is in a foreign language.",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
     "OptionOnlyForcedSubtitlesHelp": "Only subtitles marked as forced will be loaded.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "Countries",
     "OptionAlwaysPlaySubtitlesHelp": "Subtitles matching the language preference will be loaded regardless of the audio language.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "Genres",
     "OptionNoSubtitlesHelp": "Subtitles will not be loaded by default.",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderPlotKeywords": "Plot Keywords",
     "TabProfiles": "Profiles",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "HeaderStudios": "Studios",
     "TabSecurity": "Security",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "Add User",
-    "TabSupporterClub": "Supporter Club",
+    "HeaderMetadataSettings": "Metadata Settings",
     "ButtonSave": "Save",
-    "HeaderDonationType": "Donation type:",
+    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
     "ButtonResetPassword": "Reset Password",
-    "OptionMakeOneTimeDonation": "Make a one-time donation",
+    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
     "LabelNewPassword": "New password:",
-    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
+    "TabSupporterClub": "Supporter Club",
     "LabelNewPasswordConfirm": "New password confirm:",
-    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderDonationType": "Donation type:",
     "HeaderCreatePassword": "Create Password",
-    "OptionNoTrailer": "No Trailer",
+    "OptionMakeOneTimeDonation": "Make a one-time donation",
     "LabelCurrentPassword": "Current password:",
-    "OptionNoThemeSong": "No Theme Song",
+    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
     "LabelMaxParentalRating": "Maximum allowed parental rating:",
-    "OptionNoThemeVideo": "No Theme Video",
+    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
     "MaxParentalRatingHelp": "Content with a higher rating will be hidden from this user.",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "OptionNoTrailer": "No Trailer",
     "LibraryAccessHelp": "Select the media folders to share with this user. Administrators will be able to edit all folders using the metadata manager.",
+    "OptionNoThemeSong": "No Theme Song",
     "ChannelAccessHelp": "Select the channels to share with this user. Administrators will be able to edit all channels using the metadata manager.",
+    "OptionNoThemeVideo": "No Theme Video",
     "ButtonDeleteImage": "Delete Image",
+    "LabelOneTimeDonationAmount": "Donation amount:",
     "LabelSelectUsers": "Select users:",
+    "OptionActor": "Actor",
     "ButtonUpload": "Upload",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "Upload New Image",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "Drop image here",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG\/PNG only.",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "Nothing here.",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "Please ensure downloading of internet metadata is enabled.",
     "TabSuggested": "Suggested",
     "TabLatest": "Latest",
@@ -570,9 +579,9 @@
     "LabelSkipped": "Skipped",
     "HeaderEpisodeOrganization": "Episode Organization",
     "LabelSeries": "Series:",
-    "LabelSeasonNumber": "Season number",
-    "LabelEpisodeNumber": "Episode number",
-    "LabelEndingEpisodeNumber": "Ending episode number",
+    "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)",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Display plugins for:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Episode name",
-    "LabelSeriesName": "Series name",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Series.name",
     "ValueSeriesNameUnderscore": "Series_name",
     "ValueEpisodeNamePeriod": "Episode.name",
     "ValueEpisodeNameUnderscore": "Episode_name",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Enter Text",
     "LabelTypeText": "Text",
     "HeaderSearchForSubtitles": "Search for Subtitles",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "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:"
+    "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 140138eb2..e491e1527 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/es.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Composers",
+    "HeaderRecentActivity": "Recent Activity",
     "LabelExit": "Salir",
-    "OptionOthers": "Others",
+    "HeaderPeople": "People",
     "LabelVisitCommunity": "Visitar la comunidad",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
     "LabelGithubWiki": "Wiki de Github",
-    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "OptionComposers": "Composers",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "Folders",
+    "OptionOthers": "Others",
     "LabelStandard": "Est\u00e1ndar",
-    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelViewApiDocumentation": "Ver documentacion de Api",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
     "LabelBrowseLibrary": "Navegar biblioteca",
-    "ViewTypeLiveTvChannels": "Channels",
+    "ViewTypeFolders": "Folders",
     "LabelConfigureMediaBrowser": "Configurar Media Browser",
-    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelOpenLibraryViewer": "Abrir el visor de la biblioteca",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
     "LabelRestartServer": "Reiniciar el servidor",
-    "HeaderPassword": "Password",
+    "ViewTypeLiveTvChannels": "Channels",
     "LabelShowLogWindow": "Mostrar la ventana del log",
-    "HeaderLocalAccess": "Local Access",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
     "LabelPrevious": "Anterior",
-    "HeaderViewOrder": "View Order",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
     "LabelFinish": "Terminar",
-    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
+    "HeaderPassword": "Password",
     "LabelNext": "Siguiente",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "HeaderLocalAccess": "Local Access",
     "LabelYoureDone": "Ha Terminado!",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "HeaderViewOrder": "View Order",
     "WelcomeToMediaBrowser": "\u00a1Bienvenido a Media Browser!",
-    "OptionDownloadMissingImages": "Download missing images",
+    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "TitleMediaBrowser": "Media Browser",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "ThisWizardWillGuideYou": "Este asistente lo guiar\u00e1 por el proceso de instalaci\u00f3n. Para comenzar seleccione su idioma preferido.",
-    "OptionRefreshAllData": "Refresh all data",
+    "LabelImageRefreshMode": "Image refresh mode:",
     "TellUsAboutYourself": "D\u00edganos acerca de usted",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionDownloadMissingImages": "Download missing images",
     "LabelYourFirstName": "Su nombre:",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionReplaceExistingImages": "Replace existing images",
     "MoreUsersCanBeAddedLater": "M\u00e1s usuarios pueden agregarse m\u00e1s tarde en el panel de control.",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "OptionRefreshAllData": "Refresh all data",
     "UserProfilesIntro": "Media Browser incluye soporte integrado para los perfiles de usuario, lo que permite que cada usuario tenga su propia configuraci\u00f3n de la pantalla, estado de reproducci\u00f3n y control parental.",
-    "HeaderPersonInfo": "Person Info",
+    "OptionAddMissingDataOnly": "Add missing data only",
     "LabelWindowsService": "Servicio de Windows",
-    "HeaderIdentifyItem": "Identify Item",
+    "OptionLocalRefreshOnly": "Local refresh only",
     "AWindowsServiceHasBeenInstalled": "Un servicio de Windows se ha instalado",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderRefreshMetadata": "Refresh Metadata",
     "WindowsServiceIntro1": "Media Browser Server se ejecuta normalmente como una aplicaci\u00f3n de escritorio con un icono de la bandeja, pero si prefiere ejecutarlo como un servicio en segundo plano, se puede iniciar desde el panel de control de servicios de Windows en su lugar.",
-    "HeaderConfirmDeletion": "Confirmar borrado",
+    "HeaderPersonInfo": "Person Info",
     "WindowsServiceIntro2": "Si se utiliza el servicio de Windows, tenga en cuenta que no se puede ejecutar al mismo tiempo que el icono de la bandeja, por lo que tendr\u00e1 que salir de la bandeja con el fin de ejecutar el servicio. Tambi\u00e9n tendr\u00e1 que ser configurado con privilegios administrativos a trav\u00e9s del panel de control del servicio. Tenga en cuenta que en este momento el servicio no es capaz de auto-actualizaci\u00f3n, por lo que las nuevas versiones requieren la interacci\u00f3n manual.",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "HeaderIdentifyItem": "Identify Item",
     "WizardCompleted": "Eso es todo lo que necesitamos por ahora. Media Browser ha comenzado a reunir informaci\u00f3n sobre su biblioteca de medios. Echa un vistazo a algunas de nuestras aplicaciones, y luego haga clic en <b>Finalizar<\/b> para ver el <b>Panel de control<\/b>.",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
     "LabelConfigureSettings": "Configuraci\u00f3n de opciones",
-    "ButtonIdentify": "Identify",
+    "HeaderConfirmDeletion": "Confirmar borrado",
     "LabelEnableVideoImageExtraction": "Habilitar extracci\u00f3n de im\u00e1genes de video",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
     "VideoImageExtractionHelp": "Para los v\u00eddeos que no dispongan de im\u00e1genes y que no podemos encontrar en Internet. Esto agregar\u00e1 un tiempo adicional para la exploraci\u00f3n inicial de bibliotecas, pero resultar\u00e1 en una presentaci\u00f3n m\u00e1s agradable.",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
     "LabelEnableChapterImageExtractionForMovies": "Extraer im\u00e1genes de cap\u00edtulos para pel\u00edculas",
-    "LabelCommunityRating": "Community rating:",
+    "ButtonIdentify": "Identify",
     "LabelChapterImageExtractionForMoviesHelp": "Extraer im\u00e1genes de cap\u00edtulo permitir\u00e1 a los clientes mostrar men\u00fas gr\u00e1ficos de selecci\u00f3n de escenas. El proceso puede ser lento, intensivo en utilizaci\u00f3n del CPU y puede requerir varios gigabytes de espacio. Se ejecuta como una tarea nocturna, a las 4 de la ma\u00f1ana, aunque esto se puede configurar en el \u00e1rea de tareas programadas. No se recomienda ejecutar esta tarea durante las horas pico de uso.",
-    "LabelVoteCount": "Vote count:",
+    "LabelAlbumArtist": "Album artist:",
     "LabelEnableAutomaticPortMapping": "Habilitar asignaci\u00f3n de puertos autom\u00e1tico",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP permite la configuraci\u00f3n del router para acceso externo de forma f\u00e1cil y autom\u00e1tica. Esto puede no funcionar en algunos modelos de routers.",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCommunityRating": "Community rating:",
     "ButtonOk": "OK",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelVoteCount": "Vote count:",
     "ButtonCancel": "Cancelar",
-    "LabelAwardSummary": "Award summary:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "Nuevo",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Critic rating:",
     "HeaderSetupLibrary": "Configurar biblioteca de medios",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Critic rating summary:",
     "ButtonAddMediaFolder": "Agregar una carpeta de medios",
-    "LabelOverview": "Overview:",
+    "LabelAwardSummary": "Award summary:",
     "LabelFolderType": "Tipo de carpeta:",
-    "LabelShortOverview": "Short overview:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "* Requiere el uso de un plugin, por ejemplo GameBrowser o MB Bookshelf",
-    "LabelReleaseDate": "Release date:",
+    "LabelTagline": "Tagline:",
     "ReferToMediaLibraryWiki": "Consultar el wiki de la biblioteca de medios",
-    "LabelYear": "Year:",
+    "LabelOverview": "Overview:",
     "LabelCountry": "Pa\u00eds:",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelShortOverview": "Short overview:",
     "LabelLanguage": "Idioma:",
-    "LabelEndDate": "End date:",
+    "LabelReleaseDate": "Release date:",
     "HeaderPreferredMetadataLanguage": "Idioma preferido para metadata",
-    "LabelAirDate": "Air days:",
+    "LabelYear": "Year:",
     "LabelSaveLocalMetadata": "Guardar im\u00e1genes y metadata en las carpetas de medios",
-    "LabelAirTime:": "Air time:",
+    "LabelPlaceOfBirth": "Place of birth:",
     "LabelSaveLocalMetadataHelp": "Guardar im\u00e1genes y metadata directamente en las carpetas de medios, permitir\u00e1 colocarlas en un lugar donde se pueden editar f\u00e1cilmente.",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelEndDate": "End date:",
     "LabelDownloadInternetMetadata": "Descargar imagenes y metadata de internet",
-    "LabelParentalRating": "Parental rating:",
+    "LabelAirDate": "Air days:",
     "LabelDownloadInternetMetadataHelp": "Media Browser permite descargar informaci\u00f3n acerca de su media para enriquecer la presentaci\u00f3n.",
-    "LabelCustomRating": "Custom rating:",
+    "LabelAirTime:": "Air time:",
     "TabPreferences": "Preferencias",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Run time (minutes):",
     "TabPassword": "Contrase\u00f1a",
-    "LabelRevenue": "Revenue ($):",
+    "LabelParentalRating": "Parental rating:",
     "TabLibraryAccess": "Acceso a biblioteca",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelCustomRating": "Custom rating:",
     "TabImage": "imagen",
-    "LabelPlayers": "Players:",
+    "LabelBudget": "Budget",
     "TabProfile": "Perfil",
-    "Label3DFormat": "3D format:",
+    "LabelRevenue": "Revenue ($):",
     "TabMetadata": "Metadata",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "LabelOriginalAspectRatio": "Original aspect ratio:",
     "TabImages": "Im\u00e1genes",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "LabelPlayers": "Players:",
     "TabNotifications": "Notificaciones",
-    "HeaderExternalIds": "External Id's:",
+    "Label3DFormat": "3D format:",
     "TabCollectionTitles": "T\u00edtulos",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
     "LabelDisplayMissingEpisodesWithinSeasons": "Mostar episodios no disponibles en temporadas",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "HeaderSpecialEpisodeInfo": "Special Episode Info",
     "LabelUnairedMissingEpisodesWithinSeasons": "Mostrar episodios a\u00fan no emitidos en temporadas",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "HeaderExternalIds": "External Id's:",
     "HeaderVideoPlaybackSettings": "Ajustes de Reproducci\u00f3n de Video",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "Dvd season number:",
     "HeaderPlaybackSettings": "Ajustes de reproducci\u00f3n",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "Dvd episode number:",
     "LabelAudioLanguagePreference": "Preferencia de idioma de audio",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
     "LabelSubtitleLanguagePreference": "Preferencia de idioma de subtitulos",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelAirsBeforeSeason": "Airs before season:",
     "OptionDefaultSubtitles": "Por defecto",
-    "LabelDisplayOrder": "Display order:",
+    "LabelAirsAfterSeason": "Airs after season:",
     "OptionOnlyForcedSubtitles": "S\u00f3lo subt\u00edtulos forzados",
-    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelAirsBeforeEpisode": "Airs before episode:",
     "OptionAlwaysPlaySubtitles": "Mostrar siempre subt\u00edtulos",
-    "HeaderCountries": "Countries",
+    "LabelTreatImageAs": "Treat image as:",
     "OptionNoSubtitles": "Sin subt\u00edtulos",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "Display order:",
     "OptionDefaultSubtitlesHelp": "Los subt\u00edtulos que concuerden con la preferencia de idioma se cargar\u00e1n cuando el audio est\u00e9 en un idioma extranjero.",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
     "OptionOnlyForcedSubtitlesHelp": "S\u00f3lo se cargar\u00e1n los subt\u00edtulos marcados como forzados.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "Countries",
     "OptionAlwaysPlaySubtitlesHelp": "Los subt\u00edtulos que concuerden con la preferencia de idioma se cargar\u00e1n independientemente del idioma de audio.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "Genres",
     "OptionNoSubtitlesHelp": "Los subt\u00edtulos no se cargar\u00e1n de forma predeterminada.",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderPlotKeywords": "Plot Keywords",
     "TabProfiles": "Perfiles",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "HeaderStudios": "Studios",
     "TabSecurity": "Seguridad",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "Agregar Usuario",
-    "TabSupporterClub": "Supporter Club",
+    "HeaderMetadataSettings": "Metadata Settings",
     "ButtonSave": "Grabar",
-    "HeaderDonationType": "Donation type:",
+    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
     "ButtonResetPassword": "Reiniciar Contrase\u00f1a",
-    "OptionMakeOneTimeDonation": "Make a one-time donation",
+    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
     "LabelNewPassword": "Nueva Contrase\u00f1a:",
-    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
+    "TabSupporterClub": "Supporter Club",
     "LabelNewPasswordConfirm": "Confirmaci\u00f3n de contrase\u00f1a nueva:",
-    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderDonationType": "Donation type:",
     "HeaderCreatePassword": "Crear Contrase\u00f1a",
-    "OptionNoTrailer": "No Trailer",
+    "OptionMakeOneTimeDonation": "Make a one-time donation",
     "LabelCurrentPassword": "Contrase\u00f1a actual",
-    "OptionNoThemeSong": "No Theme Song",
+    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
     "LabelMaxParentalRating": "M\u00e1xima clasificaci\u00f3n permitida",
-    "OptionNoThemeVideo": "No Theme Video",
+    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
     "MaxParentalRatingHelp": "El contenido con clasificaci\u00f3n parental superior se ocultar\u00e1 para este usuario.",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "OptionNoTrailer": "No Trailer",
     "LibraryAccessHelp": "Seleccione las carpetas de medios para compartir con este usuario. Los administradores podr\u00e1n editar todas las carpetas usando el gestor de metadata.",
+    "OptionNoThemeSong": "No Theme Song",
     "ChannelAccessHelp": "Seleccione los canales para compartir con este usuario. Los administradores podr\u00e1n editar todos los canales mediante el gestor de metadatos.",
+    "OptionNoThemeVideo": "No Theme Video",
     "ButtonDeleteImage": "Borrar imagen",
+    "LabelOneTimeDonationAmount": "Donation amount:",
     "LabelSelectUsers": "Seleccionar usuarios:",
+    "OptionActor": "Actor",
     "ButtonUpload": "Subir",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "Subir nueva imagen",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "Depositar Imagen Aqu\u00ed",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "Se Recomienda una Proporci\u00f3n de Aspecto 1:1. Solo JPG\/PNG",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "Nada aqu\u00ed.",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "Por favor aseg\u00farese que la descarga de metadata de internet esta habilitada",
     "TabSuggested": "Sugerencia",
     "TabLatest": "Novedades",
@@ -212,7 +221,7 @@
     "OptionAscending": "Ascendente",
     "OptionDescending": "Descendente",
     "OptionRuntime": "Tiempo",
-    "OptionReleaseDate": "Release Date",
+    "OptionReleaseDate": "Fecha de estreno",
     "OptionPlayCount": "N\u00famero de reproducc.",
     "OptionDatePlayed": "Fecha de reproducci\u00f3n",
     "OptionDateAdded": "A\u00f1adido el",
@@ -566,12 +575,12 @@
     "HeaderProgram": "Programa",
     "HeaderClients": "Clientes",
     "LabelCompleted": "Completado",
-    "LabelFailed": "Error",
+    "LabelFailed": "Err\u00f3neo",
     "LabelSkipped": "Omitido",
     "HeaderEpisodeOrganization": "Organizaci\u00f3n de episodios",
-    "LabelSeries": "Series:",
-    "LabelSeasonNumber": "Season number",
-    "LabelEpisodeNumber": "Episode number",
+    "LabelSeries": "Serie:",
+    "LabelSeasonNumber": "Temporada n\u00famero:",
+    "LabelEpisodeNumber": "Episodio n\u00famero:",
     "LabelEndingEpisodeNumber": "N\u00famero episodio final:",
     "LabelEndingEpisodeNumberHelp": "S\u00f3lo requerido para archivos multi-episodio",
     "HeaderSupportTheTeam": "Apoye al Equipo de Media Browser",
@@ -714,10 +723,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",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Mostrar plugins para:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Nombre episodio",
-    "LabelSeriesName": "Nombre de la serie",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Series.name",
     "ValueSeriesNameUnderscore": "Series_name",
     "ValueEpisodeNamePeriod": "Episode.name",
     "ValueEpisodeNameUnderscore": "Episode_name",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Entrar texto",
     "LabelTypeText": "Texto",
     "HeaderSearchForSubtitles": "B\u00fasqueda de Subt\u00edtulos",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "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:"
+    "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 17b2d6722..e032bd9a5 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Compositores",
+    "HeaderRecentActivity": "Actividad Reciente",
     "LabelExit": "Salir",
-    "OptionOthers": "Otros",
+    "HeaderPeople": "Personas",
     "LabelVisitCommunity": "Visitar la Comunidad",
+    "HeaderDownloadPeopleMetadataFor": "Descargar biograf\u00eda e im\u00e1genes para:",
     "LabelGithubWiki": "Wiki de Github",
-    "HeaderDownloadPeopleMetadataForHelp": "Habilitar opciones adicionales proporcionar\u00e1 m\u00e1s informaci\u00f3n en pantalla pero resultar\u00e1 en barridos de la biblioteca m\u00e1s lentos",
+    "OptionComposers": "Compositores",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "Carpetas",
+    "OptionOthers": "Otros",
     "LabelStandard": "Est\u00e1ndar",
-    "LabelDisplayFoldersView": "Mostrar una vista de carpetas para mostrar carpetas de medios simples",
     "LabelViewApiDocumentation": "Ver documentaci\u00f3n del Api",
-    "ViewTypeLiveTvRecordingGroups": "Grabaciones",
+    "HeaderDownloadPeopleMetadataForHelp": "Habilitar opciones adicionales proporcionar\u00e1 m\u00e1s informaci\u00f3n en pantalla pero resultar\u00e1 en barridos de la biblioteca m\u00e1s lentos",
     "LabelBrowseLibrary": "Explorar Biblioteca",
-    "ViewTypeLiveTvChannels": "Canales",
+    "ViewTypeFolders": "Carpetas",
     "LabelConfigureMediaBrowser": "Configurar Media Browser",
-    "LabelAllowLocalAccessWithoutPassword": "Permite acceso local sin una contrase\u00f1a",
+    "LabelDisplayFoldersView": "Mostrar una vista de carpetas para mostrar carpetas de medios simples",
     "LabelOpenLibraryViewer": "Abrir el Visor de la Biblioteca",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "Al habilitarse, no se requerir\u00e1 de una contrase\u00f1a cuando se inicie sesi\u00f3n desde su red local.",
+    "ViewTypeLiveTvRecordingGroups": "Grabaciones",
     "LabelRestartServer": "Reiniciar el Servidor",
-    "HeaderPassword": "Contrase\u00f1a",
+    "ViewTypeLiveTvChannels": "Canales",
     "LabelShowLogWindow": "Mostrar Ventana de Bit\u00e1cora",
-    "HeaderLocalAccess": "Acceso Local",
+    "LabelAllowLocalAccessWithoutPassword": "Permite acceso local sin una contrase\u00f1a",
     "LabelPrevious": "Anterior",
-    "HeaderViewOrder": "Orden de Despliegue",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "Al habilitarse, no se requerir\u00e1 de una contrase\u00f1a cuando se inicie sesi\u00f3n desde su red local.",
     "LabelFinish": "Terminar",
-    "LabelSelectUserViewOrder": "Seleccione el orden en que sus vistas ser\u00e1n desplegadas dentro de las apps de Media Browser",
+    "HeaderPassword": "Contrase\u00f1a",
     "LabelNext": "Siguiente",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "HeaderLocalAccess": "Acceso Local",
     "LabelYoureDone": "Ha Terminado!",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "HeaderViewOrder": "Orden de Despliegue",
     "WelcomeToMediaBrowser": "\u00a1Bienvenido a Media Broswer!",
-    "OptionDownloadMissingImages": "Download missing images",
+    "LabelSelectUserViewOrder": "Seleccione el orden en que sus vistas ser\u00e1n desplegadas dentro de las apps de Media Browser",
     "TitleMediaBrowser": "Media Browser",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "ThisWizardWillGuideYou": "Este asistente le guiar\u00e1 a trav\u00e9s del proceso de instalaci\u00f3n. Para comenzar, por favor seleccione su lenguaje preferido.",
-    "OptionRefreshAllData": "Refresh all data",
+    "LabelImageRefreshMode": "Image refresh mode:",
     "TellUsAboutYourself": "D\u00edganos sobre usted",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionDownloadMissingImages": "Download missing images",
     "LabelYourFirstName": "Su nombre:",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionReplaceExistingImages": "Replace existing images",
     "MoreUsersCanBeAddedLater": "Se pueden agregar m\u00e1s usuarios posteriormente en el panel de control.",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "OptionRefreshAllData": "Refresh all data",
     "UserProfilesIntro": "Media Browser incluye soporte integrado para perfiles de usuario, permiti\u00e9ndo a cada usuario tener su propia configuraci\u00f3n de pantalla, estado de reproducci\u00f3n y controles parentales.",
-    "HeaderPersonInfo": "Person Info",
+    "OptionAddMissingDataOnly": "Add missing data only",
     "LabelWindowsService": "Servicio de Windows",
-    "HeaderIdentifyItem": "Identify Item",
+    "OptionLocalRefreshOnly": "Local refresh only",
     "AWindowsServiceHasBeenInstalled": "Se ha instalado un Servicio de Windows.",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderRefreshMetadata": "Refresh Metadata",
     "WindowsServiceIntro1": "Media Browser Server se ejecuta normalmente como una aplicaci\u00f3n de escritorio con un icono en el \u00e1rea de notificaci\u00f3n, pero si prefiere ejecutarlo como un servicio de segundo plano, puede ser iniciado desde el panel de control de servicios de windows.",
-    "HeaderConfirmDeletion": "Confirmar Eliminaci\u00f3n",
+    "HeaderPersonInfo": "Person Info",
     "WindowsServiceIntro2": "Si utiliza el servicio de Windows, tenga en cuenta que no se puede ejecutar simult\u00e1neamiente con el icono en el \u00e1rea de notificaci\u00f3n, por lo que tendr\u00e1 que finalizar desde el icono para poder ejecutar el servicio. Adicionalmente, el servicio deber\u00e1 ser configurado con privilegios administrativos a trav\u00e9s del panel de control del servicio. Tenga en cuenta que en este momento el servicio no es capaz de actualizarse a s\u00ed mismo, por lo que las nuevas versiones requerir\u00e1n de interacci\u00f3n manual.",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "HeaderIdentifyItem": "Identify Item",
     "WizardCompleted": "Eso es todo lo que necesitamos por ahora. Media Browser ha comenzado a recolectar informaci\u00f3n sobre su biblioteca de medios. Eche un vistazo a algunas de nuestras aplicaciones, y luego haga clic en <b>Finalizar<\/b> para ver el <b>Panel de Control<\/b>.",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
     "LabelConfigureSettings": "Configuraci\u00f3n de opciones",
-    "ButtonIdentify": "Identify",
+    "HeaderConfirmDeletion": "Confirmar Eliminaci\u00f3n",
     "LabelEnableVideoImageExtraction": "Habilitar extracci\u00f3n de im\u00e1genes de video",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
     "VideoImageExtractionHelp": "Para videos que no cuenten con im\u00e1genes, y para los que no podemos encontrar im\u00e1genes en Internet. Esto incrementar\u00e1 un poco el tiempo de la exploraci\u00f3n inicial de las bibliotecas, pero resultar\u00e1 en una presentaci\u00f3n m\u00e1s agradable.",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
     "LabelEnableChapterImageExtractionForMovies": "Extraer im\u00e1genes de cap\u00edtulos para Pel\u00edculas",
-    "LabelCommunityRating": "Community rating:",
+    "ButtonIdentify": "Identify",
     "LabelChapterImageExtractionForMoviesHelp": "Extraer im\u00e1genes de cap\u00edtulos permite a los clientes mostrar men\u00fas gr\u00e1ficos de selecci\u00f3n de escenas. El proceso puede ser lento, intensivo en utilizaci\u00f3n del CPU y puede requerir varios gigabytes de espacio. Se ejecuta como una tarea nocturna, programada a las 4 de la ma\u00f1ana, aunque esto se puede configurar en el \u00e1rea de tareas programadas. No se recomienda ejecutar esta tarea durante las horas pico de uso.",
-    "LabelVoteCount": "Vote count:",
+    "LabelAlbumArtist": "Album artist:",
     "LabelEnableAutomaticPortMapping": "Habilitar mapeo autom\u00e1tico de puertos",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP permite la configuraci\u00f3n de ruteador de manera autom\u00e1tica, para acceso remoto de manera f\u00e1cil. Eso puede no funcionar con algunos modelos de ruteadores.",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCommunityRating": "Community rating:",
     "ButtonOk": "Ok",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelVoteCount": "Vote count:",
     "ButtonCancel": "Cancelar",
-    "LabelAwardSummary": "Award summary:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "Nuevo",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Critic rating:",
     "HeaderSetupLibrary": "Configurar su biblioteca de medios",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Critic rating summary:",
     "ButtonAddMediaFolder": "Agregar carpeta de medios",
-    "LabelOverview": "Overview:",
+    "LabelAwardSummary": "Award summary:",
     "LabelFolderType": "Tipo de carpeta:",
-    "LabelShortOverview": "Short overview:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "* Requiere el uso de un complemento, p. ej. GameBrowser o MB Bookshelf.",
-    "LabelReleaseDate": "Release date:",
+    "LabelTagline": "Tagline:",
     "ReferToMediaLibraryWiki": "Consultar la wiki de la biblioteca de medios.",
-    "LabelYear": "Year:",
+    "LabelOverview": "Overview:",
     "LabelCountry": "Pa\u00eds:",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelShortOverview": "Short overview:",
     "LabelLanguage": "Idioma:",
-    "LabelEndDate": "End date:",
+    "LabelReleaseDate": "Release date:",
     "HeaderPreferredMetadataLanguage": "Idioma preferido para metadatos:",
-    "LabelAirDate": "Air days:",
+    "LabelYear": "Year:",
     "LabelSaveLocalMetadata": "Guardar im\u00e1genes y metadatos en las carpetas de medios",
-    "LabelAirTime:": "Air time:",
+    "LabelPlaceOfBirth": "Place of birth:",
     "LabelSaveLocalMetadataHelp": "Guardar im\u00e1genes y metadatos directamente en las carpetas de medios los colocar\u00e1 en un lugar donde se pueden editar f\u00e1cilmente.",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelEndDate": "End date:",
     "LabelDownloadInternetMetadata": "Descargar im\u00e1genes y metadatos de internet",
-    "LabelParentalRating": "Parental rating:",
+    "LabelAirDate": "Air days:",
     "LabelDownloadInternetMetadataHelp": "Media Browser permite descargar informaci\u00f3n de sus medios para enriquecer la presentaci\u00f3n.",
-    "LabelCustomRating": "Custom rating:",
+    "LabelAirTime:": "Air time:",
     "TabPreferences": "Preferencias",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Run time (minutes):",
     "TabPassword": "Contrase\u00f1a",
-    "LabelRevenue": "Revenue ($):",
+    "LabelParentalRating": "Parental rating:",
     "TabLibraryAccess": "Acceso a biblioteca",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelCustomRating": "Custom rating:",
     "TabImage": "Imagen",
-    "LabelPlayers": "Players:",
+    "LabelBudget": "Budget",
     "TabProfile": "Perf\u00edl",
-    "Label3DFormat": "3D format:",
+    "LabelRevenue": "Revenue ($):",
     "TabMetadata": "Metadatos",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "LabelOriginalAspectRatio": "Original aspect ratio:",
     "TabImages": "Im\u00e1genes",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "LabelPlayers": "Players:",
     "TabNotifications": "Notificaciones",
-    "HeaderExternalIds": "External Id's:",
+    "Label3DFormat": "3D format:",
     "TabCollectionTitles": "T\u00edtulos",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
     "LabelDisplayMissingEpisodesWithinSeasons": "Mostar episodios no disponibles en las temporadas",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "HeaderSpecialEpisodeInfo": "Special Episode Info",
     "LabelUnairedMissingEpisodesWithinSeasons": "Mostrar episodios a\u00fan no emitidos en las temporadas",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "HeaderExternalIds": "External Id's:",
     "HeaderVideoPlaybackSettings": "Ajustes de Reproducci\u00f3n de Video",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "Dvd season number:",
     "HeaderPlaybackSettings": "Configuraci\u00f3n de Reproducci\u00f3n",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "Dvd episode number:",
     "LabelAudioLanguagePreference": "Preferencia de idioma de audio:",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
     "LabelSubtitleLanguagePreference": "Preferencia de idioma de subt\u00edtulos:",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelAirsBeforeSeason": "Airs before season:",
     "OptionDefaultSubtitles": "Por Defecto",
-    "LabelDisplayOrder": "Display order:",
+    "LabelAirsAfterSeason": "Airs after season:",
     "OptionOnlyForcedSubtitles": "\u00danicamente subt\u00edtulos forzados",
-    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelAirsBeforeEpisode": "Airs before episode:",
     "OptionAlwaysPlaySubtitles": "Siempre mostrar subt\u00edtulos",
-    "HeaderCountries": "Countries",
+    "LabelTreatImageAs": "Treat image as:",
     "OptionNoSubtitles": "Sin Subtitulos",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "Display order:",
     "OptionDefaultSubtitlesHelp": "Los subt\u00edtulos que coincidan con el lenguaje preferido ser\u00e1n cargados cuando el audio se encuentre en un lenguaje extranjero.",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
     "OptionOnlyForcedSubtitlesHelp": "Se cargar\u00e1n \u00fanicamente subt\u00edtulos marcados como forzados.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "Countries",
     "OptionAlwaysPlaySubtitlesHelp": "Los subt\u00edtulos que coincidan con el lenguaje preferido ser\u00e1n cargados independientemente del lenguaje del audio.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "Genres",
     "OptionNoSubtitlesHelp": "Los subt\u00edtulos no ser\u00e1n cargados por defecto.",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderPlotKeywords": "Plot Keywords",
     "TabProfiles": "Perfiles",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "HeaderStudios": "Studios",
     "TabSecurity": "Seguridad",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "Agregar Usuario",
-    "TabSupporterClub": "Supporter Club",
+    "HeaderMetadataSettings": "Metadata Settings",
     "ButtonSave": "Guardar",
-    "HeaderDonationType": "Donation type:",
+    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
     "ButtonResetPassword": "Restablecer Contrase\u00f1a",
-    "OptionMakeOneTimeDonation": "Make a one-time donation",
+    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
     "LabelNewPassword": "Nueva contrase\u00f1a:",
-    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
+    "TabSupporterClub": "Supporter Club",
     "LabelNewPasswordConfirm": "Confirmaci\u00f3n de contrase\u00f1a nueva:",
-    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderDonationType": "Donation type:",
     "HeaderCreatePassword": "Crear Contrase\u00f1a",
-    "OptionNoTrailer": "No Trailer",
+    "OptionMakeOneTimeDonation": "Make a one-time donation",
     "LabelCurrentPassword": "Contrase\u00f1a actual:",
-    "OptionNoThemeSong": "No Theme Song",
+    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
     "LabelMaxParentalRating": "M\u00e1xima clasificaci\u00f3n parental permitida:",
-    "OptionNoThemeVideo": "No Theme Video",
+    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
     "MaxParentalRatingHelp": "El contenido con clasificaci\u00f3n parental superior se ocultar\u00e1 para este usuario.",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "OptionNoTrailer": "No Trailer",
     "LibraryAccessHelp": "Seleccione las carpetas de medios para compartir con este usuario. Los administradores podr\u00e1n editar todas las carpetas usando el administrador de metadatos.",
+    "OptionNoThemeSong": "No Theme Song",
     "ChannelAccessHelp": "Seleccione los canales a compartir con este usuario. Los administradores podr\u00e1n editar todos los canales empleando el administrador de metadatos.",
+    "OptionNoThemeVideo": "No Theme Video",
     "ButtonDeleteImage": "Eliminar Imagen",
+    "LabelOneTimeDonationAmount": "Donation amount:",
     "LabelSelectUsers": "Seleccionar Usuarios:",
+    "OptionActor": "Actor",
     "ButtonUpload": "Subir",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "Subir Nueva Imagen",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "Depositar imagen aqu\u00ed",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "Se Recomienda una Proporci\u00f3n de Aspecto 1:1. Solo JPG\/PNG.",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "Nada aqu\u00ed.",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "Por favor aseg\u00farese que la descarga de metadatos de internet esta habilitada.",
     "TabSuggested": "Sugerencias",
     "TabLatest": "Recientes",
@@ -212,7 +221,7 @@
     "OptionAscending": "Ascendente",
     "OptionDescending": "Descendente",
     "OptionRuntime": "Duraci\u00f3n",
-    "OptionReleaseDate": "Release Date",
+    "OptionReleaseDate": "Fecha de Estreno",
     "OptionPlayCount": "N\u00famero de Reproducc.",
     "OptionDatePlayed": "Fecha de Reproducci\u00f3n",
     "OptionDateAdded": "Agregardo el",
@@ -570,8 +579,8 @@
     "LabelSkipped": "Omitido",
     "HeaderEpisodeOrganization": "Organizaci\u00f3n de Episodios",
     "LabelSeries": "Series:",
-    "LabelSeasonNumber": "Season number",
-    "LabelEpisodeNumber": "Episode number",
+    "LabelSeasonNumber": "N\u00famero de temporada",
+    "LabelEpisodeNumber": "N\u00famero de episodio",
     "LabelEndingEpisodeNumber": "N\u00famero episodio final",
     "LabelEndingEpisodeNumberHelp": "S\u00f3lo requerido para archivos multi-episodio",
     "HeaderSupportTheTeam": "Apoye al Equipo de Media Browser",
@@ -714,12 +723,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",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Desplegar complementos para:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Nombre del episodio",
-    "LabelSeriesName": "Nombre de la serie",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Nombre.serie",
     "ValueSeriesNameUnderscore": "Nombre_serie",
     "ValueEpisodeNamePeriod": "Nombre del episodio",
     "ValueEpisodeNameUnderscore": "Nombre_episodio",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Capturar Texto",
     "LabelTypeText": "Texto",
     "HeaderSearchForSubtitles": "Buscar Subtitulos",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "App: {0}, Dispositivo: {1}",
     "ProviderValue": "Proveedor: {0}",
     "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:"
+    "LabelChannelDownloadSizeLimitHelp": "Limitar el tama\u00f1o de la carpeta de descargas del canal"
 }
\ 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 9da59f3b4..6708434ed 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/fr.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Compositeurs",
+    "HeaderRecentActivity": "Activit\u00e9 R\u00e9cente",
     "LabelExit": "Quitter",
-    "OptionOthers": "Autres",
+    "HeaderPeople": "Personnes",
     "LabelVisitCommunity": "Visiter la Communaut\u00e9",
+    "HeaderDownloadPeopleMetadataFor": "T\u00e9l\u00e9charger la biographie et les images pour:",
     "LabelGithubWiki": "GitHub Wiki",
-    "HeaderDownloadPeopleMetadataForHelp": "Activer les options compl\u00e9mentaires fournira plus d'information \u00e0 l'\u00e9cran mais causera une lenteur des scans de librairie.",
+    "OptionComposers": "Compositeurs",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "R\u00e9pertoires",
+    "OptionOthers": "Autres",
     "LabelStandard": "Standard",
-    "LabelDisplayFoldersView": "Afficher une vue mosa\u00efque pour montrer les dossiers media en int\u00e9gralit\u00e9.",
     "LabelViewApiDocumentation": "Consulter la documentation API",
-    "ViewTypeLiveTvRecordingGroups": "Enregistrements",
+    "HeaderDownloadPeopleMetadataForHelp": "Activer les options compl\u00e9mentaires fournira plus d'information \u00e0 l'\u00e9cran mais causera une lenteur des scans de librairie.",
     "LabelBrowseLibrary": "Parcourir la biblioth\u00e8que",
-    "ViewTypeLiveTvChannels": "Cha\u00eenes",
+    "ViewTypeFolders": "R\u00e9pertoires",
     "LabelConfigureMediaBrowser": "Configurer Media Browser",
-    "LabelAllowLocalAccessWithoutPassword": "Autoriser l'acc\u00e8s local sans un mot de passe",
+    "LabelDisplayFoldersView": "Afficher une vue mosa\u00efque pour montrer les dossiers media en int\u00e9gralit\u00e9.",
     "LabelOpenLibraryViewer": "Ouvrir le navigateur de biblioth\u00e8que",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "Si activ\u00e9, le mot de passe ne sera pas requis pour s'authentifier depuis le r\u00e9seau local.",
+    "ViewTypeLiveTvRecordingGroups": "Enregistrements",
     "LabelRestartServer": "Red\u00e9marrer le Serveur",
-    "HeaderPassword": "Mot de passe",
+    "ViewTypeLiveTvChannels": "Cha\u00eenes",
     "LabelShowLogWindow": "Afficher la fen\u00eatre du journal d'\u00e9v\u00e8nements",
-    "HeaderLocalAccess": "Acc\u00e8s local",
+    "LabelAllowLocalAccessWithoutPassword": "Autoriser l'acc\u00e8s local sans un mot de passe",
     "LabelPrevious": "Pr\u00e9c\u00e9dent",
-    "HeaderViewOrder": "View Order",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "Si activ\u00e9, le mot de passe ne sera pas requis pour s'authentifier depuis le r\u00e9seau local.",
     "LabelFinish": "Terminer",
-    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
+    "HeaderPassword": "Mot de passe",
     "LabelNext": "Suivant",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "HeaderLocalAccess": "Acc\u00e8s local",
     "LabelYoureDone": "Vous avez Termin\u00e9!",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "HeaderViewOrder": "View Order",
     "WelcomeToMediaBrowser": "Bienvenue dans Media Browser!",
-    "OptionDownloadMissingImages": "Download missing images",
+    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "TitleMediaBrowser": "Media Browser",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "ThisWizardWillGuideYou": "Cet assistant vous guidera dans le processus de configuration. Pour commencer, merci de s\u00e9lectionner votre langue pr\u00e9f\u00e9r\u00e9e.",
-    "OptionRefreshAllData": "Refresh all data",
+    "LabelImageRefreshMode": "Image refresh mode:",
     "TellUsAboutYourself": "Parlez-nous de vous",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionDownloadMissingImages": "Download missing images",
     "LabelYourFirstName": "Votre pr\u00e9nom:",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionReplaceExistingImages": "Replace existing images",
     "MoreUsersCanBeAddedLater": "D'autres utilisateurs pourront \u00eatre ajout\u00e9s ult\u00e9rieurement \u00e0 partir du tableau de bord.",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "OptionRefreshAllData": "Refresh all data",
     "UserProfilesIntro": "Media Browser supporte nativement les profils utilisateurs, donnant la possibilit\u00e9 pour chaque utilisateur d'avoir ses propres param\u00e8tres d'affichage, \u00e9tats de lecture et param\u00e8tres de contr\u00f4le parental.",
-    "HeaderPersonInfo": "Person Info",
+    "OptionAddMissingDataOnly": "Add missing data only",
     "LabelWindowsService": "Service Windows",
-    "HeaderIdentifyItem": "Identify Item",
+    "OptionLocalRefreshOnly": "Local refresh only",
     "AWindowsServiceHasBeenInstalled": "Un service Windows a \u00e9t\u00e9 install\u00e9.",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderRefreshMetadata": "Actualiser les m\u00e9tadonn\u00e9es",
     "WindowsServiceIntro1": "Media Browser fonctionne normalement en tant qu'application sur le bureau avec une ic\u00f4ne dans la barre des t\u00e2ches, mais si vous pr\u00e9f\u00e9rez le lancer en tant que service d'arri\u00e8re-plan, il peut \u00eatre d\u00e9marr\u00e9 via le gestionnaire de services Windows.",
-    "HeaderConfirmDeletion": "Confirmer suppression",
+    "HeaderPersonInfo": "Person Info",
     "WindowsServiceIntro2": "Si le service Windows est utilis\u00e9, veuillez noter qu'il ne peut pas fonctionner en m\u00eame temps que l'application dans la barre des t\u00e2ches, il faut donc fermer l'application de la barre des t\u00e2ches pour pouvoir ex\u00e9cuter le service. Le service devra aussi \u00eatre configur\u00e9 avec les droits administrateurs via le panneau de configuration. Veuillez noter qu'actuellement la mise \u00e0 jour automatique du service n'est pas disponible, les mises \u00e0 jour devront donc se faire manuellement.",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "HeaderIdentifyItem": "Identify Item",
     "WizardCompleted": "C'est tout ce dont nous avons besoin pour l'instant. Media Browser a commenc\u00e9 la collecte d'information sur votre biblioth\u00e8que de m\u00e9dia. Visitez quelques unes de nos applications, ensuite cliquez <b>Terminer<\/b> pour voir le <b>Tableau de bord<\/b>",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
     "LabelConfigureSettings": "Configurer les param\u00e8tres",
-    "ButtonIdentify": "Identify",
+    "HeaderConfirmDeletion": "Confirmer suppression",
     "LabelEnableVideoImageExtraction": "Activer l'extraction d'image des videos",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
     "VideoImageExtractionHelp": "Pour les vid\u00e9os sans image et pour lesquelles nous n'avons pas trouv\u00e9 d'images sur Internet. Ce processus prolongera la mise \u00e0 jour initiale de la biblioth\u00e8que mais offrira un meilleur rendu visuel.",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
     "LabelEnableChapterImageExtractionForMovies": "Extraire les images de chapitre pour les films",
-    "LabelCommunityRating": "Community rating:",
+    "ButtonIdentify": "Identify",
     "LabelChapterImageExtractionForMoviesHelp": "L'extraction d'images de chapitre permettra aux clients d'afficher des menus visuels pour la s\u00e9lection des sc\u00e8nes. Le processus peut \u00eatre long et consommateur de ressources du processeur et de stockage (plusieurs gigaoctets). Il s'ex\u00e9cute par d\u00e9faut comme t\u00e2che programm\u00e9e \u00e0 4:00 (AM) mais son param\u00e9trage peut \u00eatre modifi\u00e9 dans les options des t\u00e2ches programm\u00e9es. Il est d\u00e9conseill\u00e9 d'ex\u00e9cuter cette t\u00e2che durant les heures d'utilisation normales.",
-    "LabelVoteCount": "Vote count:",
+    "LabelAlbumArtist": "Album artist:",
     "LabelEnableAutomaticPortMapping": "Activer la configuration automatique de port",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP permet la configuration automatique de routeurs pour un acc\u00e8s \u00e0 distance facile. Ceci peut ne pas fonctionner sur certains mod\u00e8les de routeur.",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCommunityRating": "Community rating:",
     "ButtonOk": "Ok",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelVoteCount": "Vote count:",
     "ButtonCancel": "Annuler",
-    "LabelAwardSummary": "Award summary:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "Nouveau",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Critic rating:",
     "HeaderSetupLibrary": "Configurer votre biblioth\u00e8que de m\u00e9dia",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Critic rating summary:",
     "ButtonAddMediaFolder": "Ajouter r\u00e9pertoire de m\u00e9dia",
-    "LabelOverview": "Overview:",
+    "LabelAwardSummary": "Award summary:",
     "LabelFolderType": "Type de r\u00e9pertoire:",
-    "LabelShortOverview": "Short overview:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "* Requiert l'utilisation d'un plug-in, Ex: GameBrowser ou MB BookShelf",
-    "LabelReleaseDate": "Release date:",
+    "LabelTagline": "Tagline:",
     "ReferToMediaLibraryWiki": "Se r\u00e9f\u00e9rer au wiki des biblioth\u00e8ques de m\u00e9dia",
-    "LabelYear": "Year:",
+    "LabelOverview": "Overview:",
     "LabelCountry": "Pays:",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelShortOverview": "Short overview:",
     "LabelLanguage": "Langue:",
-    "LabelEndDate": "End date:",
+    "LabelReleaseDate": "Release date:",
     "HeaderPreferredMetadataLanguage": "Langue pr\u00e9f\u00e9r\u00e9e pour les m\u00e9tadonn\u00e9es:",
-    "LabelAirDate": "Air days:",
+    "LabelYear": "Year:",
     "LabelSaveLocalMetadata": "Enregistrer les images et m\u00e9tadonn\u00e9es dans les r\u00e9pertoires de m\u00e9dia",
-    "LabelAirTime:": "Air time:",
+    "LabelPlaceOfBirth": "Place of birth:",
     "LabelSaveLocalMetadataHelp": "Enregistrer les images et m\u00e9tadonn\u00e9es dans les r\u00e9pertoires de m\u00e9dia va les placer \u00e0 un endroit o\u00f9 elles pourront facilement \u00eatre modifi\u00e9es.",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelEndDate": "End date:",
     "LabelDownloadInternetMetadata": "T\u00e9l\u00e9charger les images et m\u00e9tadonn\u00e9es depuis Internet",
-    "LabelParentalRating": "Parental rating:",
+    "LabelAirDate": "Air days:",
     "LabelDownloadInternetMetadataHelp": "Media Browser peut t\u00e9l\u00e9charger des m\u00e9tadonn\u00e9es sur vos m\u00e9dia pour en offrir une pr\u00e9sentation plus riche.",
-    "LabelCustomRating": "Custom rating:",
+    "LabelAirTime:": "Air time:",
     "TabPreferences": "Pr\u00e9f\u00e9rences",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Run time (minutes):",
     "TabPassword": "Mot de Passe",
-    "LabelRevenue": "Revenue ($):",
+    "LabelParentalRating": "Parental rating:",
     "TabLibraryAccess": "Acc\u00e8s aux biblioth\u00e8ques",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelCustomRating": "Custom rating:",
     "TabImage": "Image",
-    "LabelPlayers": "Players:",
+    "LabelBudget": "Budget",
     "TabProfile": "Profil",
-    "Label3DFormat": "3D format:",
+    "LabelRevenue": "Revenue ($):",
     "TabMetadata": "M\u00e9tadonn\u00e9es",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "LabelOriginalAspectRatio": "Original aspect ratio:",
     "TabImages": "Images",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "LabelPlayers": "Players:",
     "TabNotifications": "Notifications",
-    "HeaderExternalIds": "External Id's:",
+    "Label3DFormat": "3D format:",
     "TabCollectionTitles": "Titres",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
     "LabelDisplayMissingEpisodesWithinSeasons": "Afficher les \u00e9pisodes manquants dans les saisons",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "HeaderSpecialEpisodeInfo": "Special Episode Info",
     "LabelUnairedMissingEpisodesWithinSeasons": "Afficher les \u00e9pisodes non diffus\u00e9s dans les saisons",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "HeaderExternalIds": "External Id's:",
     "HeaderVideoPlaybackSettings": "Param\u00e8tres de lecture video",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "Dvd season number:",
     "HeaderPlaybackSettings": "Param\u00e8tres de lecture",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "Dvd episode number:",
     "LabelAudioLanguagePreference": "Param\u00e8tres de langue audio:",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
     "LabelSubtitleLanguagePreference": "Param\u00e8tres de langue de sous-titre",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelAirsBeforeSeason": "Airs before season:",
     "OptionDefaultSubtitles": "Par d\u00e9faut",
-    "LabelDisplayOrder": "Display order:",
+    "LabelAirsAfterSeason": "Airs after season:",
     "OptionOnlyForcedSubtitles": "Seulement les sous-titres forc\u00e9s",
-    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelAirsBeforeEpisode": "Airs before episode:",
     "OptionAlwaysPlaySubtitles": "Toujours afficher les sous-titres",
-    "HeaderCountries": "Countries",
+    "LabelTreatImageAs": "Treat image as:",
     "OptionNoSubtitles": "Aucun sous-titre",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "Display order:",
     "OptionDefaultSubtitlesHelp": "Les sous-titres correspondants \u00e0 la langue pr\u00e9f\u00e9r\u00e9e seront charg\u00e9s lorsque la langue audio est \u00e9trang\u00e8re.",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
     "OptionOnlyForcedSubtitlesHelp": "Seulement les sous-titres forc\u00e9s seront charg\u00e9s.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "Countries",
     "OptionAlwaysPlaySubtitlesHelp": "Les sous-titres correspondants \u00e0 la langue pr\u00e9f\u00e9r\u00e9e seront charg\u00e9s peu importe la langue audio.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "Genres",
     "OptionNoSubtitlesHelp": "Les sous-titres ne seront pas charg\u00e9s par d\u00e9faut.",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderPlotKeywords": "Plot Keywords",
     "TabProfiles": "Profils",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "HeaderStudios": "Studios",
     "TabSecurity": "S\u00e9curit\u00e9",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "Ajouter utilisateur",
-    "TabSupporterClub": "Supporter Club",
+    "HeaderMetadataSettings": "Metadata Settings",
     "ButtonSave": "Sauvegarder",
-    "HeaderDonationType": "Donation type:",
+    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
     "ButtonResetPassword": "R\u00e9initialiser Mot de Passe",
-    "OptionMakeOneTimeDonation": "Make a one-time donation",
+    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
     "LabelNewPassword": "Nouveau mot de passe",
-    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
+    "TabSupporterClub": "Supporter Club",
     "LabelNewPasswordConfirm": "Confirmation du nouveau mot de passe:",
-    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderDonationType": "Donation type:",
     "HeaderCreatePassword": "Cr\u00e9er Mot de Passe",
-    "OptionNoTrailer": "No Trailer",
+    "OptionMakeOneTimeDonation": "Make a one-time donation",
     "LabelCurrentPassword": "Mot de passe actuel:",
-    "OptionNoThemeSong": "No Theme Song",
+    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
     "LabelMaxParentalRating": "Note maximale d'\u00e9valuation de contr\u00f4le parental:",
-    "OptionNoThemeVideo": "No Theme Video",
+    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
     "MaxParentalRatingHelp": "Le contenu avec une note d'\u00e9valuation de contr\u00f4le parental plus \u00e9lev\u00e9e ne sera pas visible par cet utilisateur.",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "OptionNoTrailer": "Aucune bande-annonce",
     "LibraryAccessHelp": "Selectionnez le r\u00e9pertoire de m\u00e9dia \u00e0 partager avec cet utilisateur. Les administrateurs pourront modifier tous les r\u00e9pertoires en utilisant le gestionnaire de m\u00e9tadonn\u00e9es.",
+    "OptionNoThemeSong": "No Theme Song",
     "ChannelAccessHelp": "S\u00e9lectionner les cha\u00eenes \u00e0 partager avec cet utilisateur. Les administrateurs pourront modifier toutes les cha\u00eenes par le gestionnaire de m\u00e9tadonn\u00e9es.",
+    "OptionNoThemeVideo": "No Theme Video",
     "ButtonDeleteImage": "Supprimer Image",
+    "LabelOneTimeDonationAmount": "Donation amount:",
     "LabelSelectUsers": "S\u00e9lectionner utilisateurs:",
+    "OptionActor": "Actor",
     "ButtonUpload": "Envoyer",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "Envoyer nouvelle image",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "Placer image ici",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "Rapport d'aspect 1:1 recommand\u00e9. Seulement JPG\/PNG.",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "Rien ici.",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "Merci de vous assurer que le t\u00e9l\u00e9chargement des m\u00e9tadonn\u00e9es depuis Internet est bien activ\u00e9.",
     "TabSuggested": "Sugg\u00e9r\u00e9s",
     "TabLatest": "Plus r\u00e9cents",
@@ -212,7 +221,7 @@
     "OptionAscending": "Ascendant",
     "OptionDescending": "Descendant",
     "OptionRuntime": "Dur\u00e9e",
-    "OptionReleaseDate": "Release Date",
+    "OptionReleaseDate": "Date de sortie",
     "OptionPlayCount": "Nombre de lectures",
     "OptionDatePlayed": "Date de lecture",
     "OptionDateAdded": "Date d'ajout",
@@ -262,7 +271,7 @@
     "TabMovies": "Films",
     "TabStudios": "Studios",
     "TabTrailers": "Bandes-annonces",
-    "LabelArtists": "Artists:",
+    "LabelArtists": "Artistes",
     "LabelArtistsHelp": "Separate multiple using ;",
     "HeaderLatestMovies": "Films les plus r\u00e9cents",
     "HeaderLatestTrailers": "Bande-annonces les plus r\u00e9centes",
@@ -566,12 +575,12 @@
     "HeaderProgram": "Programme",
     "HeaderClients": "Clients",
     "LabelCompleted": "Compl\u00e9t\u00e9",
-    "LabelFailed": "\u00c9chou\u00e9",
+    "LabelFailed": "\u00c9chec",
     "LabelSkipped": "Saut\u00e9",
     "HeaderEpisodeOrganization": "Organisation d'\u00e9pisodes",
     "LabelSeries": "S\u00e9ries:",
-    "LabelSeasonNumber": "Season number",
-    "LabelEpisodeNumber": "Episode number",
+    "LabelSeasonNumber": "Num\u00e9ro de saison",
+    "LabelEpisodeNumber": "Num\u00e9ro d'\u00e9pisode",
     "LabelEndingEpisodeNumber": "Num\u00e9ro d'\u00e9pisode se terminant",
     "LabelEndingEpisodeNumberHelp": "Seulement requis pour les fichiers multi-\u00e9pisodes",
     "HeaderSupportTheTeam": "Soutenez l'\u00e9quippe Media Browser",
@@ -714,10 +723,10 @@
     "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",
+    "ButtonAudioTracks": "Piste audio",
     "ButtonPreviousTrack": "Piste pr\u00e9c\u00e9dente",
     "ButtonNextTrack": "Piste suivante",
     "ButtonStop": "Arr\u00eat",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Afficher les plugins pour:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theatre",
-    "LabelEpisodeName": "Nom d'\u00e9pisode",
-    "LabelSeriesName": "Nom de s\u00e9ries",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Series.name",
     "ValueSeriesNameUnderscore": "Series_name",
     "ValueEpisodeNamePeriod": "Episode.name",
     "ValueEpisodeNameUnderscore": "Episode_name",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Entrer texte",
     "LabelTypeText": "Texte",
     "HeaderSearchForSubtitles": "Rechercher des sous-titres",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "Application : {0}, P\u00e9riph\u00e9rique : {1}",
     "ProviderValue": "Fournisseur : {0}",
     "LabelChannelDownloadSizeLimit": "Taille limite de t\u00e9l\u00e9chargement (Go) :",
-    "LabelChannelDownloadSizeLimitHelp": "Limiter la taille du dossier de t\u00e9l\u00e9chargement de la cha\u00eene",
-    "HeaderRecentActivity": "Activit\u00e9 R\u00e9cente",
-    "HeaderPeople": "Personnes",
-    "HeaderDownloadPeopleMetadataFor": "T\u00e9l\u00e9charger la biographie et les images pour:"
+    "LabelChannelDownloadSizeLimitHelp": "Limiter la taille du dossier de t\u00e9l\u00e9chargement de la cha\u00eene"
 }
\ 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 e7a0527c5..7e9bf1065 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/he.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/he.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Composers",
+    "HeaderRecentActivity": "Recent Activity",
     "LabelExit": "\u05d9\u05e6\u05d9\u05d0\u05d4",
-    "OptionOthers": "Others",
+    "HeaderPeople": "People",
     "LabelVisitCommunity": "\u05d1\u05e7\u05e8 \u05d1\u05e7\u05d4\u05d9\u05dc\u05d4",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
     "LabelGithubWiki": "\u05e1\u05e4\u05e8\u05d9\u05d9\u05ea \u05d4\u05e7\u05d5\u05d3",
-    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "OptionComposers": "Composers",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "Folders",
+    "OptionOthers": "Others",
     "LabelStandard": "\u05e8\u05d2\u05d9\u05dc",
-    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelViewApiDocumentation": "\u05e8\u05d0\u05d4 \u05de\u05e1\u05de\u05db\u05d9 \u05e2\u05e8\u05db\u05ea \u05e4\u05d9\u05ea\u05d5\u05d7",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
     "LabelBrowseLibrary": "\u05d3\u05e4\u05d3\u05e3 \u05d1\u05ea\u05d9\u05e7\u05d9\u05d9\u05d4",
-    "ViewTypeLiveTvChannels": "Channels",
+    "ViewTypeFolders": "Folders",
     "LabelConfigureMediaBrowser": "\u05d4\u05d2\u05d3\u05e8 \u05d0\u05ea Media Browser",
-    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelOpenLibraryViewer": "\u05e4\u05ea\u05d7 \u05de\u05e6\u05d9\u05d2 \u05ea\u05d9\u05e7\u05d9\u05d5\u05ea",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
     "LabelRestartServer": "\u05d0\u05ea\u05d7\u05dc \u05d0\u05ea \u05d4\u05e9\u05e8\u05ea",
-    "HeaderPassword": "Password",
+    "ViewTypeLiveTvChannels": "Channels",
     "LabelShowLogWindow": "\u05d4\u05e8\u05d0\u05d4 \u05d7\u05dc\u05d5\u05df \u05dc\u05d5\u05d2",
-    "HeaderLocalAccess": "Local Access",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
     "LabelPrevious": "\u05d4\u05e7\u05d5\u05d3\u05dd",
-    "HeaderViewOrder": "View Order",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
     "LabelFinish": "\u05e1\u05d9\u05d9\u05dd",
-    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
+    "HeaderPassword": "Password",
     "LabelNext": "\u05d4\u05d1\u05d0",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "HeaderLocalAccess": "Local Access",
     "LabelYoureDone": "\u05e1\u05d9\u05d9\u05de\u05ea!",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "HeaderViewOrder": "View Order",
     "WelcomeToMediaBrowser": "\u05d1\u05e8\u05d5\u05da \u05d4\u05d1\u05d0 \u05dc- Media Browser!",
-    "OptionDownloadMissingImages": "Download missing images",
+    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "TitleMediaBrowser": "Media Browser",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "ThisWizardWillGuideYou": "\u05d0\u05e9\u05e3 \u05d6\u05d4 \u05d9\u05e2\u05d6\u05d5\u05e8 \u05dc\u05da \u05d1\u05d4\u05ea\u05dc\u05d9\u05da \u05d4\u05d4\u05ea\u05e7\u05e0\u05d4.",
-    "OptionRefreshAllData": "Refresh all data",
+    "LabelImageRefreshMode": "Image refresh mode:",
     "TellUsAboutYourself": "\u05e1\u05e4\u05e8 \u05dc\u05e0\u05d5 \u05e2\u05dc \u05e2\u05e6\u05de\u05da",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionDownloadMissingImages": "Download missing images",
     "LabelYourFirstName": "\u05e9\u05de\u05da \u05d4\u05e4\u05e8\u05d8\u05d9:",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionReplaceExistingImages": "Replace existing images",
     "MoreUsersCanBeAddedLater": "\u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05d2\u05d3\u05d9\u05e8 \u05de\u05e9\u05ea\u05de\u05e9\u05d9\u05dd \u05e0\u05d5\u05e1\u05e4\u05d9\u05dd \u05de\u05d0\u05d5\u05d7\u05e8 \u05d9\u05d5\u05ea\u05e8 \u05d3\u05e8\u05da \u05dc\u05d5\u05d7 \u05d4\u05d1\u05e7\u05e8\u05d4.",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "OptionRefreshAllData": "Refresh all data",
     "UserProfilesIntro": "Media Browser \u05db\u05d5\u05dc\u05dc \u05ea\u05de\u05d9\u05db\u05d4 \u05de\u05d5\u05d1\u05e0\u05ea \u05d1\u05de\u05e1\u05e4\u05e8 \u05de\u05e9\u05ea\u05de\u05e9\u05d9\u05dd. \u05d5\u05de\u05d0\u05e4\u05e9\u05e8 \u05dc\u05db\u05dc \u05d0\u05d7\u05d3 \u05de\u05d4\u05dd \u05ea\u05e6\u05d5\u05d2\u05ea \u05d4\u05d2\u05d3\u05e8\u05d5\u05ea, \u05de\u05e6\u05d1 \u05e0\u05d2\u05df \u05d5\u05d1\u05e7\u05e8\u05ea \u05d4\u05d5\u05e8\u05d9\u05dd \u05d0\u05d9\u05e9\u05d9\u05ea.",
-    "HeaderPersonInfo": "Person Info",
+    "OptionAddMissingDataOnly": "Add missing data only",
     "LabelWindowsService": "\u05e9\u05d9\u05e8\u05d5\u05ea \u05d5\u05d5\u05d9\u05e0\u05d3\u05d5\u05e1",
-    "HeaderIdentifyItem": "Identify Item",
+    "OptionLocalRefreshOnly": "Local refresh only",
     "AWindowsServiceHasBeenInstalled": "\u05e9\u05d9\u05e8\u05d5\u05ea \u05d5\u05d5\u05d9\u05e0\u05d3\u05d5\u05e1 \u05d4\u05d5\u05ea\u05e7\u05df",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderRefreshMetadata": "Refresh Metadata",
     "WindowsServiceIntro1": "\u05e9\u05e8\u05ea Media Browser \u05e8\u05e5 \u05db\u05ea\u05d5\u05db\u05e0\u05ea \u05e9\u05d5\u05dc\u05d7\u05df \u05e2\u05d1\u05d5\u05d3\u05d4 \u05e2\u05dd \u05d0\u05d9\u05e7\u05d5\u05df \u05d1\u05e9\u05d5\u05e8\u05ea \u05d4\u05de\u05e9\u05d9\u05de\u05d5\u05ea, \u05d0\u05d1\u05dc \u05d0\u05dd \u05d0\u05ea\u05d4 \u05de\u05e2\u05d3\u05d9\u05e3 \u05dc\u05d4\u05e8\u05d9\u05e5 \u05d0\u05ea \u05d4\u05e9\u05e8\u05ea \u05db\u05e9\u05d9\u05e8\u05d5\u05ea \u05e8\u05e7\u05e2, \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05ea\u05d7\u05d9\u05dc \u05d0\u05ea \u05d4\u05e9\u05e8\u05ea \u05de\u05ea\u05d5\u05da \u05d7\u05dc\u05d5\u05df \u05d4\u05d1\u05e7\u05d4 \u05e9\u05dc \u05e9\u05d9\u05e8\u05d5\u05ea\u05d9 \u05d5\u05d5\u05d9\u05e0\u05d3\u05d5\u05e1 \u05d1\u05de\u05e7\u05d5\u05dd.",
-    "HeaderConfirmDeletion": "Confirm Deletion",
+    "HeaderPersonInfo": "Person Info",
     "WindowsServiceIntro2": "\u05d0\u05dd \u05d0\u05ea\u05d4 \u05de\u05e4\u05e2\u05d9\u05dc \u05d0\u05ea \u05d4\u05e9\u05d9\u05e8\u05d5\u05ea \u05d5\u05d5\u05d9\u05e0\u05d3\u05d5\u05e1, \u05d1\u05d1\u05e7\u05e9\u05d4 \u05e9\u05d9\u05dd \u05dc\u05d1 \u05e9\u05d4\u05d5\u05d0 \u05dc\u05d0 \u05d9\u05db\u05d5\u05dc \u05dc\u05e8\u05d5\u05e5 \u05d1\u05d0\u05d5\u05ea\u05d5 \u05d6\u05de\u05df \u05e9\u05d4\u05e9\u05e8\u05ea \u05db\u05d1\u05e8 \u05e2\u05d5\u05d1\u05d3 \u05d1\u05e8\u05e7\u05e2. \u05dc\u05db\u05df \u05ea\u05e6\u05d8\u05e8\u05da \u05dc\u05e1\u05d2\u05d5\u05e8 \u05d0\u05ea \u05d4\u05e9\u05e8\u05ea \u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05d4\u05e4\u05e2\u05d9\u05dc \u05d0\u05ea \u05d4\u05e9\u05d9\u05e8\u05d5\u05ea. \u05d4\u05e9\u05d9\u05e8\u05d5\u05ea \u05d2\u05dd \u05e6\u05e8\u05d9\u05da \u05dc\u05d4\u05d9\u05d5\u05ea \u05de\u05d5\u05d2\u05d3\u05e8 \u05e2\u05dd \u05d4\u05e8\u05e9\u05d0\u05d5\u05ea \u05de\u05e0\u05d4\u05dc \u05d3\u05e8\u05da \u05dc\u05d5\u05d7 \u05d4\u05d1\u05e7\u05e8\u05d4. \u05d1\u05d1\u05e7\u05e9\u05d4 \u05e7\u05d7 \u05d1\u05d7\u05e9\u05d1\u05d5\u05df \u05e9\u05db\u05e8\u05d2\u05e2 \u05d4\u05e9\u05d9\u05e8\u05d5\u05ea \u05dc\u05d0 \u05d9\u05db\u05d5\u05dc \u05dc\u05e2\u05d3\u05db\u05df \u05d0\u05ea \u05e2\u05e6\u05de\u05d5 \u05d0\u05d5\u05d8\u05d5\u05de\u05d8\u05d9\u05ea, \u05d5\u05dc\u05db\u05df \u05d2\u05d9\u05e8\u05e1\u05d0\u05d5\u05ea \u05d7\u05d3\u05e9\u05d5\u05ea \u05d9\u05e6\u05e8\u05d9\u05db\u05d5 \u05e2\u05d9\u05d3\u05db\u05d5\u05df \u05d9\u05d3\u05e0\u05d9.",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "HeaderIdentifyItem": "Identify Item",
     "WizardCompleted": "\u05d6\u05d4 \u05db\u05dc \u05de\u05d4 \u05e9\u05e6\u05e8\u05d9\u05da \u05dc\u05e2\u05db\u05e9\u05d9\u05d5. Media Browser \u05d4\u05d7\u05dc \u05dc\u05d0\u05e1\u05d5\u05e3 \u05de\u05d9\u05d3\u05e2 \u05dc\u05d2\u05d1\u05d9 \u05ea\u05d9\u05e7\u05d9\u05d9\u05ea \u05d4\u05de\u05d3\u05d9\u05d4 \u05e9\u05dc\u05da. \u05d0\u05dc \u05ea\u05e9\u05db\u05d7 \u05dc\u05d1\u05d3\u05d5\u05e7 \u05d0\u05ea \u05de\u05d2\u05d5\u05d5\u05df \u05d4\u05d0\u05e4\u05dc\u05d9\u05e7\u05e6\u05d9\u05d5\u05ea \u05e9\u05dc\u05e0\u05d5, \u05d5\u05d0\u05d6 \u05dc\u05d7\u05e5 <b>\u05e1\u05d9\u05d9\u05dd<\/b> \u05dc\u05e8\u05d0\u05d5\u05ea \u05d0\u05ea \u05d4<b>\u05dc\u05d5\u05d7 \u05d1\u05e7\u05e8\u05d4<\/b>.",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
     "LabelConfigureSettings": "\u05e7\u05d1\u05e2 \u05d0\u05ea \u05ea\u05e6\u05d5\u05e8\u05ea \u05d4\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea",
-    "ButtonIdentify": "Identify",
+    "HeaderConfirmDeletion": "Confirm Deletion",
     "LabelEnableVideoImageExtraction": "\u05d0\u05e4\u05e9\u05e8 \u05e9\u05dc\u05d9\u05e4\u05ea \u05ea\u05de\u05d5\u05e0\u05d4 \u05de\u05e1\u05e8\u05d8",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
     "VideoImageExtractionHelp": "\u05e2\u05d1\u05d5\u05e8 \u05e1\u05e8\u05d8\u05d9\u05dd \u05e9\u05d0\u05d9\u05df \u05dc\u05d4\u05dd \u05db\u05d1\u05e8 \u05ea\u05de\u05d5\u05e0\u05d4, \u05d5\u05dc\u05d0 \u05e0\u05de\u05e6\u05d0\u05d4 \u05dc\u05d4\u05dd \u05d0\u05d7\u05ea \u05d1\u05d0\u05d9\u05e0\u05d8\u05e8\u05e0\u05d8. \u05d4\u05d2\u05d3\u05e8\u05d4 \u05d6\u05d5 \u05ea\u05d5\u05e1\u05d9\u05e3 \u05de\u05e2\u05d8 \u05d6\u05de\u05df \u05dc\u05ea\u05d4\u05dc\u05d9\u05da \u05e1\u05e8\u05d9\u05e7\u05ea \u05d4\u05ea\u05e7\u05d9\u05d9\u05d4 \u05d4\u05e8\u05d0\u05e9\u05d5\u05e0\u05d9, \u05d0\u05da \u05ea\u05e1\u05e4\u05e7 \u05ea\u05e6\u05d5\u05d2\u05d4 \u05d9\u05d5\u05ea\u05e8 \u05d9\u05e4\u05d4.",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
     "LabelEnableChapterImageExtractionForMovies": "\u05d7\u05dc\u05e5 \u05ea\u05de\u05d5\u05e0\u05ea \u05e4\u05e8\u05e7 \u05dc\u05e1\u05e8\u05d8\u05d9\u05dd",
-    "LabelCommunityRating": "Community rating:",
+    "ButtonIdentify": "Identify",
     "LabelChapterImageExtractionForMoviesHelp": "\u05d7\u05d9\u05dc\u05d5\u05e5 \u05ea\u05de\u05d5\u05e0\u05d5\u05ea \u05e4\u05e8\u05e7\u05d9\u05dd \u05d9\u05d0\u05e4\u05e9\u05e8 \u05dc\u05de\u05e9\u05ea\u05de\u05e9\u05d9\u05dd \u05dc\u05e8\u05d0\u05d5\u05ea \u05ea\u05e4\u05e8\u05d9\u05d8 \u05d1\u05d7\u05d9\u05e8\u05ea \u05e1\u05e6\u05e0\u05d5\u05ea \u05d2\u05e8\u05e4\u05d9. \u05d4\u05ea\u05d4\u05dc\u05d9\u05da \u05d9\u05db\u05d5\u05dc \u05dc\u05d4\u05d9\u05d5\u05ea \u05d0\u05d9\u05d8\u05d9, \u05dc\u05d3\u05e8\u05d5\u05e9 \u05de\u05e9\u05d0\u05d1\u05d9 \u05de\u05e2\u05d1\u05d3 \u05e8\u05d1\u05d9\u05dd \u05d5\u05dc\u05ea\u05e4\u05d5\u05e1 \u05e9\u05d8\u05d7 \u05d0\u05d9\u05d7\u05e1\u05d5\u05df \u05e8\u05d1. \u05d0\u05e4\u05e9\u05e8\u05d5\u05ea \u05d6\u05d5 \u05e8\u05e6\u05d4 \u05db\u05de\u05e9\u05d9\u05de\u05d4 \u05de\u05ea\u05d5\u05d6\u05de\u05e0\u05ea \u05d1\u05d0\u05e8\u05d1\u05e2 \u05dc\u05e4\u05e0\u05d5\u05ea \u05d1\u05d5\u05e7\u05e8, \u05d0\u05da \u05d6\u05d4 \u05e0\u05d9\u05ea\u05df \u05dc\u05e9\u05d9\u05e0\u05d5\u05d9 \u05d1\u05d7\u05dc\u05d5\u05df \u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05d4\u05de\u05e9\u05d9\u05de\u05d5\u05ea \u05d4\u05de\u05ea\u05d5\u05d6\u05de\u05e0\u05d5\u05ea. \u05d6\u05d4 \u05dc\u05d0 \u05de\u05de\u05d5\u05dc\u05e5 \u05dc\u05d4\u05e4\u05e2\u05d9\u05dc \u05de\u05e9\u05d9\u05de\u05d4 \u05d6\u05d5 \u05d1\u05e9\u05e2\u05d5\u05ea \u05d4\u05e9\u05d9\u05de\u05d5\u05e9 \u05d4\u05e2\u05d9\u05e7\u05e8\u05d9\u05d5\u05ea \u05d1\u05de\u05d7\u05e9\u05d1.",
-    "LabelVoteCount": "Vote count:",
+    "LabelAlbumArtist": "Album artist:",
     "LabelEnableAutomaticPortMapping": "\u05d0\u05e4\u05e9\u05e8 \u05de\u05d9\u05e4\u05d5\u05d9 \u05e4\u05d5\u05e8\u05d8\u05d9\u05dd \u05d0\u05d5\u05d8\u05d5\u05de\u05d8\u05d9",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP \u05de\u05d0\u05e4\u05e9\u05e8 \u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05d0\u05d5\u05d8\u05d5\u05de\u05d8\u05d9\u05d5\u05ea \u05e9\u05dc \u05d4\u05e8\u05d0\u05d5\u05d8\u05e8 \u05dc\u05d0\u05e4\u05e9\u05e8 \u05d2\u05d9\u05e9\u05d4 \u05de\u05e8\u05d5\u05d7\u05e7\u05ea \u05d1\u05e7\u05dc\u05d5\u05ea. \u05d0\u05e4\u05e9\u05e8\u05d5\u05ea \u05d6\u05d5 \u05e2\u05dc\u05d5\u05dc\u05d4 \u05dc\u05d0 \u05dc\u05e2\u05d1\u05d5\u05d3 \u05e2\u05dd \u05db\u05dc \u05d3\u05d2\u05de\u05d9 \u05d4\u05e8\u05d0\u05d5\u05d8\u05e8\u05d9\u05dd.",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCommunityRating": "Community rating:",
     "ButtonOk": "\u05d0\u05e9\u05e8",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelVoteCount": "Vote count:",
     "ButtonCancel": "\u05d1\u05d8\u05dc",
-    "LabelAwardSummary": "Award summary:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "\u05d7\u05d3\u05e9",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Critic rating:",
     "HeaderSetupLibrary": "\u05d4\u05d2\u05d3\u05e8 \u05d0\u05ea \u05e1\u05e4\u05e8\u05d9\u05d9\u05ea \u05d4\u05de\u05d3\u05d9\u05d4 \u05e9\u05dc\u05da",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Critic rating summary:",
     "ButtonAddMediaFolder": "\u05d4\u05d5\u05e1\u05e3 \u05ea\u05d9\u05e7\u05d9\u05d9\u05ea \u05de\u05d3\u05d9\u05d4",
-    "LabelOverview": "Overview:",
+    "LabelAwardSummary": "Award summary:",
     "LabelFolderType": "\u05e1\u05d5\u05d2 \u05d4\u05ea\u05d9\u05e7\u05d9\u05d9\u05d4:",
-    "LabelShortOverview": "Short overview:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "* \u05de\u05e6\u05e8\u05d9\u05da \u05de\u05d4\u05de\u05e9\u05ea\u05de\u05e9 \u05ea\u05d5\u05e1\u05e3, \u05dc\u05d3\u05d5\u05d2\u05de\u05d0 GameBrowser \u05d0\u05d5 MB Bookshelf",
-    "LabelReleaseDate": "Release date:",
+    "LabelTagline": "Tagline:",
     "ReferToMediaLibraryWiki": "\u05e4\u05e0\u05d4 \u05dc\u05de\u05d9\u05d3\u05e2 \u05d0\u05d5\u05d3\u05d5\u05ea \u05e1\u05e4\u05e8\u05d9\u05d9\u05ea \u05d4\u05de\u05d3\u05d9\u05d4.",
-    "LabelYear": "Year:",
+    "LabelOverview": "Overview:",
     "LabelCountry": "\u05de\u05d3\u05d9\u05e0\u05d4:",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelShortOverview": "Short overview:",
     "LabelLanguage": "\u05e9\u05e4\u05d4:",
-    "LabelEndDate": "End date:",
+    "LabelReleaseDate": "Release date:",
     "HeaderPreferredMetadataLanguage": "\u05e9\u05e4\u05ea \u05de\u05d9\u05d3\u05e2 \u05de\u05d5\u05e2\u05d3\u05e4\u05ea:",
-    "LabelAirDate": "Air days:",
+    "LabelYear": "Year:",
     "LabelSaveLocalMetadata": "\u05e9\u05de\u05d5\u05e8 \u05ea\u05de\u05d5\u05e0\u05d5\u05ea \u05e8\u05e7\u05e2 \u05d5\u05de\u05d9\u05d3\u05e2 \u05d1\u05ea\u05d5\u05da \u05e1\u05e4\u05e8\u05d9\u05d5\u05ea \u05d4\u05de\u05d3\u05d9\u05d4",
-    "LabelAirTime:": "Air time:",
+    "LabelPlaceOfBirth": "Place of birth:",
     "LabelSaveLocalMetadataHelp": "\u05e9\u05de\u05d9\u05e8\u05ea \u05ea\u05de\u05d5\u05e0\u05d5\u05ea \u05e8\u05e7\u05e2 \u05d5\u05de\u05d9\u05d3\u05e2 \u05d9\u05e9\u05d9\u05e8\u05d5\u05ea \u05d1\u05e1\u05e4\u05e8\u05d9\u05d5\u05ea \u05d4\u05de\u05d3\u05d9\u05d4 \u05ea\u05d0\u05e4\u05e9\u05e8 \u05e2\u05e8\u05d9\u05db\u05d4 \u05e0\u05d5\u05d7\u05d4 \u05d5\u05e7\u05dc\u05d4 \u05e9\u05dc\u05d4\u05dd.",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelEndDate": "End date:",
     "LabelDownloadInternetMetadata": "\u05d4\u05d5\u05e8\u05d3 \u05ea\u05de\u05d5\u05e0\u05d5\u05ea \u05e8\u05e7\u05e2 \u05d5\u05de\u05d9\u05d3\u05e2 \u05de\u05d4\u05d0\u05d9\u05e0\u05e8\u05e0\u05d8",
-    "LabelParentalRating": "Parental rating:",
+    "LabelAirDate": "Air days:",
     "LabelDownloadInternetMetadataHelp": "Media Browser \u05d9\u05db\u05d5\u05dc \u05dc\u05d4\u05d5\u05e8\u05d9\u05d3 \u05de\u05d9\u05d3\u05e2 \u05dc\u05d2\u05d1\u05d9 \u05e7\u05d1\u05e6\u05d9 \u05d4\u05de\u05d3\u05d9\u05d4 \u05e9\u05dc\u05da \u05db\u05d3\u05d9 \u05d0\u05e4\u05e9\u05e8 \u05ea\u05e6\u05d5\u05d2\u05d4 \u05e2\u05e9\u05d9\u05e8\u05d4.",
-    "LabelCustomRating": "Custom rating:",
+    "LabelAirTime:": "Air time:",
     "TabPreferences": "\u05d4\u05e2\u05d3\u05e4\u05d5\u05ea",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Run time (minutes):",
     "TabPassword": "\u05e1\u05d9\u05e1\u05de\u05d0",
-    "LabelRevenue": "Revenue ($):",
+    "LabelParentalRating": "Parental rating:",
     "TabLibraryAccess": "\u05d2\u05d9\u05e9\u05d4 \u05dc\u05ea\u05d9\u05e7\u05d9\u05d5\u05ea",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelCustomRating": "Custom rating:",
     "TabImage": "\u05ea\u05de\u05d5\u05e0\u05d4",
-    "LabelPlayers": "Players:",
+    "LabelBudget": "Budget",
     "TabProfile": "\u05e4\u05e8\u05d5\u05e4\u05d9\u05dc",
-    "Label3DFormat": "3D format:",
+    "LabelRevenue": "Revenue ($):",
     "TabMetadata": "Metadata",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "LabelOriginalAspectRatio": "Original aspect ratio:",
     "TabImages": "\u05ea\u05de\u05d5\u05e0\u05d5\u05ea",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "LabelPlayers": "Players:",
     "TabNotifications": "\u05d4\u05ea\u05e8\u05d0\u05d5\u05ea",
-    "HeaderExternalIds": "External Id's:",
+    "Label3DFormat": "3D format:",
     "TabCollectionTitles": "\u05db\u05d5\u05ea\u05e8\u05d9\u05dd",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
     "LabelDisplayMissingEpisodesWithinSeasons": "\u05d4\u05e6\u05d2 \u05e4\u05e8\u05e7\u05d9\u05dd \u05d7\u05e1\u05e8\u05d9\u05dd \u05d1\u05ea\u05d5\u05da \u05d4\u05e2\u05d5\u05e0\u05d5\u05ea",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "HeaderSpecialEpisodeInfo": "Special Episode Info",
     "LabelUnairedMissingEpisodesWithinSeasons": "\u05d4\u05e6\u05d2 \u05e4\u05e8\u05e7\u05d9\u05dd \u05e9\u05e2\u05d3\u05d9\u05df \u05d0\u05dc \u05e9\u05d5\u05d3\u05e8\u05d5 \u05d1\u05ea\u05d5\u05da \u05d4\u05e2\u05d5\u05e0\u05d5\u05ea",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "HeaderExternalIds": "External Id's:",
     "HeaderVideoPlaybackSettings": "\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05e0\u05d9\u05d2\u05d5\u05df",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "Dvd season number:",
     "HeaderPlaybackSettings": "\u05d0\u05e4\u05e9\u05e8\u05d5\u05d9\u05d5\u05ea \u05e0\u05d9\u05d2\u05d5\u05df",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "Dvd episode number:",
     "LabelAudioLanguagePreference": "\u05e9\u05e4\u05ea \u05e7\u05d5\u05dc \u05de\u05d5\u05e2\u05d3\u05e4\u05ea:",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
     "LabelSubtitleLanguagePreference": "\u05e9\u05e4\u05ea \u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea \u05de\u05d5\u05e2\u05d3\u05e4\u05ea:",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelAirsBeforeSeason": "Airs before season:",
     "OptionDefaultSubtitles": "Default",
-    "LabelDisplayOrder": "Display order:",
+    "LabelAirsAfterSeason": "Airs after season:",
     "OptionOnlyForcedSubtitles": "Only forced subtitles",
-    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelAirsBeforeEpisode": "Airs before episode:",
     "OptionAlwaysPlaySubtitles": "Always play subtitles",
-    "HeaderCountries": "Countries",
+    "LabelTreatImageAs": "Treat image as:",
     "OptionNoSubtitles": "No Subtitles",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "Display order:",
     "OptionDefaultSubtitlesHelp": "Subtitles matching the language preference will be loaded when the audio is in a foreign language.",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
     "OptionOnlyForcedSubtitlesHelp": "Only subtitles marked as forced will be loaded.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "Countries",
     "OptionAlwaysPlaySubtitlesHelp": "Subtitles matching the language preference will be loaded regardless of the audio language.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "Genres",
     "OptionNoSubtitlesHelp": "Subtitles will not be loaded by default.",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderPlotKeywords": "Plot Keywords",
     "TabProfiles": "\u05e4\u05e8\u05d5\u05e4\u05d9\u05dc\u05d9\u05dd",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "HeaderStudios": "Studios",
     "TabSecurity": "\u05d1\u05d8\u05d9\u05d7\u05d5\u05ea",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "\u05d4\u05d5\u05e1\u05e3 \u05de\u05e9\u05ea\u05de\u05e9",
-    "TabSupporterClub": "Supporter Club",
+    "HeaderMetadataSettings": "Metadata Settings",
     "ButtonSave": "\u05e9\u05de\u05d5\u05e8",
-    "HeaderDonationType": "Donation type:",
+    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
     "ButtonResetPassword": "\u05d0\u05d9\u05e4\u05d5\u05e1 \u05e1\u05d9\u05e1\u05de\u05d0",
-    "OptionMakeOneTimeDonation": "Make a one-time donation",
+    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
     "LabelNewPassword": "\u05e1\u05d9\u05e1\u05de\u05d0 \u05d7\u05d3\u05e9\u05d4:",
-    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
+    "TabSupporterClub": "Supporter Club",
     "LabelNewPasswordConfirm": "\u05d0\u05d9\u05de\u05d5\u05ea \u05e1\u05d9\u05e1\u05de\u05d0 \u05d7\u05d3\u05e9\u05d4:",
-    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderDonationType": "Donation type:",
     "HeaderCreatePassword": "\u05e6\u05d5\u05e8 \u05e1\u05d9\u05e1\u05de\u05d0",
-    "OptionNoTrailer": "No Trailer",
+    "OptionMakeOneTimeDonation": "Make a one-time donation",
     "LabelCurrentPassword": "\u05e1\u05d9\u05e1\u05de\u05d0 \u05e0\u05d5\u05db\u05d7\u05d9\u05ea:",
-    "OptionNoThemeSong": "No Theme Song",
+    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
     "LabelMaxParentalRating": "\u05d3\u05d9\u05e8\u05d5\u05d2 \u05d4\u05d5\u05e8\u05d9\u05dd \u05de\u05e7\u05e1\u05d9\u05de\u05d0\u05dc\u05d9:",
-    "OptionNoThemeVideo": "No Theme Video",
+    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
     "MaxParentalRatingHelp": "\u05ea\u05d5\u05db\u05df \u05e2\u05dd \u05d3\u05d9\u05e8\u05d5\u05d2 \u05d2\u05d5\u05d1\u05d4 \u05d9\u05d5\u05ea\u05e8 \u05d9\u05d5\u05e1\u05ea\u05e8 \u05de\u05d4\u05de\u05e9\u05ea\u05de\u05e9.",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "OptionNoTrailer": "No Trailer",
     "LibraryAccessHelp": "\u05d1\u05d7\u05e8 \u05d0\u05ea \u05e1\u05e4\u05e8\u05d9\u05d5\u05ea \u05d4\u05de\u05d3\u05d9\u05d4 \u05d0\u05e9\u05e8 \u05d9\u05e9\u05d5\u05ea\u05e4\u05d5 \u05e2\u05dd \u05d4\u05de\u05e9\u05ea\u05de\u05e9. \u05de\u05e0\u05d4\u05dc\u05d9\u05dd \u05d9\u05d5\u05db\u05dc\u05d5 \u05dc\u05e2\u05e8\u05d5\u05ea \u05d0\u05ea \u05db\u05dc \u05d4\u05ea\u05d9\u05e7\u05d9\u05d5\u05ea \u05d1\u05d0\u05de\u05e6\u05e2\u05d5\u05ea \u05e2\u05d5\u05e8\u05da \u05d4\u05de\u05d9\u05d3\u05e2.",
+    "OptionNoThemeSong": "No Theme Song",
     "ChannelAccessHelp": "Select the channels to share with this user. Administrators will be able to edit all channels using the metadata manager.",
+    "OptionNoThemeVideo": "No Theme Video",
     "ButtonDeleteImage": "\u05de\u05d7\u05e7 \u05ea\u05de\u05d5\u05e0\u05d4",
+    "LabelOneTimeDonationAmount": "Donation amount:",
     "LabelSelectUsers": "\u05d1\u05d7\u05e8 \u05de\u05e9\u05ea\u05de\u05e9\u05d9\u05dd:",
+    "OptionActor": "Actor",
     "ButtonUpload": "\u05d4\u05e2\u05dc\u05d4",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "\u05d4\u05e2\u05dc\u05d4 \u05ea\u05de\u05d5\u05e0\u05d4 \u05d7\u05d3\u05e9\u05d4",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "\u05e9\u05d7\u05e8\u05e8 \u05ea\u05de\u05d5\u05e0\u05d4 \u05db\u05d0\u05df",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "\u05de\u05d5\u05de\u05dc\u05e5 \u05d9\u05d7\u05e1 \u05d2\u05d5\u05d1\u05d4 \u05e9\u05dc 1:1. \u05e8\u05e7 JPG\/PNG.",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "\u05d0\u05d9\u05df \u05db\u05d0\u05df \u05db\u05dc\u05d5\u05dd.",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "\u05d1\u05d1\u05e7\u05e9\u05d4 \u05d5\u05d5\u05d3\u05d0 \u05db\u05d9 \u05d4\u05d5\u05e8\u05d3\u05ea \u05de\u05d9\u05d3\u05e2 \u05de\u05d4\u05d0\u05d9\u05e0\u05d8\u05e8\u05e0\u05d8 \u05de\u05d0\u05d5\u05e4\u05e9\u05e8\u05ea",
     "TabSuggested": "\u05de\u05de\u05d5\u05dc\u05e5",
     "TabLatest": "\u05d0\u05d7\u05e8\u05d5\u05df",
@@ -212,7 +221,7 @@
     "OptionAscending": "\u05e1\u05d3\u05e8 \u05e2\u05d5\u05dc\u05d4",
     "OptionDescending": "\u05e1\u05d3\u05e8 \u05d9\u05d5\u05e8\u05d3",
     "OptionRuntime": "\u05de\u05e9\u05da",
-    "OptionReleaseDate": "Release Date",
+    "OptionReleaseDate": "\u05ea\u05d0\u05e8\u05d9\u05da \u05e9\u05d9\u05d7\u05e8\u05d5\u05e8",
     "OptionPlayCount": "\u05de\u05e1\u05e4\u05e8 \u05d4\u05e9\u05de\u05e2\u05d5\u05ea",
     "OptionDatePlayed": "\u05ea\u05d0\u05e8\u05d9\u05da \u05e0\u05d9\u05d2\u05d5\u05df",
     "OptionDateAdded": "\u05ea\u05d0\u05e8\u05d9\u05da \u05d4\u05d5\u05e1\u05e4\u05d4",
@@ -483,7 +492,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.",
@@ -566,12 +575,12 @@
     "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:",
-    "LabelSeasonNumber": "Season number",
-    "LabelEpisodeNumber": "Episode number",
+    "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:",
     "LabelEndingEpisodeNumberHelp": "\u05d4\u05db\u05e8\u05d7\u05d9 \u05e8\u05e7 \u05e2\u05d1\u05d5\u05e8 \u05e7\u05d1\u05e6\u05d9\u05dd \u05e9\u05dc \u05e4\u05e8\u05e7\u05d9\u05dd \u05de\u05d7\u05d5\u05d1\u05e8\u05d9\u05dd",
     "HeaderSupportTheTeam": "\u05ea\u05de\u05d5\u05dc \u05d1\u05e6\u05d5\u05d5\u05ea Media Browser",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Display plugins for:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Episode name",
-    "LabelSeriesName": "Series name",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Series.name",
     "ValueSeriesNameUnderscore": "Series_name",
     "ValueEpisodeNamePeriod": "Episode.name",
     "ValueEpisodeNameUnderscore": "Episode_name",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Enter Text",
     "LabelTypeText": "Text",
     "HeaderSearchForSubtitles": "Search for Subtitles",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "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:"
+    "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 dc24d795d..4663e5849 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/it.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/it.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Compositori",
+    "HeaderRecentActivity": "Attivit\u00e0 recenti",
     "LabelExit": "Esci",
-    "OptionOthers": "Altri",
+    "HeaderPeople": "Persone",
     "LabelVisitCommunity": "Visita Comunit\u00e0",
+    "HeaderDownloadPeopleMetadataFor": "Scarica biografia e immagini per:",
     "LabelGithubWiki": "Github Wiki",
-    "HeaderDownloadPeopleMetadataForHelp": "Abilitando il provider scaricher\u00e0 pi\u00f9 informazioni ( la scansione sar\u00e0 pi\u00f9 lenta)",
+    "OptionComposers": "Compositori",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "Cartelle",
+    "OptionOthers": "Altri",
     "LabelStandard": "Standard",
-    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelViewApiDocumentation": "Documentazione Api",
-    "ViewTypeLiveTvRecordingGroups": "Registrazioni",
+    "HeaderDownloadPeopleMetadataForHelp": "Abilitando il provider scaricher\u00e0 pi\u00f9 informazioni ( la scansione sar\u00e0 pi\u00f9 lenta)",
     "LabelBrowseLibrary": "Esplora la libreria",
-    "ViewTypeLiveTvChannels": "canali",
+    "ViewTypeFolders": "Cartelle",
     "LabelConfigureMediaBrowser": "Configura Media Browser",
-    "LabelAllowLocalAccessWithoutPassword": "Consenti di accedere localmente senza password",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelOpenLibraryViewer": "Apri visualizzatore libreria",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "Quando abilitato la password non \u00e8 necessaria",
+    "ViewTypeLiveTvRecordingGroups": "Registrazioni",
     "LabelRestartServer": "Riavvia Server",
-    "HeaderPassword": "Password",
+    "ViewTypeLiveTvChannels": "canali",
     "LabelShowLogWindow": "Mostra Finestra log",
-    "HeaderLocalAccess": "Accesso locale",
+    "LabelAllowLocalAccessWithoutPassword": "Consenti di accedere localmente senza password",
     "LabelPrevious": "Precedente",
-    "HeaderViewOrder": "View Order",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "Quando abilitato la password non \u00e8 necessaria",
     "LabelFinish": "Finito",
-    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
+    "HeaderPassword": "Password",
     "LabelNext": "Prossimo",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "HeaderLocalAccess": "Accesso locale",
     "LabelYoureDone": "Tu hai Finito!",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "HeaderViewOrder": "View Order",
     "WelcomeToMediaBrowser": "Benvenuto in Media browser!",
-    "OptionDownloadMissingImages": "Download missing images",
+    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "TitleMediaBrowser": "Media browser",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "ThisWizardWillGuideYou": "Procedura Guidata per l'installazione.",
-    "OptionRefreshAllData": "Refresh all data",
+    "LabelImageRefreshMode": "Image refresh mode:",
     "TellUsAboutYourself": "Parlaci di te",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionDownloadMissingImages": "Download missing images",
     "LabelYourFirstName": "Nome",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionReplaceExistingImages": "Replace existing images",
     "MoreUsersCanBeAddedLater": "Puoi aggiungere altri utenti in un secondo momento all'interno del pannello di configurazione",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "OptionRefreshAllData": "Refresh all data",
     "UserProfilesIntro": "Media Browser include il supporto integrato per i profili utente, permettendo ad ogni utente di avere le proprie impostazioni di visualizzazione.",
-    "HeaderPersonInfo": "Person Info",
+    "OptionAddMissingDataOnly": "Add missing data only",
     "LabelWindowsService": "Servizio Windows",
-    "HeaderIdentifyItem": "Identify Item",
+    "OptionLocalRefreshOnly": "Local refresh only",
     "AWindowsServiceHasBeenInstalled": "Servizio Windows Installato",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderRefreshMetadata": "Refresh Metadata",
     "WindowsServiceIntro1": "Media Browser  Server, normalmente viene eseguito come un'applicazione desktop con una icona nella barra, ma se si preferisce farlo funzionare come un servizio in background, pu\u00f2 essere avviato dal pannello di controllo dei servizi di Windows, invece.",
-    "HeaderConfirmDeletion": "Conferma Cancellazione",
+    "HeaderPersonInfo": "Person Info",
     "WindowsServiceIntro2": "Se si utilizza il servizio di Windows, si ricorda che non pu\u00f2 essere eseguito allo stesso tempo come l'icona di sistema, quindi  devi chiudere l'applicazione al fine di eseguire il servizio. Il servizio dovr\u00e0 anche essere configurato con privilegi amministrativi tramite il pannello di controllo. Si prega di notare che in questo momento il servizio non \u00e8 in grado di Autoaggiornarsi, quindi le nuove versioni richiedono l'interazione manuale",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "HeaderIdentifyItem": "Identify Item",
     "WizardCompleted": "Questo \u00e8 tutto abbiamo bisogno per ora. Browser Media ha iniziato a raccogliere informazioni sulla vostra libreria multimediale. Scopri alcune delle nostre applicazioni, quindi fare clic su <b>Finito<\/b> per aprire<b>il pannello di controllo<\/b>.",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
     "LabelConfigureSettings": "Configura",
-    "ButtonIdentify": "Identify",
+    "HeaderConfirmDeletion": "Conferma Cancellazione",
     "LabelEnableVideoImageExtraction": "Estrazione immagine video non possibile",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
     "VideoImageExtractionHelp": "Per i video che sono sprovvisti di immagini,e che non siamo riusciti a trovarle su Internet.Questo aggiunger\u00e0 del tempo addizionale alla scansione della tua libreria ma si tradurr\u00e0 in una presentazione pi\u00f9 piacevole.",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
     "LabelEnableChapterImageExtractionForMovies": "Estrazione immagine capitolo estratto per Film",
-    "LabelCommunityRating": "Community rating:",
+    "ButtonIdentify": "Identify",
     "LabelChapterImageExtractionForMoviesHelp": "L'Estrazione di immagini capitoli permetter\u00e0 ai clienti di visualizzare i menu di selezione delle scene . Il processo pu\u00f2 essere lento e pu\u00f2 richiedere diversi gigabyte di spazio. Viene schedulato alle 04:00, anche se questo \u00e8 configurabile nella zona di operazioni pianificate. Non \u00e8 consigliabile eseguire questa operazione durante le ore di picco.",
-    "LabelVoteCount": "Vote count:",
+    "LabelAlbumArtist": "Album artist:",
     "LabelEnableAutomaticPortMapping": "Abilita mappatura delle porte automatiche",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP consente la configurazione automatica del router per l'accesso remoto facile. Questo potrebbe non funzionare con alcuni modelli di router.",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCommunityRating": "Community rating:",
     "ButtonOk": "OK",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelVoteCount": "Vote count:",
     "ButtonCancel": "Annulla",
-    "LabelAwardSummary": "Award summary:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "Nuovo",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Critic rating:",
     "HeaderSetupLibrary": "Configura la tua libreria",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Critic rating summary:",
     "ButtonAddMediaFolder": "Aggiungi cartella",
-    "LabelOverview": "Overview:",
+    "LabelAwardSummary": "Award summary:",
     "LabelFolderType": "Tipo cartella",
-    "LabelShortOverview": "Short overview:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "* Richiede l'uso di un plugin, ad esempio GameBrowser o MB Bookshelf.",
-    "LabelReleaseDate": "Release date:",
+    "LabelTagline": "Tagline:",
     "ReferToMediaLibraryWiki": "Fare riferimento alla wiki libreria multimediale.",
-    "LabelYear": "Year:",
+    "LabelOverview": "Overview:",
     "LabelCountry": "Nazione:",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelShortOverview": "Short overview:",
     "LabelLanguage": "lingua:",
-    "LabelEndDate": "End date:",
+    "LabelReleaseDate": "Release date:",
     "HeaderPreferredMetadataLanguage": "Lingua dei metadati preferita:",
-    "LabelAirDate": "Air days:",
+    "LabelYear": "Year:",
     "LabelSaveLocalMetadata": "Salva immagini e metadati nelle cartelle multimediali",
-    "LabelAirTime:": "Air time:",
+    "LabelPlaceOfBirth": "Place of birth:",
     "LabelSaveLocalMetadataHelp": "Il salvataggio di immagini e dei metadati direttamente nelle cartelle multimediali verranno messe in un posto dove possono essere facilmente modificate.",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelEndDate": "End date:",
     "LabelDownloadInternetMetadata": "Scarica immagini e dei metadati da internet",
-    "LabelParentalRating": "Parental rating:",
+    "LabelAirDate": "Air days:",
     "LabelDownloadInternetMetadataHelp": "Media Browser pu\u00f2 scaricare informazioni sui vostri media per consentire presentazioni migliori.",
-    "LabelCustomRating": "Custom rating:",
+    "LabelAirTime:": "Air time:",
     "TabPreferences": "Preferenze",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Run time (minutes):",
     "TabPassword": "Password",
-    "LabelRevenue": "Revenue ($):",
+    "LabelParentalRating": "Parental rating:",
     "TabLibraryAccess": "Accesso libreria",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelCustomRating": "Custom rating:",
     "TabImage": "Immagine",
-    "LabelPlayers": "Players:",
+    "LabelBudget": "Budget",
     "TabProfile": "Profilo",
-    "Label3DFormat": "3D format:",
+    "LabelRevenue": "Revenue ($):",
     "TabMetadata": "Metadata",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "LabelOriginalAspectRatio": "Original aspect ratio:",
     "TabImages": "Immagini",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "LabelPlayers": "Players:",
     "TabNotifications": "Notifiche",
-    "HeaderExternalIds": "External Id's:",
+    "Label3DFormat": "3D format:",
     "TabCollectionTitles": "Titolo",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
     "LabelDisplayMissingEpisodesWithinSeasons": "Visualizza gli episodi mancanti  nelle stagioni",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "HeaderSpecialEpisodeInfo": "Special Episode Info",
     "LabelUnairedMissingEpisodesWithinSeasons": "Visualizzare episodi mai andati in onda all'interno stagioni",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "HeaderExternalIds": "External Id's:",
     "HeaderVideoPlaybackSettings": "Impostazioni di riproduzione video",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "Dvd season number:",
     "HeaderPlaybackSettings": "Impostazioni di riproduzione",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "Dvd episode number:",
     "LabelAudioLanguagePreference": "Audio preferenze di lingua:",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
     "LabelSubtitleLanguagePreference": "Sottotitoli preferenze di lingua:",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelAirsBeforeSeason": "Airs before season:",
     "OptionDefaultSubtitles": "Predefinito",
-    "LabelDisplayOrder": "Display order:",
+    "LabelAirsAfterSeason": "Airs after season:",
     "OptionOnlyForcedSubtitles": "Solo i sottotitoli forzati",
-    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelAirsBeforeEpisode": "Airs before episode:",
     "OptionAlwaysPlaySubtitles": "Visualizza sempre i sottotitoli",
-    "HeaderCountries": "Countries",
+    "LabelTreatImageAs": "Treat image as:",
     "OptionNoSubtitles": "Nessun Sottotitolo",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "Display order:",
     "OptionDefaultSubtitlesHelp": "Sottotitoli corrispondenti alla lingua di preferenza saranno caricati quando l'audio \u00e8 in una lingua straniera.",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
     "OptionOnlyForcedSubtitlesHelp": "Solo sottotitoli contrassegnati come forzati saranno caricati.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "Countries",
     "OptionAlwaysPlaySubtitlesHelp": "Sottotitoli corrispondenti alla lingua di preferenza saranno caricati a prescindere dalla lingua audio.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "Genres",
     "OptionNoSubtitlesHelp": "I sottotitoli non verranno caricati di default.",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderPlotKeywords": "Plot Keywords",
     "TabProfiles": "Profili",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "HeaderStudios": "Studios",
     "TabSecurity": "Sicurezza",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "Aggiungi Utente",
-    "TabSupporterClub": "Supporter Club",
+    "HeaderMetadataSettings": "Metadata Settings",
     "ButtonSave": "Salva",
-    "HeaderDonationType": "Donation type:",
+    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
     "ButtonResetPassword": "Reset Password",
-    "OptionMakeOneTimeDonation": "Make a one-time donation",
+    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
     "LabelNewPassword": "Nuova Password:",
-    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
+    "TabSupporterClub": "Supporter Club",
     "LabelNewPasswordConfirm": "Nuova Password Conferma:",
-    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderDonationType": "Donation type:",
     "HeaderCreatePassword": "Crea Password",
-    "OptionNoTrailer": "No Trailer",
+    "OptionMakeOneTimeDonation": "Make a one-time donation",
     "LabelCurrentPassword": "Password Corrente:",
-    "OptionNoThemeSong": "No Theme Song",
+    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
     "LabelMaxParentalRating": "Massima valutazione dei genitori consentita:",
-    "OptionNoThemeVideo": "No Theme Video",
+    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
     "MaxParentalRatingHelp": "Contento di un punteggio pi\u00f9 elevato sar\u00e0 nascosto da questo utente.",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "OptionNoTrailer": "No Trailer",
     "LibraryAccessHelp": "Selezionare le cartelle multimediali da condividere con questo utente. Gli amministratori saranno in grado di modificare tutte le cartelle utilizzando il gestore dei metadati.",
+    "OptionNoThemeSong": "No Theme Song",
     "ChannelAccessHelp": "Selezionare i canali da condividere con questo utente. Gli amministratori saranno in grado di modificare tutti i canali usando il gestore dei metadati",
+    "OptionNoThemeVideo": "No Theme Video",
     "ButtonDeleteImage": "Elimina immagine",
+    "LabelOneTimeDonationAmount": "Donation amount:",
     "LabelSelectUsers": "Seleziona Utenti:",
+    "OptionActor": "Actor",
     "ButtonUpload": "Carica",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "Carica nuova immagine",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "Trascina l'immagine qui",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG\/PNG only.",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "Niente qui.",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "Assicurarsi che download di metadati internet \u00e8 abilitata.",
     "TabSuggested": "Suggeriti",
     "TabLatest": "Novit\u00e0",
@@ -212,7 +221,7 @@
     "OptionAscending": "Ascendente",
     "OptionDescending": "Discentente",
     "OptionRuntime": "Durata",
-    "OptionReleaseDate": "Release Date",
+    "OptionReleaseDate": "Uscito il",
     "OptionPlayCount": "Visto N\u00b0",
     "OptionDatePlayed": "Visto il",
     "OptionDateAdded": "Aggiunto il",
@@ -570,8 +579,8 @@
     "LabelSkipped": "Saltato",
     "HeaderEpisodeOrganization": "Organizzazione Episodi",
     "LabelSeries": "Serie:",
-    "LabelSeasonNumber": "Season number",
-    "LabelEpisodeNumber": "Episode number",
+    "LabelSeasonNumber": "Numero Stagione",
+    "LabelEpisodeNumber": "Numero Episodio",
     "LabelEndingEpisodeNumber": "Ultimo Episodio Numero",
     "LabelEndingEpisodeNumberHelp": "\u00e8 richiesto solo se ci sono pi\u00f9 file per espisodio",
     "HeaderSupportTheTeam": "Team di supporto di Media Browser",
@@ -714,12 +723,12 @@
     "TabNowPlaying": "In esecuzione",
     "TabNavigation": "Navigazione",
     "TabControls": "Controlli",
-    "ButtonFullscreen": "Tutto Schermo",
+    "ButtonFullscreen": "Schermo intero",
     "ButtonScenes": "Scene",
     "ButtonSubtitles": "Sottotitoli",
-    "ButtonAudioTracks": "Tracce audio",
-    "ButtonPreviousTrack": "Traccia Precedente",
-    "ButtonNextTrack": "Prossima Traccia",
+    "ButtonAudioTracks": "Traccia Audio",
+    "ButtonPreviousTrack": "Precedente traccia",
+    "ButtonNextTrack": "traccia Prossima",
     "ButtonStop": "Stop",
     "ButtonPause": "Pausa",
     "LabelGroupMoviesIntoCollections": "Raggruppa i film nelle collection",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Mostra plugin per:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Nome episodio",
-    "LabelSeriesName": "Nome serie",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Nome Serie",
     "ValueSeriesNameUnderscore": "Nome Serie",
     "ValueEpisodeNamePeriod": "Nome Episodio",
     "ValueEpisodeNameUnderscore": "Nome Episodio",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Inserisci il testo",
     "LabelTypeText": "Testo",
     "HeaderSearchForSubtitles": "Ricerca per sottotitoli",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "App: {0}, Dispositivo: {1}",
     "ProviderValue": "Provider: {0}",
     "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:"
+    "LabelChannelDownloadSizeLimitHelp": "Dimensione massima del canale relativo alla cartella di download"
 }
\ 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 d6fc766c6..ddf3627e2 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/kk.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/kk.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "\u041a\u043e\u043c\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u043b\u0430\u0440",
+    "HeaderRecentActivity": "\u041a\u0435\u0438\u0456\u043d\u0433\u0456 \u04d9\u0440\u0435\u043a\u0435\u0442\u0442\u0435\u0440",
     "LabelExit": "\u0428\u044b\u0493\u0443",
-    "OptionOthers": "\u0411\u0430\u0441\u049b\u0430\u043b\u0430\u0440",
+    "HeaderPeople": "\u0410\u0434\u0430\u043c\u0434\u0430\u0440",
     "LabelVisitCommunity": "\u049a\u0430\u0443\u044b\u043c\u0434\u0430\u0441\u0442\u044b\u049b\u049b\u0430 \u0431\u0430\u0440\u0443",
+    "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;",
     "LabelGithubWiki": "Github \u0443\u0438\u043a\u0438\u0456",
-    "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.",
+    "OptionComposers": "\u041a\u043e\u043c\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u043b\u0430\u0440",
     "LabelSwagger": "Swagger \u0442\u0456\u043b\u0434\u0435\u0441\u0443\u0456",
-    "ViewTypeFolders": "\u049a\u0430\u043b\u0442\u0430\u043b\u0430\u0440",
+    "OptionOthers": "\u0411\u0430\u0441\u049b\u0430\u043b\u0430\u0440",
     "LabelStandard": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u0442\u044b",
-    "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 \u049a\u0430\u043b\u0442\u0430\u043b\u0430\u0440 \u0430\u0441\u043f\u0435\u043a\u0442\u0456\u043d \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0443",
     "LabelViewApiDocumentation": "API \u049b\u04b1\u0436\u0430\u0442\u0442\u0430\u043c\u0430\u0441\u044b\u043d \u049b\u0430\u0440\u0430\u0443",
-    "ViewTypeLiveTvRecordingGroups": "\u0416\u0430\u0437\u0431\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.",
     "LabelBrowseLibrary": "\u0422\u0430\u0441\u0443\u0448\u044b\u0445\u0430\u043d\u0430\u043d\u044b \u0448\u0430\u0440\u043b\u0430\u0443",
-    "ViewTypeLiveTvChannels": "\u0410\u0440\u043d\u0430\u043b\u0430\u0440",
+    "ViewTypeFolders": "\u049a\u0430\u043b\u0442\u0430\u043b\u0430\u0440",
     "LabelConfigureMediaBrowser": "Media Browser \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f\u0441\u044b",
-    "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",
+    "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 \u049a\u0430\u043b\u0442\u0430\u043b\u0430\u0440 \u0430\u0441\u043f\u0435\u043a\u0442\u0456\u043d \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0443",
     "LabelOpenLibraryViewer": "\u0422\u0430\u0441\u0443\u0448\u044b\u0445\u0430\u043d\u0430\u043d\u044b \u049b\u0430\u0440\u0430\u0443 \u049b\u04b1\u0440\u0430\u043b\u044b",
-    "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.",
+    "ViewTypeLiveTvRecordingGroups": "\u0416\u0430\u0437\u0431\u0430\u043b\u0430\u0440",
     "LabelRestartServer": "\u0421\u0435\u0440\u0432\u0435\u0440\u0434\u0456 \u049b\u0430\u0439\u0442\u0430 \u0456\u0441\u043a\u0435 \u049b\u043e\u0441\u0443",
-    "HeaderPassword": "\u049a\u04b1\u043f\u0438\u044f \u0441\u04e9\u0437",
+    "ViewTypeLiveTvChannels": "\u0410\u0440\u043d\u0430\u043b\u0430\u0440",
     "LabelShowLogWindow": "\u0416\u04b1\u0440\u043d\u0430\u043b \u0442\u0435\u0440\u0435\u0437\u0435\u0441\u0456\u043d \u043a\u04e9\u0440\u0441\u0435\u0442\u0443",
-    "HeaderLocalAccess": "\u0416\u0435\u0440\u0433\u0456\u043b\u0456\u043a\u0442\u0456 \u049b\u0430\u0442\u044b\u043d\u0430\u0441",
+    "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",
     "LabelPrevious": "\u0410\u043b\u0434\u044b\u04a3\u0493\u044b",
-    "HeaderViewOrder": "\u0410\u0441\u043f\u0435\u043a\u0442\u0442\u0435\u0440 \u0440\u0435\u0442\u0456",
+    "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.",
     "LabelFinish": "\u0410\u044f\u049b\u0442\u0430\u0443",
-    "LabelSelectUserViewOrder": "Media Browser \u049b\u043e\u043b\u0434\u0430\u043d\u0431\u0430\u043b\u0430\u0440\u044b\u043d\u0434\u0430 \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u043d\u0435\u0442\u0456\u043d \u041c\u0435\u043d\u0456\u04a3 \u0430\u0441\u043f\u0435\u043a\u0442\u0442\u0435\u0440\u0456\u043c \u0440\u0435\u0442\u0456\u043d \u0442\u0430\u04a3\u0434\u0430\u04a3\u044b\u0437",
+    "HeaderPassword": "\u049a\u04b1\u043f\u0438\u044f \u0441\u04e9\u0437",
     "LabelNext": "\u041a\u0435\u043b\u0435\u0441\u0456",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "HeaderLocalAccess": "\u0416\u0435\u0440\u0433\u0456\u043b\u0456\u043a\u0442\u0456 \u049b\u0430\u0442\u044b\u043d\u0430\u0441",
     "LabelYoureDone": "\u0411\u04d9\u0440\u0456 \u0434\u0430\u0439\u044b\u043d!",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "HeaderViewOrder": "\u0410\u0441\u043f\u0435\u043a\u0442\u0442\u0435\u0440 \u0440\u0435\u0442\u0456",
     "WelcomeToMediaBrowser": "Media Browser-\u0433\u0435 \u049b\u043e\u0448 \u043a\u0435\u043b\u0434\u0456\u04a3\u0456\u0437!",
-    "OptionDownloadMissingImages": "Download missing images",
+    "LabelSelectUserViewOrder": "Media Browser \u049b\u043e\u043b\u0434\u0430\u043d\u0431\u0430\u043b\u0430\u0440\u044b\u043d\u0434\u0430 \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u043d\u0435\u0442\u0456\u043d \u041c\u0435\u043d\u0456\u04a3 \u0430\u0441\u043f\u0435\u043a\u0442\u0442\u0435\u0440\u0456\u043c \u0440\u0435\u0442\u0456\u043d \u0442\u0430\u04a3\u0434\u0430\u04a3\u044b\u0437",
     "TitleMediaBrowser": "Media Browser",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "LabelMetadataRefreshMode": "\u041c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440\u0434\u0456 \u043a\u04e9\u043a\u0435\u0439\u0442\u0435\u0441\u0442\u0456 \u0435\u0442\u0443 \u0440\u0435\u0436\u0456\u043c\u0456:",
     "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.",
-    "OptionRefreshAllData": "Refresh all data",
+    "LabelImageRefreshMode": "\u0421\u0443\u0440\u0435\u0442\u0442\u0435\u0440\u0434\u0456 \u043a\u04e9\u043a\u0435\u0439\u0442\u0435\u0441\u0442\u0456 \u0435\u0442\u0443 \u0440\u0435\u0436\u0456\u043c\u0456:",
     "TellUsAboutYourself": "\u04e8\u0437\u0456\u04a3\u0456\u0437 \u0442\u0443\u0440\u0430\u043b\u044b \u0430\u0439\u0442\u044b\u04a3\u044b\u0437",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionDownloadMissingImages": "Download missing images",
     "LabelYourFirstName": "\u0410\u0442\u044b\u04a3\u044b\u0437:",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionReplaceExistingImages": "Replace existing images",
     "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.",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "OptionRefreshAllData": "\u0411\u0430\u0440\u043b\u044b\u049b \u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440\u0434\u0456 \u043a\u04e9\u043a\u0435\u0439\u0442\u0435\u0441\u0442\u0456 \u0435\u0442\u0443",
     "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.",
-    "HeaderPersonInfo": "Person Info",
+    "OptionAddMissingDataOnly": "Add missing data only",
     "LabelWindowsService": "Windows \u049b\u044b\u0437\u043c\u0435\u0442\u0456",
-    "HeaderIdentifyItem": "Identify Item",
+    "OptionLocalRefreshOnly": "\u0422\u0435\u043a \u0493\u0430\u043d\u0430 \u0436\u0435\u0440\u0433\u0456\u043b\u0456\u043a\u0442\u0456 \u043a\u04e9\u043a\u0435\u0439\u0442\u0435\u0441\u0442\u0456 \u0435\u0442\u0443",
     "AWindowsServiceHasBeenInstalled": "Windows \u049b\u044b\u0437\u043c\u0435\u0442\u0456 \u043e\u0440\u043d\u0430\u0442\u044b\u043b\u0434\u044b.",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderRefreshMetadata": "\u041c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440\u0434\u0456 \u043a\u04e9\u043a\u0435\u0439\u0442\u0435\u0441\u0442\u0456 \u0435\u0442\u0443",
     "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.",
-    "HeaderConfirmDeletion": "\u0416\u043e\u044e\u0434\u044b \u0440\u0430\u0441\u0442\u0430\u0443",
+    "HeaderPersonInfo": "Person Info",
     "WindowsServiceIntro2": "\u0415\u0433\u0435\u0440 Windows \u049b\u044b\u0437\u043c\u0435\u0442\u0456 \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0434\u0430 \u0431\u043e\u043b\u0441\u0430, \u0435\u0441\u043a\u0435\u0440\u0456\u04a3\u0456\u0437, \u0431\u04b1\u043b \u0441\u043e\u043b \u043c\u0435\u0437\u0433\u0456\u043b\u0434\u0435 \u0436\u04af\u0439\u0435\u043b\u0456\u043a \u0442\u0430\u049b\u0442\u0430\u0434\u0430\u0493\u044b \u0431\u0435\u043b\u0433\u0456\u0448\u0435\u0434\u0435\u0439 \u0436\u04af\u043c\u044b\u0441 \u0456\u0441\u0442\u0435\u0443\u0456 \u043c\u04af\u043c\u043a\u0456\u043d \u0435\u043c\u0435\u0441, \u0441\u043e\u043d\u044b\u043c\u0435\u043d \u049b\u044b\u0437\u043c\u0435\u0442\u0442\u0456 \u0456\u0441\u043a\u0435 \u049b\u043e\u0441\u0443 \u04af\u0448\u0456\u043d \u0436\u04af\u0439\u0435\u043b\u0456\u043a \u0442\u0430\u049b\u0442\u0430\u0434\u0430\u043d \u0448\u044b\u0493\u0443\u044b\u04a3\u044b\u0437 \u049b\u0430\u0436\u0435\u0442. \u0421\u043e\u0493\u0430\u043d \u049b\u0430\u0442\u0430\u0440, \u049b\u044b\u0437\u043c\u0435\u0442\u0442\u0456 \u04d9\u043a\u0456\u043c\u0448\u0456 \u049b\u04b1\u049b\u044b\u049b\u0442\u0430\u0440\u044b\u043d\u0430 \u0438\u0435 \u0431\u043e\u043b\u044b\u043f \u049a\u044b\u0437\u043c\u0435\u0442\u0442\u0435\u0440 \u0434\u0438\u0441\u043f\u0435\u0442\u0447\u0435\u0440\u0456 \u0430\u0440\u049b\u044b\u043b\u044b \u0442\u0435\u04a3\u0448\u0435\u0443 \u049b\u0430\u0436\u0435\u0442. \u041d\u0430\u0437\u0430\u0440 \u0430\u0443\u0434\u0430\u0440\u044b\u04a3\u044b\u0437! \u049a\u0430\u0437\u0456\u0440\u0433\u0456 \u0443\u0430\u049b\u044b\u0442\u0442\u0430 \u0431\u04b1\u043b \u049b\u044b\u0437\u043c\u0435\u0442 \u04e9\u0437\u0456\u043d\u0435\u043d-\u04e9\u0437\u0456 \u0436\u0430\u04a3\u0430\u0440\u0442\u044b\u043b\u043c\u0430\u0439\u0434\u044b, \u0441\u043e\u043d\u0434\u044b\u049b\u0442\u0430\u043d \u0436\u0430\u04a3\u0430 \u043d\u04b1\u0441\u049b\u0430\u043b\u0430\u0440 \u049b\u043e\u043b\u043c\u0435\u043d \u04e9\u0437\u0430\u0440\u0430 \u04d9\u0440\u0435\u043a\u0435\u0442\u0442\u0435\u0441\u0443\u0434\u0456 \u049b\u0430\u0436\u0435\u0442 \u0435\u0442\u0435\u0434\u0456.",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "HeaderIdentifyItem": "\u042d\u043b\u0435\u043c\u0435\u043d\u0442\u0442\u0456 \u0430\u043d\u044b\u049b\u0442\u0430\u0443",
     "WizardCompleted": "\u04d8\u0437\u0456\u0440\u0448\u0435 \u0431\u04b1\u043b \u043a\u0435\u0440\u0435\u0433\u0456\u043d\u0456\u04a3 \u0431\u04d9\u0440\u0456. \u0415\u043d\u0434\u0456 Media Browser \u0442\u0430\u0441\u0443\u0448\u044b\u0445\u0430\u043d\u0430 \u0442\u0443\u0440\u0430\u043b\u044b \u0430\u049b\u043f\u0430\u0440\u0430\u0442\u0442\u044b \u0436\u0438\u043d\u0430\u0443\u0434\u044b \u0431\u0430\u0441\u0442\u0430\u0434\u044b. \u041a\u0435\u0439\u0431\u0456\u0440 \u049b\u043e\u043b\u0434\u0430\u043d\u0431\u0430\u043b\u0430\u0440\u043c\u0435\u043d \u0442\u0430\u043d\u044b\u0441\u044b\u043f \u0448\u044b\u0493\u044b\u04a3\u044b\u0437, \u0436\u04d9\u043d\u0435 \u043a\u0435\u0439\u0456\u043d <b>\u0411\u0430\u049b\u044b\u043b\u0430\u0443 \u0442\u0430\u049b\u0442\u0430\u0441\u044b\u043d<\/b> \u043a\u04e9\u0440\u0443 \u04af\u0448\u0456\u043d <b>\u0410\u044f\u049b\u0442\u0430\u0443<\/b> \u0442\u04af\u0439\u043c\u0435\u0448\u0456\u0433\u0456\u043d \u043d\u04b1\u049b\u044b\u04a3\u044b\u0437.",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "HeaderIdentifyItemHelp": "\u0406\u0437\u0434\u0435\u0443\u0434\u0456\u04a3 \u0431\u0456\u0440 \u043d\u0435 \u0431\u0456\u0440\u043d\u0435\u0448\u0435 \u0448\u0430\u0440\u0442\u044b\u043d \u0435\u043d\u0433\u0456\u0437\u0456\u04a3\u0456\u0437. \u0406\u0437\u0434\u0435\u0443 \u043d\u04d9\u0442\u0438\u0436\u0435\u043b\u0435\u0440\u0456\u043d \u043a\u04e9\u0431\u0435\u0439\u0442\u0443 \u04af\u0448\u0456\u043d \u0448\u0430\u0440\u0442\u0442\u044b \u0430\u043b\u0430\u0441\u0442\u0430\u04a3\u044b\u0437.",
     "LabelConfigureSettings": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043b\u0435\u0440\u0434\u0456 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f\u043b\u0430\u0443",
-    "ButtonIdentify": "Identify",
+    "HeaderConfirmDeletion": "\u0416\u043e\u044e\u0434\u044b \u0440\u0430\u0441\u0442\u0430\u0443",
     "LabelEnableVideoImageExtraction": "\u0411\u0435\u0439\u043d\u0435 \u0441\u0443\u0440\u0435\u0442\u0456\u043d \u0448\u044b\u0493\u0430\u0440\u044b\u043f \u0430\u043b\u0443\u0434\u044b \u049b\u043e\u0441\u0443",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
     "VideoImageExtractionHelp": "\u04d8\u043b\u0456 \u0434\u0435 \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440\u0456 \u0436\u043e\u049b, \u0436\u04d9\u043d\u0435 \u043e\u043b\u0430\u0440 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u0442\u0435 \u0442\u0430\u0431\u044b\u043b\u043c\u0430\u0493\u0430\u043d \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0440 \u04af\u0448\u0456\u043d. \u0411\u04b1\u043b \u0442\u0430\u0441\u0443\u0448\u044b\u0445\u0430\u043d\u0430\u043d\u044b\u04a3 \u0431\u0430\u0441\u0442\u0430\u043f\u049b\u044b \u0441\u043a\u0430\u043d\u0435\u0440\u043b\u0435\u0443\u0456 \u04af\u0448\u0456\u043d \u049b\u043e\u0441\u044b\u043c\u0448\u0430 \u0443\u0430\u049b\u044b\u0442 \u04af\u0441\u0442\u0435\u0439\u0434\u0456, \u0431\u0456\u0440\u0430\u049b \u043d\u04d9\u0442\u0438\u0436\u0435\u0441\u0456\u043d\u0434\u0435 \u04b1\u043d\u0430\u043c\u0434\u044b\u043b\u0430\u0443 \u043a\u04e9\u0440\u0441\u0435\u0442\u0456\u043c \u0431\u043e\u043b\u0430\u0434\u044b.",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
     "LabelEnableChapterImageExtractionForMovies": "\u0424\u0438\u043b\u044c\u043c\u0434\u0435\u0440 \u04af\u0448\u0456\u043d \u0441\u0430\u0445\u043d\u0430 \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440\u0456\u043d \u0448\u044b\u0493\u0430\u0440\u044b\u043f \u0430\u043b\u0443\u0434\u044b \u049b\u043e\u0441\u0443",
-    "LabelCommunityRating": "Community rating:",
+    "ButtonIdentify": "\u0410\u043d\u044b\u049b\u0442\u0430\u0443",
     "LabelChapterImageExtractionForMoviesHelp": "\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. \u0411\u04b1\u043b \u0442\u04af\u043d\u0433\u0456 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, \u0434\u0435\u0433\u0435\u043d\u043c\u0435\u043d \u0431\u04b1\u043b \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 \u043e\u0440\u044b\u043d\u0434\u0430\u0443 \u04b1\u0441\u044b\u043d\u044b\u043b\u043c\u0430\u0439\u0434\u044b.",
-    "LabelVoteCount": "Vote count:",
+    "LabelAlbumArtist": "Album artist:",
     "LabelEnableAutomaticPortMapping": "\u041f\u043e\u0440\u0442 \u0430\u0432\u0442\u043e\u0441\u0430\u043b\u0493\u0430\u0441\u0442\u044b\u0440\u0443\u044b\u043d \u049b\u043e\u0441\u0443",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP \u049b\u0430\u0448\u044b\u049b\u0442\u0430\u043d \u049b\u0430\u0442\u044b\u043d\u0430\u0441\u0443\u0434\u044b \u0436\u0435\u04a3\u0456\u043b\u0434\u0435\u0442\u0443 \u04af\u0448\u0456\u043d \u0440\u043e\u0443\u0442\u0435\u0440\u0434\u0456 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0442\u044b \u0442\u04af\u0440\u0434\u0435 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f\u043b\u0430\u0443\u0493\u0430 \u0440\u04b1\u049b\u0441\u0430\u0442 \u0435\u0442\u0435\u0434\u0456. \u0411\u04b1\u043b \u043a\u0435\u0439\u0431\u0456\u0440 \u0440\u043e\u0443\u0442\u0435\u0440 \u04b1\u043b\u0433\u0456\u043b\u0435\u0440\u0456\u043c\u0435\u043d \u0436\u04b1\u043c\u044b\u0441 \u0456\u0441\u0442\u0435\u043c\u0435\u0439\u0442\u0456\u043d\u0456 \u043c\u04af\u043c\u043a\u0456\u043d.",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCommunityRating": "Community rating:",
     "ButtonOk": "\u0416\u0430\u0440\u0430\u0439\u0434\u044b",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelVoteCount": "Vote count:",
     "ButtonCancel": "\u0411\u043e\u043b\u0434\u044b\u0440\u043c\u0430\u0443",
-    "LabelAwardSummary": "Award summary:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "\u0416\u0430\u0441\u0430\u0443",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Critic rating:",
     "HeaderSetupLibrary": "\u0422\u0430\u0441\u0443\u0448\u044b\u0445\u0430\u043d\u0430\u043d\u044b \u0440\u0435\u0442\u0442\u0435\u0443",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Critic rating summary:",
     "ButtonAddMediaFolder": "\u0422\u0430\u0441\u0443\u0448\u044b \u049b\u0430\u043b\u0442\u0430\u0441\u044b\u043d \u04af\u0441\u0442\u0435\u0443",
-    "LabelOverview": "Overview:",
+    "LabelAwardSummary": "Award summary:",
     "LabelFolderType": "\u049a\u0430\u043b\u0442\u0430 \u0442\u04af\u0440\u0456:",
-    "LabelShortOverview": "Short overview:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "* \u041f\u043b\u0430\u0433\u0438\u043d\u0434\u0456 \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u044b\u04a3\u044b\u0437, \u043c\u044b\u0441\u0430\u043b\u044b, GameBrowser, \u043d\u0435 MB Bookshelf.",
-    "LabelReleaseDate": "Release date:",
+    "LabelTagline": "Tagline:",
     "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.",
-    "LabelYear": "Year:",
+    "LabelOverview": "Overview:",
     "LabelCountry": "\u0415\u043b:",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelShortOverview": "Short overview:",
     "LabelLanguage": "\u0422\u0456\u043b:",
-    "LabelEndDate": "End date:",
+    "LabelReleaseDate": "\u0428\u044b\u0493\u0430\u0440\u0443 \u043a\u04af\u043d-\u0430\u0439\u044b:",
     "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:",
-    "LabelAirDate": "Air days:",
+    "LabelYear": "\u0416\u044b\u043b\u044b:",
     "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",
-    "LabelAirTime:": "Air time:",
+    "LabelPlaceOfBirth": "Place of birth:",
     "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.",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelEndDate": "\u0410\u044f\u049b\u0442\u0430\u043b\u0443 \u043a\u04af\u043d-\u0430\u0439\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",
-    "LabelParentalRating": "Parental rating:",
+    "LabelAirDate": "Air days:",
     "LabelDownloadInternetMetadataHelp": "\u0422\u043e\u043b\u044b \u043a\u04e9\u0440\u0441\u0435\u0442\u0456\u043b\u0456\u043c\u0434\u0435\u0440\u0434\u0456 \u049b\u043e\u0441\u0443 \u04af\u0448\u0456\u043d Media Browser \u0442\u0430\u0441\u0443\u0448\u044b\u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440 \u0442\u0443\u0440\u0430\u043b\u044b \u043c\u04d9\u043b\u0456\u043c\u0435\u0442\u0442\u0435\u0440\u0434\u0456 \u0436\u04af\u043a\u0442\u0435\u0443\u0456 \u043c\u04af\u043c\u043a\u0456\u043d.",
-    "LabelCustomRating": "Custom rating:",
+    "LabelAirTime:": "Air time:",
     "TabPreferences": "\u0422\u0435\u04a3\u0448\u0435\u043b\u0456\u043c\u0434\u0435\u0440",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Run time (minutes):",
     "TabPassword": "\u049a\u04b1\u043f\u0438\u044f \u0441\u04e9\u0437",
-    "LabelRevenue": "Revenue ($):",
+    "LabelParentalRating": "\u0416\u0430\u0441\u0442\u0430\u0441 \u0441\u0430\u043d\u0430\u0442\u044b:",
     "TabLibraryAccess": "\u0422\u0430\u0441\u0443\u0448\u044b\u0445\u0430\u043d\u0430\u0493\u0430 \u049b\u0430\u0442\u044b\u043d\u0430\u0441",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelCustomRating": "Custom rating:",
     "TabImage": "\u0421\u0443\u0440\u0435\u0442",
-    "LabelPlayers": "Players:",
+    "LabelBudget": "Budget",
     "TabProfile": "\u041f\u0440\u043e\u0444\u0438\u043b\u044c",
-    "Label3DFormat": "3D format:",
+    "LabelRevenue": "Revenue ($):",
     "TabMetadata": "\u041c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "LabelOriginalAspectRatio": "Original aspect ratio:",
     "TabImages": "\u0421\u0443\u0440\u0435\u0442\u0442\u0435\u0440",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "LabelPlayers": "Players:",
     "TabNotifications": "\u0425\u0430\u0431\u0430\u0440\u043b\u0430\u043d\u0434\u044b\u0440\u0443\u043b\u0430\u0440",
-    "HeaderExternalIds": "External Id's:",
+    "Label3DFormat": "3D format:",
     "TabCollectionTitles": "\u0422\u0443\u044b\u043d\u0434\u044b\u043b\u0430\u0440",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "HeaderAlternateEpisodeNumbers": "\u0411\u0430\u043b\u0430\u043c\u0430\u043b\u044b \u044d\u043f\u0438\u0437\u043e\u0434 \u043d\u04e9\u043c\u0456\u0440\u043b\u0435\u0440\u0456",
     "LabelDisplayMissingEpisodesWithinSeasons": "\u0416\u043e\u049b \u044d\u043f\u0438\u0437\u043e\u0434\u0442\u0430\u0440\u0434\u044b \u043c\u0430\u0443\u0441\u044b\u043c \u0456\u0448\u0456\u043d\u0434\u0435 \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0443",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "HeaderSpecialEpisodeInfo": "Special Episode Info",
     "LabelUnairedMissingEpisodesWithinSeasons": "\u041a\u04e9\u0440\u0441\u0435\u0442\u0456\u043b\u043c\u0435\u0433\u0435\u043d \u044d\u043f\u0438\u0437\u043e\u0434\u0442\u0430\u0440\u0434\u044b \u043c\u0430\u0443\u0441\u044b\u043c \u0456\u0448\u0456\u043d\u0434\u0435 \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0443",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "HeaderExternalIds": "External Id's:",
     "HeaderVideoPlaybackSettings": "\u0411\u0435\u0439\u043d\u0435 \u043e\u0439\u043d\u0430\u0442\u0443 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043b\u0435\u0440\u0456",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "DVD \u043c\u0430\u0443\u0441\u044b\u043c \u043d\u04e9\u043c\u0456\u0440\u0456",
     "HeaderPlaybackSettings": "\u041e\u0439\u043d\u0430\u0442\u0443 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043b\u0435\u0440\u0456",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "DVD \u044d\u043f\u0438\u0437\u043e\u0434 \u043d\u04e9\u043c\u0456\u0440\u0456",
     "LabelAudioLanguagePreference": "\u0414\u044b\u0431\u044b\u0441 \u0442\u0456\u043b\u0456\u043d\u0456\u04a3 \u0442\u0435\u04a3\u0448\u0435\u043b\u0456\u043c\u0456:",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "\u041d\u0430\u049b\u043f\u0430-\u043d\u0430\u049b \u044d\u043f\u0438\u0437\u043e\u0434 \u043d\u04e9\u043c\u0456\u0440\u0456",
     "LabelSubtitleLanguagePreference": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440 \u0442\u0456\u043b\u0456\u043d\u0456\u04a3 \u0442\u0435\u04a3\u0448\u0435\u043b\u0456\u043c\u0456:",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelAirsBeforeSeason": "Airs before season:",
     "OptionDefaultSubtitles": "\u04d8\u0434\u0435\u043f\u043a\u0456",
-    "LabelDisplayOrder": "Display order:",
+    "LabelAirsAfterSeason": "Airs after season:",
     "OptionOnlyForcedSubtitles": "\u0422\u0435\u043a \u049b\u0430\u043d\u0430 \u043c\u04d9\u0436\u0431\u04af\u0440\u043b\u0456 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440",
-    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelAirsBeforeEpisode": "Airs before episode:",
     "OptionAlwaysPlaySubtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440\u0434\u0456 \u04d9\u0440\u049b\u0430\u0448\u0430\u043d \u043e\u0439\u043d\u0430\u0442\u0443",
-    "HeaderCountries": "Countries",
+    "LabelTreatImageAs": "Treat image as:",
     "OptionNoSubtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440 \u0436\u043e\u049b",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "\u0411\u0435\u0439\u043d\u0435\u043b\u0435\u0443 \u0440\u0435\u0442\u0456:",
     "OptionDefaultSubtitlesHelp": "\u0422\u0456\u043b \u0442\u0435\u04a3\u0448\u0435\u043b\u0456\u043c\u0456\u043d\u0435 \u0441\u04d9\u0439\u043a\u0435\u0441 \u043a\u0435\u043b\u0433\u0435\u043d \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440 \u0434\u044b\u0431\u044b\u0441 \u0448\u0435\u0442\u0435\u043b \u0442\u0456\u043b\u0456\u043d\u0434\u0435 \u0431\u043e\u043b\u0493\u0430\u043d\u0434\u0430 \u0436\u04af\u043a\u0442\u0435\u043b\u0435\u0434\u0456.",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
     "OptionOnlyForcedSubtitlesHelp": "\u0422\u0435\u043a \u049b\u0430\u043d\u0430 \u043c\u04d9\u0436\u0431\u04af\u0440\u043b\u0456 \u0434\u0435\u043f \u0431\u0435\u043b\u0433\u0456\u043b\u0435\u043d\u0433\u0435\u043d \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440 \u0436\u04af\u043a\u0442\u0435\u043b\u0435\u0434\u0456.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "\u0415\u043b\u0434\u0435\u0440",
     "OptionAlwaysPlaySubtitlesHelp": "\u0422\u0456\u043b \u0442\u0435\u04a3\u0448\u0435\u043b\u0456\u043c\u0456\u043d\u0435 \u0441\u04d9\u0439\u043a\u0435\u0441 \u043a\u0435\u043b\u0433\u0435\u043d \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440 \u0434\u044b\u0431\u044b\u0441 \u0442\u0456\u043b\u0456\u043d\u0435 \u049b\u0430\u0442\u044b\u0441\u0441\u044b\u0437 \u0436\u04af\u043a\u0442\u0435\u043b\u0435\u0434\u0456.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "\u0416\u0430\u043d\u0440\u043b\u0430\u0440",
     "OptionNoSubtitlesHelp": "\u04d8\u0434\u0435\u043f\u043a\u0456\u0434\u0435 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440 \u0436\u04af\u043a\u0442\u0435\u043b\u043c\u0435\u0439\u0434\u0456.",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderPlotKeywords": "Plot Keywords",
     "TabProfiles": "\u041f\u0440\u043e\u0444\u0438\u043b\u044c\u0434\u0435\u0440",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "HeaderStudios": "\u0421\u0442\u0443\u0434\u0438\u044f\u043b\u0430\u0440",
     "TabSecurity": "\u049a\u0430\u0443\u0456\u043f\u0441\u0456\u0437\u0434\u0456\u043a",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u043d\u044b \u04af\u0441\u0442\u0435\u0443",
-    "TabSupporterClub": "Supporter Club",
+    "HeaderMetadataSettings": "Metadata Settings",
     "ButtonSave": "\u0421\u0430\u049b\u0442\u0430\u0443",
-    "HeaderDonationType": "Donation type:",
+    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
     "ButtonResetPassword": "\u049a\u04b1\u043f\u0438\u044f \u0441\u04e9\u0437\u0434\u0456 \u044b\u0441\u044b\u0440\u0443",
-    "OptionMakeOneTimeDonation": "Make a one-time donation",
+    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
     "LabelNewPassword": "\u0416\u0430\u04a3\u0430 \u049b\u04b1\u043f\u0438\u044f \u0441\u04e9\u0437",
-    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
+    "TabSupporterClub": "Supporter Club",
     "LabelNewPasswordConfirm": "\u0416\u0430\u04a3\u0430 \u049b\u04b1\u043f\u0438\u044f \u0441\u04e9\u0437\u0434\u0456 \u0440\u0430\u0441\u0442\u0430\u0443:",
-    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderDonationType": "Donation type:",
     "HeaderCreatePassword": "\u049a\u04b1\u043f\u0438\u044f \u0441\u04e9\u0437\u0434\u0456 \u0436\u0430\u0441\u0430\u0443",
-    "OptionNoTrailer": "No Trailer",
+    "OptionMakeOneTimeDonation": "Make a one-time donation",
     "LabelCurrentPassword": "\u0410\u0493\u044b\u043c\u0434\u0430\u0493\u044b \u049b\u04b1\u043f\u0438\u044f \u0441\u04e9\u0437:",
-    "OptionNoThemeSong": "No Theme Song",
+    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
     "LabelMaxParentalRating": "\u0420\u04b1\u049b\u0441\u0430\u0442 \u0435\u0442\u0456\u043b\u0433\u0435\u043d \u0435\u04a3 \u0436\u043e\u0493\u0430\u0440\u044b \u0436\u0430\u0441\u0442\u0430\u0441 \u0441\u0430\u043d\u0430\u0442\u044b:",
-    "OptionNoThemeVideo": "No Theme Video",
+    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
     "MaxParentalRatingHelp": "\u0411\u04b1\u043b \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u0434\u0430\u043d \u0436\u043e\u0493\u0430\u0440\u044b\u043b\u0430\u0443 \u0436\u0430\u0441\u0442\u0430\u0441 \u0441\u0430\u043d\u0430\u0442\u044b \u0431\u0430\u0440 \u043c\u0430\u0437\u043c\u04b1\u043d \u0436\u0430\u0441\u044b\u0440\u044b\u043b\u0430\u0434\u044b",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "OptionNoTrailer": "No Trailer",
     "LibraryAccessHelp": "\u0411\u04b1\u043b \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u043c\u0435\u043d \u043e\u0440\u0442\u0430\u049b\u0442\u0430\u0441\u0443 \u04af\u0448\u0456\u043d \u0442\u0430\u0441\u0443\u0448\u044b \u049b\u0430\u043b\u0442\u0430\u043b\u0430\u0440\u0434\u044b \u0431\u04e9\u043b\u0435\u043a\u0442\u0435\u04a3\u0456\u0437. \u041c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a \u0431\u0430\u0441\u049b\u0430\u0440\u0443\u0448\u044b\u043d\u044b \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u044b\u043f \u04d9\u043a\u0456\u043c\u0448\u0456\u043b\u0435\u0440 \u0431\u0430\u0440\u043b\u044b\u049b \u049b\u0430\u043b\u0442\u0430\u043b\u0430\u0440\u0434\u044b \u04e9\u04a3\u0434\u0435\u0443\u0456 \u043c\u04af\u043c\u043a\u0456\u043d.",
+    "OptionNoThemeSong": "No Theme Song",
     "ChannelAccessHelp": "\u0411\u04b1\u043b \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u043c\u0435\u043d \u043e\u0440\u0442\u0430\u049b\u0442\u0430\u0441\u0443 \u04af\u0448\u0456\u043d \u0430\u0440\u043d\u0430\u043b\u0430\u0440\u0434\u044b \u0431\u04e9\u043b\u0435\u043a\u0442\u0435\u04a3\u0456\u0437. \u041c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a \u0431\u0430\u0441\u049b\u0430\u0440\u0443\u0448\u044b\u043d\u044b \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u044b\u043f \u04d9\u043a\u0456\u043c\u0448\u0456\u043b\u0435\u0440 \u0431\u0430\u0440\u043b\u044b\u049b \u0430\u0440\u043d\u0430\u043b\u0430\u0440\u0434\u044b \u04e9\u04a3\u0434\u0435\u0443\u0456 \u043c\u04af\u043c\u043a\u0456\u043d.",
+    "OptionNoThemeVideo": "No Theme Video",
     "ButtonDeleteImage": "\u0421\u0443\u0440\u0435\u0442\u0442\u0456 \u0436\u043e\u044e",
+    "LabelOneTimeDonationAmount": "Donation amount:",
     "LabelSelectUsers": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u043b\u0430\u0440\u0434\u044b \u0442\u0430\u04a3\u0434\u0430\u0443:",
+    "OptionActor": "Actor",
     "ButtonUpload": "\u041a\u0435\u0440\u0456 \u049b\u043e\u0442\u0430\u0440\u0443",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "\u0416\u0430\u04a3\u0430 \u0441\u0443\u0440\u0435\u0442\u0442\u0456 \u043a\u0435\u0440\u0456 \u049b\u043e\u0442\u0430\u0440\u0443",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "\u0421\u0443\u0440\u0435\u0442\u0442\u0456 \u043c\u04b1\u043d\u0434\u0430 \u0441\u04af\u0439\u0440\u0435\u0442\u0456\u04a3\u0456\u0437",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "1:1 \u043f\u0456\u0448\u0456\u043c\u0434\u0456\u043a \u0430\u0440\u0430\u049b\u0430\u0442\u044b\u043d\u0430\u0441\u044b \u04b1\u0441\u044b\u043d\u044b\u043b\u0430\u0434\u044b. \u0422\u0435\u043a \u049b\u0430\u043d\u0430 JPG\/PNG.",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "\u041e\u0441\u044b\u043d\u0434\u0430 \u0435\u0448\u0442\u0435\u043c\u0435 \u0436\u043e\u049b.",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "\u0418\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u0442\u0435\u043d \u043c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a\u0442\u0456 \u0436\u04af\u043a\u0442\u0435\u043f \u0430\u043b\u0443\u044b \u049b\u043e\u0441\u044b\u043b\u0493\u0430\u043d\u044b\u043d \u0442\u0435\u043a\u0441\u0435\u0440\u0456\u04a3\u0456\u0437.",
     "TabSuggested": "\u04b0\u0441\u044b\u043d\u044b\u043b\u0493\u0430\u043d",
     "TabLatest": "\u0415\u04a3 \u043a\u0435\u0439\u0456\u043d\u0433\u0456",
@@ -212,7 +221,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": "Release Date",
+    "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",
@@ -262,7 +271,7 @@
     "TabMovies": "\u0424\u0438\u043b\u044c\u043c\u0434\u0435\u0440",
     "TabStudios": "\u0421\u0442\u0443\u0434\u0438\u044f\u043b\u0430\u0440",
     "TabTrailers": "\u0422\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440",
-    "LabelArtists": "Artists:",
+    "LabelArtists": "\u041e\u0440\u044b\u043d\u0434\u0430\u0443\u0448\u044b\u043b\u0430\u0440:",
     "LabelArtistsHelp": "Separate multiple using ;",
     "HeaderLatestMovies": "\u0415\u04a3 \u043a\u0435\u0439\u0456\u043d\u0433\u0456 \u0444\u0438\u043b\u044c\u043c\u0434\u0435\u0440",
     "HeaderLatestTrailers": "\u0415\u04a3 \u043a\u0435\u0439\u0456\u043d\u0433\u0456 \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440",
@@ -397,9 +406,9 @@
     "HeaderUpcomingTV": "\u041a\u04af\u0442\u0456\u043b\u0433\u0435\u043d \u0422\u0414",
     "TabStatus": "\u041a\u04af\u0439",
     "TabSettings": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043b\u0435\u0440",
-    "ButtonRefreshGuideData": "\u0422\u0414 \u043a\u0435\u0441\u0442\u0435\u0441\u0456 \u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440\u0456\u043d \u0436\u0430\u04a3\u0430\u0440\u0442\u0443",
-    "ButtonRefresh": "\u0416\u0430\u04a3\u0430\u0440\u0442\u0443",
-    "ButtonAdvancedRefresh": "Advanced Refresh",
+    "ButtonRefreshGuideData": "\u0422\u0414 \u043a\u0435\u0441\u0442\u0435\u0441\u0456 \u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440\u0456\u043d \u043a\u04e9\u043a\u0435\u0439\u0442\u0435\u0441\u0442\u0456 \u0435\u0442\u0443",
+    "ButtonRefresh": "\u041a\u04e9\u043a\u0435\u0439\u0442\u0435\u0441\u0442\u0456 \u0435\u0442\u0443",
+    "ButtonAdvancedRefresh": "\u041a\u0435\u04a3\u0435\u0439\u0442\u0456\u043b\u0433\u0435\u043d \u043a\u04e9\u043a\u0435\u0439\u0442\u0435\u0441\u0442\u0456 \u0435\u0442\u0443",
     "OptionPriority": "\u041f\u0440\u0438\u043e\u0440\u0438\u0442\u0435\u0442",
     "OptionRecordOnAllChannels": "\u0411\u0435\u0440\u0456\u043b\u0456\u043c\u0434\u0456 \u0431\u0430\u0440\u043b\u044b\u049b \u0430\u0440\u043d\u0430\u043b\u0430\u0440\u0434\u0430\u043d \u0436\u0430\u0437\u044b\u043f \u0430\u043b\u0443",
     "OptionRecordAnytime": "\u0411\u0435\u0440\u0456\u043b\u0456\u043c\u0434\u0456 \u04d9\u0440 \u0443\u0430\u049b\u044b\u0442\u0442\u0430 \u0436\u0430\u0437\u044b\u043f \u0430\u043b\u0443",
@@ -497,7 +506,7 @@
     "OptionSpecialEpisode": "\u0410\u0440\u043d\u0430\u0439\u044b\u043b\u0430\u0440",
     "OptionMissingEpisode": "\u0416\u043e\u049b \u044d\u043f\u0438\u0437\u043e\u0434\u0442\u0430\u0440",
     "OptionUnairedEpisode": "\u041a\u04e9\u0440\u0441\u0435\u0442\u0456\u043b\u043c\u0435\u0433\u0435\u043d \u044d\u043f\u0438\u0437\u043e\u0434\u0442\u0430\u0440",
-    "OptionEpisodeSortName": "\u042d\u043f\u0438\u0437\u043e\u0434 \u0441\u04b1\u0440\u044b\u043f\u0442\u0430\u0443 \u0430\u0442\u044b",
+    "OptionEpisodeSortName": "\u042d\u043f\u0438\u0437\u043e\u0434\u0442\u044b\u04a3 \u0441\u04b1\u0440\u044b\u043f\u0442\u0430\u043b\u0430\u0442\u044b\u043d \u0430\u0442\u044b",
     "OptionSeriesSortName": "\u0421\u0435\u0440\u0438\u0430\u043b \u0430\u0442\u044b",
     "OptionTvdbRating": "Tvdb \u0431\u0430\u0493\u0430\u043b\u0430\u0443\u044b",
     "HeaderTranscodingQualityPreference": "\u049a\u0430\u0439\u0442\u0430 \u043a\u043e\u0434\u0442\u0430\u0443 \u0441\u0430\u043f\u0430\u0441\u044b\u043d\u044b\u04a3 \u0442\u0435\u04a3\u0448\u0435\u043b\u0456\u043c\u0456:",
@@ -570,8 +579,8 @@
     "LabelSkipped": "\u04e8\u0442\u043a\u0456\u0437\u0456\u043b\u0433\u0435\u043d",
     "HeaderEpisodeOrganization": "\u042d\u043f\u0438\u0437\u043e\u0434\u0442\u044b \u04b1\u0439\u044b\u043c\u0434\u0430\u0441\u0442\u044b\u0440\u0443",
     "LabelSeries": "\u0421\u0435\u0440\u0438\u0430\u043b:",
-    "LabelSeasonNumber": "Season number",
-    "LabelEpisodeNumber": "Episode number",
+    "LabelSeasonNumber": "\u041c\u0430\u0443\u0441\u044b\u043c \u043d\u04e9\u043c\u0456\u0440\u0456",
+    "LabelEpisodeNumber": "\u042d\u043f\u0438\u0437\u043e\u0434 \u043d\u04e9\u043c\u0456\u0440\u0456",
     "LabelEndingEpisodeNumber": "\u0410\u044f\u049b\u0442\u0430\u0443\u0448\u044b \u044d\u043f\u0438\u0437\u043e\u0434\u0442\u044b\u04a3 \u043d\u04e9\u043c\u0456\u0440\u0456",
     "LabelEndingEpisodeNumberHelp": "\u0411\u04b1\u043b \u0442\u0435\u043a \u049b\u0430\u043d\u0430 \u0431\u0456\u0440\u043d\u0435\u0448\u0435 \u044d\u043f\u0438\u0437\u043e\u0434\u044b \u0431\u0430\u0440 \u0444\u0430\u0439\u043b\u0434\u0430\u0440 \u04af\u0448\u0456\u043d",
     "HeaderSupportTheTeam": "Media Browser \u0442\u043e\u0431\u044b\u043d \u049b\u043e\u043b\u0434\u0430\u0443",
@@ -735,7 +744,7 @@
     "LabelProfileContainersHelp": "\u04ae\u0442\u0456\u0440 \u0430\u0440\u049b\u044b\u043b\u044b \u0431\u04e9\u043b\u0456\u043f \u0430\u043b\u044b\u043d\u0493\u0430\u043d. \u0411\u0430\u0440\u043b\u044b\u049b \u043a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440\u043b\u0435\u0440\u0433\u0435 \u049b\u043e\u043b\u0434\u0430\u043d\u0443 \u04af\u0448\u0456\u043d \u0431\u04b1\u043b \u0431\u043e\u0441 \u049b\u0430\u043b\u0434\u044b\u0440\u044b\u043b\u0443 \u043c\u04af\u043c\u043a\u0456\u043d.",
     "HeaderResponseProfile": "\u04ae\u043d \u049b\u0430\u0442\u0443 \u043f\u0440\u043e\u0444\u0430\u0439\u043b\u044b",
     "LabelType": "\u0422\u04af\u0440\u0456:",
-    "LabelPersonRole": "Role:",
+    "LabelPersonRole": "\u0420\u04e9\u043b\u0456:",
     "LabelPersonRoleHelp": "Role is generally only applicable to actors.",
     "LabelProfileContainer": "\u041a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440:",
     "LabelProfileVideoCodecs": "\u0411\u0435\u0439\u043d\u0435\u043b\u0456\u043a \u043a\u043e\u0434\u0435\u043a\u0442\u0435\u0440:",
@@ -758,7 +767,7 @@
     "OptionPlainVideoItems": "\u0411\u0430\u0440\u043b\u044b\u049b \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0440\u0434\u0456 \u0436\u0430\u0439 \u0431\u0435\u0439\u043d\u0435 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0442\u0435\u0440\u0456 \u0440\u0435\u0442\u0456\u043d\u0434\u0435 \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0443",
     "OptionPlainVideoItemsHelp": "\u049a\u043e\u0441\u044b\u043b\u0493\u0430\u043d\u0434\u0430, \u0431\u0430\u0440\u043b\u044b\u049b \u049b\u0430\u043b\u0442\u0430\u043b\u0430\u0440 DIDL \u0456\u0448\u0456\u043d\u0434\u0435 \"object.item.videoItem.movie\" \u0441\u0438\u044f\u049b\u0442\u044b \u043d\u0430\u049b\u0442\u044b\u043b\u0430\u0443 \u0442\u04af\u0440\u0456\u043d\u0456\u04a3 \u043e\u0440\u043d\u044b\u043d\u0430  \"object.item.videoItem\" \u0431\u043e\u043b\u044b\u043f \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u043d\u0435\u0434\u0456.",
     "LabelSupportedMediaTypes": "\u049a\u043e\u043b\u0434\u0430\u0443\u0434\u0430\u0493\u044b \u0442\u0430\u0441\u0443\u0448\u044b\u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440 \u0442\u04af\u0440\u043b\u0435\u0440\u0456:",
-    "TabIdentification": "\u0410\u043d\u044b\u049b\u0442\u0430\u043c\u0430",
+    "TabIdentification": "\u0410\u043d\u044b\u049b\u0442\u0430\u0443",
     "TabDirectPlay": "\u0422\u0456\u043a\u0435\u043b\u0435\u0439 \u043e\u0439\u043d\u0430\u0442\u0443",
     "TabContainers": "\u041a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440\u043b\u0435\u0440",
     "TabCodecs": "\u041a\u043e\u0434\u0435\u043a\u0442\u0435\u0440",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "\u041f\u043b\u0430\u0433\u0438\u043d\u0434\u0435\u0440\u0434\u0456 \u043c\u044b\u043d\u0430\u0493\u0430\u043d \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0443:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "\u042d\u043f\u0438\u0437\u043e\u0434 \u0430\u0442\u044b",
-    "LabelSeriesName": "\u0421\u0435\u0440\u0438\u0430\u043b \u0430\u0442\u044b",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "\u0421\u0435\u0440\u0438\u0430\u043b.\u0430\u0442\u044b",
     "ValueSeriesNameUnderscore": "\u0421\u0435\u0440\u0438\u0430\u043b_\u0430\u0442\u044b",
     "ValueEpisodeNamePeriod": "\u042d\u043f\u0438\u0437\u043e\u0434.\u0430\u0442\u044b",
     "ValueEpisodeNameUnderscore": "\u042d\u043f\u0438\u0437\u043e\u0434_\u0430\u0442\u044b",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "\u041c\u04d9\u0442\u0456\u043d\u0434\u0456 \u0435\u043d\u0433\u0456\u0437\u0443",
     "LabelTypeText": "\u041c\u04d9\u0442\u0456\u043d",
     "HeaderSearchForSubtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440\u0434\u0456 \u0456\u0437\u0434\u0435\u0443",
@@ -970,7 +982,7 @@
     "LabelAppNameExample": "\u041c\u044b\u0441\u0430\u043b\u044b: Sickbeard, NzbDrone",
     "HeaderNewApiKeyHelp": "Media Browser \u0431\u0430\u0493\u0434\u0430\u0440\u043b\u0430\u043c\u0430\u0441\u044b\u043c\u0435\u043d \u049b\u0430\u0442\u044b\u043d\u0430\u0441\u0443 \u049b\u04b1\u049b\u044b\u049b\u044b\u0493\u044b \u04af\u0448\u0456\u043d \u049b\u043e\u043b\u0434\u0430\u043d\u0431\u0430\u0493\u0430 \u0440\u04b1\u049b\u0441\u0430\u0442 \u0435\u0442\u0443.",
     "HeaderHttpHeaders": "HTTP \u04af\u0441\u0442\u0456\u04a3\u0433\u0456 \u0434\u0435\u0440\u0435\u043a\u0442\u0435\u043c\u0435\u043b\u0435\u0440\u0456",
-    "HeaderIdentificationHeader": "\u0410\u043d\u044b\u049b\u0442\u0430\u043c\u0430\u043d\u044b\u04a3 \u04af\u0441\u0442\u0456\u04a3\u0433\u0456 \u0434\u0435\u0440\u0435\u043a\u0442\u0435\u043c\u0435\u0441\u0456",
+    "HeaderIdentificationHeader": "\u0410\u043d\u044b\u049b\u0442\u0430\u0443\u0434\u044b\u04a3 \u04af\u0441\u0442\u0456\u04a3\u0433\u0456 \u0434\u0435\u0440\u0435\u043a\u0442\u0435\u043c\u0435\u0441\u0456",
     "LabelValue": "\u041c\u04d9\u043d\u0456:",
     "LabelMatchType": "\u0421\u04d9\u0439\u043a\u0435\u0441 \u0442\u04af\u0440\u0456:",
     "OptionEquals": "\u0422\u0435\u04a3",
@@ -981,11 +993,11 @@
     "TabFilter": "\u0421\u04af\u0437\u0443",
     "ButtonView": "\u049a\u0430\u0440\u0430\u0443",
     "LabelPageSize": "\u042d\u043b\u0435\u043c\u0435\u043d\u0442\u0442\u0435\u0440 \u0448\u0435\u0433\u0456:",
-    "LabelPath": "Path:",
+    "LabelPath": "\u0416\u043e\u043b\u044b:",
     "LabelView": "\u041a\u04e9\u0440\u0456\u043d\u0456\u0441:",
     "TabUsers": "\u041f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u043b\u0430\u0440",
-    "LabelSortName": "Sort name:",
-    "LabelDateAdded": "Date added:",
+    "LabelSortName": "\u0421\u04b1\u0440\u044b\u043f\u0442\u0430\u043b\u0430\u0442\u044b\u043d \u0430\u0442\u044b:",
+    "LabelDateAdded": "\u04ae\u0441\u0442\u0435\u043b\u0433\u0435\u043d \u043a\u04af\u043d-\u0430\u0439\u044b",
     "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",
@@ -1078,8 +1090,5 @@
     "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",
-    "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;"
+    "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 68b02a033..509905cd8 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ko.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ko.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Composers",
+    "HeaderRecentActivity": "Recent Activity",
     "LabelExit": "Schweinsteiger",
-    "OptionOthers": "Others",
+    "HeaderPeople": "People",
     "LabelVisitCommunity": "Visit Community",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
     "LabelGithubWiki": "Github Wiki",
-    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "OptionComposers": "Composers",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "Folders",
+    "OptionOthers": "Others",
     "LabelStandard": "Standard",
-    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelViewApiDocumentation": "View Api Documentation",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
     "LabelBrowseLibrary": "Browse Library",
-    "ViewTypeLiveTvChannels": "Channels",
+    "ViewTypeFolders": "Folders",
     "LabelConfigureMediaBrowser": "Configure Media Browser",
-    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelOpenLibraryViewer": "Open Library Viewer",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
     "LabelRestartServer": "Restart Server",
-    "HeaderPassword": "Password",
+    "ViewTypeLiveTvChannels": "Channels",
     "LabelShowLogWindow": "Show Log Window",
-    "HeaderLocalAccess": "Local Access",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
     "LabelPrevious": "Previous",
-    "HeaderViewOrder": "View Order",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
     "LabelFinish": "Finish",
-    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
+    "HeaderPassword": "Password",
     "LabelNext": "Next",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "HeaderLocalAccess": "Local Access",
     "LabelYoureDone": "You're Done!",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "HeaderViewOrder": "View Order",
     "WelcomeToMediaBrowser": "Welcome to Media Browser!",
-    "OptionDownloadMissingImages": "Download missing images",
+    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "TitleMediaBrowser": "Media Browser",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "ThisWizardWillGuideYou": "This wizard will help guide you through the setup process. To begin, please select your preferred language.",
-    "OptionRefreshAllData": "Refresh all data",
+    "LabelImageRefreshMode": "Image refresh mode:",
     "TellUsAboutYourself": "Tell us about yourself",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionDownloadMissingImages": "Download missing images",
     "LabelYourFirstName": "Your first name:",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionReplaceExistingImages": "Replace existing images",
     "MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "OptionRefreshAllData": "Refresh all data",
     "UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
-    "HeaderPersonInfo": "Person Info",
+    "OptionAddMissingDataOnly": "Add missing data only",
     "LabelWindowsService": "Windows Service",
-    "HeaderIdentifyItem": "Identify Item",
+    "OptionLocalRefreshOnly": "Local refresh only",
     "AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderRefreshMetadata": "Refresh Metadata",
     "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.",
-    "HeaderConfirmDeletion": "Confirm Deletion",
+    "HeaderPersonInfo": "Person Info",
     "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.",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "HeaderIdentifyItem": "Identify Item",
     "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>.",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
     "LabelConfigureSettings": "Configure settings",
-    "ButtonIdentify": "Identify",
+    "HeaderConfirmDeletion": "Confirm Deletion",
     "LabelEnableVideoImageExtraction": "Enable video image extraction",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
     "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.",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
     "LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
-    "LabelCommunityRating": "Community rating:",
+    "ButtonIdentify": "Identify",
     "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.",
-    "LabelVoteCount": "Vote count:",
+    "LabelAlbumArtist": "Album artist:",
     "LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCommunityRating": "Community rating:",
     "ButtonOk": "Ok",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelVoteCount": "Vote count:",
     "ButtonCancel": "Cancel",
-    "LabelAwardSummary": "Award summary:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "New",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Critic rating:",
     "HeaderSetupLibrary": "Setup your media library",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Critic rating summary:",
     "ButtonAddMediaFolder": "Add media folder",
-    "LabelOverview": "Overview:",
+    "LabelAwardSummary": "Award summary:",
     "LabelFolderType": "Folder type:",
-    "LabelShortOverview": "Short overview:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
-    "LabelReleaseDate": "Release date:",
+    "LabelTagline": "Tagline:",
     "ReferToMediaLibraryWiki": "Refer to the media library wiki.",
-    "LabelYear": "Year:",
+    "LabelOverview": "Overview:",
     "LabelCountry": "Country:",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelShortOverview": "Short overview:",
     "LabelLanguage": "Language:",
-    "LabelEndDate": "End date:",
+    "LabelReleaseDate": "Release date:",
     "HeaderPreferredMetadataLanguage": "Preferred metadata language:",
-    "LabelAirDate": "Air days:",
+    "LabelYear": "Year:",
     "LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
-    "LabelAirTime:": "Air time:",
+    "LabelPlaceOfBirth": "Place of birth:",
     "LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelEndDate": "End date:",
     "LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
-    "LabelParentalRating": "Parental rating:",
+    "LabelAirDate": "Air days:",
     "LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations.",
-    "LabelCustomRating": "Custom rating:",
+    "LabelAirTime:": "Air time:",
     "TabPreferences": "Preferences",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Run time (minutes):",
     "TabPassword": "Password",
-    "LabelRevenue": "Revenue ($):",
+    "LabelParentalRating": "Parental rating:",
     "TabLibraryAccess": "Library Access",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelCustomRating": "Custom rating:",
     "TabImage": "Image",
-    "LabelPlayers": "Players:",
+    "LabelBudget": "Budget",
     "TabProfile": "Profile",
-    "Label3DFormat": "3D format:",
+    "LabelRevenue": "Revenue ($):",
     "TabMetadata": "Metadata",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "LabelOriginalAspectRatio": "Original aspect ratio:",
     "TabImages": "Images",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "LabelPlayers": "Players:",
     "TabNotifications": "Notifications",
-    "HeaderExternalIds": "External Id's:",
+    "Label3DFormat": "3D format:",
     "TabCollectionTitles": "Titles",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
     "LabelDisplayMissingEpisodesWithinSeasons": "Display missing episodes within seasons",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "HeaderSpecialEpisodeInfo": "Special Episode Info",
     "LabelUnairedMissingEpisodesWithinSeasons": "Display unaired episodes within seasons",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "HeaderExternalIds": "External Id's:",
     "HeaderVideoPlaybackSettings": "Video Playback Settings",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "Dvd season number:",
     "HeaderPlaybackSettings": "Playback Settings",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "Dvd episode number:",
     "LabelAudioLanguagePreference": "Audio language preference:",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
     "LabelSubtitleLanguagePreference": "Subtitle language preference:",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelAirsBeforeSeason": "Airs before season:",
     "OptionDefaultSubtitles": "Default",
-    "LabelDisplayOrder": "Display order:",
+    "LabelAirsAfterSeason": "Airs after season:",
     "OptionOnlyForcedSubtitles": "Only forced subtitles",
-    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelAirsBeforeEpisode": "Airs before episode:",
     "OptionAlwaysPlaySubtitles": "Always play subtitles",
-    "HeaderCountries": "Countries",
+    "LabelTreatImageAs": "Treat image as:",
     "OptionNoSubtitles": "No Subtitles",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "Display order:",
     "OptionDefaultSubtitlesHelp": "Subtitles matching the language preference will be loaded when the audio is in a foreign language.",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
     "OptionOnlyForcedSubtitlesHelp": "Only subtitles marked as forced will be loaded.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "Countries",
     "OptionAlwaysPlaySubtitlesHelp": "Subtitles matching the language preference will be loaded regardless of the audio language.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "Genres",
     "OptionNoSubtitlesHelp": "Subtitles will not be loaded by default.",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderPlotKeywords": "Plot Keywords",
     "TabProfiles": "Profiles",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "HeaderStudios": "Studios",
     "TabSecurity": "Security",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "Add User",
-    "TabSupporterClub": "Supporter Club",
+    "HeaderMetadataSettings": "Metadata Settings",
     "ButtonSave": "Save",
-    "HeaderDonationType": "Donation type:",
+    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
     "ButtonResetPassword": "Reset Password",
-    "OptionMakeOneTimeDonation": "Make a one-time donation",
+    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
     "LabelNewPassword": "New password:",
-    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
+    "TabSupporterClub": "Supporter Club",
     "LabelNewPasswordConfirm": "New password confirm:",
-    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderDonationType": "Donation type:",
     "HeaderCreatePassword": "Create Password",
-    "OptionNoTrailer": "No Trailer",
+    "OptionMakeOneTimeDonation": "Make a one-time donation",
     "LabelCurrentPassword": "Current password:",
-    "OptionNoThemeSong": "No Theme Song",
+    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
     "LabelMaxParentalRating": "Maximum allowed parental rating:",
-    "OptionNoThemeVideo": "No Theme Video",
+    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
     "MaxParentalRatingHelp": "Content with a higher rating will be hidden from this user.",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "OptionNoTrailer": "No Trailer",
     "LibraryAccessHelp": "Select the media folders to share with this user. Administrators will be able to edit all folders using the metadata manager.",
+    "OptionNoThemeSong": "No Theme Song",
     "ChannelAccessHelp": "Select the channels to share with this user. Administrators will be able to edit all channels using the metadata manager.",
+    "OptionNoThemeVideo": "No Theme Video",
     "ButtonDeleteImage": "Delete Image",
+    "LabelOneTimeDonationAmount": "Donation amount:",
     "LabelSelectUsers": "Select users:",
+    "OptionActor": "Actor",
     "ButtonUpload": "Upload",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "Upload New Image",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "Drop image here",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG\/PNG only.",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "Nothing here.",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "Please ensure downloading of internet metadata is enabled.",
     "TabSuggested": "Suggested",
     "TabLatest": "Latest",
@@ -570,9 +579,9 @@
     "LabelSkipped": "Skipped",
     "HeaderEpisodeOrganization": "Episode Organization",
     "LabelSeries": "Series:",
-    "LabelSeasonNumber": "Season number",
-    "LabelEpisodeNumber": "Episode number",
-    "LabelEndingEpisodeNumber": "Ending episode number",
+    "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)",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Display plugins for:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Episode name",
-    "LabelSeriesName": "Series name",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Series.name",
     "ValueSeriesNameUnderscore": "Series_name",
     "ValueEpisodeNamePeriod": "Episode.name",
     "ValueEpisodeNameUnderscore": "Episode_name",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Enter Text",
     "LabelTypeText": "Text",
     "HeaderSearchForSubtitles": "Search for Subtitles",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "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:"
+    "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 b9b8878d1..cd8e91d58 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ms.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ms.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Composers",
+    "HeaderRecentActivity": "Recent Activity",
     "LabelExit": "Tutup",
-    "OptionOthers": "Others",
+    "HeaderPeople": "People",
     "LabelVisitCommunity": "Melawat Masyarakat",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
     "LabelGithubWiki": "Github Wiki",
-    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "OptionComposers": "Composers",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "Folders",
+    "OptionOthers": "Others",
     "LabelStandard": "Biasa",
-    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelViewApiDocumentation": "Melihat Dokumentasi Api",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
     "LabelBrowseLibrary": "Imbas Pengumpulan",
-    "ViewTypeLiveTvChannels": "Channels",
+    "ViewTypeFolders": "Folders",
     "LabelConfigureMediaBrowser": "Konfigurasi Media Browser",
-    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelOpenLibraryViewer": "Open Library Viewer",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
     "LabelRestartServer": "Restart Server",
-    "HeaderPassword": "Password",
+    "ViewTypeLiveTvChannels": "Channels",
     "LabelShowLogWindow": "Show Log Window",
-    "HeaderLocalAccess": "Local Access",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
     "LabelPrevious": "Sebelumnya",
-    "HeaderViewOrder": "View Order",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
     "LabelFinish": "Habis",
-    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
+    "HeaderPassword": "Password",
     "LabelNext": "Seterusnya",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "HeaderLocalAccess": "Local Access",
     "LabelYoureDone": "Kamu Selesai!",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "HeaderViewOrder": "View Order",
     "WelcomeToMediaBrowser": "Welcome to Media Browser!",
-    "OptionDownloadMissingImages": "Download missing images",
+    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "TitleMediaBrowser": "Media Browser",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "ThisWizardWillGuideYou": "This wizard will help guide you through the setup process. To begin, please select your preferred language.",
-    "OptionRefreshAllData": "Refresh all data",
+    "LabelImageRefreshMode": "Image refresh mode:",
     "TellUsAboutYourself": "Tell us about yourself",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionDownloadMissingImages": "Download missing images",
     "LabelYourFirstName": "Your first name:",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionReplaceExistingImages": "Replace existing images",
     "MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "OptionRefreshAllData": "Refresh all data",
     "UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
-    "HeaderPersonInfo": "Person Info",
+    "OptionAddMissingDataOnly": "Add missing data only",
     "LabelWindowsService": "Windows Service",
-    "HeaderIdentifyItem": "Identify Item",
+    "OptionLocalRefreshOnly": "Local refresh only",
     "AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderRefreshMetadata": "Refresh Metadata",
     "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.",
-    "HeaderConfirmDeletion": "Confirm Deletion",
+    "HeaderPersonInfo": "Person Info",
     "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.",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "HeaderIdentifyItem": "Identify Item",
     "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>.",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
     "LabelConfigureSettings": "Configure settings",
-    "ButtonIdentify": "Identify",
+    "HeaderConfirmDeletion": "Confirm Deletion",
     "LabelEnableVideoImageExtraction": "Enable video image extraction",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
     "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.",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
     "LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
-    "LabelCommunityRating": "Community rating:",
+    "ButtonIdentify": "Identify",
     "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.",
-    "LabelVoteCount": "Vote count:",
+    "LabelAlbumArtist": "Album artist:",
     "LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCommunityRating": "Community rating:",
     "ButtonOk": "Ok",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelVoteCount": "Vote count:",
     "ButtonCancel": "Cancel",
-    "LabelAwardSummary": "Award summary:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "New",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Critic rating:",
     "HeaderSetupLibrary": "Setup your media library",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Critic rating summary:",
     "ButtonAddMediaFolder": "Add media folder",
-    "LabelOverview": "Overview:",
+    "LabelAwardSummary": "Award summary:",
     "LabelFolderType": "Folder type:",
-    "LabelShortOverview": "Short overview:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
-    "LabelReleaseDate": "Release date:",
+    "LabelTagline": "Tagline:",
     "ReferToMediaLibraryWiki": "Refer to the media library wiki.",
-    "LabelYear": "Year:",
+    "LabelOverview": "Overview:",
     "LabelCountry": "Country:",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelShortOverview": "Short overview:",
     "LabelLanguage": "Language:",
-    "LabelEndDate": "End date:",
+    "LabelReleaseDate": "Release date:",
     "HeaderPreferredMetadataLanguage": "Preferred metadata language:",
-    "LabelAirDate": "Air days:",
+    "LabelYear": "Year:",
     "LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
-    "LabelAirTime:": "Air time:",
+    "LabelPlaceOfBirth": "Place of birth:",
     "LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelEndDate": "End date:",
     "LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
-    "LabelParentalRating": "Parental rating:",
+    "LabelAirDate": "Air days:",
     "LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations.",
-    "LabelCustomRating": "Custom rating:",
+    "LabelAirTime:": "Air time:",
     "TabPreferences": "Preferences",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Run time (minutes):",
     "TabPassword": "Password",
-    "LabelRevenue": "Revenue ($):",
+    "LabelParentalRating": "Parental rating:",
     "TabLibraryAccess": "Library Access",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelCustomRating": "Custom rating:",
     "TabImage": "Image",
-    "LabelPlayers": "Players:",
+    "LabelBudget": "Budget",
     "TabProfile": "Profile",
-    "Label3DFormat": "3D format:",
+    "LabelRevenue": "Revenue ($):",
     "TabMetadata": "Metadata",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "LabelOriginalAspectRatio": "Original aspect ratio:",
     "TabImages": "Images",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "LabelPlayers": "Players:",
     "TabNotifications": "Notifications",
-    "HeaderExternalIds": "External Id's:",
+    "Label3DFormat": "3D format:",
     "TabCollectionTitles": "Titles",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
     "LabelDisplayMissingEpisodesWithinSeasons": "Display missing episodes within seasons",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "HeaderSpecialEpisodeInfo": "Special Episode Info",
     "LabelUnairedMissingEpisodesWithinSeasons": "Display unaired episodes within seasons",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "HeaderExternalIds": "External Id's:",
     "HeaderVideoPlaybackSettings": "Video Playback Settings",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "Dvd season number:",
     "HeaderPlaybackSettings": "Playback Settings",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "Dvd episode number:",
     "LabelAudioLanguagePreference": "Audio language preference:",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
     "LabelSubtitleLanguagePreference": "Subtitle language preference:",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelAirsBeforeSeason": "Airs before season:",
     "OptionDefaultSubtitles": "Default",
-    "LabelDisplayOrder": "Display order:",
+    "LabelAirsAfterSeason": "Airs after season:",
     "OptionOnlyForcedSubtitles": "Only forced subtitles",
-    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelAirsBeforeEpisode": "Airs before episode:",
     "OptionAlwaysPlaySubtitles": "Always play subtitles",
-    "HeaderCountries": "Countries",
+    "LabelTreatImageAs": "Treat image as:",
     "OptionNoSubtitles": "No Subtitles",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "Display order:",
     "OptionDefaultSubtitlesHelp": "Subtitles matching the language preference will be loaded when the audio is in a foreign language.",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
     "OptionOnlyForcedSubtitlesHelp": "Only subtitles marked as forced will be loaded.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "Countries",
     "OptionAlwaysPlaySubtitlesHelp": "Subtitles matching the language preference will be loaded regardless of the audio language.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "Genres",
     "OptionNoSubtitlesHelp": "Subtitles will not be loaded by default.",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderPlotKeywords": "Plot Keywords",
     "TabProfiles": "Profiles",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "HeaderStudios": "Studios",
     "TabSecurity": "Security",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "Add User",
-    "TabSupporterClub": "Supporter Club",
+    "HeaderMetadataSettings": "Metadata Settings",
     "ButtonSave": "Save",
-    "HeaderDonationType": "Donation type:",
+    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
     "ButtonResetPassword": "Reset Password",
-    "OptionMakeOneTimeDonation": "Make a one-time donation",
+    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
     "LabelNewPassword": "New password:",
-    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
+    "TabSupporterClub": "Supporter Club",
     "LabelNewPasswordConfirm": "New password confirm:",
-    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderDonationType": "Donation type:",
     "HeaderCreatePassword": "Create Password",
-    "OptionNoTrailer": "No Trailer",
+    "OptionMakeOneTimeDonation": "Make a one-time donation",
     "LabelCurrentPassword": "Current password:",
-    "OptionNoThemeSong": "No Theme Song",
+    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
     "LabelMaxParentalRating": "Maximum allowed parental rating:",
-    "OptionNoThemeVideo": "No Theme Video",
+    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
     "MaxParentalRatingHelp": "Content with a higher rating will be hidden from this user.",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "OptionNoTrailer": "No Trailer",
     "LibraryAccessHelp": "Select the media folders to share with this user. Administrators will be able to edit all folders using the metadata manager.",
+    "OptionNoThemeSong": "No Theme Song",
     "ChannelAccessHelp": "Select the channels to share with this user. Administrators will be able to edit all channels using the metadata manager.",
+    "OptionNoThemeVideo": "No Theme Video",
     "ButtonDeleteImage": "Delete Image",
+    "LabelOneTimeDonationAmount": "Donation amount:",
     "LabelSelectUsers": "Select users:",
+    "OptionActor": "Actor",
     "ButtonUpload": "Upload",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "Upload New Image",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "Drop image here",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG\/PNG only.",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "Nothing here.",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "Please ensure downloading of internet metadata is enabled.",
     "TabSuggested": "Suggested",
     "TabLatest": "Latest",
@@ -570,9 +579,9 @@
     "LabelSkipped": "Skipped",
     "HeaderEpisodeOrganization": "Episode Organization",
     "LabelSeries": "Series:",
-    "LabelSeasonNumber": "Season number",
-    "LabelEpisodeNumber": "Episode number",
-    "LabelEndingEpisodeNumber": "Ending episode number",
+    "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)",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Display plugins for:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Episode name",
-    "LabelSeriesName": "Series name",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Series.name",
     "ValueSeriesNameUnderscore": "Series_name",
     "ValueEpisodeNamePeriod": "Episode.name",
     "ValueEpisodeNameUnderscore": "Episode_name",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Enter Text",
     "LabelTypeText": "Text",
     "HeaderSearchForSubtitles": "Search for Subtitles",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "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:"
+    "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 9573baadd..e495328ba 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/nb.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/nb.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Composers",
+    "HeaderRecentActivity": "Recent Activity",
     "LabelExit": "Exit",
-    "OptionOthers": "Others",
+    "HeaderPeople": "People",
     "LabelVisitCommunity": "Bes\u00f8k oss",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
     "LabelGithubWiki": "Github Wiki",
-    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "OptionComposers": "Composers",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "Folders",
+    "OptionOthers": "Others",
     "LabelStandard": "Standard",
-    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelViewApiDocumentation": "Se Api-dokumentasjon",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
     "LabelBrowseLibrary": "Browse biblioteket",
-    "ViewTypeLiveTvChannels": "Channels",
+    "ViewTypeFolders": "Folders",
     "LabelConfigureMediaBrowser": "Konfigurer Media Browser",
-    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelOpenLibraryViewer": "\u00c5pne Biblioteket",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
     "LabelRestartServer": "Restart serveren",
-    "HeaderPassword": "Password",
+    "ViewTypeLiveTvChannels": "Channels",
     "LabelShowLogWindow": "Se logg-vinduet",
-    "HeaderLocalAccess": "Local Access",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
     "LabelPrevious": "Forrige",
-    "HeaderViewOrder": "View Order",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
     "LabelFinish": "Ferdig",
-    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
+    "HeaderPassword": "Password",
     "LabelNext": "neste",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "HeaderLocalAccess": "Local Access",
     "LabelYoureDone": "Ferdig!",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "HeaderViewOrder": "View Order",
     "WelcomeToMediaBrowser": "Velkommen til Media Browser!",
-    "OptionDownloadMissingImages": "Download missing images",
+    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "TitleMediaBrowser": "Media Browser",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "ThisWizardWillGuideYou": "Denne wizarden vil guide deg gjennom server-konfigurasjonen. For \u00e5 begynne, vennligst velg ditt foretrukne spr\u00e5k.",
-    "OptionRefreshAllData": "Refresh all data",
+    "LabelImageRefreshMode": "Image refresh mode:",
     "TellUsAboutYourself": "Fortell om deg selv",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionDownloadMissingImages": "Download missing images",
     "LabelYourFirstName": "Ditt fornavn",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionReplaceExistingImages": "Replace existing images",
     "MoreUsersCanBeAddedLater": "Du kan legge til flere brukere senere via Dashboard",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "OptionRefreshAllData": "Refresh all data",
     "UserProfilesIntro": "Media Browser inkluderer innebygd st\u00f8tte for bruker profiler som tilbyr brukere innstillinger for visning, avspillerstatus og begrensning p\u00e5 innhold.",
-    "HeaderPersonInfo": "Person Info",
+    "OptionAddMissingDataOnly": "Add missing data only",
     "LabelWindowsService": "Windows Service",
-    "HeaderIdentifyItem": "Identify Item",
+    "OptionLocalRefreshOnly": "Local refresh only",
     "AWindowsServiceHasBeenInstalled": "Windows Service har blitt installert",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderRefreshMetadata": "Refresh Metadata",
     "WindowsServiceIntro1": "Media Browser Server kj\u00f8rer normalt som en desktop-applikasjon med et tray-ikon, men om du foretrekker at det kj\u00f8res som en bakgrunnsprosess, kan du i stedet starte den fra windows service control panel.",
-    "HeaderConfirmDeletion": "Bekreft Kansellering",
+    "HeaderPersonInfo": "Person Info",
     "WindowsServiceIntro2": "Hvis du bruker Windows, v\u00e6r oppmerksom p\u00e5 at det ikke kan kj\u00f8res samtidig som ikonet, slik at du trenger \u00e5 g\u00e5 ut av \"trayen\" for \u00e5 kj\u00f8re tjenesten. Tjenesten m\u00e5 ogs\u00e5 konfigureres med administratorrettigheter via kontrollpanelet. V\u00e6r oppmerksom p\u00e5 at p\u00e5 denne tiden tjenesten ikke er i stand til selv-oppdatering, s\u00e5 nye versjoner vil kreve manuell interaksjon.",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "HeaderIdentifyItem": "Identify Item",
     "WizardCompleted": "Det er alt vi trenger for n\u00e5. Media Browser har begynt \u00e5 samle informasjon om mediebiblioteket. Sjekk ut noen av v\u00e5re programmer, og klikk deretter p\u00e5 <b> Fullf\u00f8r <\/b> for \u00e5 se <b> Dashboard <\/b>.",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
     "LabelConfigureSettings": "Konfigurer innstillinger",
-    "ButtonIdentify": "Identify",
+    "HeaderConfirmDeletion": "Bekreft Kansellering",
     "LabelEnableVideoImageExtraction": "Aktiver videobildet utvinning",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
     "VideoImageExtractionHelp": "For videoer som ikke allerede har bilder, og at vi ikke klarer \u00e5 finne internettbilder for. Dette vil tilf\u00f8re noen ytterligere tid til den opprinnelige biblioteket s\u00f8king, men vil resultere i en mer tiltalende presentasjon.",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
     "LabelEnableChapterImageExtractionForMovies": "Pakk ut kapittelbilde utvinning for Filmer",
-    "LabelCommunityRating": "Community rating:",
+    "ButtonIdentify": "Identify",
     "LabelChapterImageExtractionForMoviesHelp": "Utpakking i kapittelbilder vil tillate kunder \u00e5 vise grafiske scenevalgmenyer. Prosessen kan v\u00e6re treg, cpu-intensive og kan kreve flere Gigabyte med plass. Den kj\u00f8rer som en nattlig planlagt oppgave p\u00e5 04.00 AM, selv om dette er konfigurerbart i planlagte oppgaver omr\u00e5det. Det er ikke anbefalt \u00e5 kj\u00f8re denne oppgaven il\u00f8pet av toppbelastede timer.",
-    "LabelVoteCount": "Vote count:",
+    "LabelAlbumArtist": "Album artist:",
     "LabelEnableAutomaticPortMapping": "Sl\u00e5 p\u00e5 automatisk port mapping",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP tillater automatiserte routere konfigurasjoner for enkel ekstern tilgang. Denne funksjonen s\u00f8ttes ikke av alle routere.",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCommunityRating": "Community rating:",
     "ButtonOk": "Ok",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelVoteCount": "Vote count:",
     "ButtonCancel": "avbryt",
-    "LabelAwardSummary": "Award summary:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "Ny",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Critic rating:",
     "HeaderSetupLibrary": "Konfigurer media-biblioteket",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Critic rating summary:",
     "ButtonAddMediaFolder": "Legg til media-mappe",
-    "LabelOverview": "Overview:",
+    "LabelAwardSummary": "Award summary:",
     "LabelFolderType": "Mappe typpe",
-    "LabelShortOverview": "Short overview:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "* P\u00e5krever bruk av en plugin, e.g. GameBrowser or MB Bookshelf",
-    "LabelReleaseDate": "Release date:",
+    "LabelTagline": "Tagline:",
     "ReferToMediaLibraryWiki": "Se i media-bibliotek wikien",
-    "LabelYear": "Year:",
+    "LabelOverview": "Overview:",
     "LabelCountry": "LAnd",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelShortOverview": "Short overview:",
     "LabelLanguage": "Spr\u00e5k:",
-    "LabelEndDate": "End date:",
+    "LabelReleaseDate": "Release date:",
     "HeaderPreferredMetadataLanguage": "Foretrukket spr\u00e5k for metadata",
-    "LabelAirDate": "Air days:",
+    "LabelYear": "Year:",
     "LabelSaveLocalMetadata": "Lagre cover og metadata i medie-mappene",
-    "LabelAirTime:": "Air time:",
+    "LabelPlaceOfBirth": "Place of birth:",
     "LabelSaveLocalMetadataHelp": "Lagring av artwork og metadata direkte gjennom media mapper vil legge dem en plass hvor de lett kan editeres.",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelEndDate": "End date:",
     "LabelDownloadInternetMetadata": "Last ned cover og metadata fra internett",
-    "LabelParentalRating": "Parental rating:",
+    "LabelAirDate": "Air days:",
     "LabelDownloadInternetMetadataHelp": "MEdia Browser kan laste ned informasjon om mediet for en rikere presentasjon",
-    "LabelCustomRating": "Custom rating:",
+    "LabelAirTime:": "Air time:",
     "TabPreferences": "Innstillinger",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Run time (minutes):",
     "TabPassword": "Passord",
-    "LabelRevenue": "Revenue ($):",
+    "LabelParentalRating": "Parental rating:",
     "TabLibraryAccess": "Bibliotektilgang",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelCustomRating": "Custom rating:",
     "TabImage": "Bilde",
-    "LabelPlayers": "Players:",
+    "LabelBudget": "Budget",
     "TabProfile": "profil",
-    "Label3DFormat": "3D format:",
+    "LabelRevenue": "Revenue ($):",
     "TabMetadata": "Metadata",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "LabelOriginalAspectRatio": "Original aspect ratio:",
     "TabImages": "Bilder",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "LabelPlayers": "Players:",
     "TabNotifications": "Varsliner",
-    "HeaderExternalIds": "External Id's:",
+    "Label3DFormat": "3D format:",
     "TabCollectionTitles": "Titler",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
     "LabelDisplayMissingEpisodesWithinSeasons": "Vis episoder som sesongen mangler",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "HeaderSpecialEpisodeInfo": "Special Episode Info",
     "LabelUnairedMissingEpisodesWithinSeasons": "Vis episoder som enn\u00e5 ikke har blitt sendt",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "HeaderExternalIds": "External Id's:",
     "HeaderVideoPlaybackSettings": "Innstillinger for video-avspilling",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "Dvd season number:",
     "HeaderPlaybackSettings": "Avspillings Innstillinger",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "Dvd episode number:",
     "LabelAudioLanguagePreference": "\u00d8nsket spr\u00e5k for lydspor:",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
     "LabelSubtitleLanguagePreference": "\u00d8nsket spr\u00e5k for undertekster:",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelAirsBeforeSeason": "Airs before season:",
     "OptionDefaultSubtitles": "Standard",
-    "LabelDisplayOrder": "Display order:",
+    "LabelAirsAfterSeason": "Airs after season:",
     "OptionOnlyForcedSubtitles": "Kun tvunget undertekster",
-    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelAirsBeforeEpisode": "Airs before episode:",
     "OptionAlwaysPlaySubtitles": "Alltid spill undertekster",
-    "HeaderCountries": "Countries",
+    "LabelTreatImageAs": "Treat image as:",
     "OptionNoSubtitles": "Ingen Undertekster",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "Display order:",
     "OptionDefaultSubtitlesHelp": "Undertekster som matcher spr\u00e5kpreferansene vil bli lastet n\u00e5r lyd er i utenlandsk spr\u00e5k.",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
     "OptionOnlyForcedSubtitlesHelp": "Kun undertekster marker som tvunget vil bli lastet.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "Countries",
     "OptionAlwaysPlaySubtitlesHelp": "Undertekster som matcher spr\u00e5kets innstillinger vil bli lastet uavhengig lydens spr\u00e5k.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "Genres",
     "OptionNoSubtitlesHelp": "Undertekster vil ikke bli lastet som standard.",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderPlotKeywords": "Plot Keywords",
     "TabProfiles": "Profiler",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "HeaderStudios": "Studios",
     "TabSecurity": "Sikkerhet",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "Ny bruker",
-    "TabSupporterClub": "Supporter Club",
+    "HeaderMetadataSettings": "Metadata Settings",
     "ButtonSave": "lagre",
-    "HeaderDonationType": "Donation type:",
+    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
     "ButtonResetPassword": "Resett passord",
-    "OptionMakeOneTimeDonation": "Make a one-time donation",
+    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
     "LabelNewPassword": "Nytt passord",
-    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
+    "TabSupporterClub": "Supporter Club",
     "LabelNewPasswordConfirm": "Bekreft nytt passord",
-    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderDonationType": "Donation type:",
     "HeaderCreatePassword": "Lag nytt passord",
-    "OptionNoTrailer": "No Trailer",
+    "OptionMakeOneTimeDonation": "Make a one-time donation",
     "LabelCurrentPassword": "N\u00e5v\u00e6rende passord",
-    "OptionNoThemeSong": "No Theme Song",
+    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
     "LabelMaxParentalRating": "Maks tillatt sensur.",
-    "OptionNoThemeVideo": "No Theme Video",
+    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
     "MaxParentalRatingHelp": "Innhold med h\u00f8yere aldersgrense vil bli skjult for brukeren",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "OptionNoTrailer": "No Trailer",
     "LibraryAccessHelp": "Velg media mappe som skal deles med denne brukren. Administrator vil ha mulighet for \u00e5 endre alle mapper ved \u00e5 bruke metadata behandler.",
+    "OptionNoThemeSong": "No Theme Song",
     "ChannelAccessHelp": "Velg kanaler som skal deler med denne brukeren. Administratorer har mulighet til \u00e5 editere p\u00e5 alle kanaler som benytter metadata behandleren.",
+    "OptionNoThemeVideo": "No Theme Video",
     "ButtonDeleteImage": "Slett bilde",
+    "LabelOneTimeDonationAmount": "Donation amount:",
     "LabelSelectUsers": "Velg brukere:",
+    "OptionActor": "Actor",
     "ButtonUpload": "Last opp",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "Last opp nytt bilde",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "Slipp bilde her.",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "1:1 aspekt ratio anbefales. Kun JPG\/PNG.",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "Ingeting her",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "P\u00e5se at nedlasting av internet-metadata er sl\u00e5tt p\u00e5",
     "TabSuggested": "Forslag",
     "TabLatest": "Siste",
@@ -212,7 +221,7 @@
     "OptionAscending": "Oppover",
     "OptionDescending": "Nedover",
     "OptionRuntime": "Spilletid",
-    "OptionReleaseDate": "Release Date",
+    "OptionReleaseDate": "Slipp-dato",
     "OptionPlayCount": "Antall avspillinger",
     "OptionDatePlayed": "Dato spilt",
     "OptionDateAdded": "Dato lagt til",
@@ -570,8 +579,8 @@
     "LabelSkipped": "Hoppet over",
     "HeaderEpisodeOrganization": "Episode Organisering",
     "LabelSeries": "Series:",
-    "LabelSeasonNumber": "Season number",
-    "LabelEpisodeNumber": "Episode number",
+    "LabelSeasonNumber": "Sesong nummer",
+    "LabelEpisodeNumber": "Episode nummer",
     "LabelEndingEpisodeNumber": "Ending av episode nummer",
     "LabelEndingEpisodeNumberHelp": "Kun n\u00f8dvendig for multi-episode filer",
     "HeaderSupportTheTeam": "St\u00f8tt Media Browser Teamet",
@@ -714,12 +723,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",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Vis plugins for:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Episode navn",
-    "LabelSeriesName": "Serie navn",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Serier.navn",
     "ValueSeriesNameUnderscore": "Serie_navn",
     "ValueEpisodeNamePeriod": "Episode.navn",
     "ValueEpisodeNameUnderscore": "Episode_navn",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Skriv Tekst",
     "LabelTypeText": "Tekst",
     "HeaderSearchForSubtitles": "S\u00f8k etter undertekster",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "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:"
+    "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 437685b90..fd941881f 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/nl.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/nl.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Componisten",
+    "HeaderRecentActivity": "Recente activiteit",
     "LabelExit": "Afsluiten",
-    "OptionOthers": "Overigen",
+    "HeaderPeople": "Personen",
     "LabelVisitCommunity": "Bezoek Gemeenschap",
+    "HeaderDownloadPeopleMetadataFor": "Download biografie en afbeeldingen voor:",
     "LabelGithubWiki": "Github Wiki",
-    "HeaderDownloadPeopleMetadataForHelp": "Het inschakelen van extra opties zal meer informatie op het scherm bieden, maar resulteert in tragere bibliotheek scan.",
+    "OptionComposers": "Componisten",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "Mappen",
+    "OptionOthers": "Overigen",
     "LabelStandard": "Standaard",
-    "LabelDisplayFoldersView": "Toon een mappenweergave als u gewoon Mediamappen wilt weergeven",
     "LabelViewApiDocumentation": "Bekijk Api documentatie",
-    "ViewTypeLiveTvRecordingGroups": "Opnamen",
+    "HeaderDownloadPeopleMetadataForHelp": "Het inschakelen van extra opties zal meer informatie op het scherm bieden, maar resulteert in tragere bibliotheek scan.",
     "LabelBrowseLibrary": "Bekijk bibliotheek",
-    "ViewTypeLiveTvChannels": "Kanalen",
+    "ViewTypeFolders": "Mappen",
     "LabelConfigureMediaBrowser": "Configureer Media Browser",
-    "LabelAllowLocalAccessWithoutPassword": "Lokale toegang toestaan zonder wachtwoord",
+    "LabelDisplayFoldersView": "Toon een mappenweergave als u gewoon Mediamappen wilt weergeven",
     "LabelOpenLibraryViewer": "Open bibliotheek verkenner",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "Als dit ingeschakled is dan kan er in het thuisnetwerk zonder wachtwoord aangemeld worden.",
+    "ViewTypeLiveTvRecordingGroups": "Opnamen",
     "LabelRestartServer": "Server herstarten",
-    "HeaderPassword": "Wachtwoord",
+    "ViewTypeLiveTvChannels": "Kanalen",
     "LabelShowLogWindow": "Toon log venster",
-    "HeaderLocalAccess": "Lokale toegang",
+    "LabelAllowLocalAccessWithoutPassword": "Lokale toegang toestaan zonder wachtwoord",
     "LabelPrevious": "Vorige",
-    "HeaderViewOrder": "Weergave volgorde",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "Als dit ingeschakled is dan kan er in het thuisnetwerk zonder wachtwoord aangemeld worden.",
     "LabelFinish": "Voltooien",
-    "LabelSelectUserViewOrder": "Kies de volgorde van uw weergaven die zullen worden weergegeven in Media Browser applicaties",
+    "HeaderPassword": "Wachtwoord",
     "LabelNext": "Volgende",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "HeaderLocalAccess": "Lokale toegang",
     "LabelYoureDone": "Gereed!",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "HeaderViewOrder": "Weergave volgorde",
     "WelcomeToMediaBrowser": "Welkom bij Media Browser!",
-    "OptionDownloadMissingImages": "Download missing images",
+    "LabelSelectUserViewOrder": "Kies de volgorde van uw weergaven die zullen worden weergegeven in Media Browser applicaties",
     "TitleMediaBrowser": "Media Browser",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "LabelMetadataRefreshMode": "Metadata vernieuw mode:",
     "ThisWizardWillGuideYou": "Deze wizard helpt u door het setup-proces.",
-    "OptionRefreshAllData": "Refresh all data",
+    "LabelImageRefreshMode": "Afbeelding vernieuw mode:",
     "TellUsAboutYourself": "Vertel ons over u zelf",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionDownloadMissingImages": "Ontbrekende afbeeldingen downloaden",
     "LabelYourFirstName": "Uw voornaam:",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionReplaceExistingImages": "Bestaande afbeeldingen vervangen",
     "MoreUsersCanBeAddedLater": "Meer gebruikers kunnen later via het dashboard worden toegevoegd.",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "OptionRefreshAllData": "Vernieuw alle gegevens",
     "UserProfilesIntro": "Media Browser bevat ingebouwde ondersteuning voor gebruikersprofielen, zodat iedere gebruiker zijn eigen display-instellingen, afspeelstatus en ouderlijk toezicht heeft.",
-    "HeaderPersonInfo": "Person Info",
+    "OptionAddMissingDataOnly": "Alleen ontbrekende gegevens toevoegen",
     "LabelWindowsService": "Windows Service",
-    "HeaderIdentifyItem": "Identify Item",
+    "OptionLocalRefreshOnly": "Alleen lokaal vernieuwen",
     "AWindowsServiceHasBeenInstalled": "Er is een Windows service ge\u00efnstalleerd.",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderRefreshMetadata": "Vernieuw metagegevens",
     "WindowsServiceIntro1": "Media Browser Server werkt normaal als een desktop applicatie met een pictogram in het systeemvak, maar wanneer u het liever op de achtergrond als service laat draaien, dan kan dit worden ingesteld vanuit het Windows services configuratie scherm.",
-    "HeaderConfirmDeletion": "Bevestigen Verwijdering",
+    "HeaderPersonInfo": "Persoon informatie",
     "WindowsServiceIntro2": "Wanneer u de Windows-service gebruikt, dan dient u er rekening mee te houden dat het niet op hetzelfde moment als de desktop applicatie kan worden uitgevoerd. Het is daarom vereist de desktop applicatie eerst af te sluiten voordat u de service gebruikt. De service moet worden geconfigureerd met beheerdersrechten via het configuratie scherm. Houd er rekening mee dat op dit moment de service niet automatisch kan worden bijgewerkt, zodat nieuwe versies dus handmatige interactie vereisen.",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "HeaderIdentifyItem": "Identificeer item",
     "WizardCompleted": "Dit is alles wat we nodig hebben voor nu. Media Browser is begonnen met het verzamelen van informatie over uw mediabibliotheek. Bekijk enkele van onze apps, en klik vervolgens op <b>Voltooien<\/b> om het <b>Dashboard te bekijken<\/b>.",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "HeaderIdentifyItemHelp": "Vul \u00e9\u00e9n of meer zoek criteria in. Verwijder criteria om zoekresultaten te vergroten.",
     "LabelConfigureSettings": "Configureer instellingen",
-    "ButtonIdentify": "Identify",
+    "HeaderConfirmDeletion": "Bevestigen Verwijdering",
     "LabelEnableVideoImageExtraction": "Videobeeld extractie inschakelen",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelFollowingFileWillBeDeleted": "Het volgende bestand wordt verwijderd.",
     "VideoImageExtractionHelp": "Voor video's die nog geen afbeeldingen hebben, en waarvoor geen afbeeldingen op Internet te vinden zijn. Dit voegt extra tijd toe aan de oorspronkelijke bibliotheek scan, maar resulteert in een mooiere weergave.",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "Geef om door te gaan het resultaat in:",
     "LabelEnableChapterImageExtractionForMovies": "Extraheer hoofdstuk afbeeldingen voor Films",
-    "LabelCommunityRating": "Community rating:",
+    "ButtonIdentify": "Identificeer",
     "LabelChapterImageExtractionForMoviesHelp": "Extraheren van hoofdstuk afbeeldingen geeft de Cli\u00ebnt de mogelijkheid om grafische scene selectie menu's te tonen. Het proces kan traag en cpu-intensief zijn en kan enkele gigabytes aan ruimte vereisen. Het word uitgevoerd als nachtelijke taak om 4:00, maar dit is instelbaar via de geplande taken. Het wordt niet aanbevolen om deze taak uit te voeren tijdens de piekuren.",
-    "LabelVoteCount": "Vote count:",
+    "LabelAlbumArtist": "Album artiest:",
     "LabelEnableAutomaticPortMapping": "Automatische poorttoewijzing inschakelen",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP zorgt voor geautomatiseerde configuratie van de router voor gemakkelijke toegang op afstand. Dit werkt mogelijk niet met sommige routers.",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCommunityRating": "Beoordeling gemeenschap:",
     "ButtonOk": "Ok",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelVoteCount": "Aantal stemmen:",
     "ButtonCancel": "Annuleren",
-    "LabelAwardSummary": "Award summary:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "Nieuw",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Beoordeling critici:",
     "HeaderSetupLibrary": "Stel uw mediabibliotheek in",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Samenvatting beoordeling critici:",
     "ButtonAddMediaFolder": "Mediamap toevoegen",
-    "LabelOverview": "Overview:",
+    "LabelAwardSummary": "Samenvatting prijzen:",
     "LabelFolderType": "Maptype:",
-    "LabelShortOverview": "Short overview:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "* Hiervoor is het gebruik van een Plug-in vereist, bijvoorbeeld GameBrowser of MB Bookshelf.",
-    "LabelReleaseDate": "Release date:",
+    "LabelTagline": "Tagline:",
     "ReferToMediaLibraryWiki": "Raadpleeg de mediabibliotheek wiki.",
-    "LabelYear": "Jaar:",
+    "LabelOverview": "Overzicht:",
     "LabelCountry": "Land:",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelShortOverview": "Kort overzicht:",
     "LabelLanguage": "Taal:",
-    "LabelEndDate": "Eind datum|",
+    "LabelReleaseDate": "Uitgave datum:",
     "HeaderPreferredMetadataLanguage": "Gewenste metadata taal:",
-    "LabelAirDate": "Air days:",
+    "LabelYear": "Jaar:",
     "LabelSaveLocalMetadata": "Sla afbeeldingen en metadata op in de mediamappen",
-    "LabelAirTime:": "Air time:",
+    "LabelPlaceOfBirth": "Geboorteplaats:",
     "LabelSaveLocalMetadataHelp": "Door afbeeldingen en metadata op te slaan in de mediamappen kunnen ze makkelijker worden gevonden en bewerkt.",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelEndDate": "Eind datum|",
     "LabelDownloadInternetMetadata": "Download afbeeldingen en metadata van het internet",
-    "LabelParentalRating": "Parental rating:",
+    "LabelAirDate": "Uitzend dagen:",
     "LabelDownloadInternetMetadataHelp": "Media Browser kan informatie en afbeeldingen van uw media downloaden, om zo een mooie en uitgebreide weergave mogelijk te maken.",
-    "LabelCustomRating": "Custom rating:",
+    "LabelAirTime:": "Uitzend tijd:",
     "TabPreferences": "Voorkeuren",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Speelduur (minuten):",
     "TabPassword": "Wachtwoord",
-    "LabelRevenue": "Revenue ($):",
+    "LabelParentalRating": "Kijkwijzer classificatie:",
     "TabLibraryAccess": "Bibliotheek toegang",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelCustomRating": "Aangepaste classificatie:",
     "TabImage": "Afbeelding",
-    "LabelPlayers": "Players:",
+    "LabelBudget": "Budget",
     "TabProfile": "Profiel",
-    "Label3DFormat": "3D format:",
+    "LabelRevenue": "Omzet ($):",
     "TabMetadata": "Metagegevens",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "LabelOriginalAspectRatio": "Originele aspect ratio:",
     "TabImages": "Afbeeldingen",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "LabelPlayers": "Spelers:",
     "TabNotifications": "Meldingen",
-    "HeaderExternalIds": "External Id's:",
+    "Label3DFormat": "3D formaat",
     "TabCollectionTitles": "Titels",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "HeaderAlternateEpisodeNumbers": "Afwijkende afleveringsnummers",
     "LabelDisplayMissingEpisodesWithinSeasons": "Toon ontbrekende afleveringen binnen een seizoen",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "HeaderSpecialEpisodeInfo": "Speciale afleveringsinformatie",
     "LabelUnairedMissingEpisodesWithinSeasons": "Toon komende afleveringen binnen een seizoen",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "HeaderExternalIds": "Externe Id's",
     "HeaderVideoPlaybackSettings": "Video afspeel instellingen",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "Dvd seizoensnummer:",
     "HeaderPlaybackSettings": "Afspeel instellingen",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "Dvd afleveringsnummer:",
     "LabelAudioLanguagePreference": "Voorkeurs taal geluid:",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "Absoluut afleveringsnummer:",
     "LabelSubtitleLanguagePreference": "Voorkeurs taal ondertiteling:",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelAirsBeforeSeason": "Uitgezonden voor seizoen:",
     "OptionDefaultSubtitles": "Standaard",
-    "LabelDisplayOrder": "Display order:",
+    "LabelAirsAfterSeason": "Uitgezonden na seizoen:",
     "OptionOnlyForcedSubtitles": "Alleen 'geforceerde' ondertiteling",
-    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelAirsBeforeEpisode": "Uitgezonden voor aflevering:",
     "OptionAlwaysPlaySubtitles": "Ondertiteling altijd weergeven",
-    "HeaderCountries": "Countries",
+    "LabelTreatImageAs": "Behandel afbeelding als:",
     "OptionNoSubtitles": "Geen ondertitels",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "Weergave volgorde:",
     "OptionDefaultSubtitlesHelp": "Ondertiteling wordt weergegeven in de voorkeurstaal als de audio in een andere taal is.",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "LabelDisplaySpecialsWithinSeasons": "Voeg specials toe aan het seizoen waarin ze uitgezonden zijn",
     "OptionOnlyForcedSubtitlesHelp": "Alleen ondertitels gemarkeerd als \"gedwongen\" zullen worden geladen.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "Landen",
     "OptionAlwaysPlaySubtitlesHelp": "Ondertiteling wordt weergegeveen in de voorkeurstaal ongeacht de taal van de audio.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "Genres",
     "OptionNoSubtitlesHelp": "Ondertiteling wordt standaard niet weergegeven.",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderPlotKeywords": "Trefwoorden plot",
     "TabProfiles": "Profielen",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "HeaderStudios": "Studio's",
     "TabSecurity": "Beveiliging",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "HeaderTags": "Labels",
     "ButtonAddUser": "Gebruiker toevoegen",
-    "TabSupporterClub": "Supporter Club",
+    "HeaderMetadataSettings": "Metagegevens instellingen",
     "ButtonSave": "Opslaan",
-    "HeaderDonationType": "Donation type:",
+    "LabelLockItemToPreventChanges": "Blokkeer dit item tegen wijzigingen",
     "ButtonResetPassword": "Wachtwoord resetten",
-    "OptionMakeOneTimeDonation": "Make a one-time donation",
+    "MessageLeaveEmptyToInherit": "Leeg laten om instellingen van bovenliggend item of de algemene waarde over te nemen.",
     "LabelNewPassword": "Nieuw wachtwoord:",
-    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
+    "TabSupporterClub": "Supporters club",
     "LabelNewPasswordConfirm": "Bevestig nieuw wachtwoord:",
-    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderDonationType": "Donatie soort:",
     "HeaderCreatePassword": "Maak wachtwoord",
-    "OptionNoTrailer": "No Trailer",
+    "OptionMakeOneTimeDonation": "Doe een eenmalige donatie",
     "LabelCurrentPassword": "Huidig wachtwoord",
-    "OptionNoThemeSong": "No Theme Song",
-    "LabelMaxParentalRating": "Leeftijdsgrens",
-    "OptionNoThemeVideo": "No Theme Video",
+    "OptionLifeTimeSupporterClubMembership": "Levenslang supporters club lidmaatschap",
+    "LabelMaxParentalRating": "Maximaal toegestane kijkwijzer classificatie:",
+    "HeaderSupporterBenefit": "Lid worden van de supporters club heeft voordelen als toegang tot premium plugins, internet kanalen en meer.",
     "MaxParentalRatingHelp": "Media met een hogere classificatie wordt niet weergegeven",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "OptionNoTrailer": "Geen trailer",
     "LibraryAccessHelp": "Selecteer de mediamappen om met deze gebruiker te delen. Beheerders kunnen alle mappen bewerken via de metadata manager.",
+    "OptionNoThemeSong": "Geen thema muziek",
     "ChannelAccessHelp": "Selecteer de kanalen om te delen met deze gebruiker. Beheerders kunnen alle kanalen bewerken met de metadata manager.",
+    "OptionNoThemeVideo": "Geen thema film",
     "ButtonDeleteImage": "Verwijder afbeelding",
+    "LabelOneTimeDonationAmount": "Donatie bedrag:",
     "LabelSelectUsers": "Selecteer gebruikers:",
+    "OptionActor": "Actor",
     "ButtonUpload": "Uploaden",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "Nieuwe afbeelding uploaden",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "Afbeelding hier neerzetten",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "1:1 beeldverhouding geadviseerd. Alleen JPG\/PNG.",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "Lijst is leeg.",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "Zorg ervoor dat het downloaden van metadata van het internet is ingeschakeld.",
     "TabSuggested": "Aanbevolen",
     "TabLatest": "Nieuw",
@@ -212,7 +221,7 @@
     "OptionAscending": "Oplopend",
     "OptionDescending": "Aflopend",
     "OptionRuntime": "Speelduur",
-    "OptionReleaseDate": "Release Date",
+    "OptionReleaseDate": "Release Datum",
     "OptionPlayCount": "Afspeel telling",
     "OptionDatePlayed": "Datum afgespeeld",
     "OptionDateAdded": "Datum toegevoegd",
@@ -262,8 +271,8 @@
     "TabMovies": "Films",
     "TabStudios": "Studio's",
     "TabTrailers": "Trailers",
-    "LabelArtists": "Artists:",
-    "LabelArtistsHelp": "Separate multiple using ;",
+    "LabelArtists": "Artiest:",
+    "LabelArtistsHelp": "Scheidt meerdere met een ;",
     "HeaderLatestMovies": "Nieuwste Films",
     "HeaderLatestTrailers": "Nieuwste Trailers",
     "OptionHasSpecialFeatures": "Extra's",
@@ -399,7 +408,7 @@
     "TabSettings": "Instellingen",
     "ButtonRefreshGuideData": "Gidsgegevens Vernieuwen",
     "ButtonRefresh": "Vernieuwen",
-    "ButtonAdvancedRefresh": "Advanced Refresh",
+    "ButtonAdvancedRefresh": "Geavanceerd vernieuwen",
     "OptionPriority": "Prioriteit",
     "OptionRecordOnAllChannels": "Programma van alle kanalen opnemen",
     "OptionRecordAnytime": "Programma elke keer opnemen",
@@ -570,8 +579,8 @@
     "LabelSkipped": "Overgeslagen",
     "HeaderEpisodeOrganization": "Afleveringen Organisatie",
     "LabelSeries": "Series:",
-    "LabelSeasonNumber": "Season number",
-    "LabelEpisodeNumber": "Episode number",
+    "LabelSeasonNumber": "Seizoen:",
+    "LabelEpisodeNumber": "Aflevering:",
     "LabelEndingEpisodeNumber": "Laatste aflevering:",
     "LabelEndingEpisodeNumberHelp": "Alleen vereist voor bestanden met meerdere afleveringen",
     "HeaderSupportTheTeam": "Steun het Media Browser Team",
@@ -714,12 +723,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",
@@ -735,8 +744,8 @@
     "LabelProfileContainersHelp": "Gescheiden door een komma. Deze kan leeg gelaten worden om te laten gelden voor alle containers.",
     "HeaderResponseProfile": "Antwoord Profiel",
     "LabelType": "Type:",
-    "LabelPersonRole": "Role:",
-    "LabelPersonRoleHelp": "Role is generally only applicable to actors.",
+    "LabelPersonRole": "Rol:",
+    "LabelPersonRoleHelp": "Rol is alleen van toepassing op acteurs.",
     "LabelProfileContainer": "Container:",
     "LabelProfileVideoCodecs": "Video codecs:",
     "LabelProfileAudioCodecs": "Audio codecs:",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Toon Plug-ins voor:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Aflevering naam",
-    "LabelSeriesName": "Serie naam",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Serie.Naam",
     "ValueSeriesNameUnderscore": "Serie_naam",
     "ValueEpisodeNamePeriod": "Aflevering.naam",
     "ValueEpisodeNameUnderscore": "Aflevering_naam",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Voer tekst in",
     "LabelTypeText": "Tekst",
     "HeaderSearchForSubtitles": "Zoeken naar Ondertitels",
@@ -981,11 +993,11 @@
     "TabFilter": "Filter",
     "ButtonView": "Weergave",
     "LabelPageSize": "Itemlimiet:",
-    "LabelPath": "Path:",
+    "LabelPath": "Pad:",
     "LabelView": "Weergave:",
     "TabUsers": "Gebruikers",
-    "LabelSortName": "Sort name:",
-    "LabelDateAdded": "Date added:",
+    "LabelSortName": "Sorteer naam:",
+    "LabelDateAdded": "Datum toegevoegd:",
     "HeaderFeatures": "Toevoegingen",
     "HeaderAdvanced": "Geavanceerd",
     "ButtonSync": "Synchronisatie",
@@ -1025,7 +1037,7 @@
     "OptionScreenshot": "Schermafbeelding",
     "OptionLocked": "Vastgezet",
     "OptionUnidentified": "Onge\u00efdentificeerd",
-    "OptionMissingParentalRating": "Ontbrekende kijkwijzer certificering",
+    "OptionMissingParentalRating": "Ontbrekende kijkwijzer classificatie",
     "OptionStub": "Stub",
     "HeaderEpisodes": "Episodes:",
     "OptionSeason0": "Seizoen 0",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "App: {0}, Apparaat: {1}",
     "ProviderValue": "Aanbieder: {0}",
     "LabelChannelDownloadSizeLimit": "Downloadlimiet (GB): ",
-    "LabelChannelDownloadSizeLimitHelp": "Beperk de grootte van de kanaal download map",
-    "HeaderRecentActivity": "Recente activiteit",
-    "HeaderPeople": "Personen",
-    "HeaderDownloadPeopleMetadataFor": "Download biografie en afbeeldingen voor:"
+    "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 16f98085c..c772364c9 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pl.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pl.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Composers",
+    "HeaderRecentActivity": "Recent Activity",
     "LabelExit": "Wyj\u015b\u0107",
-    "OptionOthers": "Others",
+    "HeaderPeople": "People",
     "LabelVisitCommunity": "Odwied\u017a spo\u0142eczno\u015b\u0107",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
     "LabelGithubWiki": "Wiki Github",
-    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "OptionComposers": "Composers",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "Folders",
+    "OptionOthers": "Others",
     "LabelStandard": "Standardowy",
-    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelViewApiDocumentation": "Zobacz dokumentacj\u0119 Api",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
     "LabelBrowseLibrary": "Przejrzyj bibliotek\u0119",
-    "ViewTypeLiveTvChannels": "Channels",
+    "ViewTypeFolders": "Folders",
     "LabelConfigureMediaBrowser": "Skonfiguruj Media Browser",
-    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelOpenLibraryViewer": "Otw\u00f3rz przegl\u0105dark\u0119 biblioteki",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
     "LabelRestartServer": "Uruchom serwer ponownie",
-    "HeaderPassword": "Password",
+    "ViewTypeLiveTvChannels": "Channels",
     "LabelShowLogWindow": "Show Log Window",
-    "HeaderLocalAccess": "Local Access",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
     "LabelPrevious": "Wstecz",
-    "HeaderViewOrder": "View Order",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
     "LabelFinish": "Koniec",
-    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
+    "HeaderPassword": "Password",
     "LabelNext": "Dalej",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "HeaderLocalAccess": "Local Access",
     "LabelYoureDone": "Sko\u0144czy\u0142e\u015b!",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "HeaderViewOrder": "View Order",
     "WelcomeToMediaBrowser": "Witaj w Media Browser!",
-    "OptionDownloadMissingImages": "Download missing images",
+    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "TitleMediaBrowser": "Media Browser",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "ThisWizardWillGuideYou": "Asystent pomo\u017ce Ci podczas instalacji. Na pocz\u0105tku, wybierz tw\u00f3j preferowany j\u0119zyk.",
-    "OptionRefreshAllData": "Refresh all data",
+    "LabelImageRefreshMode": "Image refresh mode:",
     "TellUsAboutYourself": "Opowiedz nam o sobie",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionDownloadMissingImages": "Download missing images",
     "LabelYourFirstName": "Twoje imi\u0119:",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionReplaceExistingImages": "Replace existing images",
     "MoreUsersCanBeAddedLater": "Mo\u017cesz doda\u0107 wi\u0119cej u\u017cytkownik\u00f3w p\u00f3\u017aniej przez tablic\u0119 rozdzielcz\u0105.",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "OptionRefreshAllData": "Refresh all data",
     "UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
-    "HeaderPersonInfo": "Person Info",
+    "OptionAddMissingDataOnly": "Add missing data only",
     "LabelWindowsService": "Serwis Windows",
-    "HeaderIdentifyItem": "Identify Item",
+    "OptionLocalRefreshOnly": "Local refresh only",
     "AWindowsServiceHasBeenInstalled": "Serwis Windows zosta\u0142 zainstalowany.",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderRefreshMetadata": "Refresh Metadata",
     "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.",
-    "HeaderConfirmDeletion": "Confirm Deletion",
+    "HeaderPersonInfo": "Person Info",
     "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.",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "HeaderIdentifyItem": "Identify Item",
     "WizardCompleted": "To wszystko na teraz. Media Browser zacz\u0105\u0142 zbiera\u0107 informacje o twojej bibliotece. Zapoznaj si\u0119 z aplikacjami po czym kliknij <b>Koniec<\/b> \u017ceby zobaczy\u0107 <b>Tablic\u0119 rozdzielcz\u0105<\/b>.",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
     "LabelConfigureSettings": "Skonfiguruj ustawienia",
-    "ButtonIdentify": "Identify",
+    "HeaderConfirmDeletion": "Confirm Deletion",
     "LabelEnableVideoImageExtraction": "Enable video image extraction",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
     "VideoImageExtractionHelp": "Dla filmik\u00f3w kt\u00f3re nie maj\u0105 jeszcze obraz\u00f3w i dla kt\u00f3rych nie mo\u017cemy \u017cadnych znale\u017a\u0107 na internecie. Zwi\u0119kszy to czas wst\u0119pnego skanowania biblioteki ale wynikiem b\u0119dzie \u0142adniejsza prezentacja.",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
     "LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
-    "LabelCommunityRating": "Community rating:",
+    "ButtonIdentify": "Identify",
     "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.",
-    "LabelVoteCount": "Vote count:",
+    "LabelAlbumArtist": "Album artist:",
     "LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCommunityRating": "Community rating:",
     "ButtonOk": "Ok",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelVoteCount": "Vote count:",
     "ButtonCancel": "Anuluj",
-    "LabelAwardSummary": "Award summary:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "New",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Critic rating:",
     "HeaderSetupLibrary": "Ustaw swoj\u0105 bibliotek\u0119",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Critic rating summary:",
     "ButtonAddMediaFolder": "Dodaj folder",
-    "LabelOverview": "Overview:",
+    "LabelAwardSummary": "Award summary:",
     "LabelFolderType": "Typ folderu:",
-    "LabelShortOverview": "Short overview:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "* Wymaga u\u017cycia wtyczki tak jak GameBrowser lub MB Bookshelf.",
-    "LabelReleaseDate": "Release date:",
+    "LabelTagline": "Tagline:",
     "ReferToMediaLibraryWiki": "Odnie\u015b si\u0119 do wiki biblioteki.",
-    "LabelYear": "Year:",
+    "LabelOverview": "Overview:",
     "LabelCountry": "Kraj:",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelShortOverview": "Short overview:",
     "LabelLanguage": "J\u0119zyk:",
-    "LabelEndDate": "End date:",
+    "LabelReleaseDate": "Release date:",
     "HeaderPreferredMetadataLanguage": "Preferowany j\u0119zyk metadanych:",
-    "LabelAirDate": "Air days:",
+    "LabelYear": "Year:",
     "LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
-    "LabelAirTime:": "Air time:",
+    "LabelPlaceOfBirth": "Place of birth:",
     "LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelEndDate": "End date:",
     "LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
-    "LabelParentalRating": "Parental rating:",
+    "LabelAirDate": "Air days:",
     "LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations.",
-    "LabelCustomRating": "Custom rating:",
+    "LabelAirTime:": "Air time:",
     "TabPreferences": "Preferencje",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Run time (minutes):",
     "TabPassword": "Has\u0142o",
-    "LabelRevenue": "Revenue ($):",
+    "LabelParentalRating": "Parental rating:",
     "TabLibraryAccess": "Dost\u0119p do biblioteki",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelCustomRating": "Custom rating:",
     "TabImage": "Obraz",
-    "LabelPlayers": "Players:",
+    "LabelBudget": "Budget",
     "TabProfile": "Profil",
-    "Label3DFormat": "3D format:",
+    "LabelRevenue": "Revenue ($):",
     "TabMetadata": "Metadata",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "LabelOriginalAspectRatio": "Original aspect ratio:",
     "TabImages": "Images",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "LabelPlayers": "Players:",
     "TabNotifications": "Notifications",
-    "HeaderExternalIds": "External Id's:",
+    "Label3DFormat": "3D format:",
     "TabCollectionTitles": "Titles",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
     "LabelDisplayMissingEpisodesWithinSeasons": "Wy\u015bwietl brakuj\u0105ce odcinki w sezonach",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "HeaderSpecialEpisodeInfo": "Special Episode Info",
     "LabelUnairedMissingEpisodesWithinSeasons": "Wy\u015bwietl nie wydanie odcinki w sezonach",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "HeaderExternalIds": "External Id's:",
     "HeaderVideoPlaybackSettings": "Ustawienia odtwarzania wideo",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "Dvd season number:",
     "HeaderPlaybackSettings": "Playback Settings",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "Dvd episode number:",
     "LabelAudioLanguagePreference": "Preferencje j\u0119zyka audio:",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
     "LabelSubtitleLanguagePreference": "Preferencje j\u0119zyka napis\u00f3w:",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelAirsBeforeSeason": "Airs before season:",
     "OptionDefaultSubtitles": "Default",
-    "LabelDisplayOrder": "Display order:",
+    "LabelAirsAfterSeason": "Airs after season:",
     "OptionOnlyForcedSubtitles": "Only forced subtitles",
-    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelAirsBeforeEpisode": "Airs before episode:",
     "OptionAlwaysPlaySubtitles": "Always play subtitles",
-    "HeaderCountries": "Countries",
+    "LabelTreatImageAs": "Treat image as:",
     "OptionNoSubtitles": "No Subtitles",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "Display order:",
     "OptionDefaultSubtitlesHelp": "Subtitles matching the language preference will be loaded when the audio is in a foreign language.",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
     "OptionOnlyForcedSubtitlesHelp": "Only subtitles marked as forced will be loaded.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "Countries",
     "OptionAlwaysPlaySubtitlesHelp": "Subtitles matching the language preference will be loaded regardless of the audio language.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "Genres",
     "OptionNoSubtitlesHelp": "Subtitles will not be loaded by default.",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderPlotKeywords": "Plot Keywords",
     "TabProfiles": "Profile",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "HeaderStudios": "Studios",
     "TabSecurity": "Zabezpieczenie",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "Dodaj u\u017cytkownika",
-    "TabSupporterClub": "Supporter Club",
+    "HeaderMetadataSettings": "Metadata Settings",
     "ButtonSave": "Zapisz",
-    "HeaderDonationType": "Donation type:",
+    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
     "ButtonResetPassword": "Zresetuj has\u0142o",
-    "OptionMakeOneTimeDonation": "Make a one-time donation",
+    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
     "LabelNewPassword": "Nowe has\u0142o:",
-    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
+    "TabSupporterClub": "Supporter Club",
     "LabelNewPasswordConfirm": "Potwierd\u017a nowe has\u0142o:",
-    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderDonationType": "Donation type:",
     "HeaderCreatePassword": "Stw\u00f3rz has\u0142o:",
-    "OptionNoTrailer": "No Trailer",
+    "OptionMakeOneTimeDonation": "Make a one-time donation",
     "LabelCurrentPassword": "Bie\u017c\u0105ce has\u0142o:",
-    "OptionNoThemeSong": "No Theme Song",
+    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
     "LabelMaxParentalRating": "Maksymalna dozwolona ocena rodzicielska:",
-    "OptionNoThemeVideo": "No Theme Video",
+    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
     "MaxParentalRatingHelp": "Zawarto\u015b\u0107 z wy\u017csz\u0105 ocen\u0105 b\u0119dzie schowana dla tego u\u017cytkownika.",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "OptionNoTrailer": "No Trailer",
     "LibraryAccessHelp": "Select the media folders to share with this user. Administrators will be able to edit all folders using the metadata manager.",
+    "OptionNoThemeSong": "No Theme Song",
     "ChannelAccessHelp": "Select the channels to share with this user. Administrators will be able to edit all channels using the metadata manager.",
+    "OptionNoThemeVideo": "No Theme Video",
     "ButtonDeleteImage": "Usu\u0144 obrazek",
+    "LabelOneTimeDonationAmount": "Donation amount:",
     "LabelSelectUsers": "Select users:",
+    "OptionActor": "Actor",
     "ButtonUpload": "Wy\u015blij",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "Wy\u015blij nowy obrazek",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "Wrzu\u0107 obrazek tutaj",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG\/PNG only.",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "Nic tutaj nie ma.",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "Upewnij si\u0119 \u017ce pobieranie metadanych z internetu jest w\u0142\u0105czone.",
     "TabSuggested": "Sugerowane",
     "TabLatest": "Ostatnie",
@@ -212,7 +221,7 @@
     "OptionAscending": "Rosn\u0105co",
     "OptionDescending": "Malej\u0105co",
     "OptionRuntime": "D\u0142ugo\u015b\u0107 filmu",
-    "OptionReleaseDate": "Release Date",
+    "OptionReleaseDate": "Data wydania",
     "OptionPlayCount": "Ilo\u015b\u0107 odtworze\u0144",
     "OptionDatePlayed": "Data odtworzenia",
     "OptionDateAdded": "Data dodania",
@@ -570,9 +579,9 @@
     "LabelSkipped": "Skipped",
     "HeaderEpisodeOrganization": "Episode Organization",
     "LabelSeries": "Series:",
-    "LabelSeasonNumber": "Season number",
-    "LabelEpisodeNumber": "Episode number",
-    "LabelEndingEpisodeNumber": "Ending episode number",
+    "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)",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Display plugins for:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Episode name",
-    "LabelSeriesName": "Series name",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Series.name",
     "ValueSeriesNameUnderscore": "Series_name",
     "ValueEpisodeNamePeriod": "Episode.name",
     "ValueEpisodeNameUnderscore": "Episode_name",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Enter Text",
     "LabelTypeText": "Text",
     "HeaderSearchForSubtitles": "Search for Subtitles",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "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:"
+    "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 14e20e886..a30024ae8 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Compositores",
+    "HeaderRecentActivity": "Atividade Recente",
     "LabelExit": "Sair",
-    "OptionOthers": "Outros",
+    "HeaderPeople": "Pessoas",
     "LabelVisitCommunity": "Visitar a Comunidade",
+    "HeaderDownloadPeopleMetadataFor": "Fazer download da biografia e imagens para:",
     "LabelGithubWiki": "Wiki do Github",
-    "HeaderDownloadPeopleMetadataForHelp": "Ativar op\u00e7\u00f5es adicionais disponibilizar\u00e1 mais informa\u00e7\u00f5es na tela mas deixar\u00e1 os rastreamentos de biblioteca mais lentos.",
+    "OptionComposers": "Compositores",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "Pastas",
+    "OptionOthers": "Outros",
     "LabelStandard": "Padr\u00e3o",
-    "LabelDisplayFoldersView": "Exibir visualiza\u00e7\u00e3o de pastas para mostrar pastas simples de m\u00eddia",
     "LabelViewApiDocumentation": "Ver documenta\u00e7\u00e3o da Api",
-    "ViewTypeLiveTvRecordingGroups": "Grava\u00e7\u00f5es",
+    "HeaderDownloadPeopleMetadataForHelp": "Ativar op\u00e7\u00f5es adicionais disponibilizar\u00e1 mais informa\u00e7\u00f5es na tela mas deixar\u00e1 os rastreamentos de biblioteca mais lentos.",
     "LabelBrowseLibrary": "Navegar pela Biblioteca",
-    "ViewTypeLiveTvChannels": "Canais",
+    "ViewTypeFolders": "Pastas",
     "LabelConfigureMediaBrowser": "Configurar Media Browser",
-    "LabelAllowLocalAccessWithoutPassword": "Permtir acesso local sem senha",
+    "LabelDisplayFoldersView": "Exibir visualiza\u00e7\u00e3o de pastas para mostrar pastas simples de m\u00eddia",
     "LabelOpenLibraryViewer": "Abrir Visualizador da Biblioteca",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "Quando ativado, uma senha n\u00e3o ser\u00e1 necess\u00e1ria para entrar atrav\u00e9s de sua rede dom\u00e9stica.",
+    "ViewTypeLiveTvRecordingGroups": "Grava\u00e7\u00f5es",
     "LabelRestartServer": "Reiniciar Servidor",
-    "HeaderPassword": "Senha",
+    "ViewTypeLiveTvChannels": "Canais",
     "LabelShowLogWindow": "Exibir Janela de Log",
-    "HeaderLocalAccess": "Acesso Local",
+    "LabelAllowLocalAccessWithoutPassword": "Permtir acesso local sem senha",
     "LabelPrevious": "Anterior",
-    "HeaderViewOrder": "Ordem da Visualiza\u00e7\u00e3o",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "Quando ativado, uma senha n\u00e3o ser\u00e1 necess\u00e1ria para entrar atrav\u00e9s de sua rede dom\u00e9stica.",
     "LabelFinish": "Finalizar",
-    "LabelSelectUserViewOrder": "Escolha a ordem em que suas visualiza\u00e7\u00f5es ser\u00e3o exibidas dentro das apps do Media Browser",
+    "HeaderPassword": "Senha",
     "LabelNext": "Pr\u00f3ximo",
-    "LabelMetadataRefreshMode": "Modo de atualiza\u00e7\u00e3o dos metadados:",
+    "HeaderLocalAccess": "Acesso Local",
     "LabelYoureDone": "Pronto!",
-    "LabelImageRefreshMode": "Modo de atualiza\u00e7\u00e3o das imagens:",
+    "HeaderViewOrder": "Ordem da Visualiza\u00e7\u00e3o",
     "WelcomeToMediaBrowser": "Bem Vindo ao Media Browser!",
-    "OptionDownloadMissingImages": "Fazer download das imagens faltantes",
+    "LabelSelectUserViewOrder": "Escolha a ordem em que suas visualiza\u00e7\u00f5es ser\u00e3o exibidas dentro das apps do Media Browser",
     "TitleMediaBrowser": "Media Browser",
-    "OptionReplaceExistingImages": "Substituir imagens existentes",
+    "LabelMetadataRefreshMode": "Modo de atualiza\u00e7\u00e3o dos metadados:",
     "ThisWizardWillGuideYou": "Este assistente ir\u00e1 gui\u00e1-lo pelo processo de instala\u00e7\u00e3o. Para come\u00e7ar, por favor selecione seu idioma preferido.",
-    "OptionRefreshAllData": "Atualizar todos os dados",
+    "LabelImageRefreshMode": "Modo de atualiza\u00e7\u00e3o das imagens:",
     "TellUsAboutYourself": "Conte-nos sobre voc\u00ea",
-    "OptionAddMissingDataOnly": "Adicionar apenas dados faltantes",
+    "OptionDownloadMissingImages": "Fazer download das imagens faltantes",
     "LabelYourFirstName": "Seu primeiro nome:",
-    "OptionLocalRefreshOnly": "Atualiza\u00e7\u00e3o local apenas",
+    "OptionReplaceExistingImages": "Substituir imagens existentes",
     "MoreUsersCanBeAddedLater": "Mais usu\u00e1rios poder\u00e3o ser adicionados depois dentro do Painel.",
-    "HeaderRefreshMetadata": "Atualizar Metadados",
+    "OptionRefreshAllData": "Atualizar todos os dados",
     "UserProfilesIntro": "Media Browser inclui suporte a perfis de usu\u00e1rios, permitindo que cada usu\u00e1rio tenha suas prefer\u00eancias de visualiza\u00e7\u00e3o, status das reprodu\u00e7\u00f5es e controle parental.",
-    "HeaderPersonInfo": "Informa\u00e7\u00e3o da Pessoa",
+    "OptionAddMissingDataOnly": "Adicionar apenas dados faltantes",
     "LabelWindowsService": "Servi\u00e7o do Windows",
-    "HeaderIdentifyItem": "Identificar Item",
+    "OptionLocalRefreshOnly": "Atualiza\u00e7\u00e3o local apenas",
     "AWindowsServiceHasBeenInstalled": "Foi instalado um Servi\u00e7o do Windows.",
-    "HeaderIdentifyItemHelp": "Digite um ou mais crit\u00e9rios de busca. Exclua o crit\u00e9rio para aumentar os resultados da busca.",
+    "HeaderRefreshMetadata": "Atualizar Metadados",
     "WindowsServiceIntro1": "O Servidor Media Browser normalmente \u00e9 executado como uma aplica\u00e7\u00e3o de desktop com um \u00edcone na bandeja do sistema, mas se preferir executar como servi\u00e7o pode inici\u00e1-lo no painel de controle de servi\u00e7os do Windows",
-    "HeaderConfirmDeletion": "Confirmar Exclus\u00e3o",
+    "HeaderPersonInfo": "Informa\u00e7\u00e3o da Pessoa",
     "WindowsServiceIntro2": "Se usar o servi\u00e7o do Windows, por favor certifique-se que n\u00e3o esteja sendo executado ao mesmo tempo que o \u00edcone na bandeja, se estiver ter\u00e1 que sair da app antes de executar o servi\u00e7o. O servi\u00e7o necessita ser configurado com privil\u00e9gios de administrador no painel de controle. Neste momento o servi\u00e7o n\u00e3o pode se auto-atualizar, por isso novas vers\u00f5es exigir\u00e3o intera\u00e7\u00e3o manual.",
-    "LabelFollowingFileWillBeDeleted": "O seguinte arquivo ser\u00e1 exclu\u00eddo:",
+    "HeaderIdentifyItem": "Identificar Item",
     "WizardCompleted": "Isto \u00e9 todo o necess\u00e1rio. Media Browser iniciou a coleta das informa\u00e7\u00f5es de sua biblioteca de m\u00eddia. Conhe\u00e7a algumas de nossas apps e clique <b>Terminar<\/b> para ver o <b>Painel<\/b>.",
-    "LabelIfYouWishToContinueWithDeletion": "Se desejar continuar, por favor confirme digitando o valor de:",
+    "HeaderIdentifyItemHelp": "Digite um ou mais crit\u00e9rios de busca. Exclua o crit\u00e9rio para aumentar os resultados da busca.",
     "LabelConfigureSettings": "Configurar ajustes",
-    "ButtonIdentify": "Identificar",
+    "HeaderConfirmDeletion": "Confirmar Exclus\u00e3o",
     "LabelEnableVideoImageExtraction": "Ativar extra\u00e7\u00e3o de imagens de v\u00eddeo",
-    "LabelAlbumArtist": "Artista do \u00e1lbum:",
+    "LabelFollowingFileWillBeDeleted": "O seguinte arquivo ser\u00e1 exclu\u00eddo:",
     "VideoImageExtractionHelp": "Para v\u00eddeos que n\u00e3o tenham imagens e que n\u00e3o possamos encontrar imagens na internet. Isto aumentar\u00e1 o tempo do rastreamento inicial da biblioteca mas resultar\u00e1 em uma apresenta\u00e7\u00e3o mais bonita.",
-    "LabelAlbum": "\u00c1lbum:",
+    "LabelIfYouWishToContinueWithDeletion": "Se desejar continuar, por favor confirme digitando o valor de:",
     "LabelEnableChapterImageExtractionForMovies": "Extrair imagens de cap\u00edtulos dos Filmes",
-    "LabelCommunityRating": "Avalia\u00e7\u00e3o da comunidade:",
+    "ButtonIdentify": "Identificar",
     "LabelChapterImageExtractionForMoviesHelp": "Extrair imagens de cap\u00edtulos permitir\u00e1 aos clientes exibir menus gr\u00e1ficos de sele\u00e7\u00e3o de cenas. O processo pode ser lento, uso intensivo de cpu e pode exigir bastante espa\u00e7o em disco. Ele ser\u00e1 executado \u00e0s 4:00hs, embora isto possa ser configur\u00e1vel na \u00e1rea de tarefas agendadas. N\u00e3o \u00e9 recomendado executar esta tarefa durante as horas de pico de uso.",
-    "LabelVoteCount": "Contagem de votos:",
+    "LabelAlbumArtist": "Artista do \u00e1lbum:",
     "LabelEnableAutomaticPortMapping": "Ativar mapeamento de porta autom\u00e1tico",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "\u00c1lbum:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP permite uma configura\u00e7\u00e3o automatizada do roteador para acesso remoto f\u00e1cil. Isto pode n\u00e3o funcionar em alguns modelos de roteadores.",
-    "LabelCriticRating": "Avalia\u00e7\u00e3o da cr\u00edtica:",
+    "LabelCommunityRating": "Avalia\u00e7\u00e3o da comunidade:",
     "ButtonOk": "Ok",
-    "LabelCriticRatingSummary": "Resumo da avalia\u00e7\u00e3o da cr\u00edtica:",
+    "LabelVoteCount": "Contagem de votos:",
     "ButtonCancel": "Cancelar",
-    "LabelAwardSummary": "Resumo da premia\u00e7\u00e3o:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "Nova",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Avalia\u00e7\u00e3o da cr\u00edtica:",
     "HeaderSetupLibrary": "Configurar sua biblioteca de m\u00eddias",
-    "LabelTagline": "Slogan:",
+    "LabelCriticRatingSummary": "Resumo da avalia\u00e7\u00e3o da cr\u00edtica:",
     "ButtonAddMediaFolder": "Adicionar pasta de m\u00eddias",
-    "LabelOverview": "Sinopse:",
+    "LabelAwardSummary": "Resumo da premia\u00e7\u00e3o:",
     "LabelFolderType": "Tipo de pasta:",
-    "LabelShortOverview": "Sinopse curta:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "* Requer o uso de um plugin, ex. GameBrowser ou MB Bookshelf.",
-    "LabelReleaseDate": "Data do lan\u00e7amento:",
+    "LabelTagline": "Slogan:",
     "ReferToMediaLibraryWiki": "Consultar wiki da biblioteca de m\u00eddias",
-    "LabelYear": "Ano:",
+    "LabelOverview": "Sinopse:",
     "LabelCountry": "Pa\u00eds:",
-    "LabelPlaceOfBirth": "Local de nascimento:",
+    "LabelShortOverview": "Sinopse curta:",
     "LabelLanguage": "Idioma:",
-    "LabelEndDate": "Data final:",
+    "LabelReleaseDate": "Data do lan\u00e7amento:",
     "HeaderPreferredMetadataLanguage": "Idioma preferido dos metadados:",
-    "LabelAirDate": "Dias de exibi\u00e7\u00e3o:",
+    "LabelYear": "Ano:",
     "LabelSaveLocalMetadata": "Salvar artwork e metadados dentro das pastas da m\u00eddia",
-    "LabelAirTime:": "Hora da exibi\u00e7\u00e3o:",
+    "LabelPlaceOfBirth": "Local de nascimento:",
     "LabelSaveLocalMetadataHelp": "Salvar artwork e metadados diretamente nas pastas da m\u00eddia as deixar\u00e1 em um local f\u00e1cil para edit\u00e1-las.",
-    "LabelRuntimeMinutes": "Dura\u00e7\u00e3o (minutos):",
+    "LabelEndDate": "Data final:",
     "LabelDownloadInternetMetadata": "Fazer download das imagens e metadados da internet",
-    "LabelParentalRating": "Classifica\u00e7\u00e3o parental:",
+    "LabelAirDate": "Dias de exibi\u00e7\u00e3o:",
     "LabelDownloadInternetMetadataHelp": "O Media Browser pode fazer download das informa\u00e7\u00f5es de sua m\u00eddia para melhorar a apresenta\u00e7\u00e3o.",
-    "LabelCustomRating": "Classifica\u00e7\u00e3o personalizada:",
+    "LabelAirTime:": "Hora da exibi\u00e7\u00e3o:",
     "TabPreferences": "Prefer\u00eancias",
-    "LabelBudget": "Or\u00e7amento",
+    "LabelRuntimeMinutes": "Dura\u00e7\u00e3o (minutos):",
     "TabPassword": "Senha",
-    "LabelRevenue": "Receita ($):",
+    "LabelParentalRating": "Classifica\u00e7\u00e3o parental:",
     "TabLibraryAccess": "Acesso \u00e0 Biblioteca",
-    "LabelOriginalAspectRatio": "Rela\u00e7\u00e3o de aspecto original:",
+    "LabelCustomRating": "Classifica\u00e7\u00e3o personalizada:",
     "TabImage": "Imagem",
-    "LabelPlayers": "Reprodutores:",
+    "LabelBudget": "Or\u00e7amento",
     "TabProfile": "Perfil",
-    "Label3DFormat": "Formato 3D:",
+    "LabelRevenue": "Receita ($):",
     "TabMetadata": "Metadados",
-    "HeaderAlternateEpisodeNumbers": "N\u00fameros de Epis\u00f3dios Alternativos",
+    "LabelOriginalAspectRatio": "Rela\u00e7\u00e3o de aspecto original:",
     "TabImages": "Imagens",
-    "HeaderSpecialEpisodeInfo": "Informa\u00e7\u00e3o do Epis\u00f3dio Especial",
+    "LabelPlayers": "Reprodutores:",
     "TabNotifications": "Notifica\u00e7\u00f5es",
-    "HeaderExternalIds": "Id`s Externos:",
+    "Label3DFormat": "Formato 3D:",
     "TabCollectionTitles": "T\u00edtulos",
-    "LabelDvdSeasonNumber": "N\u00famero da temporada do Dvd:",
+    "HeaderAlternateEpisodeNumbers": "N\u00fameros de Epis\u00f3dios Alternativos",
     "LabelDisplayMissingEpisodesWithinSeasons": "Exibir epis\u00f3dios ausentes dentro das temporadas",
-    "LabelDvdEpisodeNumber": "N\u00famero do epis\u00f3dio do Dvd:",
+    "HeaderSpecialEpisodeInfo": "Informa\u00e7\u00e3o do Epis\u00f3dio Especial",
     "LabelUnairedMissingEpisodesWithinSeasons": "Exibir epis\u00f3dios por estrear dentro das temporadas",
-    "LabelAbsoluteEpisodeNumber": "N\u00famero absoluto do epis\u00f3dio:",
+    "HeaderExternalIds": "Id`s Externos:",
     "HeaderVideoPlaybackSettings": "Ajustes da Reprodu\u00e7\u00e3o de V\u00eddeo",
-    "LabelAirsBeforeSeason": "Exibido antes da temporada:",
+    "LabelDvdSeasonNumber": "N\u00famero da temporada do Dvd:",
     "HeaderPlaybackSettings": "Ajustes de Reprodu\u00e7\u00e3o",
-    "LabelAirsAfterSeason": "Exibido depois da temporada:",
+    "LabelDvdEpisodeNumber": "N\u00famero do epis\u00f3dio do Dvd:",
     "LabelAudioLanguagePreference": "Prefer\u00eancia do idioma do \u00e1udio:",
-    "LabelAirsBeforeEpisode": "Exibido antes do epis\u00f3dio:",
+    "LabelAbsoluteEpisodeNumber": "N\u00famero absoluto do epis\u00f3dio:",
     "LabelSubtitleLanguagePreference": "Prefer\u00eancia do idioma da legenda:",
-    "LabelTreatImageAs": "Tratar imagem como:",
+    "LabelAirsBeforeSeason": "Exibido antes da temporada:",
     "OptionDefaultSubtitles": "Padr\u00e3o",
-    "LabelDisplayOrder": "Ordem de exibi\u00e7\u00e3o:",
+    "LabelAirsAfterSeason": "Exibido depois da temporada:",
     "OptionOnlyForcedSubtitles": "Apenas legendas for\u00e7adas",
-    "LabelDisplaySpecialsWithinSeasons": "Exibir especiais dentro das temporadas em que s\u00e3o exibidos",
+    "LabelAirsBeforeEpisode": "Exibido antes do epis\u00f3dio:",
     "OptionAlwaysPlaySubtitles": "Sempre reproduzir legendas",
-    "HeaderCountries": "Pa\u00edses",
+    "LabelTreatImageAs": "Tratar imagem como:",
     "OptionNoSubtitles": "Nenhuma legenda",
-    "HeaderGenres": "G\u00eaneros",
+    "LabelDisplayOrder": "Ordem de exibi\u00e7\u00e3o:",
     "OptionDefaultSubtitlesHelp": "As legendas que forem iguais ao idioma preferido ser\u00e3o carregadas quando o \u00e1udio estiver em um idioma estrangeiro.",
-    "HeaderPlotKeywords": "Palavras-chave da Trama",
+    "LabelDisplaySpecialsWithinSeasons": "Exibir especiais dentro das temporadas em que s\u00e3o exibidos",
     "OptionOnlyForcedSubtitlesHelp": "Apenas legendas marcadas como for\u00e7adas ser\u00e3o carregadas.",
-    "HeaderStudios": "Est\u00fadios",
+    "HeaderCountries": "Pa\u00edses",
     "OptionAlwaysPlaySubtitlesHelp": "As legendas que forem iguais ao idioma preferido ser\u00e3o carregadas independente do idioma do \u00e1udio.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "G\u00eaneros",
     "OptionNoSubtitlesHelp": "As legendas n\u00e3o ser\u00e3o carregadas por padr\u00e3o.",
-    "HeaderMetadataSettings": "Ajustes dos Metadados",
+    "HeaderPlotKeywords": "Palavras-chave da Trama",
     "TabProfiles": "Perfis",
-    "LabelLockItemToPreventChanges": "Bloquear este item para evitar altera\u00e7\u00f5es futuras",
+    "HeaderStudios": "Est\u00fadios",
     "TabSecurity": "Seguran\u00e7a",
-    "MessageLeaveEmptyToInherit": "Deixar em branco para herdar os ajustes de um item superior, ou o valor padr\u00e3o global",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "Adicionar Usu\u00e1rio",
-    "TabSupporterClub": "Clube do Colaborador",
+    "HeaderMetadataSettings": "Ajustes dos Metadados",
     "ButtonSave": "Salvar",
-    "HeaderDonationType": "Tipo de doa\u00e7\u00e3o:",
+    "LabelLockItemToPreventChanges": "Bloquear este item para evitar altera\u00e7\u00f5es futuras",
     "ButtonResetPassword": "Redefinir Senha",
-    "OptionMakeOneTimeDonation": "Fazer doa\u00e7\u00e3o uma \u00fanica vez",
+    "MessageLeaveEmptyToInherit": "Deixar em branco para herdar os ajustes de um item superior, ou o valor padr\u00e3o global",
     "LabelNewPassword": "Nova senha:",
-    "OptionLifeTimeSupporterClubMembership": "Filia\u00e7\u00e3o vital\u00edcia do clube do colaborador",
+    "TabSupporterClub": "Clube do Colaborador",
     "LabelNewPasswordConfirm": "Confirmar nova senha:",
-    "HeaderSupporterBenefit": "Tornar-se um membro do clube do colaborador oferece benef\u00edcios adicionais como o acesso a plugins premium, conte\u00fado de canais de internet e mais.",
+    "HeaderDonationType": "Tipo de doa\u00e7\u00e3o:",
     "HeaderCreatePassword": "Criar Senha",
-    "OptionNoTrailer": "Nenhum Trailer",
+    "OptionMakeOneTimeDonation": "Fazer doa\u00e7\u00e3o uma \u00fanica vez",
     "LabelCurrentPassword": "Senha atual:",
-    "OptionNoThemeSong": "Nenhuma M\u00fasica-tema",
+    "OptionLifeTimeSupporterClubMembership": "Filia\u00e7\u00e3o vital\u00edcia do clube do colaborador",
     "LabelMaxParentalRating": "Classifica\u00e7\u00e3o parental m\u00e1xima permitida:",
-    "OptionNoThemeVideo": "Nenhum V\u00eddeo-tema",
+    "HeaderSupporterBenefit": "Tornar-se um membro do clube do colaborador oferece benef\u00edcios adicionais como o acesso a plugins premium, conte\u00fado de canais de internet e mais.",
     "MaxParentalRatingHelp": "Conte\u00fado com classifica\u00e7\u00e3o maior ser\u00e1 ocultado do usu\u00e1rio.",
-    "LabelOneTimeDonationAmount": "Valor da doa\u00e7\u00e3o:",
+    "OptionNoTrailer": "Nenhum Trailer",
     "LibraryAccessHelp": "Selecionar as pastas de m\u00eddia para compartilhar com este usu\u00e1rio. Administradores poder\u00e3o editar todas as pastas usando o gerenciador de metadados.",
+    "OptionNoThemeSong": "Nenhuma M\u00fasica-tema",
     "ChannelAccessHelp": "Selecione os canais a compartilhar com este usu\u00e1rio. Administradores poder\u00e3o editar todos os canais usando o gerenciador de metadados.",
+    "OptionNoThemeVideo": "Nenhum V\u00eddeo-tema",
     "ButtonDeleteImage": "Apagar Imagem",
+    "LabelOneTimeDonationAmount": "Valor da doa\u00e7\u00e3o:",
     "LabelSelectUsers": "Selecionar usu\u00e1rios:",
+    "OptionActor": "Actor",
     "ButtonUpload": "Carregar",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "Carregar Nova Imagem",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "Soltar imagem aqui",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "Propor\u00e7\u00e3o de Imagem 1:1 Recomendada. Apenas JPG\/PNG",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "Nada aqui.",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "Por favor, certifique-se que o download de metadados da internet est\u00e1 habilitado.",
     "TabSuggested": "Sugeridos",
     "TabLatest": "Recentes",
@@ -714,12 +723,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": "Faixa seguinte",
+    "ButtonPreviousTrack": "Faixa Anterior",
+    "ButtonNextTrack": "Faixa Seguinte",
     "ButtonStop": "Parar",
     "ButtonPause": "Pausar",
     "LabelGroupMoviesIntoCollections": "Agrupar filmes nas cole\u00e7\u00f5es",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Exibir plugins para:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Nome do epis\u00f3dio",
-    "LabelSeriesName": "Nome da s\u00e9rie",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Nome.s\u00e9rie",
     "ValueSeriesNameUnderscore": "Nome_s\u00e9rie",
     "ValueEpisodeNamePeriod": "Nome.epis\u00f3dio",
     "ValueEpisodeNameUnderscore": "Nome_epis\u00f3dio",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Digitar texto",
     "LabelTypeText": "Texto",
     "HeaderSearchForSubtitles": "Buscar Legendas",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "App: {0}, Dispositivo: {1}",
     "ProviderValue": "Provedor: {0}",
     "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:"
+    "LabelChannelDownloadSizeLimitHelp": "Limite o tamanho da pasta para download do canal"
 }
\ 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 b2ff3f94f..85fb9d87f 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Composers",
+    "HeaderRecentActivity": "Recent Activity",
     "LabelExit": "Sair",
-    "OptionOthers": "Others",
+    "HeaderPeople": "People",
     "LabelVisitCommunity": "Visitar a Comunidade",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
     "LabelGithubWiki": "Wiki do Github",
-    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "OptionComposers": "Composers",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "Folders",
+    "OptionOthers": "Others",
     "LabelStandard": "Padr\u00e3o",
-    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelViewApiDocumentation": "Ver Documenta\u00e7\u00e3o da API",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
     "LabelBrowseLibrary": "Navegar pela Biblioteca",
-    "ViewTypeLiveTvChannels": "Channels",
+    "ViewTypeFolders": "Folders",
     "LabelConfigureMediaBrowser": "Configurar o Media Browser",
-    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelOpenLibraryViewer": "Abrir Visualizador da Biblioteca",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
     "LabelRestartServer": "Reiniciar Servidor",
-    "HeaderPassword": "Password",
+    "ViewTypeLiveTvChannels": "Channels",
     "LabelShowLogWindow": "Mostrar Janela de Log",
-    "HeaderLocalAccess": "Local Access",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
     "LabelPrevious": "Anterior",
-    "HeaderViewOrder": "View Order",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
     "LabelFinish": "Terminar",
-    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
+    "HeaderPassword": "Password",
     "LabelNext": "Seguinte",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "HeaderLocalAccess": "Local Access",
     "LabelYoureDone": "Concluiu!",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "HeaderViewOrder": "View Order",
     "WelcomeToMediaBrowser": "Bem-vindo ao Media Browser!",
-    "OptionDownloadMissingImages": "Download missing images",
+    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "TitleMediaBrowser": "Media Browser",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "ThisWizardWillGuideYou": "Este assistente ir\u00e1 ajud\u00e1-lo durante o processo de configura\u00e7\u00e3o. Para come\u00e7ar, selecione o idioma.",
-    "OptionRefreshAllData": "Refresh all data",
+    "LabelImageRefreshMode": "Image refresh mode:",
     "TellUsAboutYourself": "Fale-nos sobre si",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionDownloadMissingImages": "Download missing images",
     "LabelYourFirstName": "O seu primeiro nome:",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionReplaceExistingImages": "Replace existing images",
     "MoreUsersCanBeAddedLater": "\u00c9 poss\u00edvel adicionar utilizadores mais tarde no Painel Principal",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "OptionRefreshAllData": "Refresh all data",
     "UserProfilesIntro": "O Media Browser inclui suporte a perfis de utilizadores, permitindo a cada utilizador ter as suas pr\u00f3prias configura\u00e7\u00f5es da visualiza\u00e7\u00e3o, estado das reprodu\u00e7\u00f5es e controlo parental.",
-    "HeaderPersonInfo": "Person Info",
+    "OptionAddMissingDataOnly": "Add missing data only",
     "LabelWindowsService": "Servi\u00e7o do Windows",
-    "HeaderIdentifyItem": "Identify Item",
+    "OptionLocalRefreshOnly": "Local refresh only",
     "AWindowsServiceHasBeenInstalled": "Foi instalado um Servi\u00e7o do Windows.",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderRefreshMetadata": "Refresh Metadata",
     "WindowsServiceIntro1": "O Media Browser Server corre, normalmente, como uma aplica\u00e7\u00e3o de Ambiente de trabalho com um \u00edcone na bandeja, mas se preferir corr\u00ea-lo como um servi\u00e7o em segundo plano, pode ser iniciado atrav\u00e9s do Painel de Controlo dos Servi\u00e7os do Windows.",
-    "HeaderConfirmDeletion": "Confirm Deletion",
+    "HeaderPersonInfo": "Person Info",
     "WindowsServiceIntro2": "Por favor tome aten\u00e7\u00e3o que se estiver a usar o servi\u00e7o, este n\u00e3o pode estar a correr ao mesmo tempo que o \u00edcone na bandeja. Por isso, ter\u00e1 de sair da aplca\u00e7\u00e3o da bandeja para poder correr o servi\u00e7o. Note, ainda, que o servi\u00e7o necessita de privil\u00e9gios administrativos via Painel de Controlo. De momento, n\u00e3o \u00e9 poss\u00edvel utilizar a fun\u00e7\u00e3o de auto-actualiza\u00e7\u00e3o ao mesmo tempo que est\u00e1 em utiliza\u00e7\u00e3o o servi\u00e7o, por isso, novas vers\u00f5es necessitam de interac\u00e7\u00e3o manual.",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "HeaderIdentifyItem": "Identify Item",
     "WizardCompleted": "\u00c9 tudo o que precisamos de momento. O Media Browser come\u00e7ou a colher informa\u00e7\u00e3o \u00e1cerca da sua biblioteca. D\u00ea uma vista de olhos nas nossas extens\u00f5es e depois clique em <b>Terminar<\/b> para ir para o <b>Painel Principal<\/b>.",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
     "LabelConfigureSettings": "Configura\u00e7\u00f5es",
-    "ButtonIdentify": "Identify",
+    "HeaderConfirmDeletion": "Confirm Deletion",
     "LabelEnableVideoImageExtraction": "Activar extrac\u00e7\u00e3o de imagens dos v\u00eddeos.",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
     "VideoImageExtractionHelp": "Para os v\u00eddeos ainda sem imagens e que n\u00e3o se encontram imagens na internet. Esta funcionalidade vai acrescentar mais algum tempo na leitura inicial da biblioteca, mas resultar\u00e1 numa apresenta\u00e7\u00e3o melhorada,",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
     "LabelEnableChapterImageExtractionForMovies": "Extrair imagens dos cap\u00edtulos dos Filmes",
-    "LabelCommunityRating": "Community rating:",
+    "ButtonIdentify": "Identify",
     "LabelChapterImageExtractionForMoviesHelp": "Extrair imagens dos cap\u00edtulos permite, \u00e0s aplica\u00e7\u00f5es clientes, apresentar menus de selec\u00e7\u00e3o de cap\u00edtulos com cenas. Este processo pode ser lento, intensivo para o CPU e pode requerer v\u00e1rios gigabytes de espa\u00e7o. Corre como um servi\u00e7o nocturno, agendado para as 04h, embora possa ser configurado na \u00e1rea de Tarefas Agendadas. N\u00e3o \u00e9 recomendado correr esta tarefa em horas que haja muita utiliza\u00e7\u00e3o.",
-    "LabelVoteCount": "Vote count:",
+    "LabelAlbumArtist": "Album artist:",
     "LabelEnableAutomaticPortMapping": "Activar mapeamento autom\u00e1tico de portas",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP permite configurar automaticamente o router, para um acesso remoto mais facilitado. Pode n\u00e3o suportar todos os modelos de routers.",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCommunityRating": "Community rating:",
     "ButtonOk": "Ok",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelVoteCount": "Vote count:",
     "ButtonCancel": "Cancelar",
-    "LabelAwardSummary": "Award summary:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "Novo",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Critic rating:",
     "HeaderSetupLibrary": "Configurar biblioteca",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Critic rating summary:",
     "ButtonAddMediaFolder": "Adicionar pasta de media",
-    "LabelOverview": "Overview:",
+    "LabelAwardSummary": "Award summary:",
     "LabelFolderType": "Tipo de pasta",
-    "LabelShortOverview": "Short overview:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "* Requer o uso de uma extens\u00e3o, e.g. GameBrowser ou MB Bookshelf",
-    "LabelReleaseDate": "Release date:",
+    "LabelTagline": "Tagline:",
     "ReferToMediaLibraryWiki": "Consulte a wiki",
-    "LabelYear": "Year:",
+    "LabelOverview": "Overview:",
     "LabelCountry": "Pa\u00eds:",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelShortOverview": "Short overview:",
     "LabelLanguage": "Idioma:",
-    "LabelEndDate": "End date:",
+    "LabelReleaseDate": "Release date:",
     "HeaderPreferredMetadataLanguage": "Idioma preferido para metadados",
-    "LabelAirDate": "Air days:",
+    "LabelYear": "Year:",
     "LabelSaveLocalMetadata": "Guardar imagens e metadados nas pastas multim\u00e9dia",
-    "LabelAirTime:": "Air time:",
+    "LabelPlaceOfBirth": "Place of birth:",
     "LabelSaveLocalMetadataHelp": "Guardar imagens e metadados diretamente nas pastas multim\u00e9dia, vai coloc\u00e1-los num local de f\u00e1cil acesso para poderem ser editados facilmente.",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelEndDate": "End date:",
     "LabelDownloadInternetMetadata": "Transferir imagens e metadados da Internet",
-    "LabelParentalRating": "Parental rating:",
+    "LabelAirDate": "Air days:",
     "LabelDownloadInternetMetadataHelp": "O Media Browser pode transferir informa\u00e7\u00f5es sobre os seus conte\u00fados multim\u00e9dia para possibilitar apresenta\u00e7\u00f5es mais ricas.",
-    "LabelCustomRating": "Custom rating:",
+    "LabelAirTime:": "Air time:",
     "TabPreferences": "Prefer\u00eancias",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Run time (minutes):",
     "TabPassword": "Senha",
-    "LabelRevenue": "Revenue ($):",
+    "LabelParentalRating": "Parental rating:",
     "TabLibraryAccess": "Aceder \u00e0 Biblioteca",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelCustomRating": "Custom rating:",
     "TabImage": "Imagem",
-    "LabelPlayers": "Players:",
+    "LabelBudget": "Budget",
     "TabProfile": "Perfil",
-    "Label3DFormat": "3D format:",
+    "LabelRevenue": "Revenue ($):",
     "TabMetadata": "Metadados",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "LabelOriginalAspectRatio": "Original aspect ratio:",
     "TabImages": "Imagens",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "LabelPlayers": "Players:",
     "TabNotifications": "Notifica\u00e7\u00f5es",
-    "HeaderExternalIds": "External Id's:",
+    "Label3DFormat": "3D format:",
     "TabCollectionTitles": "T\u00edtulos",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
     "LabelDisplayMissingEpisodesWithinSeasons": "Mostrar epis\u00f3dios em falta dentro das temporadas",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "HeaderSpecialEpisodeInfo": "Special Episode Info",
     "LabelUnairedMissingEpisodesWithinSeasons": "Mostrar epis\u00f3dios por estrear dentro das temporadas",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "HeaderExternalIds": "External Id's:",
     "HeaderVideoPlaybackSettings": "Configura\u00e7\u00f5es de Reprodu\u00e7\u00e3o de V\u00eddeo",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "Dvd season number:",
     "HeaderPlaybackSettings": "Op\u00e7\u00f5es de Reprodu\u00e7\u00e3o",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "Dvd episode number:",
     "LabelAudioLanguagePreference": "Prefer\u00eancias de Idioma de Audio:",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
     "LabelSubtitleLanguagePreference": "Prefer\u00eancia de Idioma de Legenda:",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelAirsBeforeSeason": "Airs before season:",
     "OptionDefaultSubtitles": "Padr\u00e3o",
-    "LabelDisplayOrder": "Display order:",
+    "LabelAirsAfterSeason": "Airs after season:",
     "OptionOnlyForcedSubtitles": "Only forced subtitles",
-    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelAirsBeforeEpisode": "Airs before episode:",
     "OptionAlwaysPlaySubtitles": "Reproduzir sempre legendas",
-    "HeaderCountries": "Countries",
+    "LabelTreatImageAs": "Treat image as:",
     "OptionNoSubtitles": "No Subtitles",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "Display order:",
     "OptionDefaultSubtitlesHelp": "As legendas que forem iguais ao idioma preferido ser\u00e3o carregadas quando o \u00e1udio estiver num idioma estrangeiro.",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
     "OptionOnlyForcedSubtitlesHelp": "Only subtitles marked as forced will be loaded.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "Countries",
     "OptionAlwaysPlaySubtitlesHelp": "As legendas que forem iguais ao idioma preferido ser\u00e3o carregadas independente do idioma do \u00e1udio.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "Genres",
     "OptionNoSubtitlesHelp": "As legendas n\u00e3o ser\u00e3o carregadas por padr\u00e3o.",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderPlotKeywords": "Plot Keywords",
     "TabProfiles": "Perfis",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "HeaderStudios": "Studios",
     "TabSecurity": "Seguran\u00e7a",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "Adicionar Utilizador",
-    "TabSupporterClub": "Supporter Club",
+    "HeaderMetadataSettings": "Metadata Settings",
     "ButtonSave": "Guardar",
-    "HeaderDonationType": "Donation type:",
+    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
     "ButtonResetPassword": "Redefinir Senha",
-    "OptionMakeOneTimeDonation": "Make a one-time donation",
+    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
     "LabelNewPassword": "Nova senha:",
-    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
+    "TabSupporterClub": "Supporter Club",
     "LabelNewPasswordConfirm": "Confirmar nova senha:",
-    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderDonationType": "Donation type:",
     "HeaderCreatePassword": "Criar Senha",
-    "OptionNoTrailer": "No Trailer",
+    "OptionMakeOneTimeDonation": "Make a one-time donation",
     "LabelCurrentPassword": "Senha actual:",
-    "OptionNoThemeSong": "No Theme Song",
+    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
     "LabelMaxParentalRating": "Controlo Parental m\u00e1ximo permitido:",
-    "OptionNoThemeVideo": "No Theme Video",
+    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
     "MaxParentalRatingHelp": "Conte\u00fado com classifica\u00e7\u00e3o mais elevada ser\u00e1 escondida deste utilizador.",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "OptionNoTrailer": "No Trailer",
     "LibraryAccessHelp": "Escolha as pastas de media a partilha com este utilizador. Os Administradores poder\u00e3o editar todas as pastas, usando o Gestor de Metadados.",
+    "OptionNoThemeSong": "No Theme Song",
     "ChannelAccessHelp": "Select the channels to share with this user. Administrators will be able to edit all channels using the metadata manager.",
+    "OptionNoThemeVideo": "No Theme Video",
     "ButtonDeleteImage": "Apagar imagem",
+    "LabelOneTimeDonationAmount": "Donation amount:",
     "LabelSelectUsers": "Selecionar utilizadores:",
+    "OptionActor": "Actor",
     "ButtonUpload": "Carregar",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "Carregar Nova Imagem",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "Largar imagem aqui",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "1:1 R\u00e1cio de aspecto recomendado. JPG\/ PNG apenas.",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "Nada aqui.",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "Certifique-se que a transfer\u00eancia de metadados da internet est\u00e1 activa.",
     "TabSuggested": "Sugest\u00f5es",
     "TabLatest": "Mais recente",
@@ -212,7 +221,7 @@
     "OptionAscending": "Ascendente",
     "OptionDescending": "Descendente",
     "OptionRuntime": "Dura\u00e7\u00e3o",
-    "OptionReleaseDate": "Release Date",
+    "OptionReleaseDate": "Data de lan\u00e7amento",
     "OptionPlayCount": "N.\u00ba Visualiza\u00e7\u00f5es",
     "OptionDatePlayed": "Data de reprodu\u00e7\u00e3o",
     "OptionDateAdded": "Data de adi\u00e7\u00e3o",
@@ -566,12 +575,12 @@
     "HeaderProgram": "Programa",
     "HeaderClients": "Clientes",
     "LabelCompleted": "Terminado",
-    "LabelFailed": "Failed",
+    "LabelFailed": "Falhou",
     "LabelSkipped": "Ignorado",
     "HeaderEpisodeOrganization": "Organiza\u00e7\u00e3o dos Epis\u00f3dios",
-    "LabelSeries": "Series:",
-    "LabelSeasonNumber": "Season number",
-    "LabelEpisodeNumber": "Episode number",
+    "LabelSeries": "S\u00e9rie:",
+    "LabelSeasonNumber": "N\u00famero da temporada",
+    "LabelEpisodeNumber": "N\u00famero do epis\u00f3dio",
     "LabelEndingEpisodeNumber": "N\u00famero do epis\u00f3dio final",
     "LabelEndingEpisodeNumberHelp": "Necess\u00e1rio s\u00f3 para arquivos multi-epis\u00f3dios",
     "HeaderSupportTheTeam": "Apoie a Equipa do Media Browser",
@@ -718,8 +727,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",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Exibir extens\u00f5es para:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Nome do epis\u00f3dio",
-    "LabelSeriesName": "Nome da s\u00e9rie",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Nome.da.s\u00e9rie",
     "ValueSeriesNameUnderscore": "Nome_da_s\u00e9rie",
     "ValueEpisodeNamePeriod": "Nome.do.epis\u00f3dio",
     "ValueEpisodeNameUnderscore": "Nome_do_epis\u00f3dio",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Inserir texto",
     "LabelTypeText": "Texto",
     "HeaderSearchForSubtitles": "Search for Subtitles",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "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:"
+    "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 c9be356e9..59ba552a7 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ru.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "\u041a\u043e\u043c\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u044b",
+    "HeaderRecentActivity": "\u041d\u0435\u0434\u0430\u0432\u043d\u0438\u0435 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u044f",
     "LabelExit": "\u0412\u044b\u0445\u043e\u0434",
-    "OptionOthers": "\u0414\u0440\u0443\u0433\u0438\u0435",
+    "HeaderPeople": "\u041b\u044e\u0434\u0438",
     "LabelVisitCommunity": "\u041f\u043e\u0441\u0435\u0449\u0435\u043d\u0438\u0435 \u0421\u043e\u043e\u0431\u0449\u0435\u0441\u0442\u0432\u0430",
+    "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:",
     "LabelGithubWiki": "\u0412\u0438\u043a\u0438 \u043d\u0430 Github",
-    "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.",
+    "OptionComposers": "\u041a\u043e\u043c\u043f\u043e\u0437\u0438\u0442\u043e\u0440\u044b",
     "LabelSwagger": "\u0418\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441 Swagger",
-    "ViewTypeFolders": "\u041f\u0430\u043f\u043a\u0438",
+    "OptionOthers": "\u0414\u0440\u0443\u0433\u0438\u0435",
     "LabelStandard": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442",
-    "LabelDisplayFoldersView": "\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c \u0430\u0441\u043f\u0435\u043a\u0442 \u041f\u0430\u043f\u043a\u0438, \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",
     "LabelViewApiDocumentation": "\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u044f \u043f\u043e API",
-    "ViewTypeLiveTvRecordingGroups": "\u0417\u0430\u043f\u0438\u0441\u0438",
+    "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.",
     "LabelBrowseLibrary": "\u041e\u0431\u0437\u043e\u0440 \u041c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438",
-    "ViewTypeLiveTvChannels": "\u041a\u0430\u043d\u0430\u043b\u044b",
+    "ViewTypeFolders": "\u041f\u0430\u043f\u043a\u0438",
     "LabelConfigureMediaBrowser": "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 Media Browser",
-    "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",
+    "LabelDisplayFoldersView": "\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c \u0430\u0441\u043f\u0435\u043a\u0442 \u041f\u0430\u043f\u043a\u0438, \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",
     "LabelOpenLibraryViewer": "\u0421\u0440\u0435\u0434\u0441\u0442\u0432\u043e \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0430 \u041c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "\u0415\u0441\u043b\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u043e, \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\u0436\u0434\u0435\u043d\u0438\u0438 \u0438\u0437\u043d\u0443\u0442\u0440\u0438 \u0432\u0430\u0448\u0435\u0439 \u0434\u043e\u043c\u0430\u0448\u043d\u0435\u0439 \u0441\u0435\u0442\u0438.",
+    "ViewTypeLiveTvRecordingGroups": "\u0417\u0430\u043f\u0438\u0441\u0438",
     "LabelRestartServer": "\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0430",
-    "HeaderPassword": "\u041f\u0430\u0440\u043e\u043b\u044c",
+    "ViewTypeLiveTvChannels": "\u041a\u0430\u043d\u0430\u043b\u044b",
     "LabelShowLogWindow": "\u041e\u0442\u043a\u0440\u044b\u0442\u0438\u0435 \u0416\u0443\u0440\u043d\u0430\u043b\u0430 \u0432 \u043e\u043a\u043d\u0435",
-    "HeaderLocalAccess": "\u041b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0439 \u0434\u043e\u0441\u0442\u0443\u043f",
+    "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",
     "LabelPrevious": "\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0435\u0435",
-    "HeaderViewOrder": "\u041f\u043e\u0440\u044f\u0434\u043e\u043a \u0430\u0441\u043f\u0435\u043a\u0442\u043e\u0432",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "\u0415\u0441\u043b\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u043e, \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\u0436\u0434\u0435\u043d\u0438\u0438 \u0438\u0437\u043d\u0443\u0442\u0440\u0438 \u0432\u0430\u0448\u0435\u0439 \u0434\u043e\u043c\u0430\u0448\u043d\u0435\u0439 \u0441\u0435\u0442\u0438.",
     "LabelFinish": "\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c",
-    "LabelSelectUserViewOrder": "\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u043f\u043e\u0440\u044f\u0434\u043e\u043a, \u0432 \u043a\u043e\u0442\u043e\u0440\u043e\u043c \u041c\u043e\u0438 \u0430\u0441\u043f\u0435\u043a\u0442\u044b \u0431\u0443\u0434\u0443\u0442 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c\u0441\u044f \u0432\u043d\u0443\u0442\u0440\u0438 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439 Media Browser",
+    "HeaderPassword": "\u041f\u0430\u0440\u043e\u043b\u044c",
     "LabelNext": "\u0421\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u0435",
-    "LabelMetadataRefreshMode": "\u0420\u0435\u0436\u0438\u043c \u0430\u043a\u0442\u0443\u0430\u043b\u0438\u0437\u0430\u0446\u0438\u0438 \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445:",
+    "HeaderLocalAccess": "\u041b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0439 \u0434\u043e\u0441\u0442\u0443\u043f",
     "LabelYoureDone": "\u0412\u0441\u0451 \u0433\u043e\u0442\u043e\u0432\u043e!",
-    "LabelImageRefreshMode": "\u0420\u0435\u0436\u0438\u043c \u0430\u043a\u0442\u0443\u0430\u043b\u0438\u0437\u0430\u0446\u0438\u0438 \u0440\u0438\u0441\u0443\u043d\u043a\u0430:",
+    "HeaderViewOrder": "\u041f\u043e\u0440\u044f\u0434\u043e\u043a \u0430\u0441\u043f\u0435\u043a\u0442\u043e\u0432",
     "WelcomeToMediaBrowser": "\u0412\u0430\u0441 \u043f\u0440\u0438\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u0435\u0442 Media Browser!",
-    "OptionDownloadMissingImages": "\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0435 \u0440\u0438\u0441\u0443\u043d\u043a\u0438",
+    "LabelSelectUserViewOrder": "\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u043f\u043e\u0440\u044f\u0434\u043e\u043a, \u0432 \u043a\u043e\u0442\u043e\u0440\u043e\u043c \u041c\u043e\u0438 \u0430\u0441\u043f\u0435\u043a\u0442\u044b \u0431\u0443\u0434\u0443\u0442 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c\u0441\u044f \u0432\u043d\u0443\u0442\u0440\u0438 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439 Media Browser",
     "TitleMediaBrowser": "Media Browser",
-    "OptionReplaceExistingImages": "\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0435 \u0440\u0438\u0441\u0443\u043d\u043a\u0438",
+    "LabelMetadataRefreshMode": "\u0420\u0435\u0436\u0438\u043c \u0430\u043a\u0442\u0443\u0430\u043b\u0438\u0437\u0430\u0446\u0438\u0438 \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445:",
     "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 \u0432\u0430\u0441 \u0447\u0435\u0440\u0435\u0437 \u0432\u0441\u0435 \u0444\u0430\u0437\u044b \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438. \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.",
-    "OptionRefreshAllData": "\u0410\u043a\u0442\u0443\u0430\u043b\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0441\u0435 \u0434\u0430\u043d\u043d\u044b\u0435",
+    "LabelImageRefreshMode": "\u0420\u0435\u0436\u0438\u043c \u0430\u043a\u0442\u0443\u0430\u043b\u0438\u0437\u0430\u0446\u0438\u0438 \u0440\u0438\u0441\u0443\u043d\u043a\u0430:",
     "TellUsAboutYourself": "\u0420\u0430\u0441\u0441\u043a\u0430\u0436\u0438\u0442\u0435 \u043e \u0441\u0435\u0431\u0435",
-    "OptionAddMissingDataOnly": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0435 \u0434\u0430\u043d\u043d\u044b\u0435",
+    "OptionDownloadMissingImages": "\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0435 \u0440\u0438\u0441\u0443\u043d\u043a\u0438",
     "LabelYourFirstName": "\u0412\u0430\u0448\u0435 \u0438\u043c\u044f:",
-    "OptionLocalRefreshOnly": "\u0410\u043a\u0442\u0443\u0430\u043b\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043b\u043e\u043a\u0430\u043b\u044c\u043d\u043e",
+    "OptionReplaceExistingImages": "\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0435 \u0440\u0438\u0441\u0443\u043d\u043a\u0438",
     "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.",
-    "HeaderRefreshMetadata": "\u0410\u043a\u0442\u0443\u0430\u043b\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0435",
+    "OptionRefreshAllData": "\u0410\u043a\u0442\u0443\u0430\u043b\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0441\u0435 \u0434\u0430\u043d\u043d\u044b\u0435",
     "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.",
-    "HeaderPersonInfo": "\u0421\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043e \u043f\u0435\u0440\u0441\u043e\u043d\u0435",
+    "OptionAddMissingDataOnly": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0435 \u0434\u0430\u043d\u043d\u044b\u0435",
     "LabelWindowsService": "\u0421\u043b\u0443\u0436\u0431\u0430 Windows",
-    "HeaderIdentifyItem": "\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430",
+    "OptionLocalRefreshOnly": "\u0410\u043a\u0442\u0443\u0430\u043b\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043b\u043e\u043a\u0430\u043b\u044c\u043d\u043e",
     "AWindowsServiceHasBeenInstalled": "\u0421\u043b\u0443\u0436\u0431\u0430 Windows \u0431\u044b\u043b\u0430 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0430.",
-    "HeaderIdentifyItemHelp": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043e\u0434\u0438\u043d \u0438\u043b\u0438 \u0431\u043e\u043b\u0435\u0435 \u043a\u0440\u0438\u0442\u0435\u0440\u0438\u0435\u0432 \u043f\u043e\u0438\u0441\u043a\u0430. \u0414\u043b\u044f \u0443\u0432\u0435\u043b\u0438\u0447\u0435\u043d\u0438\u044f \u0447\u0438\u0441\u043b\u0430 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u0432 \u043f\u043e\u0438\u0441\u043a\u0430 \u0443\u0431\u0435\u0440\u0438\u0442\u0435 \u043a\u0440\u0438\u0442\u0435\u0440\u0438\u0439.",
+    "HeaderRefreshMetadata": "\u0410\u043a\u0442\u0443\u0430\u043b\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0435",
     "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.",
-    "HeaderConfirmDeletion": "\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u044f",
+    "HeaderPersonInfo": "\u0421\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043e \u043f\u0435\u0440\u0441\u043e\u043d\u0435",
     "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.",
-    "LabelFollowingFileWillBeDeleted": "\u0411\u0443\u0434\u0435\u0442 \u0443\u0434\u0430\u043b\u0451\u043d \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0439 \u0444\u0430\u0439\u043b:",
+    "HeaderIdentifyItem": "\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430",
     "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>.",
-    "LabelIfYouWishToContinueWithDeletion": "\u0415\u0441\u043b\u0438 \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c, \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435 \u044d\u0442\u043e, \u0432\u0432\u0435\u0434\u044f \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u044f:",
+    "HeaderIdentifyItemHelp": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043e\u0434\u0438\u043d \u0438\u043b\u0438 \u0431\u043e\u043b\u0435\u0435 \u043a\u0440\u0438\u0442\u0435\u0440\u0438\u0435\u0432 \u043f\u043e\u0438\u0441\u043a\u0430. \u0414\u043b\u044f \u0443\u0432\u0435\u043b\u0438\u0447\u0435\u043d\u0438\u044f \u0447\u0438\u0441\u043b\u0430 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u0432 \u043f\u043e\u0438\u0441\u043a\u0430 \u0443\u0431\u0435\u0440\u0438\u0442\u0435 \u043a\u0440\u0438\u0442\u0435\u0440\u0438\u0439.",
     "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",
-    "ButtonIdentify": "\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u0446\u0438\u0440\u043e\u0432\u0430\u0442\u044c",
+    "HeaderConfirmDeletion": "\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u044f",
     "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",
-    "LabelAlbumArtist": "\u0410\u043b\u044c\u0431\u043e\u043c\u043d\u044b\u0439 \u0438\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c:",
+    "LabelFollowingFileWillBeDeleted": "\u0411\u0443\u0434\u0435\u0442 \u0443\u0434\u0430\u043b\u0451\u043d \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0439 \u0444\u0430\u0439\u043b:",
     "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.",
-    "LabelAlbum": "\u0410\u043b\u044c\u0431\u043e\u043c",
+    "LabelIfYouWishToContinueWithDeletion": "\u0415\u0441\u043b\u0438 \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c, \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435 \u044d\u0442\u043e, \u0432\u0432\u0435\u0434\u044f \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u044f:",
     "LabelEnableChapterImageExtractionForMovies": "\u0418\u0437\u0432\u043b\u0435\u043a\u0430\u0442\u044c \u0440\u0438\u0441\u0443\u043d\u043a\u0438 \u0441\u0446\u0435\u043d \u0434\u043b\u044f \u0444\u0438\u043b\u044c\u043c\u043e\u0432",
-    "LabelCommunityRating": "\u041e\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043d\u043d\u0430\u044f \u043e\u0446\u0435\u043d\u043a\u0430:",
+    "ButtonIdentify": "\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u0446\u0438\u0440\u043e\u0432\u0430\u0442\u044c",
     "LabelChapterImageExtractionForMoviesHelp": "\u0418\u0437\u0432\u043b\u0435\u0447\u0435\u043d\u0438\u0435 \u0440\u0438\u0441\u0443\u043d\u043a\u043e\u0432 \u0441\u0446\u0435\u043d \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442 \u043a\u043b\u0438\u0435\u043d\u0442\u0430\u043c \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f \u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u0438\u0445 \u043c\u0435\u043d\u044e \u0432\u044b\u0431\u043e\u0440\u0430 \u0441\u0446\u0435\u043d\u044b. \u0414\u0430\u043d\u043d\u044b\u0439 \u043f\u0440\u043e\u0446\u0435\u0441\u0441 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043c\u0435\u0434\u043b\u0435\u043d\u043d\u044b\u043c, \u043d\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044c \u043f\u0440\u043e\u0446\u0435\u0441\u0441\u043e\u0440 \u0438 \u043c\u043e\u0436\u0435\u0442 \u043f\u043e\u043d\u0430\u0434\u043e\u0431\u0438\u0442\u044c\u0441\u044f \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u0433\u0438\u0433\u0430\u0431\u0430\u0439\u0442 \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u0430. \u0412\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u0435 \u0434\u0430\u043d\u043d\u043e\u0433\u043e \u0437\u0430\u0434\u0430\u043d\u0438\u044f \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043e \u043d\u0430 4:00 \u0443\u0442\u0440\u0430, \u043e\u0434\u043d\u0430\u043a\u043e, \u0435\u0451 \u043c\u043e\u0436\u043d\u043e \u043f\u0435\u0440\u0435\u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u0432 \u043e\u0431\u043b\u0430\u0441\u0442\u0438 \u041f\u043b\u0430\u043d\u0438\u0440\u043e\u0432\u0449\u0438\u043a\u0430. \u041d\u0435 \u0440\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u0443\u0435\u0442\u0441\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0442\u044c \u0434\u0430\u043d\u043d\u043e\u0435 \u0437\u0430\u0434\u0430\u043d\u0438\u0435 \u0432 \u0447\u0430\u0441\u044b \u043f\u0438\u043a.",
-    "LabelVoteCount": "\u0427\u0438\u0441\u043b\u043e \u0433\u043e\u043b\u043e\u0441\u043e\u0432:",
+    "LabelAlbumArtist": "\u0410\u043b\u044c\u0431\u043e\u043c\u043d\u044b\u0439 \u0438\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c:",
     "LabelEnableAutomaticPortMapping": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0430\u0432\u0442\u043e\u0441\u043e\u043f\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u043e\u0440\u0442\u043e\u0432",
-    "LabelMetascore": "\u041e\u0446\u0435\u043d\u043a\u0430 Metascore:",
+    "LabelAlbum": "\u0410\u043b\u044c\u0431\u043e\u043c",
     "LabelEnableAutomaticPortMappingHelp": "UPnP \u043f\u043e\u0437\u0432\u043e\u043b\u044f\u0435\u0442 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043c\u0430\u0440\u0448\u0440\u0443\u0442\u0438\u0437\u0430\u0442\u043e\u0440 \u0434\u043b\u044f \u043e\u0431\u043b\u0435\u0433\u0447\u0435\u043d\u0438\u044f \u0432\u043d\u0435\u0448\u043d\u0435\u0433\u043e \u0434\u043e\u0441\u0442\u0443\u043f\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e, \u044d\u0442\u043e \u043d\u0435 \u0441\u0440\u0430\u0431\u043e\u0442\u0430\u0435\u0442 \u0441 \u043d\u0435\u043a\u043e\u0442\u043e\u0440\u044b\u043c\u0438 \u043c\u043e\u0434\u0435\u043b\u044f\u043c\u0438 \u043c\u0430\u0440\u0448\u0440\u0443\u0442\u0438\u0437\u0430\u0442\u043e\u0440\u043e\u0432.",
-    "LabelCriticRating": "\u041e\u0446\u0435\u043d\u043a\u0430 \u043a\u0440\u0438\u0442\u0438\u043a\u043e\u0432:",
+    "LabelCommunityRating": "\u041e\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043d\u043d\u0430\u044f \u043e\u0446\u0435\u043d\u043a\u0430:",
     "ButtonOk": "\u041e\u041a",
-    "LabelCriticRatingSummary": "\u0421\u0432\u043e\u0434\u043a\u0430 \u043e\u0446\u0435\u043d\u043a\u0438 \u043a\u0440\u0438\u0442\u0438\u043a\u043e\u0432:",
+    "LabelVoteCount": "\u0427\u0438\u0441\u043b\u043e \u0433\u043e\u043b\u043e\u0441\u043e\u0432:",
     "ButtonCancel": "\u041e\u0442\u043c\u0435\u043d\u0430",
-    "LabelAwardSummary": "\u0421\u0432\u043e\u0434\u043a\u0430 \u043d\u0430\u0433\u0440\u0430\u0434:",
+    "LabelMetascore": "\u041e\u0446\u0435\u043d\u043a\u0430 Metascore:",
     "ButtonNew": "\u0421\u043e\u0437\u0434\u0430\u0442\u044c",
-    "LabelWebsite": "\u0412\u0435\u0431\u0441\u0430\u0439\u0442:",
+    "LabelCriticRating": "\u041e\u0446\u0435\u043d\u043a\u0430 \u043a\u0440\u0438\u0442\u0438\u043a\u043e\u0432:",
     "HeaderSetupLibrary": "\u0421\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u0443\u0439\u0442\u0435 \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0443",
-    "LabelTagline": "\u041a\u043b\u044e\u0447\u0435\u0432\u0430\u044f \u0444\u0440\u0430\u0437\u0430:",
+    "LabelCriticRatingSummary": "\u0421\u0432\u043e\u0434\u043a\u0430 \u043e\u0446\u0435\u043d\u043a\u0438 \u043a\u0440\u0438\u0442\u0438\u043a\u043e\u0432:",
     "ButtonAddMediaFolder": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043c\u0435\u0434\u0438\u0430\u043f\u0430\u043f\u043a\u0443",
-    "LabelOverview": "\u041e\u0431\u043e\u0437\u0440\u0435\u043d\u0438\u0435:",
+    "LabelAwardSummary": "\u0421\u0432\u043e\u0434\u043a\u0430 \u043d\u0430\u0433\u0440\u0430\u0434:",
     "LabelFolderType": "\u0422\u0438\u043f \u043f\u0430\u043f\u043a\u0438:",
-    "LabelShortOverview": "\u041a\u0440\u0430\u0442\u043a\u043e\u0435 \u043e\u0431\u043e\u0437\u0440\u0435\u043d\u0438\u0435:",
+    "LabelWebsite": "\u0412\u0435\u0431\u0441\u0430\u0439\u0442:",
     "MediaFolderHelpPluginRequired": "* \u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u043f\u043b\u0430\u0433\u0438\u043d, \u043d\u043f\u0440., GameBrowser \u0438\u043b\u0438 MB Bookshelf.",
-    "LabelReleaseDate": "\u0414\u0430\u0442\u0430 \u0432\u044b\u043f\u0443\u0441\u043a\u0430:",
+    "LabelTagline": "\u041a\u043b\u044e\u0447\u0435\u0432\u0430\u044f \u0444\u0440\u0430\u0437\u0430:",
     "ReferToMediaLibraryWiki": "C\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043f\u043e \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0435 \u0441\u043c. \u0432 \u0432\u0438\u043a\u0438.",
-    "LabelYear": "\u0413\u043e\u0434:",
+    "LabelOverview": "\u041e\u0431\u043e\u0437\u0440\u0435\u043d\u0438\u0435:",
     "LabelCountry": "\u0421\u0442\u0440\u0430\u043d\u0430:",
-    "LabelPlaceOfBirth": "\u041c\u0435\u0441\u0442\u043e \u0440\u043e\u0436\u0434\u0435\u043d\u0438\u044f:",
+    "LabelShortOverview": "\u041a\u0440\u0430\u0442\u043a\u043e\u0435 \u043e\u0431\u043e\u0437\u0440\u0435\u043d\u0438\u0435:",
     "LabelLanguage": "\u042f\u0437\u044b\u043a:",
-    "LabelEndDate": "\u041a\u043e\u043d\u0435\u0447\u043d\u0430\u044f \u0434\u0430\u0442\u0430:",
+    "LabelReleaseDate": "\u0414\u0430\u0442\u0430 \u0432\u044b\u043f\u0443\u0441\u043a\u0430:",
     "HeaderPreferredMetadataLanguage": "\u0412\u044b\u0431\u043e\u0440 \u044f\u0437\u044b\u043a\u0430 \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445:",
-    "LabelAirDate": "\u0414\u043d\u0438 \u044d\u0444\u0438\u0440\u0430:",
+    "LabelYear": "\u0413\u043e\u0434:",
     "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\u044c \u043c\u0435\u0434\u0438\u0430\u043f\u0430\u043f\u043e\u043a",
-    "LabelAirTime:": "\u0412\u0440\u0435\u043c\u044f \u044d\u0444\u0438\u0440\u0430:",
+    "LabelPlaceOfBirth": "\u041c\u0435\u0441\u0442\u043e \u0440\u043e\u0436\u0434\u0435\u043d\u0438\u044f:",
     "LabelSaveLocalMetadataHelp": "\u041f\u0440\u0438 \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u0438 \u0438\u043b\u043b\u044e\u0441\u0442\u0440\u0430\u0446\u0438\u0439 \u0438 \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445 \u043d\u0435\u043f\u043e\u0441\u0440\u0435\u0434\u0441\u0442\u0432\u0435\u043d\u043d\u043e \u0432\u043d\u0443\u0442\u0440\u044c \u043c\u0435\u0434\u0438\u0430\u043f\u0430\u043f\u043e\u043a, \u043e\u043d\u0438 \u0431\u0443\u0434\u0443\u0442 \u0432 \u0442\u0430\u043a\u043e\u043c \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0438, \u0433\u0434\u0435 \u0438\u0445 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043b\u0435\u0433\u043a\u043e \u043f\u0440\u0430\u0432\u0438\u0442\u044c.",
-    "LabelRuntimeMinutes": "\u0412\u0440\u0435\u043c\u044f \u0432\u044b\u043f\u043e\u043b\u0435\u043d\u0438\u044f, \u043c\u0438\u043d:",
+    "LabelEndDate": "\u041a\u043e\u043d\u0435\u0447\u043d\u0430\u044f \u0434\u0430\u0442\u0430:",
     "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",
-    "LabelParentalRating": "\u0412\u043e\u0437\u0440\u0430\u0441\u0442\u043d\u0430\u044f \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f:",
+    "LabelAirDate": "\u0414\u043d\u0438 \u044d\u0444\u0438\u0440\u0430:",
     "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 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438 \u043e \u043c\u0435\u0434\u0438\u0430\u0434\u0430\u043d\u043d\u044b\u0445 \u0432 Media Browser.",
-    "LabelCustomRating": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0430\u044f \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f:",
+    "LabelAirTime:": "\u0412\u0440\u0435\u043c\u044f \u044d\u0444\u0438\u0440\u0430:",
     "TabPreferences": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438",
-    "LabelBudget": "\u0411\u044e\u0434\u0436\u0435\u0442",
+    "LabelRuntimeMinutes": "\u0412\u0440\u0435\u043c\u044f \u0432\u044b\u043f\u043e\u043b\u0435\u043d\u0438\u044f, \u043c\u0438\u043d:",
     "TabPassword": "\u041f\u0430\u0440\u043e\u043b\u044c",
-    "LabelRevenue": "\u0412\u044b\u0440\u0443\u0447\u043a\u0430, $:",
+    "LabelParentalRating": "\u0412\u043e\u0437\u0440\u0430\u0441\u0442\u043d\u0430\u044f \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f:",
     "TabLibraryAccess": "\u0414\u043e\u0441\u0442\u0443\u043f \u043a \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0435",
-    "LabelOriginalAspectRatio": "\u041e\u0440\u0438\u0433\u0438\u043d\u0430\u043b\u044c\u043d\u043e\u0435 \u0441\u043e\u043e\u0442\u043d\u043e\u0448\u0435\u043d\u0438\u0435 \u0441\u0442\u043e\u0440\u043e\u043d:",
+    "LabelCustomRating": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0430\u044f \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f:",
     "TabImage": "\u0420\u0438\u0441\u0443\u043d\u043e\u043a",
-    "LabelPlayers": "\u0418\u0433\u0440\u043e\u043a\u0438:",
+    "LabelBudget": "\u0411\u044e\u0434\u0436\u0435\u0442",
     "TabProfile": "\u041f\u0440\u043e\u0444\u0438\u043b\u044c",
-    "Label3DFormat": "3D \u0444\u043e\u0440\u043c\u0430\u0442",
+    "LabelRevenue": "\u0412\u044b\u0440\u0443\u0447\u043a\u0430, $:",
     "TabMetadata": "\u041c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0435",
-    "HeaderAlternateEpisodeNumbers": "\u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u044b\u0435 \u043d\u043e\u043c\u0435\u0440\u0430 \u044d\u043f\u0438\u0437\u043e\u0434\u043e\u0432",
+    "LabelOriginalAspectRatio": "\u041e\u0440\u0438\u0433\u0438\u043d\u0430\u043b\u044c\u043d\u043e\u0435 \u0441\u043e\u043e\u0442\u043d\u043e\u0448\u0435\u043d\u0438\u0435 \u0441\u0442\u043e\u0440\u043e\u043d:",
     "TabImages": "\u0420\u0438\u0441\u0443\u043d\u043a\u0438",
-    "HeaderSpecialEpisodeInfo": "\u0421\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043e \u0441\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u043e\u043c \u044d\u043f\u0438\u0437\u043e\u0434\u0435",
+    "LabelPlayers": "\u0418\u0433\u0440\u043e\u043a\u0438:",
     "TabNotifications": "\u0423\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f",
-    "HeaderExternalIds": "\u0412\u043d\u0435\u0448\u043d\u0438\u0435 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u044b:",
+    "Label3DFormat": "3D \u0444\u043e\u0440\u043c\u0430\u0442",
     "TabCollectionTitles": "\u041f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f",
-    "LabelDvdSeasonNumber": "\u041d\u043e\u043c\u0435\u0440 \u0441\u0435\u0437\u043e\u043d\u0430 DVD",
+    "HeaderAlternateEpisodeNumbers": "\u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u044b\u0435 \u043d\u043e\u043c\u0435\u0440\u0430 \u044d\u043f\u0438\u0437\u043e\u0434\u043e\u0432",
     "LabelDisplayMissingEpisodesWithinSeasons": "\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c \u043f\u0440\u043e\u043f\u0443\u0449\u0435\u043d\u043d\u044b\u0435 \u044d\u043f\u0438\u0437\u043e\u0434\u044b \u0432\u043d\u0443\u0442\u0440\u0438 \u0441\u0435\u0437\u043e\u043d\u043e\u0432",
-    "LabelDvdEpisodeNumber": "\u041d\u043e\u043c\u0435\u0440 \u044d\u043f\u0438\u0437\u043e\u0434\u0430 DVD",
+    "HeaderSpecialEpisodeInfo": "\u0421\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043e \u0441\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u043e\u043c \u044d\u043f\u0438\u0437\u043e\u0434\u0435",
     "LabelUnairedMissingEpisodesWithinSeasons": "\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c \u043e\u0436\u0438\u0434\u0430\u0435\u043c\u044b\u0435 \u044d\u043f\u0438\u0437\u043e\u0434\u044b \u0432\u043d\u0443\u0442\u0440\u0438 \u0441\u0435\u0437\u043e\u043d\u043e\u0432",
-    "LabelAbsoluteEpisodeNumber": "\u0410\u0431\u0441\u043e\u043b\u044e\u0442\u043d\u044b\u0439 \u043d\u043e\u043c\u0435\u0440 \u044d\u043f\u0438\u0437\u043e\u0434\u0430",
+    "HeaderExternalIds": "\u0412\u043d\u0435\u0448\u043d\u0438\u0435 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u044b:",
     "HeaderVideoPlaybackSettings": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u0432\u0438\u0434\u0435\u043e",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "\u041d\u043e\u043c\u0435\u0440 \u0441\u0435\u0437\u043e\u043d\u0430 DVD",
     "HeaderPlaybackSettings": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "\u041d\u043e\u043c\u0435\u0440 \u044d\u043f\u0438\u0437\u043e\u0434\u0430 DVD",
     "LabelAudioLanguagePreference": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044f\u0437\u044b\u043a\u0430 \u0430\u0443\u0434\u0438\u043e:",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "\u0410\u0431\u0441\u043e\u043b\u044e\u0442\u043d\u044b\u0439 \u043d\u043e\u043c\u0435\u0440 \u044d\u043f\u0438\u0437\u043e\u0434\u0430",
     "LabelSubtitleLanguagePreference": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044f\u0437\u044b\u043a\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043e\u0432:",
-    "LabelTreatImageAs": "\u0421\u0447\u0438\u0442\u0430\u0442\u044c \u0440\u0438\u0441\u0443\u043d\u043e\u043a \u043a\u0430\u043a:",
+    "LabelAirsBeforeSeason": "\u0421\u0435\u0437\u043e\u043d \"airs before\":",
     "OptionDefaultSubtitles": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u044b\u0435",
-    "LabelDisplayOrder": "\u041f\u043e\u0440\u044f\u0434\u043e\u043a \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f:",
+    "LabelAirsAfterSeason": "\u0421\u0435\u0437\u043e\u043d \"airs after\":",
     "OptionOnlyForcedSubtitles": "\u0422\u043e\u043b\u044c\u043a\u043e \u0444\u043e\u0440\u0441\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0435 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u044b",
-    "LabelDisplaySpecialsWithinSeasons": "\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c \u0441\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u044b\u0435 \u044d\u043f\u0438\u0437\u043e\u0434\u044b \u0432\u043d\u0443\u0442\u0440\u0438 \u0441\u0435\u0437\u043e\u043d\u043e\u0432, \u0433\u0434\u0435 \u043e\u043d\u0438 \u0432\u044b\u0445\u043e\u0434\u0438\u043b\u0438 \u0432 \u044d\u0444\u0438\u0440",
+    "LabelAirsBeforeEpisode": "\u042d\u043f\u0438\u0437\u043e\u0434 \"airs before\":",
     "OptionAlwaysPlaySubtitles": "\u0412\u0441\u0435\u0433\u0434\u0430 \u043f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0442\u044c \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u044b",
-    "HeaderCountries": "\u0421\u0442\u0440\u0430\u043d\u044b",
+    "LabelTreatImageAs": "\u0421\u0447\u0438\u0442\u0430\u0442\u044c \u0440\u0438\u0441\u0443\u043d\u043e\u043a \u043a\u0430\u043a:",
     "OptionNoSubtitles": "\u041d\u0435\u0442 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043e\u0432",
-    "HeaderGenres": "\u0416\u0430\u043d\u0440\u044b",
+    "LabelDisplayOrder": "\u041f\u043e\u0440\u044f\u0434\u043e\u043a \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f:",
     "OptionDefaultSubtitlesHelp": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044b, \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0435 \u044f\u0437\u044b\u043a\u0430, \u0431\u0443\u0434\u0443\u0442 \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044c\u0441\u044f, \u0435\u0441\u043b\u0438 \u0430\u0443\u0434\u0438\u043e \u043d\u0430 \u0438\u043d\u043e\u0441\u0442\u0440\u0430\u043d\u043d\u043e\u043c \u044f\u0437\u044b\u043a\u0435.",
-    "HeaderPlotKeywords": "\u041a\u043b\u044e\u0447\u0435\u0432\u044b\u0435 \u0441\u043b\u043e\u0432\u0430 \u0441\u044e\u0436\u0435\u0442\u0430",
+    "LabelDisplaySpecialsWithinSeasons": "\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c \u0441\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u044b\u0435 \u044d\u043f\u0438\u0437\u043e\u0434\u044b \u0432\u043d\u0443\u0442\u0440\u0438 \u0441\u0435\u0437\u043e\u043d\u043e\u0432, \u0433\u0434\u0435 \u043e\u043d\u0438 \u0432\u044b\u0445\u043e\u0434\u0438\u043b\u0438 \u0432 \u044d\u0444\u0438\u0440",
     "OptionOnlyForcedSubtitlesHelp": "\u0411\u0443\u0434\u0443\u0442 \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044c\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u044b, \u043e\u0431\u043e\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u044b\u0435 \u043a\u0430\u043a \u0444\u043e\u0440\u0441\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0435.",
-    "HeaderStudios": "\u0421\u0442\u0443\u0434\u0438\u0438",
+    "HeaderCountries": "\u0421\u0442\u0440\u0430\u043d\u044b",
     "OptionAlwaysPlaySubtitlesHelp": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044b, \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0435 \u044f\u0437\u044b\u043a\u0430, \u0431\u0443\u0434\u0443\u0442 \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044c\u0441\u044f \u0432\u043d\u0435 \u0437\u0430\u0432\u0438\u0441\u0438\u043c\u043e\u0441\u0442\u0438 \u043e\u0442 \u044f\u0437\u044b\u043a\u0430 \u0430\u0443\u0434\u0438\u043e.",
-    "HeaderTags": "\u0422\u0435\u0433\u0438",
+    "HeaderGenres": "\u0416\u0430\u043d\u0440\u044b",
     "OptionNoSubtitlesHelp": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044b \u043d\u0435 \u0431\u0443\u0434\u0443\u0442 \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044c\u0441\u044f \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e.",
-    "HeaderMetadataSettings": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445",
+    "HeaderPlotKeywords": "\u041a\u043b\u044e\u0447\u0435\u0432\u044b\u0435 \u0441\u043b\u043e\u0432\u0430 \u0441\u044e\u0436\u0435\u0442\u0430",
     "TabProfiles": "\u041f\u0440\u043e\u0444\u0438\u043b\u0438",
-    "LabelLockItemToPreventChanges": "\u0417\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0434\u0430\u043d\u043d\u044b\u0439 \u044d\u043b\u0435\u043c\u0435\u043d\u0442, \u0447\u0442\u043e\u0431\u044b \u043f\u0440\u0435\u0434\u043e\u0442\u0432\u0440\u0430\u0442\u0438\u0442\u044c \u0431\u0443\u0434\u0443\u0449\u0438\u0435 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f",
+    "HeaderStudios": "\u0421\u0442\u0443\u0434\u0438\u0438",
     "TabSecurity": "\u0411\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u044c",
-    "MessageLeaveEmptyToInherit": "\u041e\u0441\u0442\u0430\u0432\u044c\u0442\u0435 \u043f\u0443\u0441\u0442\u044b\u043c, \u0447\u0442\u043e\u0431\u044b \u043d\u0430\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u044c \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u043e\u0442 \u0440\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u043e\u0433\u043e \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430, \u0438\u043b\u0438 \u0433\u043b\u043e\u0431\u0430\u043b\u044c\u043d\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e.",
+    "HeaderTags": "\u0422\u0435\u0433\u0438",
     "ButtonAddUser": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f",
-    "TabSupporterClub": "\u041a\u043b\u0443\u0431 \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u043e\u0432",
+    "HeaderMetadataSettings": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445",
     "ButtonSave": "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c",
-    "HeaderDonationType": "\u0422\u0438\u043f \u043f\u043e\u0436\u0435\u0440\u0442\u0432\u043e\u0432\u0430\u043d\u0438\u044f:",
+    "LabelLockItemToPreventChanges": "\u0417\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0434\u0430\u043d\u043d\u044b\u0439 \u044d\u043b\u0435\u043c\u0435\u043d\u0442, \u0447\u0442\u043e\u0431\u044b \u043f\u0440\u0435\u0434\u043e\u0442\u0432\u0440\u0430\u0442\u0438\u0442\u044c \u0431\u0443\u0434\u0443\u0449\u0438\u0435 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f",
     "ButtonResetPassword": "\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c",
-    "OptionMakeOneTimeDonation": "\u041e\u0434\u043d\u043e\u043a\u0440\u0430\u0442\u043d\u043e\u0435 \u043f\u043e\u0436\u0435\u0440\u0442\u0432\u043e\u0432\u0430\u043d\u0438\u0435",
+    "MessageLeaveEmptyToInherit": "\u041e\u0441\u0442\u0430\u0432\u044c\u0442\u0435 \u043f\u0443\u0441\u0442\u044b\u043c, \u0447\u0442\u043e\u0431\u044b \u043d\u0430\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u044c \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u043e\u0442 \u0440\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u043e\u0433\u043e \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430, \u0438\u043b\u0438 \u0433\u043b\u043e\u0431\u0430\u043b\u044c\u043d\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e.",
     "LabelNewPassword": "\u041d\u043e\u0432\u044b\u0439 \u043f\u0430\u0440\u043e\u043b\u044c",
-    "OptionLifeTimeSupporterClubMembership": "\u041f\u043e\u0436\u0438\u0437\u043d\u0435\u043d\u043d\u043e\u0435 \u0447\u043b\u0435\u043d\u0441\u0442\u0432\u043e \u0432 \u043a\u043b\u0443\u0431\u0435 \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u043e\u0432",
+    "TabSupporterClub": "\u041a\u043b\u0443\u0431 \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u043e\u0432",
     "LabelNewPasswordConfirm": "\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u043f\u0430\u0440\u043e\u043b\u044f",
-    "HeaderSupporterBenefit": "\u0427\u043b\u0435\u043d\u0441\u0442\u0432\u043e \u0432\u043e \u043a\u043b\u0443\u0431\u0435 \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u043e\u0432 \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0438\u0432\u0430\u0435\u0442 \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u043f\u0440\u0435\u0438\u043c\u0443\u0449\u0435\u0441\u0442\u0432\u0430, \u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, \u0434\u043e\u0441\u0442\u0443\u043f \u043a \u043f\u0440\u0435\u043c\u0438\u0430\u043b\u044c\u043d\u044b\u043c \u043f\u043b\u0430\u0433\u0438\u043d\u0430\u043c, \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u044e \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442-\u043a\u0430\u043d\u0430\u043b\u043e\u0432 \u0438 \u043c\u043d\u043e\u0433\u043e\u043c\u0443 \u0434\u0440\u0443\u0433\u043e\u043c\u0443.",
+    "HeaderDonationType": "\u0422\u0438\u043f \u043f\u043e\u0436\u0435\u0440\u0442\u0432\u043e\u0432\u0430\u043d\u0438\u044f:",
     "HeaderCreatePassword": "\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c",
-    "OptionNoTrailer": "\u0411\u0435\u0437 \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u0430",
+    "OptionMakeOneTimeDonation": "\u041e\u0434\u043d\u043e\u043a\u0440\u0430\u0442\u043d\u043e\u0435 \u043f\u043e\u0436\u0435\u0440\u0442\u0432\u043e\u0432\u0430\u043d\u0438\u0435",
     "LabelCurrentPassword": "\u0422\u0435\u043a\u0443\u0449\u0438\u0439 \u043f\u0430\u0440\u043e\u043b\u044c",
-    "OptionNoThemeSong": "\u0411\u0435\u0437 \u043c\u0435\u043b\u043e\u0434\u0438\u0438 \u0442\u0435\u043c\u044b",
+    "OptionLifeTimeSupporterClubMembership": "\u041f\u043e\u0436\u0438\u0437\u043d\u0435\u043d\u043d\u043e\u0435 \u0447\u043b\u0435\u043d\u0441\u0442\u0432\u043e \u0432 \u043a\u043b\u0443\u0431\u0435 \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u043e\u0432",
     "LabelMaxParentalRating": "\u041c\u0430\u043a\u0441. \u0440\u0430\u0437\u0440\u0435\u0448\u0451\u043d\u043d\u0430\u044f \u0432\u043e\u0437\u0440\u0430\u0441\u0442\u043d\u0430\u044f \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f:",
-    "OptionNoThemeVideo": "\u0411\u0435\u0437 \u0432\u0438\u0434\u0435\u043e \u0442\u0435\u043c\u044b",
+    "HeaderSupporterBenefit": "\u0427\u043b\u0435\u043d\u0441\u0442\u0432\u043e \u0432\u043e \u043a\u043b\u0443\u0431\u0435 \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u043e\u0432 \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0438\u0432\u0430\u0435\u0442 \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u043f\u0440\u0435\u0438\u043c\u0443\u0449\u0435\u0441\u0442\u0432\u0430, \u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, \u0434\u043e\u0441\u0442\u0443\u043f \u043a \u043f\u0440\u0435\u043c\u0438\u0430\u043b\u044c\u043d\u044b\u043c \u043f\u043b\u0430\u0433\u0438\u043d\u0430\u043c, \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u044e \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442-\u043a\u0430\u043d\u0430\u043b\u043e\u0432 \u0438 \u043c\u043d\u043e\u0433\u043e\u043c\u0443 \u0434\u0440\u0443\u0433\u043e\u043c\u0443.",
     "MaxParentalRatingHelp": "\u0421\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u0441 \u0431\u043e\u043b\u0435\u0435 \u0432\u044b\u0441\u043e\u043a\u043e\u0439 \u0432\u043e\u0437\u0440\u0430\u0441\u0442\u043d\u043e\u0439 \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0435\u0439 \u0431\u0443\u0434\u0435\u0442 \u0441\u043a\u0440\u044b\u0442\u043e \u043e\u0442 \u044d\u0442\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f",
-    "LabelOneTimeDonationAmount": "\u0421\u0443\u043c\u043c\u0430 \u043f\u043e\u0436\u0435\u0440\u0442\u0432\u043e\u0432\u0430\u043d\u0438\u044f",
+    "OptionNoTrailer": "\u0411\u0435\u0437 \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u0430",
     "LibraryAccessHelp": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043c\u0435\u0434\u0438\u0430\u043f\u0430\u043f\u043a\u0438 \u0434\u043b\u044f \u0441\u043e\u0432\u043c\u0435\u0441\u0442\u043d\u043e\u0433\u043e \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f \u0441 \u044d\u0442\u0438\u043c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u043c. \u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u044b \u043c\u043e\u0433\u0443\u0442 \u043f\u0440\u0430\u0432\u0438\u0442\u044c \u0432\u0441\u0435 \u043f\u0430\u043f\u043a\u0438 \u043f\u0440\u0438 \u043f\u043e\u043c\u043e\u0449\u0438 \u0414\u0438\u0441\u043f\u0435\u0442\u0447\u0435\u0440\u0430 \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445.",
+    "OptionNoThemeSong": "\u0411\u0435\u0437 \u043c\u0435\u043b\u043e\u0434\u0438\u0438 \u0442\u0435\u043c\u044b",
     "ChannelAccessHelp": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043a\u0430\u043d\u0430\u043b\u044b \u0434\u043b\u044f \u0441\u043e\u0432\u043c\u0435\u0441\u0442\u043d\u043e\u0433\u043e \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f \u0441 \u044d\u0442\u0438\u043c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u043c. \u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u044b \u043c\u043e\u0433\u0443\u0442 \u043f\u0440\u0430\u0432\u0438\u0442\u044c \u0432\u0441\u0435 \u043a\u0430\u043d\u0430\u043b\u044b \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0414\u0438\u0441\u043f\u0435\u0442\u0447\u0435\u0440\u0430 \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445.",
+    "OptionNoThemeVideo": "\u0411\u0435\u0437 \u0432\u0438\u0434\u0435\u043e \u0442\u0435\u043c\u044b",
     "ButtonDeleteImage": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0440\u0438\u0441\u0443\u043d\u043e\u043a",
+    "LabelOneTimeDonationAmount": "\u0421\u0443\u043c\u043c\u0430 \u043f\u043e\u0436\u0435\u0440\u0442\u0432\u043e\u0432\u0430\u043d\u0438\u044f",
     "LabelSelectUsers": "\u0412\u044b\u0431\u043e\u0440 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439:",
+    "OptionActor": "Actor",
     "ButtonUpload": "\u041e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u044c",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "\u041e\u0442\u043f\u0440\u0430\u0432\u043a\u0430 \u043d\u043e\u0432\u043e\u0433\u043e \u0440\u0438\u0441\u0443\u043d\u043a\u0430",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "\u041f\u0435\u0440\u0435\u0442\u0430\u0449\u0438\u0442\u0435 \u0440\u0438\u0441\u0443\u043d\u043e\u043a \u0441\u044e\u0434\u0430",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "\u0420\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u0443\u0435\u043c\u044b\u0435 \u043f\u0440\u043e\u043f\u043e\u0440\u0446\u0438\u0438 - 1:1. \u0422\u043e\u043b\u044c\u043a\u043e JPG\/PNG.",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "\u0417\u0434\u0435\u0441\u044c \u043d\u0435\u0442 \u043d\u0438\u0447\u0435\u0433\u043e.",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "\u0423\u0431\u0435\u0434\u0438\u0442\u0435\u0441\u044c, \u0447\u0442\u043e \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445 \u0438\u0437 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u0430 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0430.",
     "TabSuggested": "\u041f\u0440\u0435\u0434\u043b\u0430\u0433\u0430\u0435\u043c\u044b\u0435",
     "TabLatest": "\u041d\u043e\u0432\u0438\u043d\u043a\u0438",
@@ -566,7 +575,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\u043d\u043e",
+    "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:",
@@ -717,7 +726,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",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u043f\u043b\u0430\u0433\u0438\u043d\u043e\u0432 \u0434\u043b\u044f:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u044d\u043f\u0438\u0437\u043e\u0434\u0430",
-    "LabelSeriesName": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u0441\u0435\u0440\u0438\u0430\u043b\u0430",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435.\u0441\u0435\u0440\u0438\u0430\u043b\u0430",
     "ValueSeriesNameUnderscore": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435_\u0441\u0435\u0440\u0438\u0430\u043b\u0430",
     "ValueEpisodeNamePeriod": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435.\u044d\u043f\u0438\u0437\u043e\u0434\u0430",
     "ValueEpisodeNameUnderscore": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435_\u044d\u043f\u0438\u0437\u043e\u0434\u0430",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "\u0412\u0432\u043e\u0434 \u0442\u0435\u043a\u0441\u0442\u0430",
     "LabelTypeText": "\u0422\u0435\u043a\u0441\u0442",
     "HeaderSearchForSubtitles": "\u041f\u043e\u0438\u0441\u043a \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043e\u0432",
@@ -1078,8 +1090,5 @@
     "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, \u0413\u0411:",
-    "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:"
+    "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/sv.json b/MediaBrowser.Server.Implementations/Localization/Server/sv.json
index d104b5ddf..c778cb05b 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/sv.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/sv.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Composers",
+    "HeaderRecentActivity": "Recent Activity",
     "LabelExit": "Avsluta",
-    "OptionOthers": "Others",
+    "HeaderPeople": "People",
     "LabelVisitCommunity": "Bes\u00f6k v\u00e5rt diskussionsforum",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
     "LabelGithubWiki": "Github Wiki",
-    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "OptionComposers": "Composers",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "Folders",
+    "OptionOthers": "Others",
     "LabelStandard": "F\u00f6rval",
-    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelViewApiDocumentation": "L\u00e4s API-dokumentationen",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
     "LabelBrowseLibrary": "Bl\u00e4ddra i biblioteket",
-    "ViewTypeLiveTvChannels": "Channels",
+    "ViewTypeFolders": "Folders",
     "LabelConfigureMediaBrowser": "Konfigurera Media Browser",
-    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelOpenLibraryViewer": "\u00d6ppna biblioteksbl\u00e4ddraren",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
     "LabelRestartServer": "Starta om servern",
-    "HeaderPassword": "Password",
+    "ViewTypeLiveTvChannels": "Channels",
     "LabelShowLogWindow": "Visa loggf\u00f6nstret",
-    "HeaderLocalAccess": "Local Access",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
     "LabelPrevious": "F\u00f6reg\u00e5ende",
-    "HeaderViewOrder": "View Order",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
     "LabelFinish": "Klart",
-    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
+    "HeaderPassword": "Password",
     "LabelNext": "N\u00e4sta",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "HeaderLocalAccess": "Local Access",
     "LabelYoureDone": "Klart!",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "HeaderViewOrder": "View Order",
     "WelcomeToMediaBrowser": "V\u00e4lkommen till Media Browser!",
-    "OptionDownloadMissingImages": "Download missing images",
+    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "TitleMediaBrowser": "Media Browser",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "ThisWizardWillGuideYou": "Den h\u00e4r guiden hj\u00e4lper dig att g\u00f6ra de f\u00f6rsta inst\u00e4llningarna. F\u00f6r att b\u00f6rja var v\u00e4nlig v\u00e4lj \u00f6nskat spr\u00e5k.",
-    "OptionRefreshAllData": "Refresh all data",
+    "LabelImageRefreshMode": "Image refresh mode:",
     "TellUsAboutYourself": "Ber\u00e4tta om dig sj\u00e4lv",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionDownloadMissingImages": "Download missing images",
     "LabelYourFirstName": "Ditt f\u00f6rnamn:",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionReplaceExistingImages": "Replace existing images",
     "MoreUsersCanBeAddedLater": "Flera anv\u00e4ndare kan skapas senare i Kontrollpanelen.",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "OptionRefreshAllData": "Refresh all data",
     "UserProfilesIntro": "Media Browser har inbyggt st\u00f6d f\u00f6r anv\u00e4ndarprofiler, s\u00e5 varje anv\u00e4ndare kan ha sina egna utseendeinst\u00e4llningar, visad-markeringar och f\u00f6r\u00e4ldral\u00e5s.",
-    "HeaderPersonInfo": "Person Info",
+    "OptionAddMissingDataOnly": "Add missing data only",
     "LabelWindowsService": "Windows-tj\u00e4nst",
-    "HeaderIdentifyItem": "Identify Item",
+    "OptionLocalRefreshOnly": "Local refresh only",
     "AWindowsServiceHasBeenInstalled": "En Windows-tj\u00e4nst har installerats.",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderRefreshMetadata": "Refresh Metadata",
     "WindowsServiceIntro1": "Media Browser Server k\u00f6rs normalt som ett anv\u00e4ndarprogram med ikon i aktivitetsf\u00e4ltet, men om s\u00e5 \u00f6nskas kan den k\u00f6ras som en Windows-tj\u00e4nst och startas fr\u00e5n kontrollpanelen Tj\u00e4nster (Services).",
-    "HeaderConfirmDeletion": "Bekr\u00e4fta radering",
+    "HeaderPersonInfo": "Person Info",
     "WindowsServiceIntro2": "Om Media Browser k\u00f6rs som en tj\u00e4nst, notera att den inte kan k\u00f6ras samtidigt som aktivitetsf\u00e4ltsikonen, s\u00e5 f\u00f6r att k\u00f6ra tj\u00e4nsten m\u00e5ste ikonen st\u00e4ngas. Tj\u00e4nsten m\u00e5ste ocks\u00e5 k\u00f6ras med administrat\u00f6rsr\u00e4ttigheter (st\u00e4lls in i kontrollpanelen Tj\u00e4nster). Automatiska uppdateringar fungerar heller inte med tj\u00e4nsten, dvs tj\u00e4nsten m\u00e5ste stoppas f\u00f6re manuell uppdatering och sedan \u00e5terstartas.",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "HeaderIdentifyItem": "Identify Item",
     "WizardCompleted": "Det var allt f\u00f6r tillf\u00e4llet. Media Browser har b\u00f6rjat samla information om ditt mediebibliotek. Ta en titt p\u00e5 n\u00e5gra av v\u00e5ra appar och klicka sedan p\u00e5 <b>Klart<\/b> f\u00f6r att komma till <b>Kontrollpanelen<\/b>.",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
     "LabelConfigureSettings": "Inst\u00e4llningar",
-    "ButtonIdentify": "Identify",
+    "HeaderConfirmDeletion": "Bekr\u00e4fta radering",
     "LabelEnableVideoImageExtraction": "Ta fram bildrutor ur videofiler",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
     "VideoImageExtractionHelp": "Dessa anv\u00e4nds f\u00f6r objekt som saknar bilder och d\u00e4r vi inte hittar n\u00e5gra vid s\u00f6kning p\u00e5 Internet. Detta g\u00f6r att den f\u00f6rsta genoms\u00f6kningen av biblioteket tar lite l\u00e4ngre tid, men ger en snyggare presentation.",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
     "LabelEnableChapterImageExtractionForMovies": "Ta fram kapitelbildrutor ur filmfiler",
-    "LabelCommunityRating": "Community rating:",
+    "ButtonIdentify": "Identify",
     "LabelChapterImageExtractionForMoviesHelp": "Detta m\u00f6jligg\u00f6r grafisk visning av menyer f\u00f6r val av kapitel. Processen kan vara tids- och CPU-kr\u00e4vande och beh\u00f6va flera gigabyte lagringsutrymme. Processen k\u00f6rs varje natt kl 04:00 men intervallet kan anpassas enligt \u00f6nskem\u00e5l i Schemal\u00e4ggaren. Vi rekommenderar inte att den k\u00f6rs vid tider d\u00e5 anv\u00e4ndare \u00e4r aktiva.",
-    "LabelVoteCount": "Vote count:",
+    "LabelAlbumArtist": "Album artist:",
     "LabelEnableAutomaticPortMapping": "Aktivera automatisk koppling av portar",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP m\u00f6jligg\u00f6r automatisk inst\u00e4llning av din router s\u00e5 att du enkelt kan n\u00e5 Media Browser fr\u00e5n Internet. Detta kanske inte fungerar med alla routrar.",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCommunityRating": "Community rating:",
     "ButtonOk": "OK",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelVoteCount": "Vote count:",
     "ButtonCancel": "Avbryt",
-    "LabelAwardSummary": "Award summary:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "Nytillkommet",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Critic rating:",
     "HeaderSetupLibrary": "Konfigurera mediabiblioteket",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Critic rating summary:",
     "ButtonAddMediaFolder": "Skapa mediamapp",
-    "LabelOverview": "Overview:",
+    "LabelAwardSummary": "Award summary:",
     "LabelFolderType": "Typ av mapp:",
-    "LabelShortOverview": "Short overview:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "* Kr\u00e4ver att ett till\u00e4gg, t ex GameBrowser eller MB Bookshelf, \u00e4r installerat.",
-    "LabelReleaseDate": "Release date:",
+    "LabelTagline": "Tagline:",
     "ReferToMediaLibraryWiki": "Se avsnittet om mediabibliotek i v\u00e5r Wiki.",
-    "LabelYear": "Year:",
+    "LabelOverview": "Overview:",
     "LabelCountry": "Land:",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelShortOverview": "Short overview:",
     "LabelLanguage": "Spr\u00e5k:",
-    "LabelEndDate": "End date:",
+    "LabelReleaseDate": "Release date:",
     "HeaderPreferredMetadataLanguage": "\u00d6nskat spr\u00e5k f\u00f6r metadata:",
-    "LabelAirDate": "Air days:",
+    "LabelYear": "Year:",
     "LabelSaveLocalMetadata": "Spara grafik och metadata i mediamapparna",
-    "LabelAirTime:": "Air time:",
+    "LabelPlaceOfBirth": "Place of birth:",
     "LabelSaveLocalMetadataHelp": "Om grafik och metadata sparas tillsammans med media \u00e4r de enkelt \u00e5tkomliga f\u00f6r redigering.",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelEndDate": "End date:",
     "LabelDownloadInternetMetadata": "H\u00e4mta grafik och metadata fr\u00e5n Internet",
-    "LabelParentalRating": "Parental rating:",
+    "LabelAirDate": "Air days:",
     "LabelDownloadInternetMetadataHelp": "Media Browser kan h\u00e4mta informatiom om dina media fr\u00e5n Internet f\u00f6r att ge en visuellt full\u00e4ndad presentation.",
-    "LabelCustomRating": "Custom rating:",
+    "LabelAirTime:": "Air time:",
     "TabPreferences": "Inst\u00e4llningar",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Run time (minutes):",
     "TabPassword": "L\u00f6senord",
-    "LabelRevenue": "Revenue ($):",
+    "LabelParentalRating": "Parental rating:",
     "TabLibraryAccess": "\u00c5tkomst till biblioteket",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelCustomRating": "Custom rating:",
     "TabImage": "Bild",
-    "LabelPlayers": "Players:",
+    "LabelBudget": "Budget",
     "TabProfile": "Profil",
-    "Label3DFormat": "3D format:",
+    "LabelRevenue": "Revenue ($):",
     "TabMetadata": "Metadata",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "LabelOriginalAspectRatio": "Original aspect ratio:",
     "TabImages": "Bilder",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "LabelPlayers": "Players:",
     "TabNotifications": "Meddelanden",
-    "HeaderExternalIds": "External Id's:",
+    "Label3DFormat": "3D format:",
     "TabCollectionTitles": "Titlar",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
     "LabelDisplayMissingEpisodesWithinSeasons": "Visa saknade avsnitt i s\u00e4songer",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "HeaderSpecialEpisodeInfo": "Special Episode Info",
     "LabelUnairedMissingEpisodesWithinSeasons": "Visa \u00e4nnu ej s\u00e4nda avsnitt i s\u00e4songer",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "HeaderExternalIds": "External Id's:",
     "HeaderVideoPlaybackSettings": "Inst\u00e4llningar f\u00f6r videouppspelning",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "Dvd season number:",
     "HeaderPlaybackSettings": "Uppspelningsinst\u00e4llningar",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "Dvd episode number:",
     "LabelAudioLanguagePreference": "\u00d6nskat spr\u00e5k f\u00f6r ljudsp\u00e5r",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
     "LabelSubtitleLanguagePreference": "\u00d6nskat spr\u00e5k f\u00f6r undertexter",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelAirsBeforeSeason": "Airs before season:",
     "OptionDefaultSubtitles": "F\u00f6rval",
-    "LabelDisplayOrder": "Display order:",
+    "LabelAirsAfterSeason": "Airs after season:",
     "OptionOnlyForcedSubtitles": "Endast tvingande undertexter",
-    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelAirsBeforeEpisode": "Airs before episode:",
     "OptionAlwaysPlaySubtitles": "Visa alltid undertexter",
-    "HeaderCountries": "Countries",
+    "LabelTreatImageAs": "Treat image as:",
     "OptionNoSubtitles": "Inga undertexter",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "Display order:",
     "OptionDefaultSubtitlesHelp": "Om ljudsp\u00e5ret \u00e4r p\u00e5 ett fr\u00e4mmande spr\u00e5k laddas undertexter p\u00e5 det \u00f6nskade spr\u00e5ket.",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
     "OptionOnlyForcedSubtitlesHelp": "Endast undertexter markerade som tvingande kommer att laddas.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "Countries",
     "OptionAlwaysPlaySubtitlesHelp": "Undertexter p\u00e5 det \u00f6nskade spr\u00e5ket kommer att laddas oavsett ljudsp\u00e5rets spr\u00e5k.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "Genres",
     "OptionNoSubtitlesHelp": "Ladda normalt inte undertexter.",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderPlotKeywords": "Plot Keywords",
     "TabProfiles": "Profiler",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "HeaderStudios": "Studios",
     "TabSecurity": "S\u00e4kerhet",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "Ny anv\u00e4ndare",
-    "TabSupporterClub": "Supporter Club",
+    "HeaderMetadataSettings": "Metadata Settings",
     "ButtonSave": "Spara",
-    "HeaderDonationType": "Donation type:",
+    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
     "ButtonResetPassword": "\u00c5terst\u00e4ll l\u00f6senord",
-    "OptionMakeOneTimeDonation": "Make a one-time donation",
+    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
     "LabelNewPassword": "Nytt l\u00f6senord:",
-    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
+    "TabSupporterClub": "Supporter Club",
     "LabelNewPasswordConfirm": "Bekr\u00e4fta nytt l\u00f6senord:",
-    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderDonationType": "Donation type:",
     "HeaderCreatePassword": "Skapa l\u00f6senord",
-    "OptionNoTrailer": "No Trailer",
+    "OptionMakeOneTimeDonation": "Make a one-time donation",
     "LabelCurrentPassword": "Nuvarande l\u00f6senord:",
-    "OptionNoThemeSong": "No Theme Song",
+    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
     "LabelMaxParentalRating": "H\u00f6gsta till\u00e5tna \u00e5ldersgr\u00e4ns",
-    "OptionNoThemeVideo": "No Theme Video",
+    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
     "MaxParentalRatingHelp": "Inneh\u00e5ll med h\u00f6gre gr\u00e4ns visas ej f\u00f6r den h\u00e4r anv\u00e4ndaren.",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "OptionNoTrailer": "No Trailer",
     "LibraryAccessHelp": "Ange vilka mediamappar den h\u00e4r anv\u00e4ndaren ska ha tillg\u00e5ng till. Administrat\u00f6rer har r\u00e4ttighet att redigera alla mappar i metadatahanteraren.",
+    "OptionNoThemeSong": "No Theme Song",
     "ChannelAccessHelp": "V\u00e4lj kanaler att dela med denna anv\u00e4ndare. Administrat\u00f6rer kan redigera alla kanaler med hj\u00e4lp av metadatahanteraren.",
+    "OptionNoThemeVideo": "No Theme Video",
     "ButtonDeleteImage": "Ta bort bild",
+    "LabelOneTimeDonationAmount": "Donation amount:",
     "LabelSelectUsers": "V\u00e4lj anv\u00e4ndare:",
+    "OptionActor": "Actor",
     "ButtonUpload": "Ladda upp",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "Ladda upp ny bild",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "Dra-och-sl\u00e4pp bild h\u00e4r",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "Bildf\u00f6rh\u00e5llande 1:1 rekommenderas. Endast JPG\/PNG.",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "Ingenting h\u00e4r.",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "Var god se till att h\u00e4mtning av metadata via Internet \u00e4r aktiverad.",
     "TabSuggested": "Rekommenderas",
     "TabLatest": "Nytillkommet",
@@ -212,7 +221,7 @@
     "OptionAscending": "Stigande",
     "OptionDescending": "Sjunkande",
     "OptionRuntime": "Speltid",
-    "OptionReleaseDate": "Release Date",
+    "OptionReleaseDate": "Lanseringsdatum",
     "OptionPlayCount": "Antal visningar",
     "OptionDatePlayed": "Senast visad",
     "OptionDateAdded": "Inlagd den",
@@ -570,8 +579,8 @@
     "LabelSkipped": "Hoppades \u00f6ver",
     "HeaderEpisodeOrganization": "Katalogisering av avsnitt",
     "LabelSeries": "Serie:",
-    "LabelSeasonNumber": "Season number",
-    "LabelEpisodeNumber": "Episode number",
+    "LabelSeasonNumber": "S\u00e4songsnummer:",
+    "LabelEpisodeNumber": "Avsnittsnummer:",
     "LabelEndingEpisodeNumber": "Avslutande avsnittsnummer:",
     "LabelEndingEpisodeNumberHelp": "Kr\u00e4vs endast f\u00f6r filer som inneh\u00e5ller flera avsnitt",
     "HeaderSupportTheTeam": "St\u00f6d utvecklingen av Media Browser",
@@ -718,8 +727,8 @@
     "ButtonScenes": "Scener",
     "ButtonSubtitles": "Undertexter",
     "ButtonAudioTracks": "Ljudsp\u00e5r",
-    "ButtonPreviousTrack": "F\u00f6reg\u00e5ende sp\u00e5r:",
-    "ButtonNextTrack": "N\u00e4sta sp\u00e5r:",
+    "ButtonPreviousTrack": "F\u00f6reg\u00e5ende sp\u00e5r",
+    "ButtonNextTrack": "N\u00e4sta sp\u00e5r",
     "ButtonStop": "Stopp",
     "ButtonPause": "Paus",
     "LabelGroupMoviesIntoCollections": "Gruppera filmer i samlingsboxar",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Visa till\u00e4gg f\u00f6r:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Avsnittstitel",
-    "LabelSeriesName": "Serietitel",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Series.name",
     "ValueSeriesNameUnderscore": "Series_name",
     "ValueEpisodeNamePeriod": "Episode.name",
     "ValueEpisodeNameUnderscore": "Episode_name",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Ange text",
     "LabelTypeText": "Text",
     "HeaderSearchForSubtitles": "S\u00f6k efter undertexter",
@@ -888,8 +900,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.",
+    "MessageNoPlaylistsAvailable": "Spellistor l\u00e5ter dig skapa listor med inneh\u00e5ll att spela upp i ordning. F\u00f6r att l\u00e4gga till objekt i spellistor, h\u00f6gerklicka eller tryck-och-h\u00e5ll och v\u00e4lj \"l\u00e4gg till i spellista\".",
+    "MessageNoPlaylistItemsAvailable": "Den h\u00e4r spellistan \u00e4r tom.",
     "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.",
@@ -1001,17 +1013,17 @@
     "OptionContextStreaming": "Str\u00f6mning",
     "OptionContextStatic": "Synk",
     "ButtonAddToPlaylist": "L\u00e4gg till i spellista",
-    "TabPlaylists": "Playlists",
+    "TabPlaylists": "Spellistor",
     "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",
+    "LabelAllLanguages": "Alla spr\u00e5k",
+    "HeaderBrowseOnlineImages": "Bl\u00e4ddra bland bilder online",
+    "LabelSource": "K\u00e4lla:",
+    "OptionAll": "Alla",
+    "LabelImage": "Bild:",
+    "ButtonBrowseImages": "Bl\u00e4ddra bland bilder",
+    "HeaderImages": "Bilder",
+    "HeaderBackdrops": "Fondbilder",
+    "HeaderScreenshots": "Sk\u00e4rmklipp",
     "HeaderAddUpdateImage": "Add\/Update Image",
     "LabelJpgPngOnly": "JPG\/PNG only",
     "LabelImageType": "Image type:",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "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:"
+    "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 7ae76143b..bf5b50a60 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/tr.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/tr.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Composers",
+    "HeaderRecentActivity": "Recent Activity",
     "LabelExit": "Cikis",
-    "OptionOthers": "Others",
+    "HeaderPeople": "People",
     "LabelVisitCommunity": "Bizi Ziyaret Edin",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
     "LabelGithubWiki": "Github Wiki",
-    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "OptionComposers": "Composers",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "Folders",
+    "OptionOthers": "Others",
     "LabelStandard": "Standart",
-    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelViewApiDocumentation": "Api D\u00f6k\u00fcman\u0131 Goruntule",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
     "LabelBrowseLibrary": "K\u00fct\u00fcphane",
-    "ViewTypeLiveTvChannels": "Channels",
+    "ViewTypeFolders": "Folders",
     "LabelConfigureMediaBrowser": "Media Taray\u0131c\u0131 Konfig\u00fcrasyon",
-    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelOpenLibraryViewer": "K\u00fct\u00fcphane G\u00f6r\u00fcnt\u00fcleyici",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
     "LabelRestartServer": "Server Yeniden Baslat",
-    "HeaderPassword": "Password",
+    "ViewTypeLiveTvChannels": "Channels",
     "LabelShowLogWindow": "Log Ekran\u0131n\u0131 G\u00f6r\u00fcnt\u00fcle",
-    "HeaderLocalAccess": "Local Access",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
     "LabelPrevious": "\u00d6nceki",
-    "HeaderViewOrder": "View Order",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
     "LabelFinish": "Bitir",
-    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
+    "HeaderPassword": "Password",
     "LabelNext": "Sonraki",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "HeaderLocalAccess": "Local Access",
     "LabelYoureDone": "Haz\u0131rs\u0131n!",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "HeaderViewOrder": "View Order",
     "WelcomeToMediaBrowser": "Media Taray\u0131c\u0131ya Hosgeldiniz !",
-    "OptionDownloadMissingImages": "Download missing images",
+    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "TitleMediaBrowser": "Media Taray\u0131c\u0131",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "ThisWizardWillGuideYou": "Bu sihirbaz kurulum i\u015flemi boyunca size yard\u0131mc\u0131 olacakt\u0131r. Ba\u015flamak i\u00e7in, tercih etti\u011finiz dili se\u00e7iniz.",
-    "OptionRefreshAllData": "Refresh all data",
+    "LabelImageRefreshMode": "Image refresh mode:",
     "TellUsAboutYourself": "Kendinizden Bahsedin",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionDownloadMissingImages": "Download missing images",
     "LabelYourFirstName": "\u0130lk Ad",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionReplaceExistingImages": "Replace existing images",
     "MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "OptionRefreshAllData": "Refresh all data",
     "UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
-    "HeaderPersonInfo": "Person Info",
+    "OptionAddMissingDataOnly": "Add missing data only",
     "LabelWindowsService": "Windows Servis",
-    "HeaderIdentifyItem": "Identify Item",
+    "OptionLocalRefreshOnly": "Local refresh only",
     "AWindowsServiceHasBeenInstalled": "Windows Servisi Y\u00fcklenmistir.",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderRefreshMetadata": "Refresh Metadata",
     "WindowsServiceIntro1": "Medya Taray\u0131c\u0131 Sunucu normalde bir tepsi simgesi ile bir masa\u00fcst\u00fc uygulamas\u0131 olarak cal\u0131s\u0131r, ancak bir arka plan servisi olarak \u00e7al\u0131\u015ft\u0131rmak isterseniz, bunun yerine windows servisleri kontrol panelinden baslat\u0131labilirsiniz.",
-    "HeaderConfirmDeletion": "Confirm Deletion",
+    "HeaderPersonInfo": "Person Info",
     "WindowsServiceIntro2": "Windows hizmeti kullan\u0131yorsan\u0131z, o tepsi simgesi olarak ayn\u0131 anda cal\u0131st\u0131rabilirsiniz unutmay\u0131n, b\u00f6ylece hizmetini cal\u0131st\u0131rmak i\u00e7in tepsiyi \u00e7\u0131kmak gerekir l\u00fctfen. Hizmeti de kontrol paneli \u00fczerinden y\u00f6netim ayr\u0131cal\u0131klar\u0131yla yap\u0131land\u0131r\u0131lm\u0131\u015f olmas\u0131 gerekir. Su anda hizmet kendine g\u00fcncelleme m\u00fcmk\u00fcn oldugunu unutmay\u0131n, bu y\u00fczden yeni s\u00fcr\u00fcmleri manuel etkilesimi gerektirir.",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "HeaderIdentifyItem": "Identify Item",
     "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>.",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
     "LabelConfigureSettings": "Ayarlar\u0131 Degistir",
-    "ButtonIdentify": "Identify",
+    "HeaderConfirmDeletion": "Confirm Deletion",
     "LabelEnableVideoImageExtraction": "Enable video image extraction",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
     "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.",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
     "LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
-    "LabelCommunityRating": "Community rating:",
+    "ButtonIdentify": "Identify",
     "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.",
-    "LabelVoteCount": "Vote count:",
+    "LabelAlbumArtist": "Album artist:",
     "LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCommunityRating": "Community rating:",
     "ButtonOk": "Tamam",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelVoteCount": "Vote count:",
     "ButtonCancel": "\u0130ptal",
-    "LabelAwardSummary": "Award summary:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "Yeni",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Critic rating:",
     "HeaderSetupLibrary": "Medya k\u00fct\u00fcphaneni kur",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Critic rating summary:",
     "ButtonAddMediaFolder": "Yeni Media Klas\u00f6r\u00fc",
-    "LabelOverview": "Overview:",
+    "LabelAwardSummary": "Award summary:",
     "LabelFolderType": "Klas\u00f6r T\u00fcr\u00fc:",
-    "LabelShortOverview": "Short overview:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
-    "LabelReleaseDate": "Release date:",
+    "LabelTagline": "Tagline:",
     "ReferToMediaLibraryWiki": "Refer to the media library wiki.",
-    "LabelYear": "Year:",
+    "LabelOverview": "Overview:",
     "LabelCountry": "\u00dclke",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelShortOverview": "Short overview:",
     "LabelLanguage": "Dil",
-    "LabelEndDate": "End date:",
+    "LabelReleaseDate": "Release date:",
     "HeaderPreferredMetadataLanguage": "Tercih edilen Meta Dili:",
-    "LabelAirDate": "Air days:",
+    "LabelYear": "Year:",
     "LabelSaveLocalMetadata": "Medya meta dosyalar\u0131n\u0131 ayn\u0131 klas\u00f6rlere i\u015fle",
-    "LabelAirTime:": "Air time:",
+    "LabelPlaceOfBirth": "Place of birth:",
     "LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelEndDate": "End date:",
     "LabelDownloadInternetMetadata": "\u0130nternetten \u0130\u00e7erik Y\u00fckleyin",
-    "LabelParentalRating": "Parental rating:",
+    "LabelAirDate": "Air days:",
     "LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations.",
-    "LabelCustomRating": "Custom rating:",
+    "LabelAirTime:": "Air time:",
     "TabPreferences": "Tercihler",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Run time (minutes):",
     "TabPassword": "\u015eifre",
-    "LabelRevenue": "Revenue ($):",
+    "LabelParentalRating": "Parental rating:",
     "TabLibraryAccess": "K\u00fct\u00fcphane Eri\u015fim",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelCustomRating": "Custom rating:",
     "TabImage": "Resim",
-    "LabelPlayers": "Players:",
+    "LabelBudget": "Budget",
     "TabProfile": "Profil",
-    "Label3DFormat": "3D format:",
+    "LabelRevenue": "Revenue ($):",
     "TabMetadata": "Metadata",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "LabelOriginalAspectRatio": "Original aspect ratio:",
     "TabImages": "Resimler",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "LabelPlayers": "Players:",
     "TabNotifications": "Notifications",
-    "HeaderExternalIds": "External Id's:",
+    "Label3DFormat": "3D format:",
     "TabCollectionTitles": "Titles",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
     "LabelDisplayMissingEpisodesWithinSeasons": "Sezondaki kay\u0131p b\u00f6l\u00fcmleri g\u00f6ster",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "HeaderSpecialEpisodeInfo": "Special Episode Info",
     "LabelUnairedMissingEpisodesWithinSeasons": "Display unaired episodes within seasons",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "HeaderExternalIds": "External Id's:",
     "HeaderVideoPlaybackSettings": "Video Oynatma Ayarlar\u0131",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "Dvd season number:",
     "HeaderPlaybackSettings": "Playback Settings",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "Dvd episode number:",
     "LabelAudioLanguagePreference": "Ses Dili Tercihi:",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
     "LabelSubtitleLanguagePreference": "Altyaz\u0131 Dili Tercihi:",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelAirsBeforeSeason": "Airs before season:",
     "OptionDefaultSubtitles": "Default",
-    "LabelDisplayOrder": "Display order:",
+    "LabelAirsAfterSeason": "Airs after season:",
     "OptionOnlyForcedSubtitles": "Only forced subtitles",
-    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelAirsBeforeEpisode": "Airs before episode:",
     "OptionAlwaysPlaySubtitles": "Always play subtitles",
-    "HeaderCountries": "Countries",
+    "LabelTreatImageAs": "Treat image as:",
     "OptionNoSubtitles": "Altyaz\u0131 Yok",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "Display order:",
     "OptionDefaultSubtitlesHelp": "Subtitles matching the language preference will be loaded when the audio is in a foreign language.",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
     "OptionOnlyForcedSubtitlesHelp": "Only subtitles marked as forced will be loaded.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "Countries",
     "OptionAlwaysPlaySubtitlesHelp": "Subtitles matching the language preference will be loaded regardless of the audio language.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "Genres",
     "OptionNoSubtitlesHelp": "Subtitles will not be loaded by default.",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderPlotKeywords": "Plot Keywords",
     "TabProfiles": "Profiller",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "HeaderStudios": "Studios",
     "TabSecurity": "G\u00fcvenlik",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "Kullan\u0131c\u0131 Ekle",
-    "TabSupporterClub": "Supporter Club",
+    "HeaderMetadataSettings": "Metadata Settings",
     "ButtonSave": "Kay\u0131t",
-    "HeaderDonationType": "Donation type:",
+    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
     "ButtonResetPassword": "\u015eifre S\u0131f\u0131rla",
-    "OptionMakeOneTimeDonation": "Make a one-time donation",
+    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
     "LabelNewPassword": "Yeni \u015eifre",
-    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
+    "TabSupporterClub": "Supporter Club",
     "LabelNewPasswordConfirm": "Yeni \u015eifreyi Onayla",
-    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderDonationType": "Donation type:",
     "HeaderCreatePassword": "\u015eifre Olu\u015ftur",
-    "OptionNoTrailer": "No Trailer",
+    "OptionMakeOneTimeDonation": "Make a one-time donation",
     "LabelCurrentPassword": "Kullan\u0131mdaki \u015eifreniz",
-    "OptionNoThemeSong": "No Theme Song",
+    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
     "LabelMaxParentalRating": "Maksimum izin verilen ebeveyn de\u011ferlendirmesi:",
-    "OptionNoThemeVideo": "No Theme Video",
+    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
     "MaxParentalRatingHelp": "Daha y\u00fcksek bir derece ile \u0130\u00e7erik Bu kullan\u0131c\u0131dan gizli olacak.",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "OptionNoTrailer": "No Trailer",
     "LibraryAccessHelp": "Bu kullan\u0131c\u0131 ile payla\u015fmak i\u00e7in medya klas\u00f6rleri se\u00e7in. Y\u00f6neticiler meta y\u00f6neticisini kullanarak t\u00fcm klas\u00f6rleri d\u00fczenlemesi m\u00fcmk\u00fcn olacakt\u0131r.",
+    "OptionNoThemeSong": "No Theme Song",
     "ChannelAccessHelp": "Select the channels to share with this user. Administrators will be able to edit all channels using the metadata manager.",
+    "OptionNoThemeVideo": "No Theme Video",
     "ButtonDeleteImage": "Resim Sil",
+    "LabelOneTimeDonationAmount": "Donation amount:",
     "LabelSelectUsers": "Select users:",
+    "OptionActor": "Actor",
     "ButtonUpload": "Y\u00fckle",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "Yeni Resim Y\u00fckle",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "Resmi buraya s\u00fcr\u00fckle",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG\/PNG only.",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "Nothing here.",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "Please ensure downloading of internet metadata is enabled.",
     "TabSuggested": "\u00d6nerilen",
     "TabLatest": "Son",
@@ -212,7 +221,7 @@
     "OptionAscending": "Y\u00fckselen",
     "OptionDescending": "D\u00fc\u015fen",
     "OptionRuntime": "\u00c7al\u0131\u015fma s\u00fcresi",
-    "OptionReleaseDate": "Release Date",
+    "OptionReleaseDate": "Yay\u0131nlanma Tarihi",
     "OptionPlayCount": "Oynatma sayac\u0131",
     "OptionDatePlayed": "Oynatma Tarihi",
     "OptionDateAdded": "Eklenme Tarihi",
@@ -570,9 +579,9 @@
     "LabelSkipped": "Skipped",
     "HeaderEpisodeOrganization": "Episode Organization",
     "LabelSeries": "Series:",
-    "LabelSeasonNumber": "Season number",
-    "LabelEpisodeNumber": "Episode number",
-    "LabelEndingEpisodeNumber": "Ending episode number",
+    "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)",
@@ -718,8 +727,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",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Display plugins for:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Episode name",
-    "LabelSeriesName": "Series name",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Series.name",
     "ValueSeriesNameUnderscore": "Series_name",
     "ValueEpisodeNamePeriod": "Episode.name",
     "ValueEpisodeNameUnderscore": "Episode_name",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Enter Text",
     "LabelTypeText": "Text",
     "HeaderSearchForSubtitles": "Search for Subtitles",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "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:"
+    "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 13462ce4e..c37221bab 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/vi.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/vi.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Composers",
+    "HeaderRecentActivity": "Recent Activity",
     "LabelExit": "Tho\u00e1t",
-    "OptionOthers": "Others",
+    "HeaderPeople": "People",
     "LabelVisitCommunity": "Gh\u00e9 th\u0103m trang C\u1ed9ng \u0111\u1ed3ng",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
     "LabelGithubWiki": "Github Wiki",
-    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "OptionComposers": "Composers",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "Folders",
+    "OptionOthers": "Others",
     "LabelStandard": "Ti\u00eau chu\u1ea9n",
-    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelViewApiDocumentation": "T\u00e0i li\u1ec7u xem  Api",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
     "LabelBrowseLibrary": "Duy\u1ec7t th\u01b0 vi\u1ec7n",
-    "ViewTypeLiveTvChannels": "Channels",
+    "ViewTypeFolders": "Folders",
     "LabelConfigureMediaBrowser": "C\u1ea5u h\u00ecnh Media Browser",
-    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelOpenLibraryViewer": "Open Library Viewer",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
     "LabelRestartServer": "Kh\u1edfi \u0111\u1ed9ng l\u1ea1i m\u00e1y ch\u1ee7",
-    "HeaderPassword": "Password",
+    "ViewTypeLiveTvChannels": "Channels",
     "LabelShowLogWindow": "Show Log Window",
-    "HeaderLocalAccess": "Local Access",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
     "LabelPrevious": "Tr\u01b0\u1edbc",
-    "HeaderViewOrder": "View Order",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
     "LabelFinish": "K\u1ebft th\u00fac",
-    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
+    "HeaderPassword": "Password",
     "LabelNext": "Ti\u1ebfp theo",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "HeaderLocalAccess": "Local Access",
     "LabelYoureDone": "B\u1ea1n \u0111\u00e3 ho\u00e0n th\u00e0nh!",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "HeaderViewOrder": "View Order",
     "WelcomeToMediaBrowser": "Ch\u00e0o m\u1eebng \u0111\u1ebfn B\u1ea1n \u0111\u1ebfn v\u1edbi Media Browser!",
-    "OptionDownloadMissingImages": "Download missing images",
+    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "TitleMediaBrowser": "Media Browser",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "ThisWizardWillGuideYou": "Th\u1ee7 thu\u1eadt n\u00e0y s\u1ebd h\u01b0\u1edbng d\u1eabn qu\u00e1 tr\u00ecnh c\u00e0i \u0111\u1eb7t cho b\u1ea1n. \u0110\u1ec3 b\u1eaft \u0111\u1ea7u, vui l\u00f2ng l\u1ef1a ch\u1ecdn ng\u00f4n ng\u1eef b\u1ea1n \u01b0a th\u00edch.",
-    "OptionRefreshAllData": "Refresh all data",
+    "LabelImageRefreshMode": "Image refresh mode:",
     "TellUsAboutYourself": "N\u00f3i cho ch\u00fang t\u00f4i bi\u1ebft \u0111\u00f4i \u0111i\u1ec1u v\u1ec1 B\u1ea1n",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionDownloadMissingImages": "Download missing images",
     "LabelYourFirstName": "T\u00ean c\u1ee7a B\u1ea1n",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionReplaceExistingImages": "Replace existing images",
     "MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "OptionRefreshAllData": "Refresh all data",
     "UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
-    "HeaderPersonInfo": "Person Info",
+    "OptionAddMissingDataOnly": "Add missing data only",
     "LabelWindowsService": "D\u1ecbch v\u1ee5 c\u1ee7a Windows",
-    "HeaderIdentifyItem": "Identify Item",
+    "OptionLocalRefreshOnly": "Local refresh only",
     "AWindowsServiceHasBeenInstalled": "M\u1ed9t d\u1ecbch v\u1ee5 c\u1ee7a Windows \u0111\u00e3 \u0111\u01b0\u1ee3c c\u00e0i \u0111\u1eb7t",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderRefreshMetadata": "Refresh Metadata",
     "WindowsServiceIntro1": "Media Browser Server ch\u1ea1y b\u00ecnh th\u01b0\u1eddng nh\u01b0 m\u1ed9t \u1ee9ng d\u1ee5ng m\u00e1y t\u00ednh v\u1edbi khay bi\u1ec3u t\u01b0\u1ee3ng, nh\u01b0ng n\u1ebfu b\u1ea1n th\u00edch \u0111\u1ec3 n\u00f3 ch\u1ea1y nh\u01b0 m\u1ed9t d\u1ecbch v\u1ee5 n\u1ec1n, n\u00f3 c\u00f3t h\u1ec3 kh\u1edfi \u0111\u1ed9ng c\u00f9ng c\u00e1c d\u1ecbch v\u1ee5 c\u1ee7a h\u1ec7 \u0111i\u1ec1u h\u00e0nh windows",
-    "HeaderConfirmDeletion": "Confirm Deletion",
+    "HeaderPersonInfo": "Person Info",
     "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.",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "HeaderIdentifyItem": "Identify Item",
     "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>.",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
     "LabelConfigureSettings": "C\u00e0i \u0111\u1eb7t c\u1ea5u h\u00ecnh",
-    "ButtonIdentify": "Identify",
+    "HeaderConfirmDeletion": "Confirm Deletion",
     "LabelEnableVideoImageExtraction": "Enable video image extraction",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
     "VideoImageExtractionHelp": "\u0110\u1ed1i v\u1edbi c\u00e1c video kh\u00f4ng c\u00f3 s\u1eb5n h\u00ecnh \u1ea3nh v\u00e0 ch\u00fang ta kh\u00f4ng t\u00ecm th\u1ea5y c\u00e1c h\u00ecnh \u1ea3nh \u0111\u00f3 tr\u00ean internet. \u0110i\u1ec1u n\u00e0y s\u1ebd",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
     "LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
-    "LabelCommunityRating": "Community rating:",
+    "ButtonIdentify": "Identify",
     "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.",
-    "LabelVoteCount": "Vote count:",
+    "LabelAlbumArtist": "Album artist:",
     "LabelEnableAutomaticPortMapping": "Cho ph\u00e9p t\u1ef1 \u0111\u1ed9ng \u00e1nh x\u1ea1 c\u1ed5ng (port)",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCommunityRating": "Community rating:",
     "ButtonOk": "Ok",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelVoteCount": "Vote count:",
     "ButtonCancel": "Tho\u00e1t",
-    "LabelAwardSummary": "Award summary:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "M\u1edbi",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Critic rating:",
     "HeaderSetupLibrary": "C\u00e0i \u0111\u1eb7t th\u01b0 vi\u1ec7n media c\u1ee7a b\u1ea1n",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Critic rating summary:",
     "ButtonAddMediaFolder": "Th\u00eam m\u1ed9t th\u01b0 m\u1ee5c media",
-    "LabelOverview": "Overview:",
+    "LabelAwardSummary": "Award summary:",
     "LabelFolderType": "Lo\u1ea1i th\u01b0 m\u1ee5c",
-    "LabelShortOverview": "Short overview:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
-    "LabelReleaseDate": "Release date:",
+    "LabelTagline": "Tagline:",
     "ReferToMediaLibraryWiki": "Tham kh\u1ea3o th\u01b0 vi\u1ec7n wiki media.",
-    "LabelYear": "Year:",
+    "LabelOverview": "Overview:",
     "LabelCountry": "Qu\u1ed1c gia:",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelShortOverview": "Short overview:",
     "LabelLanguage": "Ng\u00f4n ng\u1eef",
-    "LabelEndDate": "End date:",
+    "LabelReleaseDate": "Release date:",
     "HeaderPreferredMetadataLanguage": "Ng\u00f4n ng\u1eef metadata \u01b0a th\u00edch",
-    "LabelAirDate": "Air days:",
+    "LabelYear": "Year:",
     "LabelSaveLocalMetadata": "L\u01b0u c\u00e1c \u1ea3nh ngh\u1ec7 thu\u1eadt v\u00e0 metadata v\u00e0o trong c\u00e1c th\u01b0 m\u1ee5c media",
-    "LabelAirTime:": "Air time:",
+    "LabelPlaceOfBirth": "Place of birth:",
     "LabelSaveLocalMetadataHelp": "L\u01b0u c\u00e1c \u1ea3nh ngh\u1ec7 thu\u1eadt v\u00e0 metadata v\u00e0o trong c\u00e1c th\u01b0 m\u1ee5c media, s\u1ebd \u0111\u01b0a ch\u00fang v\u00e0o m\u1ed9t n\u01a1i b\u1ea1n c\u00f3 th\u1ec3 ch\u1ec9nh s\u1eeda d\u1ec5 d\u00e0ng h\u01a1n.",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelEndDate": "End date:",
     "LabelDownloadInternetMetadata": "T\u1ea3i \u1ea3nh ngh\u1ec7 thu\u1eadt v\u00e0 metadata t\u1eeb internet",
-    "LabelParentalRating": "Parental rating:",
+    "LabelAirDate": "Air days:",
     "LabelDownloadInternetMetadataHelp": "Media Browser c\u00f3 th\u1ec3 t\u1ea3i th\u00f4ng tin v\u1ec1 media c\u1ee7a b\u1ea1n \u0111\u1ec3 cho ph\u00e9p tr\u00ecnh di\u1ec5n ch\u00fang m\u1ed9t c\u00e1ch phong ph\u00faho\u01a1n",
-    "LabelCustomRating": "Custom rating:",
+    "LabelAirTime:": "Air time:",
     "TabPreferences": "\u01afa th\u00edch",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Run time (minutes):",
     "TabPassword": "M\u1eadt kh\u1ea9u",
-    "LabelRevenue": "Revenue ($):",
+    "LabelParentalRating": "Parental rating:",
     "TabLibraryAccess": "Truy c\u1eadp th\u01b0 vi\u1ec7n",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelCustomRating": "Custom rating:",
     "TabImage": "H\u00ecnh \u1ea3nh",
-    "LabelPlayers": "Players:",
+    "LabelBudget": "Budget",
     "TabProfile": "H\u1ed3 s\u01a1",
-    "Label3DFormat": "3D format:",
+    "LabelRevenue": "Revenue ($):",
     "TabMetadata": "Metadata",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "LabelOriginalAspectRatio": "Original aspect ratio:",
     "TabImages": "H\u00ecnh \u1ea3nh",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "LabelPlayers": "Players:",
     "TabNotifications": "Notifications",
-    "HeaderExternalIds": "External Id's:",
+    "Label3DFormat": "3D format:",
     "TabCollectionTitles": "Ti\u00eau \u0111\u1ec1",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
     "LabelDisplayMissingEpisodesWithinSeasons": "Display missing episodes within seasons",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "HeaderSpecialEpisodeInfo": "Special Episode Info",
     "LabelUnairedMissingEpisodesWithinSeasons": "Display unaired episodes within seasons",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "HeaderExternalIds": "External Id's:",
     "HeaderVideoPlaybackSettings": "C\u00e1c c\u00e0i \u0111\u1eb7t ph\u00e1t Video",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "Dvd season number:",
     "HeaderPlaybackSettings": "Playback Settings",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "Dvd episode number:",
     "LabelAudioLanguagePreference": "Ng\u00f4n ng\u1eef tho\u1ea1i \u01b0a th\u00edch:",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
     "LabelSubtitleLanguagePreference": "Ng\u00f4n ng\u1eef ph\u1ee5 \u0111\u1ec1 \u01b0a th\u00edch:",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelAirsBeforeSeason": "Airs before season:",
     "OptionDefaultSubtitles": "Default",
-    "LabelDisplayOrder": "Display order:",
+    "LabelAirsAfterSeason": "Airs after season:",
     "OptionOnlyForcedSubtitles": "Only forced subtitles",
-    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelAirsBeforeEpisode": "Airs before episode:",
     "OptionAlwaysPlaySubtitles": "Always play subtitles",
-    "HeaderCountries": "Countries",
+    "LabelTreatImageAs": "Treat image as:",
     "OptionNoSubtitles": "No Subtitles",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "Display order:",
     "OptionDefaultSubtitlesHelp": "Subtitles matching the language preference will be loaded when the audio is in a foreign language.",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
     "OptionOnlyForcedSubtitlesHelp": "Only subtitles marked as forced will be loaded.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "Countries",
     "OptionAlwaysPlaySubtitlesHelp": "Subtitles matching the language preference will be loaded regardless of the audio language.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "Genres",
     "OptionNoSubtitlesHelp": "Subtitles will not be loaded by default.",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderPlotKeywords": "Plot Keywords",
     "TabProfiles": "H\u1ed3 s\u01a1",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "HeaderStudios": "Studios",
     "TabSecurity": "B\u1ea3o m\u1eadt",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "Th\u00eam ng\u01b0\u1eddi d\u00f9ng",
-    "TabSupporterClub": "Supporter Club",
+    "HeaderMetadataSettings": "Metadata Settings",
     "ButtonSave": "L\u01b0u",
-    "HeaderDonationType": "Donation type:",
+    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
     "ButtonResetPassword": "Reset m\u1eadt kh\u1ea9u",
-    "OptionMakeOneTimeDonation": "Make a one-time donation",
+    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
     "LabelNewPassword": "M\u1eadt kh\u1ea9u m\u1edbi:",
-    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
+    "TabSupporterClub": "Supporter Club",
     "LabelNewPasswordConfirm": "X\u00e1c nh\u1eadn m\u1eadt kh\u1ea9u m\u1edbi:",
-    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderDonationType": "Donation type:",
     "HeaderCreatePassword": "T\u1ea1o m\u1eadt kh\u1ea9u",
-    "OptionNoTrailer": "No Trailer",
+    "OptionMakeOneTimeDonation": "Make a one-time donation",
     "LabelCurrentPassword": "M\u1eadt kh\u1ea9u hi\u1ec7n t\u1ea1i:",
-    "OptionNoThemeSong": "No Theme Song",
+    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
     "LabelMaxParentalRating": "Maximum allowed parental rating:",
-    "OptionNoThemeVideo": "No Theme Video",
+    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
     "MaxParentalRatingHelp": "N\u1ed9i dung v\u1edbi \u0111\u00e1nh gi\u00e1 cao h\u01a1n s\u1ebd \u0111\u01b0\u1ee3c \u1ea9n \u0111i t\u1eeb ng\u01b0\u1eddi d\u00f9ng n\u00e0y.",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "OptionNoTrailer": "No Trailer",
     "LibraryAccessHelp": "Select the media folders to share with this user. Administrators will be able to edit all folders using the metadata manager.",
+    "OptionNoThemeSong": "No Theme Song",
     "ChannelAccessHelp": "Select the channels to share with this user. Administrators will be able to edit all channels using the metadata manager.",
+    "OptionNoThemeVideo": "No Theme Video",
     "ButtonDeleteImage": "X\u00f3a h\u00ecnh \u1ea3nh",
+    "LabelOneTimeDonationAmount": "Donation amount:",
     "LabelSelectUsers": "Select users:",
+    "OptionActor": "Actor",
     "ButtonUpload": "T\u1ea3i l\u00ean",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "T\u1ea3i l\u00ean m\u1ed9t \u1ea3nh m\u1edbi",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "K\u00e9o\/Th\u1ea3 h\u00ecnh \u1ea3nh t\u1ea1i \u0111\u00e2y",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG\/PNG only.",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "Kh\u00f4ng c\u00f3 g\u00ec \u1edf \u0111\u00e2y.",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "Please ensure downloading of internet metadata is enabled.",
     "TabSuggested": "Suggested",
     "TabLatest": "M\u1edbi nh\u1ea5t",
@@ -212,7 +221,7 @@
     "OptionAscending": "Ascending",
     "OptionDescending": "Descending",
     "OptionRuntime": "Th\u1eddi gian ph\u00e1t",
-    "OptionReleaseDate": "Release Date",
+    "OptionReleaseDate": "Ng\u00e0y ph\u00e1t h\u00e0nh",
     "OptionPlayCount": "S\u1ed1 l\u1ea7n ph\u00e1t",
     "OptionDatePlayed": "Ng\u00e0y ph\u00e1t",
     "OptionDateAdded": "Ng\u00e0y th\u00eam",
@@ -570,9 +579,9 @@
     "LabelSkipped": "B\u1ecf qua",
     "HeaderEpisodeOrganization": "Episode Organization",
     "LabelSeries": "Series:",
-    "LabelSeasonNumber": "Season number",
-    "LabelEpisodeNumber": "Episode number",
-    "LabelEndingEpisodeNumber": "Ending episode number",
+    "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)",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Display plugins for:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Episode name",
-    "LabelSeriesName": "Series name",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Series.name",
     "ValueSeriesNameUnderscore": "Series_name",
     "ValueEpisodeNamePeriod": "Episode.name",
     "ValueEpisodeNameUnderscore": "Episode_name",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Enter Text",
     "LabelTypeText": "Text",
     "HeaderSearchForSubtitles": "Search for Subtitles",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "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:"
+    "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 446fcf198..daf43935a 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
@@ -1,179 +1,188 @@
 {
-    "OptionComposers": "Composers",
+    "HeaderRecentActivity": "Recent Activity",
     "LabelExit": "\u96e2\u958b",
-    "OptionOthers": "Others",
+    "HeaderPeople": "People",
     "LabelVisitCommunity": "\u8a2a\u554f\u793e\u5340",
+    "HeaderDownloadPeopleMetadataFor": "Download biography and images for:",
     "LabelGithubWiki": "Github \u7ef4\u57fa",
-    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
+    "OptionComposers": "Composers",
     "LabelSwagger": "Swagger",
-    "ViewTypeFolders": "Folders",
+    "OptionOthers": "Others",
     "LabelStandard": "\u6a19\u6dee",
-    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelViewApiDocumentation": "\u67e5\u770bAPI\u6587\u6a94",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
+    "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
     "LabelBrowseLibrary": "\u700f\u89bd\u5a92\u9ad4\u5eab",
-    "ViewTypeLiveTvChannels": "Channels",
+    "ViewTypeFolders": "Folders",
     "LabelConfigureMediaBrowser": "\u8a2d\u5b9aMedia Browser",
-    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
+    "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "LabelOpenLibraryViewer": "\u6253\u958b\u5a92\u9ad4\u5eab\u700f\u89bd\u5668",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
+    "ViewTypeLiveTvRecordingGroups": "Recordings",
     "LabelRestartServer": "\u91cd\u65b0\u555f\u52d5\u4f3a\u5668\u670d",
-    "HeaderPassword": "Password",
+    "ViewTypeLiveTvChannels": "Channels",
     "LabelShowLogWindow": "\u986f\u793a\u65e5\u8a8c",
-    "HeaderLocalAccess": "Local Access",
+    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
     "LabelPrevious": "\u4e0a\u4e00\u500b",
-    "HeaderViewOrder": "View Order",
+    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
     "LabelFinish": "\u5b8c\u7d50",
-    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
+    "HeaderPassword": "Password",
     "LabelNext": "\u4e0b\u4e00\u500b",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "HeaderLocalAccess": "Local Access",
     "LabelYoureDone": "\u5b8c\u6210!",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "HeaderViewOrder": "View Order",
     "WelcomeToMediaBrowser": "\u6b61\u8fce\u4f86\u5230 Media Browser\uff01",
-    "OptionDownloadMissingImages": "Download missing images",
+    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "TitleMediaBrowser": "Media Browser",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "ThisWizardWillGuideYou": "\u56ae\u5c0e\u5c07\u5f15\u5c0e\u4f60\u5b8c\u6210\u5b89\u88dd\u7a0b\u5e8f\u3002",
-    "OptionRefreshAllData": "Refresh all data",
+    "LabelImageRefreshMode": "Image refresh mode:",
     "TellUsAboutYourself": "\u8acb\u4ecb\u7d39\u4e00\u4e0b\u81ea\u5df1",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionDownloadMissingImages": "Download missing images",
     "LabelYourFirstName": "\u4f60\u7684\u540d\u5b57\uff1a",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionReplaceExistingImages": "Replace existing images",
     "MoreUsersCanBeAddedLater": "\u5f80\u5f8c\u53ef\u4ee5\u5728\u63a7\u5236\u53f0\u5167\u6dfb\u52a0\u66f4\u591a\u7528\u6236\u3002",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "OptionRefreshAllData": "Refresh all data",
     "UserProfilesIntro": "Media Browser \u5167\u7f6e\u652f\u6301\u591a\u500b\u7528\u6236\u914d\u7f6e\uff0c\u4f7f\u6bcf\u500b\u7528\u6236\u90fd\u64c1\u6709\u81ea\u5df1\u5c08\u5c6c\u7684\u986f\u793a\u8a2d\u7f6e\uff0c\u64ad\u653e\u72c0\u614b\u548c\u5bb6\u9577\u63a7\u5236\u8a2d\u7f6e\u3002",
-    "HeaderPersonInfo": "Person Info",
+    "OptionAddMissingDataOnly": "Add missing data only",
     "LabelWindowsService": "Windows\u670d\u52d9",
-    "HeaderIdentifyItem": "Identify Item",
+    "OptionLocalRefreshOnly": "Local refresh only",
     "AWindowsServiceHasBeenInstalled": "Windows\u670d\u52d9\u5df2\u7d93\u5b89\u88dd\u5b8c\u7562\u3002",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderRefreshMetadata": "Refresh Metadata",
     "WindowsServiceIntro1": "Media Browser \u4f3a\u670d\u5668\u901a\u5e38\u6703\u4f5c\u70ba\u4e00\u500b\u6709\u7a0b\u5f0f\u76e4\u5716\u6a19\u7684\u684c\u9762\u61c9\u7528\u7a0b\u5f0f\u904b\u884c\uff0c\u4f46\u5982\u679c\u4f60\u66f4\u559c\u6b61\u5c07\u5b83\u4f5c\u70ba\u5f8c\u53f0\u670d\u52d9\uff0c\u5b83\u53ef\u4ee5\u5f9eWindows\u670d\u52d9\u63a7\u5236\u53f0\u555f\u52d5\u3002",
-    "HeaderConfirmDeletion": "Confirm Deletion",
+    "HeaderPersonInfo": "Person Info",
     "WindowsServiceIntro2": "\u5982\u679c\u4f7f\u7528Windows\u670d\u52d9\uff0c\u8acb\u6ce8\u610f\uff0c\u5b83\u4e0d\u80fd\u540c\u6642\u4f5c\u70ba\u7a0b\u5f0f\u76e4\u5716\u6a19\u684c\u9762\u61c9\u7528\u7a0b\u5f0f\u904b\u884c\uff0c\u6240\u4ee5\u4f60\u9700\u8981\u5f9e\u7a0b\u5f0f\u76e4\u5716\u6a19\u9000\u51fa\uff0c\u4ee5\u904b\u884cWindows\u670d\u52d9\u3002\u8a72\u670d\u52d9\u9084\u9700\u8981\u5177\u6709\u7ba1\u7406\u54e1\u6b0a\u9650\uff0c\u9019\u53ef\u4ee5\u901a\u904eWindows\u670d\u52d9\u63a7\u5236\u53f0\u9032\u884c\u914d\u7f6e\u3002\u8acb\u6ce8\u610f\uff0c\u6b64\u6642\u7684 Media Browser \u4f3a\u670d\u5668\u670d\u52d9\u662f\u7121\u6cd5\u81ea\u52d5\u66f4\u65b0\uff0c\u56e0\u6b64\u65b0\u7248\u672c\u5c07\u9700\u8981\u624b\u52d5\u66f4\u65b0\u3002",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "HeaderIdentifyItem": "Identify Item",
     "WizardCompleted": "\u9019\u5c31\u662f\u6211\u5011\u73fe\u5728\u6240\u9700\u8981\u77e5\u9053\u7684\u3002Media Browser \u5df2\u7d93\u958b\u59cb\u6536\u96c6\u4f60\u7684\u5a92\u9ad4\u5eab\u7684\u8cc7\u6599\u3002\u8acb\u7e7c\u7e8c\u700f\u89bd\u6211\u5011\u5176\u4ed6\u7684\u7a0b\u5f0f\uff0c\u7136\u5f8c\u55ae\u64ca<b>\u5b8c\u6210<\/b>\u4f86\u67e5\u770b<b>\u63a7\u5236\u53f0<\/b>\u3002",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
     "LabelConfigureSettings": "\u914d\u7f6e\u8a2d\u5b9a",
-    "ButtonIdentify": "Identify",
+    "HeaderConfirmDeletion": "Confirm Deletion",
     "LabelEnableVideoImageExtraction": "\u555f\u52d5\u8996\u983b\u622a\u5716\u63d0\u53d6",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
     "VideoImageExtractionHelp": "\u5c0d\u65bc\u6c92\u6709\u622a\u5716\u4ee5\u53ca\u6211\u5011\u76ee\u524d\u7121\u6cd5\u5f9e\u4e92\u806f\u7db2\u627e\u5230\u6709\u95dc\u622a\u5716\u7684\u8996\u983b\uff0c\u5728\u521d\u59cb\u5a92\u9ad4\u5eab\u6383\u63cf\u6642\uff0c\u6703\u589e\u52a0\u4e00\u4e9b\u984d\u5916\u7684\u6383\u63cf\u6642\u9593\uff0c\u4f46\u4f60\u5c07\u6703\u770b\u5230\u4e00\u500b\u66f4\u6085\u76ee\u7684\u4ecb\u7d39\u4ecb\u9762\u3002",
-    "LabelAlbum": "Album:",
+    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
     "LabelEnableChapterImageExtractionForMovies": "\u63d0\u53d6\u96fb\u5f71\u7ae0\u7bc0\u622a\u5716",
-    "LabelCommunityRating": "Community rating:",
+    "ButtonIdentify": "Identify",
     "LabelChapterImageExtractionForMoviesHelp": "\u5f9e\u8996\u983b\u7ae0\u7bc0\u4e2d\u63d0\u53d6\u622a\u5716\u5c07\u5141\u8a31\u5ba2\u6236\u7aef\u7528\u5716\u50cf\u986f\u793a\u9078\u64c7\u83dc\u55ae\u3002\u9019\u500b\u904e\u7a0b\u53ef\u80fd\u6703\u5f88\u6162\uff0c\u4f54\u7528\u66f4\u591a\u7684CPU\u8cc7\u6e90\uff0c\u4e26\u4e14\u53ef\u80fd\u9700\u8981\u7684\u6578GB\u786c\u789f\u7a7a\u9593\u3002\u5b83\u9ed8\u8a8d\u9810\u5b9a\u5728\u6bcf\u665a\u7684\u51cc\u66684\u9ede\u904b\u884c\uff0c\u4f46\u9019\u662f\u53ef\u4ee5\u5f9e\u4efb\u52d9\u8868\u9032\u884c\u8a2d\u5b9a\u7684\u3002\u4e0d\u5efa\u8b70\u5728\u9ad8\u5cf0\u4f7f\u7528\u6642\u9593\u904b\u884c\u6b64\u4efb\u52d9\u3002",
-    "LabelVoteCount": "Vote count:",
+    "LabelAlbumArtist": "Album artist:",
     "LabelEnableAutomaticPortMapping": "\u555f\u7528\u81ea\u52d5\u7aef\u53e3\u8f49\u767c",
-    "LabelMetascore": "Metascore:",
+    "LabelAlbum": "Album:",
     "LabelEnableAutomaticPortMappingHelp": "UPnP\u5141\u8a31\u8def\u7531\u5668\u81ea\u52d5\u8a2d\u7f6e\u5f9e\u800c\u53ef\u4ee5\u66f4\u65b9\u4fbf\u5730\u9060\u7a0b\u8a2a\u554f\u4f3a\u670d\u5668\u3002\u9019\u53ef\u80fd\u4e0d\u9069\u7528\u65bc\u67d0\u4e9b\u8def\u7531\u5668\u578b\u865f\u3002",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCommunityRating": "Community rating:",
     "ButtonOk": "OK",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelVoteCount": "Vote count:",
     "ButtonCancel": "\u53d6\u6d88",
-    "LabelAwardSummary": "Award summary:",
+    "LabelMetascore": "Metascore:",
     "ButtonNew": "\u5275\u5efa",
-    "LabelWebsite": "Website:",
+    "LabelCriticRating": "Critic rating:",
     "HeaderSetupLibrary": "\u8a2d\u7f6e\u4f60\u7684\u5a92\u9ad4\u5eab",
-    "LabelTagline": "Tagline:",
+    "LabelCriticRatingSummary": "Critic rating summary:",
     "ButtonAddMediaFolder": "\u6dfb\u52a0\u5a92\u9ad4\u6587\u4ef6\u593e",
-    "LabelOverview": "Overview:",
+    "LabelAwardSummary": "Award summary:",
     "LabelFolderType": "\u5a92\u9ad4\u6587\u4ef6\u593e\u985e\u578b\uff1a",
-    "LabelShortOverview": "Short overview:",
+    "LabelWebsite": "Website:",
     "MediaFolderHelpPluginRequired": "*\u9700\u8981\u4f7f\u7528\u4e00\u500b\u63d2\u4ef6\uff0c\u4f8b\u5982GameBrowser\u6216MB Bookshelf\u3002",
-    "LabelReleaseDate": "Release date:",
+    "LabelTagline": "Tagline:",
     "ReferToMediaLibraryWiki": "\u53c3\u7167\u5a92\u9ad4\u5eab\u7ef4\u57fa",
-    "LabelYear": "Year:",
+    "LabelOverview": "Overview:",
     "LabelCountry": "\u570b\u5bb6\uff1a",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelShortOverview": "Short overview:",
     "LabelLanguage": "\u8a9e\u8a00\uff1a",
-    "LabelEndDate": "End date:",
+    "LabelReleaseDate": "Release date:",
     "HeaderPreferredMetadataLanguage": "\u9996\u9078\u5a92\u9ad4\u8cc7\u6599\u8a9e\u8a00\uff1a",
-    "LabelAirDate": "Air days:",
+    "LabelYear": "Year:",
     "LabelSaveLocalMetadata": "\u4fdd\u5b58\u5a92\u9ad4\u5716\u50cf\u53ca\u8cc7\u6599\u5230\u5a92\u9ad4\u6a94\u6848\u6240\u5728\u7684\u6587\u4ef6\u593e",
-    "LabelAirTime:": "Air time:",
+    "LabelPlaceOfBirth": "Place of birth:",
     "LabelSaveLocalMetadataHelp": "\u76f4\u63a5\u4fdd\u5b58\u5a92\u9ad4\u5716\u50cf\u53ca\u8cc7\u6599\u5230\u5a92\u9ad4\u6240\u5728\u7684\u6587\u4ef6\u593e\u80fd\u4f7f\u7de8\u8f2f\u5de5\u4f5c\u66f4\u5bb9\u6613\u3002",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelEndDate": "End date:",
     "LabelDownloadInternetMetadata": "\u5f9e\u4e92\u806f\u7db2\u4e0b\u8f09\u5a92\u9ad4\u5716\u50cf\u53ca\u8cc7\u6599",
-    "LabelParentalRating": "Parental rating:",
+    "LabelAirDate": "Air days:",
     "LabelDownloadInternetMetadataHelp": "Media Browser\u53ef\u4ee5\u5f9e\u4e92\u806f\u7db2\u4e0b\u8f09\u5a92\u9ad4\u5716\u50cf\u53ca\u8cc7\u6599\u5f9e\u800c\u63d0\u4f9b\u66f4\u8c50\u5bcc\u7684\u5a92\u9ad4\u8868\u9054\u65b9\u5f0f\u3002",
-    "LabelCustomRating": "Custom rating:",
+    "LabelAirTime:": "Air time:",
     "TabPreferences": "\u504f\u597d",
-    "LabelBudget": "Budget",
+    "LabelRuntimeMinutes": "Run time (minutes):",
     "TabPassword": "\u5bc6\u78bc",
-    "LabelRevenue": "Revenue ($):",
+    "LabelParentalRating": "Parental rating:",
     "TabLibraryAccess": "\u5a92\u9ad4\u5eab\u700f\u89bd\u6b0a\u9650",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelCustomRating": "Custom rating:",
     "TabImage": "\u5716\u50cf",
-    "LabelPlayers": "Players:",
+    "LabelBudget": "Budget",
     "TabProfile": "\u914d\u7f6e",
-    "Label3DFormat": "3D format:",
+    "LabelRevenue": "Revenue ($):",
     "TabMetadata": "\u5a92\u9ad4\u8cc7\u6599",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "LabelOriginalAspectRatio": "Original aspect ratio:",
     "TabImages": "\u5716\u50cf",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "LabelPlayers": "Players:",
     "TabNotifications": "Notifications",
-    "HeaderExternalIds": "External Id's:",
+    "Label3DFormat": "3D format:",
     "TabCollectionTitles": "\u6a19\u984c",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
     "LabelDisplayMissingEpisodesWithinSeasons": "\u986f\u793a\u7bc0\u76ee\u5b63\u5ea6\u5167\u7f3a\u5c11\u7684\u55ae\u5143",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "HeaderSpecialEpisodeInfo": "Special Episode Info",
     "LabelUnairedMissingEpisodesWithinSeasons": "\u5728\u7bc0\u76ee\u5b63\u5ea6\u5167\u986f\u793a\u9084\u672a\u767c\u4f48\u7684\u55ae\u5143",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "HeaderExternalIds": "External Id's:",
     "HeaderVideoPlaybackSettings": "\u8996\u983b\u56de\u653e\u8a2d\u7f6e",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelDvdSeasonNumber": "Dvd season number:",
     "HeaderPlaybackSettings": "Playback Settings",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelDvdEpisodeNumber": "Dvd episode number:",
     "LabelAudioLanguagePreference": "\u97f3\u983b\u8a9e\u8a00\u504f\u597d\u9078\u9805\uff1a",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
     "LabelSubtitleLanguagePreference": "\u5b57\u5e55\u8a9e\u8a00\u504f\u597d\u9078\u9805\uff1a",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelAirsBeforeSeason": "Airs before season:",
     "OptionDefaultSubtitles": "Default",
-    "LabelDisplayOrder": "Display order:",
+    "LabelAirsAfterSeason": "Airs after season:",
     "OptionOnlyForcedSubtitles": "Only forced subtitles",
-    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
+    "LabelAirsBeforeEpisode": "Airs before episode:",
     "OptionAlwaysPlaySubtitles": "Always play subtitles",
-    "HeaderCountries": "Countries",
+    "LabelTreatImageAs": "Treat image as:",
     "OptionNoSubtitles": "No Subtitles",
-    "HeaderGenres": "Genres",
+    "LabelDisplayOrder": "Display order:",
     "OptionDefaultSubtitlesHelp": "Subtitles matching the language preference will be loaded when the audio is in a foreign language.",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
     "OptionOnlyForcedSubtitlesHelp": "Only subtitles marked as forced will be loaded.",
-    "HeaderStudios": "Studios",
+    "HeaderCountries": "Countries",
     "OptionAlwaysPlaySubtitlesHelp": "Subtitles matching the language preference will be loaded regardless of the audio language.",
-    "HeaderTags": "Tags",
+    "HeaderGenres": "Genres",
     "OptionNoSubtitlesHelp": "Subtitles will not be loaded by default.",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderPlotKeywords": "Plot Keywords",
     "TabProfiles": "\u914d\u7f6e",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "HeaderStudios": "Studios",
     "TabSecurity": "\u5b89\u5168\u6027",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "HeaderTags": "Tags",
     "ButtonAddUser": "\u6dfb\u52a0\u7528\u6236",
-    "TabSupporterClub": "Supporter Club",
+    "HeaderMetadataSettings": "Metadata Settings",
     "ButtonSave": "\u4fdd\u5b58",
-    "HeaderDonationType": "Donation type:",
+    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
     "ButtonResetPassword": "\u91cd\u8a2d\u5bc6\u78bc",
-    "OptionMakeOneTimeDonation": "Make a one-time donation",
+    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
     "LabelNewPassword": "\u65b0\u5bc6\u78bc\uff1a",
-    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
+    "TabSupporterClub": "Supporter Club",
     "LabelNewPasswordConfirm": "\u78ba\u8a8d\u65b0\u5bc6\u78bc\uff1a",
-    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderDonationType": "Donation type:",
     "HeaderCreatePassword": "\u5275\u5efa\u5bc6\u78bc",
-    "OptionNoTrailer": "No Trailer",
+    "OptionMakeOneTimeDonation": "Make a one-time donation",
     "LabelCurrentPassword": "\u7576\u524d\u7684\u5bc6\u78bc\uff1a",
-    "OptionNoThemeSong": "No Theme Song",
+    "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership",
     "LabelMaxParentalRating": "\u6700\u5927\u5141\u8a31\u7684\u5bb6\u9577\u8a55\u7d1a\uff1a",
-    "OptionNoThemeVideo": "No Theme Video",
+    "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.",
     "MaxParentalRatingHelp": "\u5177\u6709\u8f03\u9ad8\u7684\u5bb6\u9577\u8a55\u7d1a\u5167\u5bb9\u5c07\u5f9e\u9019\u7528\u6236\u88ab\u96b1\u85cf",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "OptionNoTrailer": "No Trailer",
     "LibraryAccessHelp": "\u9078\u64c7\u5a92\u9ad4\u6587\u4ef6\u593e\u8207\u9019\u7528\u6236\u5171\u4eab\u3002\u7ba1\u7406\u54e1\u5c07\u53ef\u4ee5\u4f7f\u7528\u5a92\u9ad4\u8cc7\u6599\u64da\u7ba1\u7406\u5668\u7de8\u8f2f\u6240\u6709\u7684\u5a92\u9ad4\u6587\u4ef6\u593e\u3002",
+    "OptionNoThemeSong": "No Theme Song",
     "ChannelAccessHelp": "Select the channels to share with this user. Administrators will be able to edit all channels using the metadata manager.",
+    "OptionNoThemeVideo": "No Theme Video",
     "ButtonDeleteImage": "\u522a\u9664\u5716\u50cf",
+    "LabelOneTimeDonationAmount": "Donation amount:",
     "LabelSelectUsers": "Select users:",
+    "OptionActor": "Actor",
     "ButtonUpload": "\u4e0a\u8f09",
+    "OptionComposer": "Composer",
     "HeaderUploadNewImage": "\u4e0a\u8f09\u65b0\u5716\u50cf",
+    "OptionDirector": "Director",
     "LabelDropImageHere": "\u5728\u9019\u88e1\u653e\u4e0b\u5716\u50cf",
+    "OptionGuestStar": "Guest star",
     "ImageUploadAspectRatioHelp": "\u63a8\u85a6\u4f7f\u67091:1\u5bec\u9ad8\u6bd4\u4f8b\u7684\u5716\u50cf\u3002\u53ea\u5141\u8a31JPG\/PNG\u683c\u5f0f",
+    "OptionProducer": "Producer",
     "MessageNothingHere": "\u9019\u88e1\u6c92\u6709\u4ec0\u9ebc\u3002",
+    "OptionWriter": "Writer",
     "MessagePleaseEnsureInternetMetadata": "\u8acb\u78ba\u4fdd\u5df2\u555f\u7528\u5f9e\u4e92\u806f\u7db2\u4e0b\u8f09\u5a92\u9ad4\u8cc7\u6599\u3002",
     "TabSuggested": "\u5efa\u8b70",
     "TabLatest": "\u6700\u65b0",
@@ -212,7 +221,7 @@
     "OptionAscending": "\u5347\u5e8f",
     "OptionDescending": "\u964d\u5e8f",
     "OptionRuntime": "\u64ad\u653e\u9577\u5ea6",
-    "OptionReleaseDate": "Release Date",
+    "OptionReleaseDate": "\u767c\u5e03\u65e5\u671f",
     "OptionPlayCount": "\u64ad\u653e\u6b21\u6578",
     "OptionDatePlayed": "\u64ad\u653e\u65e5\u671f",
     "OptionDateAdded": "\u6dfb\u52a0\u65e5\u671f",
@@ -483,7 +492,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.",
@@ -570,9 +579,9 @@
     "LabelSkipped": "Skipped",
     "HeaderEpisodeOrganization": "Episode Organization",
     "LabelSeries": "Series:",
-    "LabelSeasonNumber": "Season number",
-    "LabelEpisodeNumber": "Episode number",
-    "LabelEndingEpisodeNumber": "Ending episode number",
+    "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)",
@@ -842,12 +851,15 @@
     "LabelDisplayPluginsFor": "Display plugins for:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeName": "Episode name",
-    "LabelSeriesName": "Series name",
+    "LabelEpisodeNamePlain": "Episode name",
+    "LabelSeriesNamePlain": "Series name",
     "ValueSeriesNamePeriod": "Series.name",
     "ValueSeriesNameUnderscore": "Series_name",
     "ValueEpisodeNamePeriod": "Episode.name",
     "ValueEpisodeNameUnderscore": "Episode_name",
+    "LabelSeasonNumberPlain": "Season number",
+    "LabelEpisodeNumberPlain": "Episode number",
+    "LabelEndingEpisodeNumberPlain": "Ending episode number",
     "HeaderTypeText": "Enter Text",
     "LabelTypeText": "Text",
     "HeaderSearchForSubtitles": "Search for Subtitles",
@@ -1078,8 +1090,5 @@
     "AppDeviceValues": "App: {0}, Device: {1}",
     "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:"
+    "LabelChannelDownloadSizeLimitHelp": "Limit the size of the channel download folder"
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Playlists/PlaylistImageEnhancer.cs b/MediaBrowser.Server.Implementations/Playlists/PlaylistImageEnhancer.cs
index 6b3170e42..baf5202c4 100644
--- a/MediaBrowser.Server.Implementations/Playlists/PlaylistImageEnhancer.cs
+++ b/MediaBrowser.Server.Implementations/Playlists/PlaylistImageEnhancer.cs
@@ -29,7 +29,7 @@ namespace MediaBrowser.Server.Implementations.Playlists
 
         public bool Supports(IHasImages item, ImageType imageType)
         {
-            return imageType == ImageType.Primary && item is Playlist;
+            return (imageType == ImageType.Primary || imageType == ImageType.Thumb) && item is Playlist;
         }
 
         public MetadataProviderPriority Priority
@@ -102,7 +102,9 @@ namespace MediaBrowser.Server.Implementations.Playlists
             return GetConfigurationCacheKey(items);
         }
 
-        private const int ImageSize = 800;
+        private const int SquareImageSize = 800;
+        private const int ThumbImageWidth = 1600;
+        private const int ThumbImageHeight = 900;
 
         public ImageSize GetEnhancedImageSize(IHasImages item, ImageType imageType, int imageIndex, ImageSize originalImageSize)
         {
@@ -113,10 +115,19 @@ namespace MediaBrowser.Server.Implementations.Playlists
                 return originalImageSize;
             }
 
+            if (imageType == ImageType.Thumb)
+            {
+                return new ImageSize
+                {
+                    Height = ThumbImageHeight,
+                    Width = ThumbImageWidth
+                };
+            }
+
             return new ImageSize
             {
-                Height = ImageSize,
-                Width = ImageSize
+                Height = SquareImageSize,
+                Width = SquareImageSize
             };
         }
 
@@ -129,7 +140,9 @@ namespace MediaBrowser.Server.Implementations.Playlists
                 return originalImage;
             }
 
-            var img = await GetCollage(items).ConfigureAwait(false);
+            var img = imageType == ImageType.Thumb  ?
+                await GetThumbCollage(items).ConfigureAwait(false) :
+                await GetSquareCollage(items).ConfigureAwait(false);
 
             using (originalImage)
             {
@@ -137,12 +150,74 @@ namespace MediaBrowser.Server.Implementations.Playlists
             }
         }
 
-        private Task<Image> GetCollage(List<BaseItem> items)
+        private Task<Image> GetThumbCollage(List<BaseItem> items)
+        {
+            return GetThumbCollage(items.Select(i => i.GetImagePath(ImageType.Primary)).ToList());
+        }
+
+        private Task<Image> GetSquareCollage(List<BaseItem> items)
+        {
+            return GetSquareCollage(items.Select(i => i.GetImagePath(ImageType.Primary)).ToList());
+        }
+
+        private async Task<Image> GetThumbCollage(List<string> files)
         {
-            return GetCollage(items.Select(i => i.GetImagePath(ImageType.Primary)).ToList());
+            if (files.Count < 3)
+            {
+                return await GetSingleImage(files).ConfigureAwait(false);
+            }
+
+            const int rows = 1;
+            const int cols = 3;
+
+            const int cellWidth = 2 * (ThumbImageWidth / 3);
+            const int cellHeight = ThumbImageHeight;
+            var index = 0;
+
+            var img = new Bitmap(ThumbImageWidth, ThumbImageHeight, PixelFormat.Format32bppPArgb);
+
+            using (var graphics = Graphics.FromImage(img))
+            {
+                graphics.CompositingQuality = CompositingQuality.HighQuality;
+                graphics.SmoothingMode = SmoothingMode.HighQuality;
+                graphics.InterpolationMode = InterpolationMode.HighQualityBicubic;
+                graphics.PixelOffsetMode = PixelOffsetMode.HighQuality;
+                graphics.CompositingMode = CompositingMode.SourceCopy;
+
+                for (var row = 0; row < rows; row++)
+                {
+                    for (var col = 0; col < cols; col++)
+                    {
+                        var x = col * (cellWidth / 2);
+                        var y = row * cellHeight;
+
+                        if (files.Count > index)
+                        {
+                            using (var fileStream = _fileSystem.GetFileStream(files[index], FileMode.Open, FileAccess.Read, FileShare.Read, true))
+                            {
+                                using (var memoryStream = new MemoryStream())
+                                {
+                                    await fileStream.CopyToAsync(memoryStream).ConfigureAwait(false);
+
+                                    memoryStream.Position = 0;
+
+                                    using (var imgtemp = Image.FromStream(memoryStream, true, false))
+                                    {
+                                        graphics.DrawImage(imgtemp, x, y, cellWidth, cellHeight);
+                                    }
+                                }
+                            }
+                        }
+
+                        index++;
+                    }
+                }
+            }
+
+            return img;
         }
 
-        private async Task<Image> GetCollage(List<string> files)
+        private async Task<Image> GetSquareCollage(List<string> files)
         {
             if (files.Count < 4)
             {
@@ -152,10 +227,10 @@ namespace MediaBrowser.Server.Implementations.Playlists
             const int rows = 2;
             const int cols = 2;
 
-            const int singleSize = ImageSize / 2;
+            const int singleSize = SquareImageSize / 2;
             var index = 0;
 
-            var img = new Bitmap(ImageSize, ImageSize, PixelFormat.Format32bppPArgb);
+            var img = new Bitmap(SquareImageSize, SquareImageSize, PixelFormat.Format32bppPArgb);
 
             using (var graphics = Graphics.FromImage(img))
             {
diff --git a/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs b/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs
index a719e8be2..d2ace23a9 100644
--- a/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs
+++ b/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs
@@ -157,10 +157,10 @@ namespace MediaBrowser.Server.Implementations.Session
                     throw new ArgumentException("SeekPositionTicks cannot be null");
                 }
 
-                args["StartPositionTicks"] = command.SeekPositionTicks.Value.ToString(CultureInfo.InvariantCulture);
+                args["SeekPositionTicks"] = command.SeekPositionTicks.Value.ToString(CultureInfo.InvariantCulture);
             }
 
-            return SendMessage(command.Command.ToString(), cancellationToken);
+            return SendMessage(command.Command.ToString(), args, cancellationToken);
         }
 
         public Task SendLibraryUpdateInfo(LibraryUpdateInfo info, CancellationToken cancellationToken)
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index c14f32387..1b5bd8440 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -312,13 +312,6 @@ namespace MediaBrowser.ServerApplication
                 saveConfig = true;
             }
 
-            if (ServerConfigurationManager.Configuration.NotificationOptions != null)
-            {
-                ServerConfigurationManager.SaveConfiguration("notifications", ServerConfigurationManager.Configuration.NotificationOptions);
-                ServerConfigurationManager.Configuration.NotificationOptions = null;
-                saveConfig = true;
-            }
-
             if (ServerConfigurationManager.Configuration.LiveTvOptions != null)
             {
                 ServerConfigurationManager.SaveConfiguration("livetv", ServerConfigurationManager.Configuration.LiveTvOptions);
@@ -333,13 +326,6 @@ 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();
diff --git a/MediaBrowser.Tests/MediaBrowser.Tests.csproj b/MediaBrowser.Tests/MediaBrowser.Tests.csproj
index 95ae25f93..dc7393b01 100644
--- a/MediaBrowser.Tests/MediaBrowser.Tests.csproj
+++ b/MediaBrowser.Tests/MediaBrowser.Tests.csproj
@@ -55,6 +55,7 @@
     <Compile Include="MediaEncoding\Subtitles\VttWriterTest.cs" />
     <Compile Include="Providers\MovieDbProviderTests.cs" />
     <Compile Include="Resolvers\MovieResolverTests.cs" />
+    <Compile Include="Resolvers\MusicResolverTests.cs" />
     <Compile Include="Resolvers\TvUtilTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Server.Implementations\Library\ResolverHelperTests.cs" />
diff --git a/MediaBrowser.Tests/Resolvers/MusicResolverTests.cs b/MediaBrowser.Tests/Resolvers/MusicResolverTests.cs
new file mode 100644
index 000000000..201f25263
--- /dev/null
+++ b/MediaBrowser.Tests/Resolvers/MusicResolverTests.cs
@@ -0,0 +1,30 @@
+using MediaBrowser.Controller.Resolvers;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace MediaBrowser.Tests.Resolvers
+{
+    [TestClass]
+    public class MusicResolverTests
+    {
+        [TestMethod]
+        public void TestMultiDiscAlbums()
+        {
+            Assert.IsFalse(EntityResolutionHelper.IsMultiDiscAlbumFolder(@"blah blah"));
+            Assert.IsFalse(EntityResolutionHelper.IsMultiDiscAlbumFolder(@"d:\\music\weezer\\03 Pinkerton"));
+            Assert.IsFalse(EntityResolutionHelper.IsMultiDiscAlbumFolder(@"d:\\music\\michael jackson\\Bad (2012 Remaster)"));
+
+            Assert.IsTrue(EntityResolutionHelper.IsMultiDiscAlbumFolder(@"cd1"));
+            Assert.IsTrue(EntityResolutionHelper.IsMultiDiscAlbumFolder(@"disc1"));
+            Assert.IsTrue(EntityResolutionHelper.IsMultiDiscAlbumFolder(@"disk1"));
+
+            // Add a space
+            Assert.IsTrue(EntityResolutionHelper.IsMultiDiscAlbumFolder(@"cd 1"));
+            Assert.IsTrue(EntityResolutionHelper.IsMultiDiscAlbumFolder(@"disc 1"));
+            Assert.IsTrue(EntityResolutionHelper.IsMultiDiscAlbumFolder(@"disk 1"));
+
+            Assert.IsTrue(EntityResolutionHelper.IsMultiDiscAlbumFolder(@"cd  - 1"));
+            Assert.IsTrue(EntityResolutionHelper.IsMultiDiscAlbumFolder(@"disc- 1"));
+            Assert.IsTrue(EntityResolutionHelper.IsMultiDiscAlbumFolder(@"disk - 1"));
+        }
+    }
+}
-- 
cgit v1.2.3


From 18a7ddc2fa4644a10de0d9f72b3154ff4528be89 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 29 Aug 2014 00:06:30 -0400
Subject: add photo album

---
 MediaBrowser.Api/MediaBrowser.Api.csproj           |   1 +
 MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs |  12 +
 MediaBrowser.Api/Playback/StreamRequest.cs         |   2 +
 MediaBrowser.Api/Playback/ThrottledStream.cs       | 339 +++++++++++++++++++++
 MediaBrowser.Api/UserLibrary/ItemsService.cs       |   2 +-
 MediaBrowser.Controller/Entities/Audio/Audio.cs    |   1 +
 MediaBrowser.Controller/Entities/Photo.cs          |  27 +-
 MediaBrowser.Controller/Entities/PhotoAlbum.cs     |  21 ++
 MediaBrowser.Controller/Entities/TV/Episode.cs     |   1 +
 .../MediaBrowser.Controller.csproj                 |   1 +
 .../HttpServer/RangeRequestWriter.cs               |   4 +-
 .../Library/Resolvers/PhotoAlbumResolver.cs        |  39 +++
 .../Library/Resolvers/PhotoResolver.cs             |  26 +-
 .../MediaBrowser.Server.Implementations.csproj     |   1 +
 Nuget/MediaBrowser.Common.Internal.nuspec          |   4 +-
 Nuget/MediaBrowser.Common.nuspec                   |   2 +-
 Nuget/MediaBrowser.Model.Signed.nuspec             |   2 +-
 Nuget/MediaBrowser.Server.Core.nuspec              |   4 +-
 18 files changed, 462 insertions(+), 27 deletions(-)
 create mode 100644 MediaBrowser.Api/Playback/ThrottledStream.cs
 create mode 100644 MediaBrowser.Controller/Entities/PhotoAlbum.cs
 create mode 100644 MediaBrowser.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs

(limited to 'MediaBrowser.Server.Implementations/Library')

diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index 5cb9ebb1b..30077c547 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -73,6 +73,7 @@
     <Compile Include="Dlna\DlnaServerService.cs" />
     <Compile Include="Dlna\DlnaService.cs" />
     <Compile Include="Library\ChapterService.cs" />
+    <Compile Include="Playback\ThrottledStream.cs" />
     <Compile Include="PlaylistService.cs" />
     <Compile Include="Subtitles\SubtitleService.cs" />
     <Compile Include="Movies\CollectionService.cs" />
diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
index 134c28524..9dd99c6ed 100644
--- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
@@ -670,5 +670,17 @@ namespace MediaBrowser.Api.Playback.Hls
                 return TranscodingJobType.Hls;
             }
         }
+
+        protected override string GetInputArgument(StreamState state)
+        {
+            if (state.InputProtocol == Model.MediaInfo.MediaProtocol.File &&
+                state.RunTimeTicks.HasValue &&
+                !string.Equals(state.OutputVideoCodec, "copy", StringComparison.OrdinalIgnoreCase))
+            {
+                return "http://localhost:8096/videos/" + state.Request.Id + "/stream?static=true&Throttle=true&mediaSourceId=" + state.Request.MediaSourceId;
+            }
+
+            return base.GetInputArgument(state);
+        }
     }
 }
diff --git a/MediaBrowser.Api/Playback/StreamRequest.cs b/MediaBrowser.Api/Playback/StreamRequest.cs
index c72ead949..0de8c28a9 100644
--- a/MediaBrowser.Api/Playback/StreamRequest.cs
+++ b/MediaBrowser.Api/Playback/StreamRequest.cs
@@ -70,6 +70,8 @@ namespace MediaBrowser.Api.Playback
         public string DeviceProfileId { get; set; }
 
         public string Params { get; set; }
+
+        public bool Throttle { get; set; }
     }
 
     public class VideoStreamRequest : StreamRequest
diff --git a/MediaBrowser.Api/Playback/ThrottledStream.cs b/MediaBrowser.Api/Playback/ThrottledStream.cs
new file mode 100644
index 000000000..18421a3cc
--- /dev/null
+++ b/MediaBrowser.Api/Playback/ThrottledStream.cs
@@ -0,0 +1,339 @@
+using System;
+using System.IO;
+using System.Threading;
+
+namespace MediaBrowser.Api.Playback
+{
+    /// <summary>
+    /// Class for streaming data with throttling support.
+    /// </summary>
+    public class ThrottledStream : Stream
+    {
+        /// <summary>
+        /// A constant used to specify an infinite number of bytes that can be transferred per second.
+        /// </summary>
+        public const long Infinite = 0;
+
+        #region Private members
+        /// <summary>
+        /// The base stream.
+        /// </summary>
+        private Stream _baseStream;
+
+        /// <summary>
+        /// The maximum bytes per second that can be transferred through the base stream.
+        /// </summary>
+        private long _maximumBytesPerSecond;
+
+        /// <summary>
+        /// The number of bytes that has been transferred since the last throttle.
+        /// </summary>
+        private long _byteCount;
+
+        /// <summary>
+        /// The start time in milliseconds of the last throttle.
+        /// </summary>
+        private long _start;
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Gets the current milliseconds.
+        /// </summary>
+        /// <value>The current milliseconds.</value>
+        protected long CurrentMilliseconds
+        {
+            get
+            {
+                return Environment.TickCount;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum bytes per second that can be transferred through the base stream.
+        /// </summary>
+        /// <value>The maximum bytes per second.</value>
+        public long MaximumBytesPerSecond
+        {
+            get
+            {
+                return _maximumBytesPerSecond;
+            }
+            set
+            {
+                if (MaximumBytesPerSecond != value)
+                {
+                    _maximumBytesPerSecond = value;
+                    Reset();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the current stream supports reading.
+        /// </summary>
+        /// <returns>true if the stream supports reading; otherwise, false.</returns>
+        public override bool CanRead
+        {
+            get
+            {
+                return _baseStream.CanRead;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the current stream supports seeking.
+        /// </summary>
+        /// <value></value>
+        /// <returns>true if the stream supports seeking; otherwise, false.</returns>
+        public override bool CanSeek
+        {
+            get
+            {
+                return _baseStream.CanSeek;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the current stream supports writing.
+        /// </summary>
+        /// <value></value>
+        /// <returns>true if the stream supports writing; otherwise, false.</returns>
+        public override bool CanWrite
+        {
+            get
+            {
+                return _baseStream.CanWrite;
+            }
+        }
+
+        /// <summary>
+        /// Gets the length in bytes of the stream.
+        /// </summary>
+        /// <value></value>
+        /// <returns>A long value representing the length of the stream in bytes.</returns>
+        /// <exception cref="T:System.NotSupportedException">The base stream does not support seeking. </exception>
+        /// <exception cref="T:System.ObjectDisposedException">Methods were called after the stream was closed. </exception>
+        public override long Length
+        {
+            get
+            {
+                return _baseStream.Length;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the position within the current stream.
+        /// </summary>
+        /// <value></value>
+        /// <returns>The current position within the stream.</returns>
+        /// <exception cref="T:System.IO.IOException">An I/O error occurs. </exception>
+        /// <exception cref="T:System.NotSupportedException">The base stream does not support seeking. </exception>
+        /// <exception cref="T:System.ObjectDisposedException">Methods were called after the stream was closed. </exception>
+        public override long Position
+        {
+            get
+            {
+                return _baseStream.Position;
+            }
+            set
+            {
+                _baseStream.Position = value;
+            }
+        }
+        #endregion
+
+        #region Ctor
+        /// <summary>
+        /// Initializes a new instance of the <see cref="T:ThrottledStream"/> class with an
+        /// infinite amount of bytes that can be processed.
+        /// </summary>
+        /// <param name="baseStream">The base stream.</param>
+        public ThrottledStream(Stream baseStream)
+            : this(baseStream, ThrottledStream.Infinite)
+        {
+            // Nothing todo.
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="T:ThrottledStream"/> class.
+        /// </summary>
+        /// <param name="baseStream">The base stream.</param>
+        /// <param name="maximumBytesPerSecond">The maximum bytes per second that can be transferred through the base stream.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <see cref="baseStream"/> is a null reference.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when <see cref="maximumBytesPerSecond"/> is a negative value.</exception>
+        public ThrottledStream(Stream baseStream, long maximumBytesPerSecond)
+        {
+            if (baseStream == null)
+            {
+                throw new ArgumentNullException("baseStream");
+            }
+
+            if (maximumBytesPerSecond < 0)
+            {
+                throw new ArgumentOutOfRangeException("maximumBytesPerSecond",
+                    maximumBytesPerSecond, "The maximum number of bytes per second can't be negatie.");
+            }
+
+            _baseStream = baseStream;
+            _maximumBytesPerSecond = maximumBytesPerSecond;
+            _start = CurrentMilliseconds;
+            _byteCount = 0;
+        }
+        #endregion
+
+        #region Public methods
+        /// <summary>
+        /// Clears all buffers for this stream and causes any buffered data to be written to the underlying device.
+        /// </summary>
+        /// <exception cref="T:System.IO.IOException">An I/O error occurs.</exception>
+        public override void Flush()
+        {
+            _baseStream.Flush();
+        }
+
+        /// <summary>
+        /// Reads a sequence of bytes from the current stream and advances the position within the stream by the number of bytes read.
+        /// </summary>
+        /// <param name="buffer">An array of bytes. When this method returns, the buffer contains the specified byte array with the values between offset and (offset + count - 1) replaced by the bytes read from the current source.</param>
+        /// <param name="offset">The zero-based byte offset in buffer at which to begin storing the data read from the current stream.</param>
+        /// <param name="count">The maximum number of bytes to be read from the current stream.</param>
+        /// <returns>
+        /// The total number of bytes read into the buffer. This can be less than the number of bytes requested if that many bytes are not currently available, or zero (0) if the end of the stream has been reached.
+        /// </returns>
+        /// <exception cref="T:System.ArgumentException">The sum of offset and count is larger than the buffer length. </exception>
+        /// <exception cref="T:System.ObjectDisposedException">Methods were called after the stream was closed. </exception>
+        /// <exception cref="T:System.NotSupportedException">The base stream does not support reading. </exception>
+        /// <exception cref="T:System.ArgumentNullException">buffer is null. </exception>
+        /// <exception cref="T:System.IO.IOException">An I/O error occurs. </exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">offset or count is negative. </exception>
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            Throttle(count);
+
+            return _baseStream.Read(buffer, offset, count);
+        }
+
+        /// <summary>
+        /// Sets the position within the current stream.
+        /// </summary>
+        /// <param name="offset">A byte offset relative to the origin parameter.</param>
+        /// <param name="origin">A value of type <see cref="T:System.IO.SeekOrigin"></see> indicating the reference point used to obtain the new position.</param>
+        /// <returns>
+        /// The new position within the current stream.
+        /// </returns>
+        /// <exception cref="T:System.IO.IOException">An I/O error occurs. </exception>
+        /// <exception cref="T:System.NotSupportedException">The base stream does not support seeking, such as if the stream is constructed from a pipe or console output. </exception>
+        /// <exception cref="T:System.ObjectDisposedException">Methods were called after the stream was closed. </exception>
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            return _baseStream.Seek(offset, origin);
+        }
+
+        /// <summary>
+        /// Sets the length of the current stream.
+        /// </summary>
+        /// <param name="value">The desired length of the current stream in bytes.</param>
+        /// <exception cref="T:System.NotSupportedException">The base stream does not support both writing and seeking, such as if the stream is constructed from a pipe or console output. </exception>
+        /// <exception cref="T:System.IO.IOException">An I/O error occurs. </exception>
+        /// <exception cref="T:System.ObjectDisposedException">Methods were called after the stream was closed. </exception>
+        public override void SetLength(long value)
+        {
+            _baseStream.SetLength(value);
+        }
+
+        /// <summary>
+        /// Writes a sequence of bytes to the current stream and advances the current position within this stream by the number of bytes written.
+        /// </summary>
+        /// <param name="buffer">An array of bytes. This method copies count bytes from buffer to the current stream.</param>
+        /// <param name="offset">The zero-based byte offset in buffer at which to begin copying bytes to the current stream.</param>
+        /// <param name="count">The number of bytes to be written to the current stream.</param>
+        /// <exception cref="T:System.IO.IOException">An I/O error occurs. </exception>
+        /// <exception cref="T:System.NotSupportedException">The base stream does not support writing. </exception>
+        /// <exception cref="T:System.ObjectDisposedException">Methods were called after the stream was closed. </exception>
+        /// <exception cref="T:System.ArgumentNullException">buffer is null. </exception>
+        /// <exception cref="T:System.ArgumentException">The sum of offset and count is greater than the buffer length. </exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">offset or count is negative. </exception>
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            Throttle(count);
+
+            _baseStream.Write(buffer, offset, count);
+        }
+
+        /// <summary>
+        /// Returns a <see cref="T:System.String"></see> that represents the current <see cref="T:System.Object"></see>.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="T:System.String"></see> that represents the current <see cref="T:System.Object"></see>.
+        /// </returns>
+        public override string ToString()
+        {
+            return _baseStream.ToString();
+        }
+        #endregion
+
+        #region Protected methods
+        /// <summary>
+        /// Throttles for the specified buffer size in bytes.
+        /// </summary>
+        /// <param name="bufferSizeInBytes">The buffer size in bytes.</param>
+        protected void Throttle(int bufferSizeInBytes)
+        {
+            // Make sure the buffer isn't empty.
+            if (_maximumBytesPerSecond <= 0 || bufferSizeInBytes <= 0)
+            {
+                return;
+            }
+
+            _byteCount += bufferSizeInBytes;
+            long elapsedMilliseconds = CurrentMilliseconds - _start;
+
+            if (elapsedMilliseconds > 0)
+            {
+                // Calculate the current bps.
+                long bps = _byteCount * 1000L / elapsedMilliseconds;
+
+                // If the bps are more then the maximum bps, try to throttle.
+                if (bps > _maximumBytesPerSecond)
+                {
+                    // Calculate the time to sleep.
+                    long wakeElapsed = _byteCount * 1000L / _maximumBytesPerSecond;
+                    int toSleep = (int)(wakeElapsed - elapsedMilliseconds);
+
+                    if (toSleep > 1)
+                    {
+                        try
+                        {
+                            // The time to sleep is more then a millisecond, so sleep.
+                            Thread.Sleep(toSleep);
+                        }
+                        catch (ThreadAbortException)
+                        {
+                            // Eatup ThreadAbortException.
+                        }
+
+                        // A sleep has been done, reset.
+                        Reset();
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Will reset the bytecount to 0 and reset the start time to the current time.
+        /// </summary>
+        protected void Reset()
+        {
+            long difference = CurrentMilliseconds - _start;
+
+            // Only reset counters when a known history is available of more then 1 second.
+            if (difference > 1000)
+            {
+                _byteCount = 0;
+                _start = CurrentMilliseconds;
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs
index ba07571bf..25821c213 100644
--- a/MediaBrowser.Api/UserLibrary/ItemsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs
@@ -1430,7 +1430,7 @@ namespace MediaBrowser.Api.UserLibrary
                 nextId = list[index + 1].Id;
             }
 
-            return list.Where(i => i.Id == previousId || i.Id == nextId);
+            return list.Where(i => i.Id == previousId || i.Id == nextId || i.Id == adjacentToIdGuid);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs
index 3ffdf744d..b13403bbf 100644
--- a/MediaBrowser.Controller/Entities/Audio/Audio.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs
@@ -77,6 +77,7 @@ namespace MediaBrowser.Controller.Entities.Audio
             }
         }
 
+        [IgnoreDataMember]
         public override Folder LatestItemsIndexContainer
         {
             get
diff --git a/MediaBrowser.Controller/Entities/Photo.cs b/MediaBrowser.Controller/Entities/Photo.cs
index aa9e63791..1f38de9a3 100644
--- a/MediaBrowser.Controller/Entities/Photo.cs
+++ b/MediaBrowser.Controller/Entities/Photo.cs
@@ -1,5 +1,8 @@
-using MediaBrowser.Model.Drawing;
+using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Drawing;
 using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
 
 namespace MediaBrowser.Controller.Entities
 {
@@ -14,6 +17,14 @@ namespace MediaBrowser.Controller.Entities
             Taglines = new List<string>();
         }
 
+        public override bool SupportsLocalMetadata
+        {
+            get
+            {
+                return false;
+            }
+        }
+
         public override string MediaType
         {
             get
@@ -22,6 +33,15 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
+        [IgnoreDataMember]
+        public override Folder LatestItemsIndexContainer
+        {
+            get
+            {
+                return Parents.OfType<PhotoAlbum>().FirstOrDefault();
+            }
+        }
+
         public int? Width { get; set; }
         public int? Height { get; set; }
         public string CameraMake { get; set; }
@@ -32,5 +52,10 @@ namespace MediaBrowser.Controller.Entities
         public ImageOrientation? Orientation { get; set; }
         public double? Aperture { get; set; }
         public double? ShutterSpeed { get; set; }
+
+        protected override bool GetBlockUnratedValue(UserConfiguration config)
+        {
+            return config.BlockUnratedItems.Contains(UnratedItem.Other);
+        }
     }
 }
diff --git a/MediaBrowser.Controller/Entities/PhotoAlbum.cs b/MediaBrowser.Controller/Entities/PhotoAlbum.cs
new file mode 100644
index 000000000..7af4109f3
--- /dev/null
+++ b/MediaBrowser.Controller/Entities/PhotoAlbum.cs
@@ -0,0 +1,21 @@
+using MediaBrowser.Model.Configuration;
+using System.Linq;
+
+namespace MediaBrowser.Controller.Entities
+{
+    public class PhotoAlbum : Folder
+    {
+        public override bool SupportsLocalMetadata
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        protected override bool GetBlockUnratedValue(UserConfiguration config)
+        {
+            return config.BlockUnratedItems.Contains(UnratedItem.Other);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs
index 70577bbfd..b95c7df9c 100644
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -95,6 +95,7 @@ namespace MediaBrowser.Controller.Entities.TV
             }
         }
 
+        [IgnoreDataMember]
         public override Folder LatestItemsIndexContainer
         {
             get
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 561ae9326..aeeaae073 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -156,6 +156,7 @@
     <Compile Include="Entities\MusicVideo.cs" />
     <Compile Include="Entities\IHasAwards.cs" />
     <Compile Include="Entities\Photo.cs" />
+    <Compile Include="Entities\PhotoAlbum.cs" />
     <Compile Include="Entities\UserView.cs" />
     <Compile Include="FileOrganization\IFileOrganizationService.cs" />
     <Compile Include="Library\DeleteOptions.cs" />
diff --git a/MediaBrowser.Server.Implementations/HttpServer/RangeRequestWriter.cs b/MediaBrowser.Server.Implementations/HttpServer/RangeRequestWriter.cs
index 9de6972f8..2e2f5e9f8 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/RangeRequestWriter.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/RangeRequestWriter.cs
@@ -1,10 +1,10 @@
-using System.Threading;
-using ServiceStack.Web;
+using ServiceStack.Web;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Net;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace MediaBrowser.Server.Implementations.HttpServer
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs
new file mode 100644
index 000000000..2fcfd7086
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/PhotoAlbumResolver.cs
@@ -0,0 +1,39 @@
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.Entities;
+using System;
+using System.IO;
+using System.Linq;
+
+namespace MediaBrowser.Server.Implementations.Library.Resolvers
+{
+    public class PhotoAlbumResolver : FolderResolver<PhotoAlbum>
+    {
+        /// <summary>
+        /// Resolves the specified args.
+        /// </summary>
+        /// <param name="args">The args.</param>
+        /// <returns>Trailer.</returns>
+        protected override PhotoAlbum Resolve(ItemResolveArgs args)
+        {
+            // Must be an image file within a photo collection
+            if (!args.IsRoot && args.IsDirectory && string.Equals(args.GetCollectionType(), CollectionType.Photos, StringComparison.OrdinalIgnoreCase))
+            {
+                if (HasPhotos(args))
+                {
+                    return new PhotoAlbum
+                    {
+                        Path = args.Path
+                    };
+                }
+            }
+
+            return null;
+        }
+
+        private static bool HasPhotos(ItemResolveArgs args)
+        {
+            return args.FileSystemChildren.Any(i => ((i.Attributes & FileAttributes.Directory) != FileAttributes.Directory) && PhotoResolver.IsImageFile(i.FullName));
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/PhotoResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/PhotoResolver.cs
index cba7aba9a..60e7edfdd 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/PhotoResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/PhotoResolver.cs
@@ -1,24 +1,14 @@
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.Entities;
 using System;
+using System.IO;
 using System.Linq;
 
 namespace MediaBrowser.Server.Implementations.Library.Resolvers
 {
     public class PhotoResolver : ItemResolver<Photo>
     {
-        private readonly IServerApplicationPaths _applicationPaths;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PhotoResolver" /> class.
-        /// </summary>
-        /// <param name="applicationPaths">The application paths.</param>
-        public PhotoResolver(IServerApplicationPaths applicationPaths)
-        {
-            _applicationPaths = applicationPaths;
-        }
-
         /// <summary>
         /// Resolves the specified args.
         /// </summary>
@@ -27,7 +17,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers
         protected override Photo Resolve(ItemResolveArgs args)
         {
             // Must be an image file within a photo collection
-            if (!args.IsDirectory && IsImageFile(args.Path) && string.Equals(args.GetCollectionType(), "photos", StringComparison.OrdinalIgnoreCase))
+            if (!args.IsDirectory && IsImageFile(args.Path) && string.Equals(args.GetCollectionType(), CollectionType.Photos, StringComparison.OrdinalIgnoreCase))
             {
                 return new Photo
                 {
@@ -39,10 +29,12 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers
         }
 
         protected static string[] ImageExtensions = { ".tiff", ".jpeg", ".jpg", ".png", ".aiff" };
-        protected bool IsImageFile(string path)
+        internal static bool IsImageFile(string path)
         {
-            return !path.EndsWith("folder.jpg", StringComparison.OrdinalIgnoreCase)
-                && ImageExtensions.Any(p => path.EndsWith(p, StringComparison.OrdinalIgnoreCase));
+            var filename = Path.GetFileName(path);
+
+            return !string.Equals(filename, "folder.jpg", StringComparison.OrdinalIgnoreCase)
+                && ImageExtensions.Contains(Path.GetExtension(path) ?? string.Empty, StringComparer.OrdinalIgnoreCase);
         }
 
     }
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index e8dd54f16..4668d7891 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -174,6 +174,7 @@
     <Compile Include="Library\CoreResolutionIgnoreRule.cs" />
     <Compile Include="Library\LibraryManager.cs" />
     <Compile Include="Library\MusicManager.cs" />
+    <Compile Include="Library\Resolvers\PhotoAlbumResolver.cs" />
     <Compile Include="Library\Resolvers\PhotoResolver.cs" />
     <Compile Include="Library\Resolvers\PlaylistResolver.cs" />
     <Compile Include="Library\SearchEngine.cs" />
diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec
index 935d26750..11ccc3075 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.428</version>
+        <version>3.0.429</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.428" />
+            <dependency id="MediaBrowser.Common" version="3.0.429" />
             <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 4c3626c8d..b91274593 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.428</version>
+        <version>3.0.429</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 67127ea77..9280656b1 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.428</version>
+        <version>3.0.429</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 23743e2d0..a44bc2eab 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.428</version>
+        <version>3.0.429</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.428" />
+            <dependency id="MediaBrowser.Common" version="3.0.429" />
         </dependencies>
     </metadata>
     <files>
-- 
cgit v1.2.3