From f636c10e24a6f26f1c8e41ba6d3751334d6dcb90 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 20 Jan 2015 22:54:45 -0500
Subject: sync updates

---
 MediaBrowser.Controller/Library/ILibraryManager.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 2ebd1cab9..9871ef3c5 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -123,14 +123,7 @@ namespace MediaBrowser.Controller.Library
         /// Gets the default view.
         /// </summary>
         /// <returns>IEnumerable{VirtualFolderInfo}.</returns>
-        IEnumerable<VirtualFolderInfo> GetDefaultVirtualFolders();
-
-        /// <summary>
-        /// Gets the view.
-        /// </summary>
-        /// <param name="user">The user.</param>
-        /// <returns>IEnumerable{VirtualFolderInfo}.</returns>
-        IEnumerable<VirtualFolderInfo> GetVirtualFolders(User user);
+        IEnumerable<VirtualFolderInfo> GetVirtualFolders();
 
         /// <summary>
         /// Gets the item by id.
-- 
cgit v1.2.3


From 63f3cf97dada179fc6e9e3a177504d3e7b36321c Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 26 Jan 2015 11:47:15 -0500
Subject: add option to merge metadata and IBN paths

---
 MediaBrowser.Api/Music/InstantMixService.cs        |  18 +--
 MediaBrowser.Api/Playback/BaseStreamingService.cs  |   2 +-
 MediaBrowser.Api/StartupWizardService.cs           |   2 +-
 MediaBrowser.Api/UserLibrary/UserLibraryService.cs |  96 ++------------
 .../ScheduledTasks/ScheduledTaskWorker.cs          |  72 +++++------
 .../Devices/CameraImageUploadInfo.cs               |  10 ++
 MediaBrowser.Controller/Devices/IDeviceManager.cs  |   5 +-
 MediaBrowser.Controller/Entities/AdultVideo.cs     |  19 ---
 .../Entities/Audio/MusicAlbum.cs                   |   8 +-
 .../Entities/Audio/MusicArtist.cs                  |  59 ++-------
 MediaBrowser.Controller/Entities/Folder.cs         |  34 ++---
 MediaBrowser.Controller/Entities/Movies/BoxSet.cs  |  33 +----
 MediaBrowser.Controller/Entities/UserView.cs       |   3 +-
 .../Entities/UserViewBuilder.cs                    |  21 ++-
 MediaBrowser.Controller/Library/IMusicManager.cs   |  17 +--
 .../Library/IUserViewManager.cs                    |   4 +
 .../MediaBrowser.Controller.csproj                 |   2 +-
 MediaBrowser.Controller/Playlists/Playlist.cs      |  29 +----
 .../Configuration/ServerConfiguration.cs           |   2 +-
 .../Notifications/NotificationType.cs              |   3 +-
 .../Configuration/ServerConfigurationManager.cs    |  14 +-
 .../Devices/DeviceManager.cs                       |  25 +++-
 .../EntryPoints/Notifications/Notifications.cs     |  22 +++-
 .../IO/LibraryMonitor.cs                           |   5 +-
 .../Library/LibraryManager.cs                      |  29 ++---
 .../Library/MusicManager.cs                        |  35 +++++
 .../Library/UserViewManager.cs                     | 141 ++++++++++++++++++++-
 .../Localization/Server/server.json                |   6 +-
 .../Notifications/CoreNotificationTypes.cs         |  14 +-
 .../Session/SessionManager.cs                      |  49 +++----
 .../TV/TVSeriesManager.cs                          |   9 +-
 MediaBrowser.WebDashboard/Api/PackageCreator.cs    |   2 +-
 .../MediaBrowser.WebDashboard.csproj               |   4 +-
 33 files changed, 413 insertions(+), 381 deletions(-)
 create mode 100644 MediaBrowser.Controller/Devices/CameraImageUploadInfo.cs
 delete mode 100644 MediaBrowser.Controller/Entities/AdultVideo.cs

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Api/Music/InstantMixService.cs b/MediaBrowser.Api/Music/InstantMixService.cs
index cfb826a13..78c6a8bf4 100644
--- a/MediaBrowser.Api/Music/InstantMixService.cs
+++ b/MediaBrowser.Api/Music/InstantMixService.cs
@@ -73,44 +73,44 @@ namespace MediaBrowser.Api.Music
 
         public object Get(GetInstantMixFromArtistId request)
         {
-            var item = (MusicArtist)_libraryManager.GetItemById(request.Id);
+            var item = _libraryManager.GetItemById(request.Id);
 
             var user = _userManager.GetUserById(request.UserId.Value);
 
-            var items = _musicManager.GetInstantMixFromArtist(item.Name, user);
+            var items = _musicManager.GetInstantMixFromItem(item, user);
 
             return GetResult(items, user, request);
         }
 
         public object Get(GetInstantMixFromMusicGenreId request)
         {
-            var item = (MusicGenre)_libraryManager.GetItemById(request.Id);
+            var item = _libraryManager.GetItemById(request.Id);
 
             var user = _userManager.GetUserById(request.UserId.Value);
 
-            var items = _musicManager.GetInstantMixFromGenres(new[] { item.Name }, user);
+            var items = _musicManager.GetInstantMixFromItem(item, user);
 
             return GetResult(items, user, request);
         }
 
         public object Get(GetInstantMixFromSong request)
         {
-            var item = (Audio)_libraryManager.GetItemById(request.Id);
+            var item = _libraryManager.GetItemById(request.Id);
 
             var user = _userManager.GetUserById(request.UserId.Value);
 
-            var items = _musicManager.GetInstantMixFromSong(item, user);
+            var items = _musicManager.GetInstantMixFromItem(item, user);
 
             return GetResult(items, user, request);
         }
 
         public object Get(GetInstantMixFromAlbum request)
         {
-            var album = (MusicAlbum)_libraryManager.GetItemById(request.Id);
+            var album = _libraryManager.GetItemById(request.Id);
 
             var user = _userManager.GetUserById(request.UserId.Value);
 
-            var items = _musicManager.GetInstantMixFromAlbum(album, user);
+            var items = _musicManager.GetInstantMixFromItem(album, user);
 
             return GetResult(items, user, request);
         }
@@ -121,7 +121,7 @@ namespace MediaBrowser.Api.Music
 
             var user = _userManager.GetUserById(request.UserId.Value);
 
-            var items = _musicManager.GetInstantMixFromPlaylist(playlist, user);
+            var items = _musicManager.GetInstantMixFromItem(playlist, user);
 
             return GetResult(items, user, request);
         }
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 77f6dc103..b3610bc38 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -824,7 +824,7 @@ namespace MediaBrowser.Api.Playback
         {
             get
             {
-                return true;
+                return false;
             }
         }
 
diff --git a/MediaBrowser.Api/StartupWizardService.cs b/MediaBrowser.Api/StartupWizardService.cs
index cb0c54674..bf5c04540 100644
--- a/MediaBrowser.Api/StartupWizardService.cs
+++ b/MediaBrowser.Api/StartupWizardService.cs
@@ -62,7 +62,7 @@ namespace MediaBrowser.Api
         {
             _config.Configuration.IsStartupWizardCompleted = true;
             _config.Configuration.EnableLocalizedGuids = true;
-            _config.Configuration.StoreArtistsInMetadata = true;
+            _config.Configuration.MergeMetadataAndImagesByName = true;
             _config.Configuration.EnableStandaloneMetadata = true;
             _config.Configuration.EnableLibraryMetadataSubFolder = true;
             _config.SaveConfiguration();
diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
index c6ec53018..80ab72db7 100644
--- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
@@ -228,7 +228,7 @@ namespace MediaBrowser.Api.UserLibrary
         /// </summary>
         /// <value>The user id.</value>
         [ApiMember(Name = "UserId", Description = "User Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
-        public Guid UserId { get; set; }
+        public string UserId { get; set; }
 
         [ApiMember(Name = "Limit", Description = "Limit", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
         public int Limit { get; set; }
@@ -304,81 +304,15 @@ namespace MediaBrowser.Api.UserLibrary
         {
             var user = _userManager.GetUserById(request.UserId);
 
-            var includeTypes = string.IsNullOrWhiteSpace(request.IncludeItemTypes)
-                ? new string[] { }
-                : request.IncludeItemTypes.Split(',');
-
-            var currentUser = user;
-
-            Func<BaseItem, bool> filter = i =>
-            {
-                if (includeTypes.Length > 0)
-                {
-                    if (!includeTypes.Contains(i.GetType().Name, StringComparer.OrdinalIgnoreCase))
-                    {
-                        return false;
-                    }
-                }
-
-                if (request.IsPlayed.HasValue)
-                {
-                    var val = request.IsPlayed.Value;
-                    if (i.IsPlayed(currentUser) != val)
-                    {
-                        return false;
-                    }
-                }
-
-                return i.LocationType != LocationType.Virtual && !i.IsFolder;
-            };
-
-            // Avoid implicitly captured closure
-            var libraryItems = string.IsNullOrEmpty(request.ParentId) && user != null ?
-                GetItemsConfiguredForLatest(user, filter) :
-                GetAllLibraryItems(request.UserId, _userManager, _libraryManager, request.ParentId, filter);
-
-            libraryItems = libraryItems.OrderByDescending(i => i.DateCreated);
-
-            if (request.IsPlayed.HasValue)
+            var list = _userViewManager.GetLatestItems(new LatestItemsQuery
             {
-                var takeLimit = request.Limit * 20;
-                libraryItems = libraryItems.Take(takeLimit);
-            }
-
-            // Avoid implicitly captured closure
-            var items = libraryItems
-                .ToList();
-
-            var list = new List<Tuple<BaseItem, List<BaseItem>>>();
-
-            foreach (var item in items)
-            {
-                // Only grab the index container for media
-                var container = item.IsFolder || !request.GroupItems ? null : item.LatestItemsIndexContainer;
-
-                if (container == null)
-                {
-                    list.Add(new Tuple<BaseItem, List<BaseItem>>(null, new List<BaseItem> { item }));
-                }
-                else
-                {
-                    var current = list.FirstOrDefault(i => i.Item1 != null && i.Item1.Id == container.Id);
-
-                    if (current != null)
-                    {
-                        current.Item2.Add(item);
-                    }
-                    else
-                    {
-                        list.Add(new Tuple<BaseItem, List<BaseItem>>(container, new List<BaseItem> { item }));
-                    }
-                }
-
-                if (list.Count >= request.Limit)
-                {
-                    break;
-                }
-            }
+                GroupItems = request.GroupItems,
+                IncludeItemTypes = (request.IncludeItemTypes ?? string.Empty).Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToArray(),
+                IsPlayed = request.IsPlayed,
+                Limit = request.Limit,
+                ParentId = request.ParentId,
+                UserId = request.UserId
+            });
 
             var options = GetDtoOptions(request);
 
@@ -403,18 +337,6 @@ namespace MediaBrowser.Api.UserLibrary
             return ToOptimizedResult(dtos.ToList());
         }
 
-        private IEnumerable<BaseItem> GetItemsConfiguredForLatest(User user, Func<BaseItem,bool> filter)
-        {
-            // Avoid implicitly captured closure
-            var currentUser = user;
-
-            return user.RootFolder.GetChildren(user, true)
-                .OfType<Folder>()
-                .Where(i => !user.Configuration.LatestItemsExcludes.Contains(i.Id.ToString("N")))
-                .SelectMany(i => i.GetRecursiveChildren(currentUser, filter))
-                .DistinctBy(i => i.Id);
-        }
-
         public async Task<object> Get(GetUserViews request)
         {
             var user = _userManager.GetUserById(request.UserId);
diff --git a/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs b/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
index 5e9038500..b09cb7105 100644
--- a/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
+++ b/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
@@ -108,13 +108,9 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
         /// </summary>
         private TaskResult _lastExecutionResult;
         /// <summary>
-        /// The _last execution resultinitialized
-        /// </summary>
-        private bool _lastExecutionResultinitialized;
-        /// <summary>
         /// The _last execution result sync lock
         /// </summary>
-        private object _lastExecutionResultSyncLock = new object();
+        private readonly object _lastExecutionResultSyncLock = new object();
         /// <summary>
         /// Gets the last execution result.
         /// </summary>
@@ -123,38 +119,39 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
         {
             get
             {
-                LazyInitializer.EnsureInitialized(ref _lastExecutionResult, ref _lastExecutionResultinitialized, ref _lastExecutionResultSyncLock, () =>
+                if (_lastExecutionResult == null)
                 {
-                    var path = GetHistoryFilePath();
-
-                    try
-                    {
-                        return JsonSerializer.DeserializeFromFile<TaskResult>(path);
-                    }
-                    catch (DirectoryNotFoundException)
-                    {
-                        // File doesn't exist. No biggie
-                        return null;
-                    }
-                    catch (FileNotFoundException)
-                    {
-                        // File doesn't exist. No biggie
-                        return null;
-                    }
-                    catch (Exception ex)
+                    lock (_lastExecutionResultSyncLock)
                     {
-                        Logger.ErrorException("Error deserializing {0}", ex, path);
-                        return null;
+                        if (_lastExecutionResult == null)
+                        {
+                            var path = GetHistoryFilePath();
+
+                            try
+                            {
+                                return JsonSerializer.DeserializeFromFile<TaskResult>(path);
+                            }
+                            catch (DirectoryNotFoundException)
+                            {
+                                // File doesn't exist. No biggie
+                            }
+                            catch (FileNotFoundException)
+                            {
+                                // File doesn't exist. No biggie
+                            }
+                            catch (Exception ex)
+                            {
+                                Logger.ErrorException("Error deserializing {0}", ex, path);
+                            }
+                        }
                     }
-                });
+                }
 
                 return _lastExecutionResult;
             }
             private set
             {
                 _lastExecutionResult = value;
-
-                _lastExecutionResultinitialized = value != null;
             }
         }
 
@@ -227,13 +224,9 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
         /// </summary>
         private IEnumerable<ITaskTrigger> _triggers;
         /// <summary>
-        /// The _triggers initialized
-        /// </summary>
-        private bool _triggersInitialized;
-        /// <summary>
         /// The _triggers sync lock
         /// </summary>
-        private object _triggersSyncLock = new object();
+        private readonly object _triggersSyncLock = new object();
         /// <summary>
         /// Gets the triggers that define when the task will run
         /// </summary>
@@ -243,7 +236,16 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
         {
             get
             {
-                LazyInitializer.EnsureInitialized(ref _triggers, ref _triggersInitialized, ref _triggersSyncLock, LoadTriggers);
+                if (_triggers == null)
+                {
+                    lock (_triggersSyncLock)
+                    {
+                        if (_triggers == null)
+                        {
+                            _triggers = LoadTriggers();
+                        }
+                    }
+                }
 
                 return _triggers;
             }
@@ -262,8 +264,6 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
 
                 _triggers = value.ToList();
 
-                _triggersInitialized = true;
-
                 ReloadTriggerEvents(false);
 
                 SaveTriggers(_triggers);
diff --git a/MediaBrowser.Controller/Devices/CameraImageUploadInfo.cs b/MediaBrowser.Controller/Devices/CameraImageUploadInfo.cs
new file mode 100644
index 000000000..b3f3bb902
--- /dev/null
+++ b/MediaBrowser.Controller/Devices/CameraImageUploadInfo.cs
@@ -0,0 +1,10 @@
+using MediaBrowser.Model.Devices;
+
+namespace MediaBrowser.Controller.Devices
+{
+    public class CameraImageUploadInfo
+    {
+        public LocalFileInfo FileInfo { get; set; }
+        public DeviceInfo Device { get; set; }
+    }
+}
diff --git a/MediaBrowser.Controller/Devices/IDeviceManager.cs b/MediaBrowser.Controller/Devices/IDeviceManager.cs
index f5010bb45..78eebd994 100644
--- a/MediaBrowser.Controller/Devices/IDeviceManager.cs
+++ b/MediaBrowser.Controller/Devices/IDeviceManager.cs
@@ -3,7 +3,6 @@ using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Session;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 
@@ -15,6 +14,10 @@ namespace MediaBrowser.Controller.Devices
         /// Occurs when [device options updated].
         /// </summary>
         event EventHandler<GenericEventArgs<DeviceInfo>> DeviceOptionsUpdated;
+        /// <summary>
+        /// Occurs when [camera image uploaded].
+        /// </summary>
+        event EventHandler<GenericEventArgs<CameraImageUploadInfo>> CameraImageUploaded;
 
         /// <summary>
         /// Registers the device.
diff --git a/MediaBrowser.Controller/Entities/AdultVideo.cs b/MediaBrowser.Controller/Entities/AdultVideo.cs
deleted file mode 100644
index 6c3f7851e..000000000
--- a/MediaBrowser.Controller/Entities/AdultVideo.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MediaBrowser.Controller.Entities
-{
-    [Obsolete]
-    public class AdultVideo : Video, IHasProductionLocations, IHasTaglines
-    {
-        public List<string> ProductionLocations { get; set; }
-
-        public List<string> Taglines { get; set; }
-
-        public AdultVideo()
-        {
-            Taglines = new List<string>();
-            ProductionLocations = new List<string>();
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
index 00a7e8b67..b9a38d594 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -1,11 +1,11 @@
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Users;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
-using MediaBrowser.Model.Users;
 
 namespace MediaBrowser.Controller.Entities.Audio
 {
@@ -181,10 +181,4 @@ namespace MediaBrowser.Controller.Entities.Audio
             return id;
         }
     }
-
-    [Obsolete]
-    public class MusicAlbumDisc : Folder
-    {
-
-    }
 }
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
index 5cca91202..4cc3f1892 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
@@ -129,43 +129,20 @@ namespace MediaBrowser.Controller.Entities.Audio
             var others = items.Except(songs).ToList();
 
             var totalItems = songs.Count + others.Count;
-            var percentages = new Dictionary<Guid, double>(totalItems);
-
-            var tasks = new List<Task>();
+            var numComplete = 0;
 
             // Refresh songs
             foreach (var item in songs)
             {
-                if (tasks.Count >= 2)
-                {
-                    await Task.WhenAll(tasks).ConfigureAwait(false);
-                    tasks.Clear();
-                }
-
                 cancellationToken.ThrowIfCancellationRequested();
-                var innerProgress = new ActionableProgress<double>();
 
-                // Avoid implicitly captured closure
-                var currentChild = item;
-                innerProgress.RegisterAction(p =>
-                {
-                    lock (percentages)
-                    {
-                        percentages[currentChild.Id] = p / 100;
-
-                        var percent = percentages.Values.Sum();
-                        percent /= totalItems;
-                        percent *= 100;
-                        progress.Report(percent);
-                    }
-                });
-
-                var taskChild = item;
-                tasks.Add(Task.Run(async () => await RefreshItem(taskChild, refreshOptions, innerProgress, cancellationToken).ConfigureAwait(false), cancellationToken));
-            }
+                await item.RefreshMetadata(refreshOptions, cancellationToken).ConfigureAwait(false);
 
-            await Task.WhenAll(tasks).ConfigureAwait(false);
-            tasks.Clear();
+                numComplete++;
+                double percent = numComplete;
+                percent /= totalItems;
+                progress.Report(percent * 100);
+            }
 
             // Refresh current item
             await RefreshMetadata(refreshOptions, cancellationToken).ConfigureAwait(false);
@@ -175,31 +152,17 @@ namespace MediaBrowser.Controller.Entities.Audio
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
-                // Avoid implicitly captured closure
-                var currentChild = item;
-
                 await item.RefreshMetadata(refreshOptions, cancellationToken).ConfigureAwait(false);
-                lock (percentages)
-                {
-                    percentages[currentChild.Id] = 1;
 
-                    var percent = percentages.Values.Sum();
-                    percent /= totalItems;
-                    percent *= 100;
-                    progress.Report(percent);
-                }
+                numComplete++;
+                double percent = numComplete;
+                percent /= totalItems;
+                progress.Report(percent * 100);
             }
 
             progress.Report(100);
         }
 
-        private async Task RefreshItem(BaseItem item, MetadataRefreshOptions refreshOptions, IProgress<double> progress, CancellationToken cancellationToken)
-        {
-            await item.RefreshMetadata(refreshOptions, cancellationToken).ConfigureAwait(false);
-
-            progress.Report(100);
-        }
-
         public ArtistInfo GetLookupInfo()
         {
             var info = GetItemLookupInfo<ArtistInfo>();
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 9cc320095..8c13c7e66 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -283,7 +283,17 @@ namespace MediaBrowser.Controller.Entities
         {
             get
             {
-                return _children ?? (_children = LoadChildrenInternal());
+                if (_children == null)
+                {
+                    lock (_childrenSyncLock)
+                    {
+                        if (_children == null)
+                        {
+                            _children = LoadChildrenInternal();
+                        }
+                    }
+                }
+                return _children;
             }
         }
 
@@ -749,28 +759,6 @@ namespace MediaBrowser.Controller.Entities
             return childrenItems;
         }
 
-        /// <summary>
-        /// Retrieves the child.
-        /// </summary>
-        /// <param name="child">The child.</param>
-        /// <returns>BaseItem.</returns>
-        private BaseItem RetrieveChild(Guid child)
-        {
-            var item = LibraryManager.GetItemById(child);
-
-            if (item != null)
-            {
-                if (item is IByReferenceItem)
-                {
-                    return LibraryManager.GetOrAddByReferenceItem(item);
-                }
-
-                item.Parent = this;
-            }
-
-            return item;
-        }
-
         private BaseItem RetrieveChild(BaseItem child)
         {
             if (child.Id == Guid.Empty)
diff --git a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
index e08d88b02..dea97aed4 100644
--- a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
+++ b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
@@ -143,31 +143,19 @@ namespace MediaBrowser.Controller.Entities.Movies
             var items = GetRecursiveChildren().ToList();
 
             var totalItems = items.Count;
-            var percentages = new Dictionary<Guid, double>(totalItems);
+            var numComplete = 0;
 
             // Refresh songs
             foreach (var item in items)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                var innerProgress = new ActionableProgress<double>();
 
-                // Avoid implicitly captured closure
-                var currentChild = item;
-                innerProgress.RegisterAction(p =>
-                {
-                    lock (percentages)
-                    {
-                        percentages[currentChild.Id] = p / 100;
-
-                        var percent = percentages.Values.Sum();
-                        percent /= totalItems;
-                        percent *= 100;
-                        progress.Report(percent);
-                    }
-                });
-
-                // Avoid implicitly captured closure
-                await RefreshItem(item, refreshOptions, innerProgress, cancellationToken).ConfigureAwait(false);
+                await item.RefreshMetadata(refreshOptions, cancellationToken).ConfigureAwait(false);
+
+                numComplete++;
+                double percent = numComplete;
+                percent /= totalItems;
+                progress.Report(percent * 100);
             }
 
             // Refresh current item
@@ -176,13 +164,6 @@ namespace MediaBrowser.Controller.Entities.Movies
             progress.Report(100);
         }
 
-        private async Task RefreshItem(BaseItem item, MetadataRefreshOptions refreshOptions, IProgress<double> progress, CancellationToken cancellationToken)
-        {
-            await item.RefreshMetadata(refreshOptions, cancellationToken).ConfigureAwait(false);
-
-            progress.Report(100);
-        }
-
         public override bool IsVisible(User user)
         {
             if (base.IsVisible(user))
diff --git a/MediaBrowser.Controller/Entities/UserView.cs b/MediaBrowser.Controller/Entities/UserView.cs
index f1436d45e..cd179eb42 100644
--- a/MediaBrowser.Controller/Entities/UserView.cs
+++ b/MediaBrowser.Controller/Entities/UserView.cs
@@ -64,8 +64,7 @@ namespace MediaBrowser.Controller.Entities
             {
                 CollectionType.Books,
                 CollectionType.HomeVideos,
-                CollectionType.Photos,
-                string.Empty
+                CollectionType.Photos
             };
 
             var collectionFolder = folder as ICollectionFolder;
diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
index 1572c1af0..a24a42535 100644
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -409,12 +409,21 @@ namespace MediaBrowser.Controller.Entities
 
         private QueryResult<BaseItem> GetMusicLatest(Folder parent, User user, InternalItemsQuery query)
         {
-            query.SortBy = new[] { ItemSortBy.DateCreated, ItemSortBy.SortName };
-            query.SortOrder = SortOrder.Descending;
+            var items = _userViewManager.GetLatestItems(new LatestItemsQuery
+            {
+                UserId = user.Id.ToString("N"),
+                Limit = GetSpecialItemsLimit(),
+                IncludeItemTypes = new[] { typeof(Audio.Audio).Name },
+                ParentId = (parent == null ? null : parent.Id.ToString("N")),
+                GroupItems = true
 
-            var items = GetRecursiveChildren(parent, user, new[] { CollectionType.Music, CollectionType.MusicVideos }, i => i is MusicVideo || i is Audio.Audio && FilterItem(i, query));
+            }).Select(i => i.Item1);
 
-            return PostFilterAndSort(items, parent, GetSpecialItemsLimit(), query);
+            query.SortBy = new string[] { };
+
+            //var items = GetRecursiveChildren(parent, user, new[] { CollectionType.Music, CollectionType.MusicVideos }, i => i is MusicVideo || i is Audio.Audio && FilterItem(i, query));
+
+            return PostFilterAndSort(items, parent, null, query);
         }
 
         private async Task<QueryResult<BaseItem>> GetMovieFolders(Folder parent, User user, InternalItemsQuery query)
@@ -741,7 +750,7 @@ namespace MediaBrowser.Controller.Entities
 
         private async Task<QueryResult<BaseItem>> GetGameGenreItems(Folder queryParent, Folder displayParent, User user, InternalItemsQuery query)
         {
-            var items = GetRecursiveChildren(queryParent, user, new[] {CollectionType.Games},
+            var items = GetRecursiveChildren(queryParent, user, new[] { CollectionType.Games },
                 i => i is Game && i.Genres.Contains(displayParent.Name, StringComparer.OrdinalIgnoreCase));
 
             return GetResult(items, queryParent, query);
@@ -1686,7 +1695,7 @@ namespace MediaBrowser.Controller.Entities
             return parent.GetRecursiveChildren(user);
         }
 
-        private IEnumerable<BaseItem> GetRecursiveChildren(Folder parent, User user, IEnumerable<string> viewTypes, Func<BaseItem,bool> filter)
+        private IEnumerable<BaseItem> GetRecursiveChildren(Folder parent, User user, IEnumerable<string> viewTypes, Func<BaseItem, bool> filter)
         {
             if (parent == null || parent is UserView)
             {
diff --git a/MediaBrowser.Controller/Library/IMusicManager.cs b/MediaBrowser.Controller/Library/IMusicManager.cs
index f66f18401..0ce0687cc 100644
--- a/MediaBrowser.Controller/Library/IMusicManager.cs
+++ b/MediaBrowser.Controller/Library/IMusicManager.cs
@@ -1,6 +1,5 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.Playlists;
 using System.Collections.Generic;
 
 namespace MediaBrowser.Controller.Library
@@ -13,7 +12,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="item">The item.</param>
         /// <param name="user">The user.</param>
         /// <returns>IEnumerable{Audio}.</returns>
-        IEnumerable<Audio> GetInstantMixFromSong(Audio item, User user);
+        IEnumerable<Audio> GetInstantMixFromItem(BaseItem item, User user);
         /// <summary>
         /// Gets the instant mix from artist.
         /// </summary>
@@ -22,20 +21,6 @@ namespace MediaBrowser.Controller.Library
         /// <returns>IEnumerable{Audio}.</returns>
         IEnumerable<Audio> GetInstantMixFromArtist(string name, User user);
         /// <summary>
-        /// Gets the instant mix from album.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <param name="user">The user.</param>
-        /// <returns>IEnumerable{Audio}.</returns>
-        IEnumerable<Audio> GetInstantMixFromAlbum(MusicAlbum item, User user);
-        /// <summary>
-        /// Gets the instant mix from playlist.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <param name="user">The user.</param>
-        /// <returns>IEnumerable&lt;Audio&gt;.</returns>
-        IEnumerable<Audio> GetInstantMixFromPlaylist(Playlist item, User user);
-        /// <summary>
         /// Gets the instant mix from genre.
         /// </summary>
         /// <param name="genres">The genres.</param>
diff --git a/MediaBrowser.Controller/Library/IUserViewManager.cs b/MediaBrowser.Controller/Library/IUserViewManager.cs
index 727ccd00a..f55c17924 100644
--- a/MediaBrowser.Controller/Library/IUserViewManager.cs
+++ b/MediaBrowser.Controller/Library/IUserViewManager.cs
@@ -1,5 +1,7 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Library;
+using MediaBrowser.Model.Querying;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
@@ -16,5 +18,7 @@ namespace MediaBrowser.Controller.Library
         Task<UserView> GetUserView(string type, string sortName, CancellationToken cancellationToken);
 
         Task<UserView> GetUserView(string category, string type, User user, string sortName, CancellationToken cancellationToken);
+
+        List<Tuple<BaseItem, List<BaseItem>>> GetLatestItems(LatestItemsQuery request);
     }
 }
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 0667730fd..867d9b0c5 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -101,6 +101,7 @@
     <Compile Include="Collections\ICollectionManager.cs" />
     <Compile Include="Connect\IConnectManager.cs" />
     <Compile Include="Connect\UserLinkResult.cs" />
+    <Compile Include="Devices\CameraImageUploadInfo.cs" />
     <Compile Include="Devices\IDeviceManager.cs" />
     <Compile Include="Devices\IDeviceRepository.cs" />
     <Compile Include="Dlna\ControlRequest.cs" />
@@ -117,7 +118,6 @@
     <Compile Include="Drawing\ImageStream.cs" />
     <Compile Include="Dto\DtoOptions.cs" />
     <Compile Include="Dto\IDtoService.cs" />
-    <Compile Include="Entities\AdultVideo.cs" />
     <Compile Include="Entities\Audio\IHasAlbumArtist.cs" />
     <Compile Include="Entities\Audio\IHasMusicGenres.cs" />
     <Compile Include="Entities\Book.cs" />
diff --git a/MediaBrowser.Controller/Playlists/Playlist.cs b/MediaBrowser.Controller/Playlists/Playlist.cs
index 071a9bf93..0f0c6a97e 100644
--- a/MediaBrowser.Controller/Playlists/Playlist.cs
+++ b/MediaBrowser.Controller/Playlists/Playlist.cs
@@ -113,38 +113,17 @@ namespace MediaBrowser.Controller.Playlists
                 return LibraryManager.Sort(items, user, new[] { ItemSortBy.AlbumArtist, ItemSortBy.Album, ItemSortBy.SortName }, SortOrder.Ascending);
             }
 
-            // Grab these explicitly to avoid the sorting that will happen below
-            var collection = item as BoxSet;
-            if (collection != null)
-            {
-                var items = user == null
-                    ? collection.Children
-                    : collection.GetChildren(user, true);
-
-                return items
-                   .Where(m => !m.IsFolder);
-            }
-
-            // Grab these explicitly to avoid the sorting that will happen below
-            var season = item as Season;
-            if (season != null)
-            {
-                var items = user == null
-                    ? season.Children
-                    : season.GetChildren(user, true);
-
-                return items
-                   .Where(m => !m.IsFolder);
-            }
-
             var folder = item as Folder;
-
             if (folder != null)
             {
                 var items = user == null
                     ? folder.GetRecursiveChildren(m => !m.IsFolder)
                     : folder.GetRecursiveChildren(user, m => !m.IsFolder);
 
+                if (folder.IsPreSorted)
+                {
+                    return items;
+                }
                 return LibraryManager.Sort(items, user, new[] { ItemSortBy.SortName }, SortOrder.Ascending);
             }
 
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index f62cf88b7..c15c76004 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -168,7 +168,7 @@ namespace MediaBrowser.Model.Configuration
         /// <value>The dashboard source path.</value>
         public string DashboardSourcePath { get; set; }
 
-        public bool StoreArtistsInMetadata { get; set; }
+        public bool MergeMetadataAndImagesByName { get; set; }
         public bool EnableStandaloneMetadata { get; set; }
 
         /// <summary>
diff --git a/MediaBrowser.Model/Notifications/NotificationType.cs b/MediaBrowser.Model/Notifications/NotificationType.cs
index 34e4d32b5..269e27a4f 100644
--- a/MediaBrowser.Model/Notifications/NotificationType.cs
+++ b/MediaBrowser.Model/Notifications/NotificationType.cs
@@ -18,6 +18,7 @@ namespace MediaBrowser.Model.Notifications
         NewLibraryContent,
         NewLibraryContentMultiple,
         ServerRestartRequired,
-        TaskFailed
+        TaskFailed,
+        CameraImageUploaded
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
index 5f7ccec4b..bb9e9057a 100644
--- a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
+++ b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
@@ -88,9 +88,12 @@ namespace MediaBrowser.Server.Implementations.Configuration
         /// </summary>
         private void UpdateItemsByNamePath()
         {
-            ((ServerApplicationPaths)ApplicationPaths).ItemsByNamePath = string.IsNullOrEmpty(Configuration.ItemsByNamePath) ?
-                null :
-                Configuration.ItemsByNamePath;
+            if (!Configuration.MergeMetadataAndImagesByName)
+            {
+                ((ServerApplicationPaths)ApplicationPaths).ItemsByNamePath = string.IsNullOrEmpty(Configuration.ItemsByNamePath) ?
+                    null :
+                    Configuration.ItemsByNamePath;
+            }
         }
 
         /// <summary>
@@ -101,6 +104,11 @@ namespace MediaBrowser.Server.Implementations.Configuration
             ((ServerApplicationPaths)ApplicationPaths).InternalMetadataPath = string.IsNullOrEmpty(Configuration.MetadataPath) ?
                 GetInternalMetadataPath() :
                 Configuration.MetadataPath;
+
+            if (Configuration.MergeMetadataAndImagesByName)
+            {
+                ((ServerApplicationPaths)ApplicationPaths).ItemsByNamePath = ((ServerApplicationPaths)ApplicationPaths).InternalMetadataPath;
+            }
         }
 
         private string GetInternalMetadataPath()
diff --git a/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs b/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs
index e057ec5cd..3211f88d5 100644
--- a/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs
+++ b/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs
@@ -27,6 +27,8 @@ namespace MediaBrowser.Server.Implementations.Devices
         private readonly IConfigurationManager _config;
         private readonly ILogger _logger;
 
+        public event EventHandler<GenericEventArgs<CameraImageUploadInfo>> CameraImageUploaded;
+
         /// <summary>
         /// Occurs when [device options updated].
         /// </summary>
@@ -116,7 +118,7 @@ namespace MediaBrowser.Server.Implementations.Devices
             {
                 devices = devices.Where(i => CanAccessDevice(query.UserId, i.Id));
             }
-            
+
             var array = devices.ToArray();
             return new QueryResult<DeviceInfo>
             {
@@ -137,7 +139,8 @@ namespace MediaBrowser.Server.Implementations.Devices
 
         public async Task AcceptCameraUpload(string deviceId, Stream stream, LocalFileInfo file)
         {
-            var path = GetUploadPath(deviceId);
+            var device = GetDevice(deviceId);
+            var path = GetUploadPath(device);
 
             if (!string.IsNullOrWhiteSpace(file.Album))
             {
@@ -163,11 +166,27 @@ namespace MediaBrowser.Server.Implementations.Devices
             {
                 _libraryMonitor.ReportFileSystemChangeComplete(path, true);
             }
+
+            if (CameraImageUploaded != null)
+            {
+                EventHelper.FireEventIfNotNull(CameraImageUploaded, this, new GenericEventArgs<CameraImageUploadInfo>
+                {
+                    Argument = new CameraImageUploadInfo
+                    {
+                        Device = device,
+                        FileInfo = file
+                    }
+                }, _logger);
+            }
         }
 
         private string GetUploadPath(string deviceId)
         {
-            var device = GetDevice(deviceId);
+            return GetUploadPath(GetDevice(deviceId));
+        }
+
+        private string GetUploadPath(DeviceInfo device)
+        {
             if (!string.IsNullOrWhiteSpace(device.CameraUploadPath))
             {
                 return device.CameraUploadPath;
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
index 2d824f36c..37bca4ddb 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
@@ -3,6 +3,7 @@ using MediaBrowser.Common.Plugins;
 using MediaBrowser.Common.ScheduledTasks;
 using MediaBrowser.Common.Updates;
 using MediaBrowser.Controller;
+using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
@@ -44,8 +45,9 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
         private readonly object _libraryChangedSyncLock = new object();
 
         private readonly IConfigurationManager _config;
+        private readonly IDeviceManager _deviceManager;
 
-        public Notifications(IInstallationManager installationManager, IUserManager userManager, ILogger logger, ITaskManager taskManager, INotificationManager notificationManager, ILibraryManager libraryManager, ISessionManager sessionManager, IServerApplicationHost appHost, IConfigurationManager config)
+        public Notifications(IInstallationManager installationManager, IUserManager userManager, ILogger logger, ITaskManager taskManager, INotificationManager notificationManager, ILibraryManager libraryManager, ISessionManager sessionManager, IServerApplicationHost appHost, IConfigurationManager config, IDeviceManager deviceManager)
         {
             _installationManager = installationManager;
             _userManager = userManager;
@@ -56,6 +58,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
             _sessionManager = sessionManager;
             _appHost = appHost;
             _config = config;
+            _deviceManager = deviceManager;
         }
 
         public void Run()
@@ -74,6 +77,21 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
             _appHost.HasPendingRestartChanged += _appHost_HasPendingRestartChanged;
             _appHost.HasUpdateAvailableChanged += _appHost_HasUpdateAvailableChanged;
             _appHost.ApplicationUpdated += _appHost_ApplicationUpdated;
+            _deviceManager.CameraImageUploaded +=_deviceManager_CameraImageUploaded;
+        }
+
+        async void _deviceManager_CameraImageUploaded(object sender, GenericEventArgs<CameraImageUploadInfo> e)
+        {
+            var type = NotificationType.CameraImageUploaded.ToString();
+
+            var notification = new NotificationRequest
+            {
+                NotificationType = type
+            };
+
+            notification.Variables["DeviceName"] = e.Argument.Device.Name;
+
+            await SendNotification(notification).ConfigureAwait(false);
         }
 
         async void _appHost_ApplicationUpdated(object sender, GenericEventArgs<PackageVersionInfo> e)
@@ -451,6 +469,8 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
             _appHost.HasPendingRestartChanged -= _appHost_HasPendingRestartChanged;
             _appHost.HasUpdateAvailableChanged -= _appHost_HasUpdateAvailableChanged;
             _appHost.ApplicationUpdated -= _appHost_ApplicationUpdated;
+
+            _deviceManager.CameraImageUploaded -= _deviceManager_CameraImageUploaded;
         }
 
         private void DisposeLibraryUpdateTimer()
diff --git a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
index ce6224295..d501d1210 100644
--- a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
+++ b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
@@ -566,7 +566,10 @@ namespace MediaBrowser.Server.Implementations.IO
                 .Distinct()
                 .ToList();
 
-            foreach (var p in paths) Logger.Info(p + " reports change.");
+            foreach (var p in paths)
+            {
+                Logger.Info(p + " reports change.");
+            }
 
             // If the root folder changed, run the library task so the user can see it
             if (itemsToRefresh.Any(i => i is AggregateFolder))
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 0ebd1aace..124bb396e 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -219,11 +219,7 @@ namespace MediaBrowser.Server.Implementations.Library
         /// <summary>
         /// The _root folder sync lock
         /// </summary>
-        private object _rootFolderSyncLock = new object();
-        /// <summary>
-        /// The _root folder initialized
-        /// </summary>
-        private bool _rootFolderInitialized;
+        private readonly object _rootFolderSyncLock = new object();
         /// <summary>
         /// Gets the root folder.
         /// </summary>
@@ -232,17 +228,17 @@ namespace MediaBrowser.Server.Implementations.Library
         {
             get
             {
-                LazyInitializer.EnsureInitialized(ref _rootFolder, ref _rootFolderInitialized, ref _rootFolderSyncLock, CreateRootFolder);
-                return _rootFolder;
-            }
-            private set
-            {
-                _rootFolder = value;
-
-                if (value == null)
+                if (_rootFolder == null)
                 {
-                    _rootFolderInitialized = false;
+                    lock (_rootFolderSyncLock)
+                    {
+                        if (_rootFolder == null)
+                        {
+                            _rootFolder = CreateRootFolder();
+                        }
+                    }
                 }
+                return _rootFolder;
             }
         }
 
@@ -849,11 +845,6 @@ namespace MediaBrowser.Server.Implementations.Library
         {
             get
             {
-                if (ConfigurationManager.Configuration.StoreArtistsInMetadata)
-                {
-                    return Path.Combine(ConfigurationManager.ApplicationPaths.InternalMetadataPath, "artists");
-                }
-
                 return Path.Combine(ConfigurationManager.ApplicationPaths.ItemsByNamePath, "artists");
             }
         }
diff --git a/MediaBrowser.Server.Implementations/Library/MusicManager.cs b/MediaBrowser.Server.Implementations/Library/MusicManager.cs
index 5a7533ad2..7733e7d37 100644
--- a/MediaBrowser.Server.Implementations/Library/MusicManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MusicManager.cs
@@ -83,5 +83,40 @@ namespace MediaBrowser.Server.Implementations.Library
                 .Take(100)
                 .OrderBy(i => Guid.NewGuid());
         }
+
+        public IEnumerable<Audio> GetInstantMixFromItem(BaseItem item, User user)
+        {
+            var genre = item as MusicGenre;
+            if (genre != null)
+            {
+                return GetInstantMixFromGenres(new[] { item.Name }, user);
+            }
+
+            var playlist = item as Playlist;
+            if (playlist != null)
+            {
+                return GetInstantMixFromPlaylist(playlist, user);
+            }
+
+            var album = item as MusicAlbum;
+            if (album != null)
+            {
+                return GetInstantMixFromAlbum(album, user);
+            }
+
+            var artist = item as MusicArtist;
+            if (artist != null)
+            {
+                return GetInstantMixFromArtist(artist.Name, user);
+            }
+
+            var song = item as Audio;
+            if (song != null)
+            {
+                return GetInstantMixFromSong(song, user);
+            }
+            
+            return new Audio[] { };
+        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
index d8c5f85c0..2ec9e8a4f 100644
--- a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
@@ -16,6 +16,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using MoreLinq;
 
 namespace MediaBrowser.Server.Implementations.Library
 {
@@ -56,7 +57,9 @@ namespace MediaBrowser.Server.Implementations.Library
 
             var excludeFolderIds = user.Configuration.ExcludeFoldersFromGrouping.Select(i => new Guid(i)).ToList();
 
-            var standaloneFolders = folders.Where(i => UserView.IsExcludedFromGrouping(i) || excludeFolderIds.Contains(i.Id)).ToList();
+            var standaloneFolders = folders
+                .Where(i => UserView.IsExcludedFromGrouping(i) || excludeFolderIds.Contains(i.Id))
+                .ToList();
 
             var foldersWithViewTypes = folders
                 .Except(standaloneFolders)
@@ -164,5 +167,141 @@ namespace MediaBrowser.Server.Implementations.Library
 
             return _libraryManager.GetNamedView(name, type, sortName, cancellationToken);
         }
+
+        public List<Tuple<BaseItem, List<BaseItem>>> GetLatestItems(LatestItemsQuery request)
+        {
+            var user = _userManager.GetUserById(request.UserId);
+
+            var includeTypes = request.IncludeItemTypes;
+
+            var currentUser = user;
+
+            Func<BaseItem, bool> filter = i =>
+            {
+                if (includeTypes.Length > 0)
+                {
+                    if (!includeTypes.Contains(i.GetType().Name, StringComparer.OrdinalIgnoreCase))
+                    {
+                        return false;
+                    }
+                }
+
+                if (request.IsPlayed.HasValue)
+                {
+                    var val = request.IsPlayed.Value;
+                    if (i.IsPlayed(currentUser) != val)
+                    {
+                        return false;
+                    }
+                }
+
+                return i.LocationType != LocationType.Virtual && !i.IsFolder;
+            };
+
+            // Avoid implicitly captured closure
+            var libraryItems = string.IsNullOrEmpty(request.ParentId) && user != null ?
+                GetItemsConfiguredForLatest(user, filter) :
+                GetAllLibraryItems(request.UserId, _userManager, _libraryManager, request.ParentId, filter);
+
+            libraryItems = libraryItems.OrderByDescending(i => i.DateCreated);
+
+            if (request.IsPlayed.HasValue)
+            {
+                var takeLimit = (request.Limit ?? 20) * 20;
+                libraryItems = libraryItems.Take(takeLimit);
+            }
+
+            // Avoid implicitly captured closure
+            var items = libraryItems
+                .ToList();
+
+            var list = new List<Tuple<BaseItem, List<BaseItem>>>();
+
+            foreach (var item in items)
+            {
+                // Only grab the index container for media
+                var container = item.IsFolder || !request.GroupItems ? null : item.LatestItemsIndexContainer;
+
+                if (container == null)
+                {
+                    list.Add(new Tuple<BaseItem, List<BaseItem>>(null, new List<BaseItem> { item }));
+                }
+                else
+                {
+                    var current = list.FirstOrDefault(i => i.Item1 != null && i.Item1.Id == container.Id);
+
+                    if (current != null)
+                    {
+                        current.Item2.Add(item);
+                    }
+                    else
+                    {
+                        list.Add(new Tuple<BaseItem, List<BaseItem>>(container, new List<BaseItem> { item }));
+                    }
+                }
+
+                if (list.Count >= request.Limit)
+                {
+                    break;
+                }
+            }
+
+            return list;
+        }
+
+        protected IList<BaseItem> GetAllLibraryItems(string userId, IUserManager userManager, ILibraryManager libraryManager, string parentId, Func<BaseItem, bool> filter)
+        {
+            if (!string.IsNullOrEmpty(parentId))
+            {
+                var folder = (Folder)libraryManager.GetItemById(new Guid(parentId));
+
+                if (!string.IsNullOrWhiteSpace(userId))
+                {
+                    var user = userManager.GetUserById(userId);
+
+                    if (user == null)
+                    {
+                        throw new ArgumentException("User not found");
+                    }
+
+                    return folder
+                        .GetRecursiveChildren(user, filter)
+                        .ToList();
+                }
+
+                return folder
+                    .GetRecursiveChildren(filter);
+            }
+            if (!string.IsNullOrWhiteSpace(userId))
+            {
+                var user = userManager.GetUserById(userId);
+
+                if (user == null)
+                {
+                    throw new ArgumentException("User not found");
+                }
+
+                return user
+                    .RootFolder
+                    .GetRecursiveChildren(user, filter)
+                    .ToList();
+            }
+
+            return libraryManager
+                .RootFolder
+                .GetRecursiveChildren(filter);
+        }
+        
+        private IEnumerable<BaseItem> GetItemsConfiguredForLatest(User user, Func<BaseItem, bool> filter)
+        {
+            // Avoid implicitly captured closure
+            var currentUser = user;
+
+            return user.RootFolder.GetChildren(user, true)
+                .OfType<Folder>()
+                .Where(i => !user.Configuration.LatestItemsExcludes.Contains(i.Id.ToString("N")))
+                .SelectMany(i => i.GetRecursiveChildren(currentUser, filter))
+                .DistinctBy(i => i.Id);
+        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 15bc62412..d75a1bc3f 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -55,6 +55,7 @@
     "HeaderAudio": "Audio",
     "HeaderVideo": "Video",
     "HeaderPaths": "Paths",
+    "CategorySync": "Sync",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
     "LabelSyncTempPath": "Temporary file path:",
@@ -669,6 +670,7 @@
     "NotificationOptionInstallationFailed": "Installation failure",
     "NotificationOptionNewLibraryContent": "New content added",
     "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
     "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",
@@ -893,7 +895,7 @@
     "OptionCommunityMostWatchedSort": "Most Watched",
     "TabNextUp": "Next Up",
     "HeaderBecomeMediaBrowserSupporter": "Become a Media Browser Supporter",
-    "TextAccessPremiumFeatures": "Enjoy Premium Features",
+    "TextEnjoyBonusFeatures": "Enjoy Bonus Features",
     "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 + 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.",
@@ -957,7 +959,7 @@
     "OptionLatestTvRecordings": "Latest recordings",
     "LabelProtocolInfo": "Protocol info:",
     "LabelProtocolInfoHelp": "The value that will be used when responding to GetProtocolInfo requests from the device.",
-    "TabKodiMetadata": "Kodi",
+    "TabNfo": "Nfo",
     "HeaderKodiMetadataHelp": "Media Browser includes native support for Kodi Nfo metadata and images. To enable or disable Kodi metadata, use the Advanced tab to configure options for your media types.",
     "LabelKodiMetadataUser": "Sync user watch data to nfo's for:",
     "LabelKodiMetadataUserHelp": "Enable this to keep watch data in sync between Media Browser and Kodi.",
diff --git a/MediaBrowser.Server.Implementations/Notifications/CoreNotificationTypes.cs b/MediaBrowser.Server.Implementations/Notifications/CoreNotificationTypes.cs
index 405bf407a..d8acbe06c 100644
--- a/MediaBrowser.Server.Implementations/Notifications/CoreNotificationTypes.cs
+++ b/MediaBrowser.Server.Implementations/Notifications/CoreNotificationTypes.cs
@@ -1,7 +1,6 @@
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Notifications;
-using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Notifications;
 using System;
 using System.Collections.Generic;
@@ -137,6 +136,13 @@ namespace MediaBrowser.Server.Implementations.Notifications
                      Type = NotificationType.VideoPlaybackStopped.ToString(),
                      DefaultTitle = "{UserName} has finished playing {ItemName} on {DeviceName}.",
                      Variables = new List<string>{"UserName", "ItemName", "DeviceName", "AppName"}
+                },
+
+                new NotificationTypeInfo
+                {
+                     Type = NotificationType.CameraImageUploaded.ToString(),
+                     DefaultTitle = "A new camera image has been uploaded from {DeviceName}.",
+                     Variables = new List<string>{"DeviceName"}
                 }
             };
 
@@ -171,10 +177,14 @@ namespace MediaBrowser.Server.Implementations.Notifications
             {
                 note.Category = _localization.GetLocalizedString("CategoryUser");
             }
-            else   if (note.Type.IndexOf("Plugin", StringComparison.OrdinalIgnoreCase) != -1)
+            else if (note.Type.IndexOf("Plugin", StringComparison.OrdinalIgnoreCase) != -1)
             {
                 note.Category = _localization.GetLocalizedString("CategoryPlugin");
             }
+            else if (note.Type.IndexOf("CameraImageUploaded", StringComparison.OrdinalIgnoreCase) != -1)
+            {
+                note.Category = _localization.GetLocalizedString("CategorySync");
+            }
             else
             {
                 note.Category = _localization.GetLocalizedString("CategorySystem");
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index b4be3d788..0613cda30 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -870,14 +870,14 @@ namespace MediaBrowser.Server.Implementations.Session
             {
                 if (items.Any(i => !session.QueueableMediaTypes.Contains(i.MediaType, StringComparer.OrdinalIgnoreCase)))
                 {
-                    throw new ArgumentException(string.Format("{0} is unable to queue the requested media type.", session.DeviceName ?? session.Id.ToString()));
+                    throw new ArgumentException(string.Format("{0} is unable to queue the requested media type.", session.DeviceName ?? session.Id));
                 }
             }
             else
             {
                 if (items.Any(i => !session.PlayableMediaTypes.Contains(i.MediaType, StringComparer.OrdinalIgnoreCase)))
                 {
-                    throw new ArgumentException(string.Format("{0} is unable to play the requested media type.", session.DeviceName ?? session.Id.ToString()));
+                    throw new ArgumentException(string.Format("{0} is unable to play the requested media type.", session.DeviceName ?? session.Id));
                 }
             }
 
@@ -895,6 +895,19 @@ namespace MediaBrowser.Server.Implementations.Session
         {
             var item = _libraryManager.GetItemById(new Guid(id));
 
+            var byName = item as IItemByName;
+
+            if (byName != null)
+            {
+                var items = user == null ?
+                    _libraryManager.RootFolder.GetRecursiveChildren(i => !i.IsFolder && byName.ItemFilter(i)) :
+                    user.RootFolder.GetRecursiveChildren(user, i => !i.IsFolder && byName.ItemFilter(i));
+
+                items = items.OrderBy(i => i.SortName);
+
+                return items;
+            }
+            
             if (item.IsFolder)
             {
                 var folder = (Folder)item;
@@ -913,37 +926,9 @@ namespace MediaBrowser.Server.Implementations.Session
 
         private IEnumerable<BaseItem> TranslateItemForInstantMix(string id, User user)
         {
-            var item = _libraryManager.GetItemById(new Guid(id));
-
-            var audio = item as Audio;
-
-            if (audio != null)
-            {
-                return _musicManager.GetInstantMixFromSong(audio, user);
-            }
-
-            var artist = item as MusicArtist;
-
-            if (artist != null)
-            {
-                return _musicManager.GetInstantMixFromArtist(artist.Name, user);
-            }
-
-            var album = item as MusicAlbum;
-
-            if (album != null)
-            {
-                return _musicManager.GetInstantMixFromAlbum(album, user);
-            }
-
-            var genre = item as MusicGenre;
-
-            if (genre != null)
-            {
-                return _musicManager.GetInstantMixFromGenres(new[] { genre.Name }, user);
-            }
+            var item = _libraryManager.GetItemById(id);
 
-            return new BaseItem[] { };
+            return _musicManager.GetInstantMixFromItem(item, user);
         }
 
         public Task SendBrowseCommand(string controllingSessionId, string sessionId, BrowseRequest command, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs b/MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs
index 11dfb4791..6700e9054 100644
--- a/MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs
+++ b/MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs
@@ -93,7 +93,8 @@ namespace MediaBrowser.Server.Implementations.TV
             return FilterSeries(request, series)
                 .AsParallel()
                 .Select(i => GetNextUp(i, currentUser))
-                .Where(i => i.Item1 != null)
+                // Include if an episode was found, and either the series is not unwatched or the specific series was requested
+                .Where(i => i.Item1 != null && (!i.Item3 || !string.IsNullOrWhiteSpace(request.SeriesId)))
                 .OrderByDescending(i =>
                 {
                     var episode = i.Item1;
@@ -123,7 +124,7 @@ namespace MediaBrowser.Server.Implementations.TV
         /// <param name="series">The series.</param>
         /// <param name="user">The user.</param>
         /// <returns>Task{Episode}.</returns>
-        private Tuple<Episode, DateTime> GetNextUp(Series series, User user)
+        private Tuple<Episode, DateTime, bool> GetNextUp(Series series, User user)
         {
             // Get them in display order, then reverse
             var allEpisodes = series.GetSeasons(user, true, true)
@@ -162,13 +163,13 @@ namespace MediaBrowser.Server.Implementations.TV
 
             if (lastWatched != null)
             {
-                return new Tuple<Episode, DateTime>(nextUp, lastWatchedDate);
+                return new Tuple<Episode, DateTime, bool>(nextUp, lastWatchedDate, false);
             }
 
             var firstEpisode = allEpisodes.LastOrDefault(i => i.LocationType != LocationType.Virtual && !i.IsPlayed(user));
 
             // Return the first episode
-            return new Tuple<Episode, DateTime>(firstEpisode, DateTime.MinValue);
+            return new Tuple<Episode, DateTime, bool>(firstEpisode, DateTime.MinValue, true);
         }
 
         private IEnumerable<Series> FilterSeries(NextUpQuery request, IEnumerable<Series> items)
diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index 340b02be7..3eb98e95d 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -441,7 +441,7 @@ namespace MediaBrowser.WebDashboard.Api
                                 "metadataconfigurationpage.js",
                                 "metadataimagespage.js",
                                 "metadatasubtitles.js",
-                                "metadatakodi.js",
+                                "metadatanfo.js",
                                 "moviegenres.js",
                                 "moviecollections.js",
                                 "movies.js",
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 7613195ea..72f3a5757 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -480,7 +480,7 @@
     <Content Include="dashboard-ui\librarypathmapping.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\metadatakodi.html">
+    <Content Include="dashboard-ui\metadatanfo.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="dashboard-ui\mypreferencesdisplay.html">
@@ -795,7 +795,7 @@
     <Content Include="dashboard-ui\scripts\librarypathmapping.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\scripts\metadatakodi.js">
+    <Content Include="dashboard-ui\scripts\metadatanfo.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="dashboard-ui\scripts\mypreferencesdisplay.js">
-- 
cgit v1.2.3


From 782fe92cf766c09c84200e9e2228e555e6644add Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 27 Jan 2015 17:45:59 -0500
Subject: support artists tag value

---
 MediaBrowser.Api/SearchService.cs                  | 13 ++-----
 MediaBrowser.Api/VideosService.cs                  |  1 -
 .../Entities/AggregateFolder.cs                    |  2 +-
 .../Entities/Audio/MusicAlbum.cs                   |  6 ----
 .../Entities/CollectionFolder.cs                   |  2 +-
 MediaBrowser.Controller/Entities/User.cs           |  2 +-
 MediaBrowser.Controller/Library/ItemResolveArgs.cs | 18 ++--------
 MediaBrowser.Model/Entities/MetadataProviders.cs   |  3 +-
 MediaBrowser.Model/Sync/SyncJobCreationResult.cs   |  9 ++++-
 MediaBrowser.Providers/Manager/ImageSaver.cs       |  3 +-
 .../MediaInfo/FFProbeAudioInfo.cs                  | 40 +++++++++++++++++-----
 MediaBrowser.Providers/Music/MusicExternalIds.cs   | 23 +++++++++++++
 .../Library/LibraryManager.cs                      | 11 +++---
 .../Library/Resolvers/SpecialFolderResolver.cs     |  7 ++--
 .../Sorting/AiredEpisodeOrderComparer.cs           |  2 ++
 .../Sync/SyncManager.cs                            |  9 ++++-
 16 files changed, 94 insertions(+), 57 deletions(-)

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Api/SearchService.cs b/MediaBrowser.Api/SearchService.cs
index 4dcf72407..ee48946d5 100644
--- a/MediaBrowser.Api/SearchService.cs
+++ b/MediaBrowser.Api/SearchService.cs
@@ -208,17 +208,10 @@ namespace MediaBrowser.Api
 
             if (album != null)
             {
-                var songs = album.GetRecursiveChildren(i => i is Audio)
-                    .Cast<Audio>()
-                    .ToList();
+                result.SongCount = album.Tracks.Count();
 
-                result.SongCount = songs.Count;
-
-                result.Artists = songs.SelectMany(i => i.AllArtists)
-                    .Distinct(StringComparer.OrdinalIgnoreCase)
-                    .ToArray();
-
-                result.AlbumArtist = songs.SelectMany(i => i.AlbumArtists).FirstOrDefault(i => !string.IsNullOrEmpty(i));
+                result.Artists = album.Artists.ToArray();
+                result.AlbumArtist = album.AlbumArtists.FirstOrDefault();
             }
 
             var song = item as Audio;
diff --git a/MediaBrowser.Api/VideosService.cs b/MediaBrowser.Api/VideosService.cs
index 442bed06f..d1b0eb05f 100644
--- a/MediaBrowser.Api/VideosService.cs
+++ b/MediaBrowser.Api/VideosService.cs
@@ -5,7 +5,6 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
-using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Querying;
 using ServiceStack;
 using System;
diff --git a/MediaBrowser.Controller/Entities/AggregateFolder.cs b/MediaBrowser.Controller/Entities/AggregateFolder.cs
index 362096b5e..af2cca5e6 100644
--- a/MediaBrowser.Controller/Entities/AggregateFolder.cs
+++ b/MediaBrowser.Controller/Entities/AggregateFolder.cs
@@ -66,7 +66,7 @@ namespace MediaBrowser.Controller.Entities
         {
             var path = ContainingFolderPath;
 
-            var args = new ItemResolveArgs(ConfigurationManager.ApplicationPaths, LibraryManager, directoryService)
+            var args = new ItemResolveArgs(ConfigurationManager.ApplicationPaths , directoryService)
             {
                 FileInfo = new DirectoryInfo(path),
                 Path = path,
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
index b9a38d594..8f766020e 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -54,12 +54,6 @@ namespace MediaBrowser.Controller.Entities.Audio
 
         public List<string> AlbumArtists { get; set; }
 
-        [IgnoreDataMember]
-        public string AlbumArtist
-        {
-            get { return AlbumArtists.FirstOrDefault(); }
-        }
-
         /// <summary>
         /// Gets the tracks.
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs
index 5452c63a4..f82934a51 100644
--- a/MediaBrowser.Controller/Entities/CollectionFolder.cs
+++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs
@@ -86,7 +86,7 @@ namespace MediaBrowser.Controller.Entities
         {
             var path = ContainingFolderPath;
 
-            var args = new ItemResolveArgs(ConfigurationManager.ApplicationPaths, LibraryManager, directoryService)
+            var args = new ItemResolveArgs(ConfigurationManager.ApplicationPaths, directoryService)
             {
                 FileInfo = new DirectoryInfo(path),
                 Path = path,
diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs
index 3c89a9609..1fca676a9 100644
--- a/MediaBrowser.Controller/Entities/User.cs
+++ b/MediaBrowser.Controller/Entities/User.cs
@@ -168,7 +168,7 @@ namespace MediaBrowser.Controller.Entities
             }
 
             // If only the casing is changing, leave the file system alone
-            if (!UsesIdForConfigurationPath && !newName.Equals(Name, StringComparison.OrdinalIgnoreCase))
+            if (!UsesIdForConfigurationPath && !string.Equals(newName, Name, StringComparison.OrdinalIgnoreCase))
             {
                 UsesIdForConfigurationPath = true;
 
diff --git a/MediaBrowser.Controller/Library/ItemResolveArgs.cs b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
index 4fa07421c..db441d285 100644
--- a/MediaBrowser.Controller/Library/ItemResolveArgs.cs
+++ b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
@@ -17,7 +17,6 @@ namespace MediaBrowser.Controller.Library
         /// The _app paths
         /// </summary>
         private readonly IServerApplicationPaths _appPaths;
-        private readonly ILibraryManager _libraryManager;
 
         public IDirectoryService DirectoryService { get; private set; }
 
@@ -25,11 +24,10 @@ namespace MediaBrowser.Controller.Library
         /// Initializes a new instance of the <see cref="ItemResolveArgs" /> class.
         /// </summary>
         /// <param name="appPaths">The app paths.</param>
-        /// <param name="libraryManager">The library manager.</param>
-        public ItemResolveArgs(IServerApplicationPaths appPaths, ILibraryManager libraryManager, IDirectoryService directoryService)
+        /// <param name="directoryService">The directory service.</param>
+        public ItemResolveArgs(IServerApplicationPaths appPaths, IDirectoryService directoryService)
         {
             _appPaths = appPaths;
-            _libraryManager = libraryManager;
             DirectoryService = directoryService;
         }
 
@@ -136,18 +134,6 @@ namespace MediaBrowser.Controller.Library
             }
         }
 
-        /// <summary>
-        /// Gets a value indicating whether this instance is root.
-        /// </summary>
-        /// <value><c>true</c> if this instance is root; otherwise, <c>false</c>.</value>
-        public bool IsRoot
-        {
-            get
-            {
-                return Parent == null;
-            }
-        }
-
         /// <summary>
         /// Gets or sets the additional locations.
         /// </summary>
diff --git a/MediaBrowser.Model/Entities/MetadataProviders.cs b/MediaBrowser.Model/Entities/MetadataProviders.cs
index e86773789..7644b150a 100644
--- a/MediaBrowser.Model/Entities/MetadataProviders.cs
+++ b/MediaBrowser.Model/Entities/MetadataProviders.cs
@@ -40,6 +40,7 @@ namespace MediaBrowser.Model.Entities
         NesBoxRom = 14,
         TvRage = 15,
         AudioDbArtist = 16,
-        AudioDbAlbum = 17
+        AudioDbAlbum = 17,
+        MusicBrainzTrack = 18
     }
 }
diff --git a/MediaBrowser.Model/Sync/SyncJobCreationResult.cs b/MediaBrowser.Model/Sync/SyncJobCreationResult.cs
index 797318b2a..6723aa2cf 100644
--- a/MediaBrowser.Model/Sync/SyncJobCreationResult.cs
+++ b/MediaBrowser.Model/Sync/SyncJobCreationResult.cs
@@ -1,8 +1,15 @@
-
+using System.Collections.Generic;
+
 namespace MediaBrowser.Model.Sync
 {
     public class SyncJobCreationResult
     {
         public SyncJob Job { get; set; }
+        public List<SyncJobItem> JobItems { get; set; }
+
+        public SyncJobCreationResult()
+        {
+            JobItems = new List<SyncJobItem>();
+        }
     }
 }
diff --git a/MediaBrowser.Providers/Manager/ImageSaver.cs b/MediaBrowser.Providers/Manager/ImageSaver.cs
index c5c6880e1..a8e16e4ae 100644
--- a/MediaBrowser.Providers/Manager/ImageSaver.cs
+++ b/MediaBrowser.Providers/Manager/ImageSaver.cs
@@ -1,6 +1,5 @@
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.IO;
-using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
@@ -9,6 +8,7 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Net;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -16,7 +16,6 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Model.Net;
 
 namespace MediaBrowser.Providers.Manager
 {
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeAudioInfo.cs b/MediaBrowser.Providers/MediaInfo/FFProbeAudioInfo.cs
index b51af0d8a..ad2b6ed0f 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeAudioInfo.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeAudioInfo.cs
@@ -187,18 +187,27 @@ namespace MediaBrowser.Providers.MediaInfo
 
             audio.Album = FFProbeHelpers.GetDictionaryValue(tags, "album");
 
-            var artist = FFProbeHelpers.GetDictionaryValue(tags, "artist");
+            var artists = FFProbeHelpers.GetDictionaryValue(tags, "artists");
 
-            if (string.IsNullOrWhiteSpace(artist))
+            if (!string.IsNullOrWhiteSpace(artists))
             {
-                audio.Artists.Clear();
+                audio.Artists = artists.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries)
+                    .Distinct(StringComparer.OrdinalIgnoreCase)
+                    .ToList();
             }
             else
             {
-                audio.Artists = SplitArtists(artist)
-                    .Distinct(StringComparer.OrdinalIgnoreCase)
-                    .ToList();
-
+                var artist = FFProbeHelpers.GetDictionaryValue(tags, "artist");
+                if (string.IsNullOrWhiteSpace(artist))
+                {
+                    audio.Artists.Clear();
+                }
+                else
+                {
+                    audio.Artists = SplitArtists(artist)
+                        .Distinct(StringComparer.OrdinalIgnoreCase)
+                        .ToList();
+                }
             }
 
             var albumArtist = FFProbeHelpers.GetDictionaryValue(tags, "albumartist") ?? FFProbeHelpers.GetDictionaryValue(tags, "album artist") ?? FFProbeHelpers.GetDictionaryValue(tags, "album_artist");
@@ -250,10 +259,23 @@ namespace MediaBrowser.Providers.MediaInfo
                 FetchStudios(audio, tags, "publisher");
             }
 
-            audio.SetProviderId(MetadataProviders.MusicBrainzAlbumArtist, FFProbeHelpers.GetDictionaryValue(tags, "MusicBrainz Album Artist Id"));
-            audio.SetProviderId(MetadataProviders.MusicBrainzArtist, FFProbeHelpers.GetDictionaryValue(tags, "MusicBrainz Artist Id"));
+            // These support mulitple values, but for now we only store the first.
+            audio.SetProviderId(MetadataProviders.MusicBrainzAlbumArtist, GetMultipleMusicBrainzId(FFProbeHelpers.GetDictionaryValue(tags, "MusicBrainz Album Artist Id")));
+            audio.SetProviderId(MetadataProviders.MusicBrainzArtist, GetMultipleMusicBrainzId(FFProbeHelpers.GetDictionaryValue(tags, "MusicBrainz Artist Id")));
+
             audio.SetProviderId(MetadataProviders.MusicBrainzAlbum, FFProbeHelpers.GetDictionaryValue(tags, "MusicBrainz Album Id"));
             audio.SetProviderId(MetadataProviders.MusicBrainzReleaseGroup, FFProbeHelpers.GetDictionaryValue(tags, "MusicBrainz Release Group Id"));
+            audio.SetProviderId(MetadataProviders.MusicBrainzTrack, FFProbeHelpers.GetDictionaryValue(tags, "MusicBrainz Release Track Id"));
+        }
+
+        private string GetMultipleMusicBrainzId(string value)
+        {
+            if (string.IsNullOrWhiteSpace(value))
+            {
+                return null;
+            }
+
+            return value.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault();
         }
 
         private readonly char[] _nameDelimiters = { '/', '|', ';', '\\' };
diff --git a/MediaBrowser.Providers/Music/MusicExternalIds.cs b/MediaBrowser.Providers/Music/MusicExternalIds.cs
index a4eab1eee..bcafdc6f6 100644
--- a/MediaBrowser.Providers/Music/MusicExternalIds.cs
+++ b/MediaBrowser.Providers/Music/MusicExternalIds.cs
@@ -118,4 +118,27 @@ namespace MediaBrowser.Providers.Music
             return item is Audio || item is MusicAlbum;
         }
     }
+
+    public class MusicBrainzTrackId : IExternalId
+    {
+        public string Name
+        {
+            get { return "MusicBrainz Track"; }
+        }
+
+        public string Key
+        {
+            get { return MetadataProviders.MusicBrainzTrack.ToString(); }
+        }
+
+        public string UrlFormatString
+        {
+            get { return "http://musicbrainz.org/track/{0}"; }
+        }
+
+        public bool Supports(IHasProviderIds item)
+        {
+            return item is Audio;
+        }
+    }
 }
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 124bb396e..d7ea444a3 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -13,7 +13,6 @@ using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Resolvers;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Configuration;
-using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Naming.Audio;
@@ -579,7 +578,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 collectionType = GetContentTypeOverride(fullPath, true);
             }
 
-            var args = new ItemResolveArgs(ConfigurationManager.ApplicationPaths, this, directoryService)
+            var args = new ItemResolveArgs(ConfigurationManager.ApplicationPaths, directoryService)
             {
                 Parent = parent,
                 Path = fullPath,
@@ -753,12 +752,14 @@ namespace MediaBrowser.Server.Implementations.Library
 
                         Directory.CreateDirectory(userRootPath);
 
-                        _userRootFolder = GetItemById(GetNewItemId(userRootPath, typeof(UserRootFolder))) as UserRootFolder;
+                        var tmpItem = GetItemById(GetNewItemId(userRootPath, typeof(UserRootFolder))) as UserRootFolder;
 
-                        if (_userRootFolder == null)
+                        if (tmpItem == null)
                         {
-                            _userRootFolder = (UserRootFolder)ResolvePath(new DirectoryInfo(userRootPath));
+                            tmpItem = (UserRootFolder)ResolvePath(new DirectoryInfo(userRootPath));
                         }
+
+                        _userRootFolder = tmpItem;
                     }
                 }
             }
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs
index 0a41a6c04..31b2d8b0f 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Common.IO;
+using MediaBrowser.Controller;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Resolvers;
@@ -11,10 +12,12 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers
     class SpecialFolderResolver : FolderResolver<Folder>
     {
         private readonly IFileSystem _fileSystem;
+        private readonly IServerApplicationPaths _appPaths;
 
-        public SpecialFolderResolver(IFileSystem fileSystem)
+        public SpecialFolderResolver(IFileSystem fileSystem, IServerApplicationPaths appPaths)
         {
             _fileSystem = fileSystem;
+            _appPaths = appPaths;
         }
 
         /// <summary>
@@ -39,7 +42,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers
                 {
                     return new AggregateFolder();
                 }
-                if (args.IsRoot)
+                if (string.Equals(args.Path, _appPaths.DefaultUserViewsPath, StringComparison.OrdinalIgnoreCase))
                 {
                     return new UserRootFolder();  //if we got here and still a root - must be user root
                 }
diff --git a/MediaBrowser.Server.Implementations/Sorting/AiredEpisodeOrderComparer.cs b/MediaBrowser.Server.Implementations/Sorting/AiredEpisodeOrderComparer.cs
index 8707f2e5b..c7bbca060 100644
--- a/MediaBrowser.Server.Implementations/Sorting/AiredEpisodeOrderComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/AiredEpisodeOrderComparer.cs
@@ -72,6 +72,8 @@ namespace MediaBrowser.Server.Implementations.Sorting
 
         private int CompareEpisodeToSpecial(Episode x, Episode y)
         {
+            // http://thetvdb.com/wiki/index.php?title=Special_Episodes
+
             var xSeason = x.PhysicalSeasonNumber ?? -1;
             var ySeason = y.AirsAfterSeasonNumber ?? y.AirsBeforeSeasonNumber ?? -1;
 
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
index cdbb0d5e5..71bc0e46b 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
@@ -158,9 +158,16 @@ namespace MediaBrowser.Server.Implementations.Sync
                 }, _logger);
             }
 
+            jobItemsResult = _repo.GetJobItems(new SyncJobItemQuery
+            {
+                Statuses = new List<SyncJobItemStatus> { SyncJobItemStatus.Queued, SyncJobItemStatus.Converting },
+                JobId = jobId
+            });
+
             return new SyncJobCreationResult
             {
-                Job = GetJob(jobId)
+                Job = GetJob(jobId),
+                JobItems = jobItemsResult.Items.ToList()
             };
         }
 
-- 
cgit v1.2.3


From a6145e54d901095e5b67704e3103843b4b515681 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 29 Jan 2015 01:06:24 -0500
Subject: support in-home easy password

---
 MediaBrowser.Api/UserService.cs                    | 78 +++++++++++++++++++++-
 .../Networking/BaseNetworkManager.cs               | 25 +++++--
 MediaBrowser.Controller/Entities/User.cs           |  2 +-
 MediaBrowser.Controller/Library/IUserManager.cs    | 15 +++++
 MediaBrowser.Model/Dto/UserDto.cs                  |  6 ++
 .../Library/UserManager.cs                         | 54 ++++++++++-----
 .../Localization/JavaScript/javascript.json        |  5 +-
 .../Localization/Server/server.json                |  8 ++-
 8 files changed, 165 insertions(+), 28 deletions(-)

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs
index 4f49dd37d..2c497d172 100644
--- a/MediaBrowser.Api/UserService.cs
+++ b/MediaBrowser.Api/UserService.cs
@@ -11,7 +11,6 @@ using MediaBrowser.Model.Connect;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Users;
 using ServiceStack;
-using ServiceStack.Text.Controller;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -148,6 +147,32 @@ namespace MediaBrowser.Api
         public bool ResetPassword { get; set; }
     }
 
+    /// <summary>
+    /// Class UpdateUserEasyPassword
+    /// </summary>
+    [Route("/Users/{Id}/EasyPassword", "POST", Summary = "Updates a user's easy password")]
+    [Authenticated]
+    public class UpdateUserEasyPassword : IReturnVoid
+    {
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets the new password.
+        /// </summary>
+        /// <value>The new password.</value>
+        public string NewPassword { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [reset password].
+        /// </summary>
+        /// <value><c>true</c> if [reset password]; otherwise, <c>false</c>.</value>
+        public bool ResetPassword { get; set; }
+    }
+
     /// <summary>
     /// Class UpdateUser
     /// </summary>
@@ -410,6 +435,8 @@ namespace MediaBrowser.Api
 
         public async Task PostAsync(UpdateUserPassword request)
         {
+            AssertCanUpdateUser(request.Id);
+
             var user = _userManager.GetUserById(request.Id);
 
             if (user == null)
@@ -434,6 +461,33 @@ namespace MediaBrowser.Api
             }
         }
 
+        public void Post(UpdateUserEasyPassword request)
+        {
+            var task = PostAsync(request);
+            Task.WaitAll(task);
+        }
+        
+        public async Task PostAsync(UpdateUserEasyPassword request)
+        {
+            AssertCanUpdateUser(request.Id);
+            
+            var user = _userManager.GetUserById(request.Id);
+
+            if (user == null)
+            {
+                throw new ResourceNotFoundException("User not found");
+            }
+
+            if (request.ResetPassword)
+            {
+                await _userManager.ResetEasyPassword(user).ConfigureAwait(false);
+            }
+            else
+            {
+                await _userManager.ChangeEasyPassword(user, request.NewPassword).ConfigureAwait(false);
+            }
+        }
+
         /// <summary>
         /// Posts the specified request.
         /// </summary>
@@ -449,7 +503,9 @@ namespace MediaBrowser.Api
         {
             // We need to parse this manually because we told service stack not to with IRequiresRequestStream
             // https://code.google.com/p/servicestack/source/browse/trunk/Common/ServiceStack.Text/ServiceStack.Text/Controller/PathInfo.cs
-            var id = new Guid(GetPathValue(1));
+            var id = GetPathValue(1);
+
+            AssertCanUpdateUser(id);
 
             var dtoUser = request;
 
@@ -499,11 +555,29 @@ namespace MediaBrowser.Api
 
         public void Post(UpdateUserConfiguration request)
         {
+            AssertCanUpdateUser(request.Id);
+
             var task = _userManager.UpdateConfiguration(request.Id, request);
 
             Task.WaitAll(task);
         }
 
+        private void AssertCanUpdateUser(string userId)
+        {
+            var auth = AuthorizationContext.GetAuthorizationInfo(Request);
+
+            // If they're going to update the record of another user, they must be an administrator
+            if (!string.Equals(userId, auth.UserId, StringComparison.OrdinalIgnoreCase))
+            {
+                var authenticatedUser = _userManager.GetUserById(auth.UserId);
+
+                if (!authenticatedUser.Policy.IsAdministrator)
+                {
+                    throw new SecurityException("Unauthorized access.");
+                }
+            }
+        }
+
         public void Post(UpdateUserPolicy request)
         {
             var task = UpdateUserPolicy(request);
diff --git a/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs b/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
index 660ac09f9..6deda1293 100644
--- a/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
+++ b/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
@@ -50,7 +50,7 @@ namespace MediaBrowser.Common.Implementations.Networking
         {
             NetworkChange.NetworkAddressChanged -= NetworkChange_NetworkAddressChanged;
             NetworkChange.NetworkAvailabilityChanged -= NetworkChange_NetworkAvailabilityChanged;
-            
+
             NetworkChange.NetworkAddressChanged += NetworkChange_NetworkAddressChanged;
             NetworkChange.NetworkAvailabilityChanged += NetworkChange_NetworkAvailabilityChanged;
         }
@@ -106,6 +106,11 @@ namespace MediaBrowser.Common.Implementations.Networking
             // Private address space:
             // http://en.wikipedia.org/wiki/Private_network
 
+            if (endpoint.StartsWith("172.", StringComparison.OrdinalIgnoreCase))
+            {
+                return Is172AddressPrivate(endpoint);
+            }
+
             return
 
                 // If url was requested with computer name, we may see this
@@ -114,11 +119,23 @@ namespace MediaBrowser.Common.Implementations.Networking
                 endpoint.StartsWith("localhost", StringComparison.OrdinalIgnoreCase) ||
                 endpoint.StartsWith("127.", StringComparison.OrdinalIgnoreCase) ||
                 endpoint.StartsWith("10.", StringComparison.OrdinalIgnoreCase) ||
-                endpoint.StartsWith("192.", StringComparison.OrdinalIgnoreCase) ||
-                endpoint.StartsWith("172.", StringComparison.OrdinalIgnoreCase) ||
+                endpoint.StartsWith("192.168", StringComparison.OrdinalIgnoreCase) ||
                 endpoint.StartsWith("169.", StringComparison.OrdinalIgnoreCase);
         }
 
+        private bool Is172AddressPrivate(string endpoint)
+        {
+            for (var i = 16; i <= 31; i++)
+            {
+                if (endpoint.StartsWith("172." + i.ToString(CultureInfo.InvariantCulture) + ".", StringComparison.OrdinalIgnoreCase))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         public bool IsInLocalNetwork(string endpoint)
         {
             return IsInLocalNetworkInternal(endpoint, true);
@@ -175,7 +192,7 @@ namespace MediaBrowser.Common.Implementations.Networking
 
             return false;
         }
-        
+
         public IEnumerable<IPAddress> GetIpAddresses(string hostName)
         {
             return Dns.GetHostAddresses(hostName);
diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs
index 1fca676a9..01a7486b3 100644
--- a/MediaBrowser.Controller/Entities/User.cs
+++ b/MediaBrowser.Controller/Entities/User.cs
@@ -32,7 +32,7 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <value>The password.</value>
         public string Password { get; set; }
-        public string LocalPassword { get; set; }
+        public string EasyPassword { get; set; }
 
         public string ConnectUserName { get; set; }
         public string ConnectUserId { get; set; }
diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs
index f5846973e..5aa58aa57 100644
--- a/MediaBrowser.Controller/Library/IUserManager.cs
+++ b/MediaBrowser.Controller/Library/IUserManager.cs
@@ -117,6 +117,13 @@ namespace MediaBrowser.Controller.Library
         /// <returns>Task.</returns>
         Task ResetPassword(User user);
 
+        /// <summary>
+        /// Resets the easy password.
+        /// </summary>
+        /// <param name="user">The user.</param>
+        /// <returns>Task.</returns>
+        Task ResetEasyPassword(User user);
+        
         /// <summary>
         /// Changes the password.
         /// </summary>
@@ -125,6 +132,14 @@ namespace MediaBrowser.Controller.Library
         /// <returns>Task.</returns>
         Task ChangePassword(User user, string newPasswordSha1);
 
+        /// <summary>
+        /// Changes the easy password.
+        /// </summary>
+        /// <param name="user">The user.</param>
+        /// <param name="newPasswordSha1">The new password sha1.</param>
+        /// <returns>Task.</returns>
+        Task ChangeEasyPassword(User user, string newPasswordSha1);
+        
         /// <summary>
         /// Gets the user dto.
         /// </summary>
diff --git a/MediaBrowser.Model/Dto/UserDto.cs b/MediaBrowser.Model/Dto/UserDto.cs
index 9b6d92030..3e2d869d6 100644
--- a/MediaBrowser.Model/Dto/UserDto.cs
+++ b/MediaBrowser.Model/Dto/UserDto.cs
@@ -66,6 +66,12 @@ namespace MediaBrowser.Model.Dto
         /// </summary>
         /// <value><c>true</c> if this instance has configured password; otherwise, <c>false</c>.</value>
         public bool HasConfiguredPassword { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance has configured easy password.
+        /// </summary>
+        /// <value><c>true</c> if this instance has configured easy password; otherwise, <c>false</c>.</value>
+        public bool HasConfiguredEasyPassword { get; set; }
         
         /// <summary>
         /// Gets or sets the last login date.
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index 6b6f5b1b6..a001b25b6 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -275,9 +275,9 @@ namespace MediaBrowser.Server.Implementations.Library
 
         private string GetLocalPasswordHash(User user)
         {
-            return string.IsNullOrEmpty(user.LocalPassword)
+            return string.IsNullOrEmpty(user.EasyPassword)
                 ? GetSha1String(string.Empty)
-                : user.LocalPassword;
+                : user.EasyPassword;
         }
 
         private bool IsPasswordEmpty(string passwordHash)
@@ -355,18 +355,20 @@ namespace MediaBrowser.Server.Implementations.Library
 
             var passwordHash = GetPasswordHash(user);
 
-            var hasConfiguredDefaultPassword = !IsPasswordEmpty(passwordHash);
+            var hasConfiguredPassword = !IsPasswordEmpty(passwordHash);
+            var hasConfiguredEasyPassword = !IsPasswordEmpty(GetLocalPasswordHash(user));
 
             var hasPassword = user.Configuration.EnableLocalPassword && !string.IsNullOrEmpty(remoteEndPoint) && _networkManager.IsInLocalNetwork(remoteEndPoint) ?
-                !IsPasswordEmpty(GetLocalPasswordHash(user)) :
-                hasConfiguredDefaultPassword;
+                hasConfiguredEasyPassword :
+                hasConfiguredPassword;
 
             var dto = new UserDto
             {
                 Id = user.Id.ToString("N"),
                 Name = user.Name,
                 HasPassword = hasPassword,
-                HasConfiguredPassword = hasConfiguredDefaultPassword,
+                HasConfiguredPassword = hasConfiguredPassword,
+                HasConfiguredEasyPassword = hasConfiguredEasyPassword,
                 LastActivityDate = user.LastActivityDate,
                 LastLoginDate = user.LastLoginDate,
                 Configuration = user.Configuration,
@@ -613,18 +615,11 @@ namespace MediaBrowser.Server.Implementations.Library
             return ChangePassword(user, GetSha1String(string.Empty));
         }
 
-        /// <summary>
-        /// Changes the password.
-        /// </summary>
-        /// <param name="user">The user.</param>
-        /// <param name="newPasswordSha1">The new password sha1.</param>
-        /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">
-        /// user
-        /// or
-        /// newPassword
-        /// </exception>
-        /// <exception cref="System.ArgumentException">Passwords for guests cannot be changed.</exception>
+        public Task ResetEasyPassword(User user)
+        {
+            return ChangeEasyPassword(user, GetSha1String(string.Empty));
+        }
+
         public async Task ChangePassword(User user, string newPasswordSha1)
         {
             if (user == null)
@@ -648,6 +643,29 @@ namespace MediaBrowser.Server.Implementations.Library
             EventHelper.FireEventIfNotNull(UserPasswordChanged, this, new GenericEventArgs<User>(user), _logger);
         }
 
+        public async Task ChangeEasyPassword(User user, string newPasswordSha1)
+        {
+            if (user == null)
+            {
+                throw new ArgumentNullException("user");
+            }
+            if (string.IsNullOrWhiteSpace(newPasswordSha1))
+            {
+                throw new ArgumentNullException("newPasswordSha1");
+            }
+
+            if (user.ConnectLinkType.HasValue && user.ConnectLinkType.Value == UserLinkType.Guest)
+            {
+                throw new ArgumentException("Passwords for guests cannot be changed.");
+            }
+
+            user.EasyPassword = newPasswordSha1;
+
+            await UpdateUser(user).ConfigureAwait(false);
+
+            EventHelper.FireEventIfNotNull(UserPasswordChanged, this, new GenericEventArgs<User>(user), _logger);
+        }
+
         /// <summary>
         /// Instantiates the new user.
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
index ede08a49c..2dcd6eca5 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -14,9 +14,12 @@
     "FileReadError": "An error occurred while reading the file.",
     "DeleteUser": "Delete User",
     "DeleteUserConfirmation": "Are you sure you wish to delete this user?",
-    "PasswordResetHeader": "Password Reset",
+    "PasswordResetHeader": "Reset Password",
     "PasswordResetComplete": "The password has been reset.",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "Are you sure you wish to reset the password?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset":  "Reset Pin Code",
     "PasswordSaved": "Password saved.",
     "PasswordMatchError": "Password and password confirmation must match.",
     "OptionRelease": "Official Release",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 3e9c75220..93ef75dc3 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Paths",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1132,11 +1133,14 @@
     "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.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp":  "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Password",
     "HeaderLocalAccess": "Local Access",
     "HeaderViewOrder": "View Order",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "LabelImageRefreshMode": "Image refresh mode:",
-- 
cgit v1.2.3


From 792e4c4f1ba3d337cfaffca03e158d95560b3093 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 30 Jan 2015 00:18:32 -0500
Subject: sync updates

---
 MediaBrowser.Api/UserLibrary/UserLibraryService.cs |  1 -
 MediaBrowser.Api/UserService.cs                    | 33 ++++++++-
 MediaBrowser.Controller/Library/IUserManager.cs    |  8 ++
 .../MediaBrowser.Model.Portable.csproj             |  3 +
 .../MediaBrowser.Model.net35.csproj                |  3 +
 MediaBrowser.Model/ApiClient/ConnectionResult.cs   |  2 +
 MediaBrowser.Model/ApiClient/ConnectionState.cs    |  4 +-
 MediaBrowser.Model/ApiClient/IApiClient.cs         |  7 ++
 MediaBrowser.Model/ApiClient/IConnectionManager.cs |  9 +++
 MediaBrowser.Model/ApiClient/ServerCredentials.cs  |  4 +
 MediaBrowser.Model/ApiClient/ServerInfo.cs         | 48 ++++++++++++
 MediaBrowser.Model/ApiClient/ServerUserInfo.cs     |  9 +++
 MediaBrowser.Model/Dto/UserDto.cs                  | 10 ++-
 MediaBrowser.Model/MediaBrowser.Model.csproj       |  1 +
 MediaBrowser.Model/Session/ClientCapabilities.cs   |  1 +
 .../Library/UserManager.cs                         | 13 ++++
 .../Localization/JavaScript/ar.json                |  3 +
 .../Localization/JavaScript/bg_BG.json             |  5 +-
 .../Localization/JavaScript/ca.json                |  3 +
 .../Localization/JavaScript/cs.json                |  3 +
 .../Localization/JavaScript/da.json                |  3 +
 .../Localization/JavaScript/de.json                |  3 +
 .../Localization/JavaScript/el.json                |  3 +
 .../Localization/JavaScript/en_GB.json             |  5 +-
 .../Localization/JavaScript/en_US.json             |  5 +-
 .../Localization/JavaScript/es.json                |  3 +
 .../Localization/JavaScript/es_MX.json             |  3 +
 .../Localization/JavaScript/fi.json                |  3 +
 .../Localization/JavaScript/fr.json                |  3 +
 .../Localization/JavaScript/he.json                |  3 +
 .../Localization/JavaScript/hr.json                |  3 +
 .../Localization/JavaScript/it.json                |  3 +
 .../Localization/JavaScript/kk.json                |  5 +-
 .../Localization/JavaScript/ms.json                |  5 +-
 .../Localization/JavaScript/nb.json                |  3 +
 .../Localization/JavaScript/nl.json                |  3 +
 .../Localization/JavaScript/pl.json                |  3 +
 .../Localization/JavaScript/pt_BR.json             |  3 +
 .../Localization/JavaScript/pt_PT.json             |  3 +
 .../Localization/JavaScript/ru.json                | 15 ++--
 .../Localization/JavaScript/sv.json                |  3 +
 .../Localization/JavaScript/tr.json                |  3 +
 .../Localization/JavaScript/uk.json                |  5 +-
 .../Localization/JavaScript/vi.json                |  3 +
 .../Localization/JavaScript/zh_CN.json             |  3 +
 .../Localization/JavaScript/zh_TW.json             |  3 +
 .../Localization/Server/ar.json                    |  8 +-
 .../Localization/Server/bg_BG.json                 |  8 +-
 .../Localization/Server/ca.json                    |  8 +-
 .../Localization/Server/cs.json                    |  8 +-
 .../Localization/Server/da.json                    |  8 +-
 .../Localization/Server/de.json                    |  8 +-
 .../Localization/Server/el.json                    |  8 +-
 .../Localization/Server/en_GB.json                 |  8 +-
 .../Localization/Server/en_US.json                 |  8 +-
 .../Localization/Server/es.json                    |  8 +-
 .../Localization/Server/es_MX.json                 |  8 +-
 .../Localization/Server/fi.json                    |  8 +-
 .../Localization/Server/fr.json                    |  8 +-
 .../Localization/Server/he.json                    |  8 +-
 .../Localization/Server/hr.json                    |  8 +-
 .../Localization/Server/it.json                    | 86 +++++++++++-----------
 .../Localization/Server/kk.json                    | 30 ++++----
 .../Localization/Server/ko.json                    |  8 +-
 .../Localization/Server/ms.json                    |  8 +-
 .../Localization/Server/nb.json                    |  8 +-
 .../Localization/Server/nl.json                    |  8 +-
 .../Localization/Server/pl.json                    |  8 +-
 .../Localization/Server/pt_BR.json                 |  8 +-
 .../Localization/Server/pt_PT.json                 |  8 +-
 .../Localization/Server/ru.json                    | 30 ++++----
 .../Localization/Server/sv.json                    |  8 +-
 .../Localization/Server/tr.json                    |  8 +-
 .../Localization/Server/uk.json                    |  8 +-
 .../Localization/Server/vi.json                    |  8 +-
 .../Localization/Server/zh_CN.json                 |  8 +-
 .../Localization/Server/zh_TW.json                 |  8 +-
 Nuget/MediaBrowser.Common.Internal.nuspec          |  4 +-
 Nuget/MediaBrowser.Common.nuspec                   |  2 +-
 Nuget/MediaBrowser.Model.Signed.nuspec             |  2 +-
 Nuget/MediaBrowser.Server.Core.nuspec              |  4 +-
 81 files changed, 505 insertions(+), 147 deletions(-)
 create mode 100644 MediaBrowser.Model/ApiClient/ServerUserInfo.cs

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
index 80ab72db7..cdfd00ce9 100644
--- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
@@ -455,7 +455,6 @@ namespace MediaBrowser.Api.UserLibrary
 
             var dtos = trailerIds
                 .Select(_libraryManager.GetItemById)
-                .OrderBy(i => i.SortName)
                 .Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user, item));
 
             return dtos.ToList();
diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs
index 2c497d172..603396e38 100644
--- a/MediaBrowser.Api/UserService.cs
+++ b/MediaBrowser.Api/UserService.cs
@@ -55,6 +55,21 @@ namespace MediaBrowser.Api
         public string Id { get; set; }
     }
 
+    /// <summary>
+    /// Class GetUser
+    /// </summary>
+    [Route("/Users/{Id}/Offline", "GET", Summary = "Gets an offline user record by Id")]
+    [Authenticated]
+    public class GetOfflineUser : IReturn<UserDto>
+    {
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        [ApiMember(Name = "User Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
+        public string Id { get; set; }
+    }
+
     /// <summary>
     /// Class DeleteUser
     /// </summary>
@@ -319,7 +334,7 @@ namespace MediaBrowser.Api
                 .Select(i => _userManager.GetUserDto(i, Request.RemoteIp))
                 .ToList();
 
-            return ToOptimizedSerializedResultUsingCache(result);
+            return ToOptimizedResult(result);
         }
 
         /// <summary>
@@ -338,7 +353,21 @@ namespace MediaBrowser.Api
 
             var result = _userManager.GetUserDto(user, Request.RemoteIp);
 
-            return ToOptimizedSerializedResultUsingCache(result);
+            return ToOptimizedResult(result);
+        }
+
+        public object Get(GetOfflineUser request)
+        {
+            var user = _userManager.GetUserById(request.Id);
+
+            if (user == null)
+            {
+                throw new ResourceNotFoundException("User not found");
+            }
+
+            var result = _userManager.GetOfflineUserDto(user, Request.RemoteIp);
+
+            return ToOptimizedResult(result);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs
index 5aa58aa57..97a3cced9 100644
--- a/MediaBrowser.Controller/Library/IUserManager.cs
+++ b/MediaBrowser.Controller/Library/IUserManager.cs
@@ -117,6 +117,14 @@ namespace MediaBrowser.Controller.Library
         /// <returns>Task.</returns>
         Task ResetPassword(User user);
 
+        /// <summary>
+        /// Gets the offline user dto.
+        /// </summary>
+        /// <param name="user">The user.</param>
+        /// <param name="deviceId">The device identifier.</param>
+        /// <returns>UserDto.</returns>
+        UserDto GetOfflineUserDto(User user, string deviceId);
+
         /// <summary>
         /// Resets the easy password.
         /// </summary>
diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
index 0a350f517..310170b5f 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -122,6 +122,9 @@
     <Compile Include="..\MediaBrowser.Model\ApiClient\ServerInfo.cs">
       <Link>ApiClient\ServerInfo.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\ApiClient\ServerUserInfo.cs">
+      <Link>ApiClient\ServerUserInfo.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\ApiClient\SessionUpdatesEventArgs.cs">
       <Link>ApiClient\SessionUpdatesEventArgs.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
index 0c5946d12..31d2e6470 100644
--- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
+++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
@@ -87,6 +87,9 @@
     <Compile Include="..\MediaBrowser.Model\ApiClient\ServerInfo.cs">
       <Link>ApiClient\ServerInfo.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\ApiClient\ServerUserInfo.cs">
+      <Link>ApiClient\ServerUserInfo.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\ApiClient\SessionUpdatesEventArgs.cs">
       <Link>ApiClient\SessionUpdatesEventArgs.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model/ApiClient/ConnectionResult.cs b/MediaBrowser.Model/ApiClient/ConnectionResult.cs
index 12a80ee15..32a80d1a3 100644
--- a/MediaBrowser.Model/ApiClient/ConnectionResult.cs
+++ b/MediaBrowser.Model/ApiClient/ConnectionResult.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Model.Connect;
+using MediaBrowser.Model.Dto;
 using System.Collections.Generic;
 
 namespace MediaBrowser.Model.ApiClient
@@ -9,6 +10,7 @@ namespace MediaBrowser.Model.ApiClient
         public List<ServerInfo> Servers { get; set; }
         public IApiClient ApiClient { get; set; }
         public ConnectUser ConnectUser { get; set; }
+        public UserDto OfflineUser { get; set; }
 
         public ConnectionResult()
         {
diff --git a/MediaBrowser.Model/ApiClient/ConnectionState.cs b/MediaBrowser.Model/ApiClient/ConnectionState.cs
index 5e47d688e..9b753c7bb 100644
--- a/MediaBrowser.Model/ApiClient/ConnectionState.cs
+++ b/MediaBrowser.Model/ApiClient/ConnectionState.cs
@@ -6,6 +6,8 @@ namespace MediaBrowser.Model.ApiClient
         ServerSignIn = 2,
         SignedIn = 3,
         ServerSelection = 4,
-        ConnectSignIn = 5
+        ConnectSignIn = 5,
+        OfflineSignIn = 6,
+        OfflineSignedIn = 7
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index 0e69bb91f..bcd1dfe12 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -557,6 +557,13 @@ namespace MediaBrowser.Model.ApiClient
         /// <exception cref="ArgumentNullException">id</exception>
         Task<UserDto> GetUserAsync(string id);
 
+        /// <summary>
+        /// Gets the offline user asynchronous.
+        /// </summary>
+        /// <param name="id">The identifier.</param>
+        /// <returns>Task&lt;UserDto&gt;.</returns>
+        Task<UserDto> GetOfflineUserAsync(string id);
+        
         /// <summary>
         /// Gets the parental ratings async.
         /// </summary>
diff --git a/MediaBrowser.Model/ApiClient/IConnectionManager.cs b/MediaBrowser.Model/ApiClient/IConnectionManager.cs
index a54c330ac..658c71ac5 100644
--- a/MediaBrowser.Model/ApiClient/IConnectionManager.cs
+++ b/MediaBrowser.Model/ApiClient/IConnectionManager.cs
@@ -136,5 +136,14 @@ namespace MediaBrowser.Model.ApiClient
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
         Task<List<ServerInfo>> GetAvailableServers(CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Authenticates an offline user with their password
+        /// </summary>
+        /// <param name="user">The user.</param>
+        /// <param name="password">The password.</param>
+        /// <param name="rememberCredentials">if set to <c>true</c> [remember credentials].</param>
+        /// <returns>Task.</returns>
+        Task AuthenticateOffline(UserDto user, string password, bool rememberCredentials);
     }
 }
diff --git a/MediaBrowser.Model/ApiClient/ServerCredentials.cs b/MediaBrowser.Model/ApiClient/ServerCredentials.cs
index fbbc6c05d..b5f38f4db 100644
--- a/MediaBrowser.Model/ApiClient/ServerCredentials.cs
+++ b/MediaBrowser.Model/ApiClient/ServerCredentials.cs
@@ -70,6 +70,10 @@ namespace MediaBrowser.Model.ApiClient
                 {
                     existing.LastConnectionMode = server.LastConnectionMode;
                 }
+                foreach (ServerUserInfo user in server.Users)
+                {
+                    existing.AddOrUpdate(user);
+                }
             }
             else
             {
diff --git a/MediaBrowser.Model/ApiClient/ServerInfo.cs b/MediaBrowser.Model/ApiClient/ServerInfo.cs
index 46cc560af..2faa5b407 100644
--- a/MediaBrowser.Model/ApiClient/ServerInfo.cs
+++ b/MediaBrowser.Model/ApiClient/ServerInfo.cs
@@ -1,12 +1,16 @@
 using MediaBrowser.Model.Connect;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.System;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace MediaBrowser.Model.ApiClient
 {
     public class ServerInfo
     {
+        public List<ServerUserInfo> Users { get; set; }
+        
         public String Name { get; set; }
         public String Id { get; set; }
         public String LocalAddress { get; set; }
@@ -23,6 +27,7 @@ namespace MediaBrowser.Model.ApiClient
         public ServerInfo()
         {
             WakeOnLanInfos = new List<WakeOnLanInfo>();
+            Users = new List<ServerUserInfo>();
         }
 
         public void ImportInfo(PublicSystemInfo systemInfo)
@@ -70,5 +75,48 @@ namespace MediaBrowser.Model.ApiClient
                     throw new ArgumentException("Unexpected ConnectionMode");
             }
         }
+
+        public void AddOrUpdate(ServerUserInfo user)
+        {
+            if (user == null)
+            {
+                throw new ArgumentNullException("user");
+            }
+
+            var list = Users.ToList();
+
+            var index = FindIndex(list, user.Id);
+
+            if (index != -1)
+            {
+                var existing = list[index];
+
+                // Merge the data
+                existing.IsOffline = user.IsOffline;
+            }
+            else
+            {
+                list.Add(user);
+            }
+
+            Users = list;
+        }
+
+        private int FindIndex(List<ServerUserInfo> users, string id)
+        {
+            var index = 0;
+
+            foreach (var user in users)
+            {
+                if (StringHelper.Equals(id, user.Id))
+                {
+                    return index;
+                }
+
+                index++;
+            }
+
+            return -1;
+        }
     }
 }
diff --git a/MediaBrowser.Model/ApiClient/ServerUserInfo.cs b/MediaBrowser.Model/ApiClient/ServerUserInfo.cs
new file mode 100644
index 000000000..43186c86d
--- /dev/null
+++ b/MediaBrowser.Model/ApiClient/ServerUserInfo.cs
@@ -0,0 +1,9 @@
+
+namespace MediaBrowser.Model.ApiClient
+{
+    public class ServerUserInfo
+    {
+        public string Id { get; set; }
+        public bool IsOffline { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Dto/UserDto.cs b/MediaBrowser.Model/Dto/UserDto.cs
index 3e2d869d6..22428fadd 100644
--- a/MediaBrowser.Model/Dto/UserDto.cs
+++ b/MediaBrowser.Model/Dto/UserDto.cs
@@ -48,7 +48,13 @@ namespace MediaBrowser.Model.Dto
         /// </summary>
         /// <value>The id.</value>
         public string Id { get; set; }
-
+        
+        /// <summary>
+        /// Gets or sets the offline password.
+        /// </summary>
+        /// <value>The offline password.</value>
+        public string OfflinePassword { get; set; }
+        
         /// <summary>
         /// Gets or sets the primary image tag.
         /// </summary>
@@ -108,7 +114,7 @@ namespace MediaBrowser.Model.Dto
         /// </summary>
         /// <value>The original primary image aspect ratio.</value>
         public double? OriginalPrimaryImageAspectRatio { get; set; }
-        
+
         /// <summary>
         /// Gets a value indicating whether this instance has primary image.
         /// </summary>
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index bad17abae..0962cbe7a 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -76,6 +76,7 @@
     <Compile Include="ApiClient\ServerCredentials.cs" />
     <Compile Include="ApiClient\ServerDiscoveryInfo.cs" />
     <Compile Include="ApiClient\ServerInfo.cs" />
+    <Compile Include="ApiClient\ServerUserInfo.cs" />
     <Compile Include="ApiClient\SessionUpdatesEventArgs.cs" />
     <Compile Include="ApiClient\WakeOnLanInfo.cs" />
     <Compile Include="Branding\BrandingOptions.cs" />
diff --git a/MediaBrowser.Model/Session/ClientCapabilities.cs b/MediaBrowser.Model/Session/ClientCapabilities.cs
index 6c1b6e8b2..6ca4507c0 100644
--- a/MediaBrowser.Model/Session/ClientCapabilities.cs
+++ b/MediaBrowser.Model/Session/ClientCapabilities.cs
@@ -16,6 +16,7 @@ namespace MediaBrowser.Model.Session
         public bool SupportsContentUploading { get; set; }
         public bool SupportsPersistentIdentifier { get; set; }
         public bool SupportsSync { get; set; }
+        public bool SupportsOfflineAccess { get; set; }
 
         public DeviceProfile DeviceProfile { get; set; }
 
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index a001b25b6..09f060a46 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -402,6 +402,19 @@ namespace MediaBrowser.Server.Implementations.Library
             return dto;
         }
 
+        public UserDto GetOfflineUserDto(User user, string deviceId)
+        {
+            var dto = GetUserDto(user);
+
+            var offlinePasswordHash = GetLocalPasswordHash(user);
+            dto.HasPassword = !IsPasswordEmpty(offlinePasswordHash);
+
+            // Hash the pin with the device Id to create a unique result for this device
+            dto.OfflinePassword = GetSha1String(offlinePasswordHash + deviceId);
+
+            return dto;
+        }
+
         private string GetImageCacheTag(BaseItem item, ItemImageInfo image)
         {
             try
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json
index 741174d91..2fd96dd0d 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "\u0647\u0644 \u0627\u0646\u062a \u0645\u062a\u0627\u0643\u062f \u0645\u0646 \u0627\u0646\u0643 \u062a\u0631\u064a\u062f \u062d\u0630\u0641 \u0647\u0630\u0627 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 \u061f",
     "PasswordResetHeader": "\u0627\u0639\u0627\u062f\u0629 \u062a\u0639\u064a\u064a\u0646 \u0643\u0644\u0645\u0629 \u0627\u0644\u0633\u0631",
     "PasswordResetComplete": "\u0644\u0642\u062f \u062a\u0645 \u0627\u0639\u0627\u062f\u0629 \u062a\u0639\u064a\u064a\u0646 \u0643\u0644\u0645\u0629 \u0627\u0644\u0633\u0631.",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "\u0647\u0644 \u0627\u0646\u062a \u0645\u062a\u0627\u0643\u062f \u0645\u0646 \u0627\u0646\u0643 \u062a\u0631\u064a\u062f \u0627\u0639\u0627\u062f\u0629 \u062a\u0639\u064a\u064a\u0646 \u0643\u0644\u0645\u0629 \u0627\u0644\u0633\u0631\u061f",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "\u062a\u0645 \u062d\u0641\u0638 \u0643\u0644\u0645\u0629 \u0627\u0644\u0633\u0631.",
     "PasswordMatchError": "\u0643\u0644\u0645\u0629 \u0627\u0644\u0633\u0631 \u0648\u062a\u0627\u0643\u064a\u062f\u0647\u0627 \u064a\u062c\u0628 \u0627\u0646 \u064a\u062a\u0637\u0627\u0628\u0642\u0627\u0646.",
     "OptionRelease": "\u0627\u0644\u0627\u0635\u062f\u0627\u0631 \u0627\u0644\u0631\u0633\u0645\u0649",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/bg_BG.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/bg_BG.json
index 1bbbe8510..e373d1716 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/bg_BG.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/bg_BG.json
@@ -14,9 +14,12 @@
     "FileReadError": "An error occurred while reading the file.",
     "DeleteUser": "Delete User",
     "DeleteUserConfirmation": "Are you sure you wish to delete this user?",
-    "PasswordResetHeader": "Password Reset",
+    "PasswordResetHeader": "Reset Password",
     "PasswordResetComplete": "The password has been reset.",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "Are you sure you wish to reset the password?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "Password saved.",
     "PasswordMatchError": "Password and password confirmation must match.",
     "OptionRelease": "\u041e\u0444\u0438\u0446\u0438\u0430\u043b\u043d\u043e \u0438\u0437\u0434\u0430\u043d\u0438\u0435",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/ca.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/ca.json
index 5c3299fbc..16b73f46c 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ca.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ca.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "Are you sure you wish to delete this user?",
     "PasswordResetHeader": "Restablir contrasenya",
     "PasswordResetComplete": "La contrasenya s'ha restablert.",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "Esteu segur que voleu restablir la contrasenya?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "S'ha guardat la contrasenya.",
     "PasswordMatchError": "Confirmaci\u00f3 de la contrasenya i la contrasenya han de coincidir.",
     "OptionRelease": "Versi\u00f3 Oficial",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/cs.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/cs.json
index 9e73ee241..8473145e6 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/cs.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/cs.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "Are you sure you wish to delete this user?",
     "PasswordResetHeader": "Obnovit heslo",
     "PasswordResetComplete": "Heslo bylo obnoveno.",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "Jste si jisti, \u017ee chcete obnovit heslo?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "Heslo ulo\u017eeno.",
     "PasswordMatchError": "Heslo a potvrzen\u00ed hesla mus\u00ed souhlasit.",
     "OptionRelease": "Ofici\u00e1ln\u00ed vyd\u00e1n\u00ed",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/da.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/da.json
index cfeb5e3d0..5acae8560 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/da.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/da.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "Er du sikker p\u00e5 du \u00f8nsker at slette denne bruger?",
     "PasswordResetHeader": "Nulstil kode",
     "PasswordResetComplete": "Koden er blevet nulstillet",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "Er du sikker p\u00e5 at koden skal nulstilles",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "Koden er gemt",
     "PasswordMatchError": "Kode og kode bekr\u00e6ftelse skal v\u00e6re ens.",
     "OptionRelease": "Officiel Udgivelse",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
index 600dc19e5..f06e6fe7b 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "M\u00f6chtest du {0} wirklich l\u00f6schen?",
     "PasswordResetHeader": "Passwort zur\u00fccksetzen",
     "PasswordResetComplete": "Das Passwort wurde zur\u00fcckgesetzt.",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "M\u00f6chtest du das Passwort wirklich zur\u00fccksetzen?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "Passwort gespeichert",
     "PasswordMatchError": "Die Passw\u00f6rter m\u00fcssen \u00fcbereinstimmen.",
     "OptionRelease": "Offizielles Release",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/el.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/el.json
index ae87f2a82..e8426614b 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/el.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/el.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "Are you sure you wish to delete this user?",
     "PasswordResetHeader": "\u0395\u03c0\u03b1\u03bd\u03b1\u03c6\u03bf\u03c1\u03ac \u03ba\u03c9\u03b4\u03b9\u03ba\u03bf\u03cd \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7\u03c2",
     "PasswordResetComplete": "\u039f \u03ba\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7\u03c2 \u03ad\u03c7\u03b5\u03b9 \u03b3\u03af\u03bd\u03b5\u03b9 \u03b5\u03c0\u03b1\u03bd\u03b1\u03c6\u03bf\u03c1\u03ac",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "\u0395\u03af\u03c3\u03c4\u03b5 \u03c3\u03af\u03b3\u03bf\u03c5\u03c1\u03bf\u03b9 \u03cc\u03c4\u03b9 \u03b8\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03b5\u03c0\u03b1\u03bd\u03b1\u03c6\u03ad\u03c1\u03b5\u03c4\u03b5 \u03c4\u03bf\u03bd \u03ba\u03c9\u03b4\u03b9\u03ba\u03cc \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7\u03c2;",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "\u039f \u03ba\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7\u03c2 \u03b1\u03c0\u03bf\u03b8\u03b7\u03ba\u03b5\u03cd\u03c4\u03b7\u03ba\u03b5",
     "PasswordMatchError": "\u039f \u03ba\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7\u03c2 \u03ba\u03b1\u03b9 \u03c4\u03bf\u03bd \u03ba\u03c9\u03b4\u03b9\u03ba\u03cc \u03b5\u03c0\u03b9\u03b2\u03b5\u03b2\u03b1\u03af\u03c9\u03c3\u03b7\u03c2 \u03c0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03c4\u03b1\u03b9\u03c1\u03b9\u03ac\u03b6\u03bf\u03c5\u03bd",
     "OptionRelease": "\u0397 \u03b5\u03c0\u03af\u03c3\u03b7\u03bc\u03b7 \u03ad\u03ba\u03b4\u03bf\u03c3\u03b7",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_GB.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_GB.json
index ad3543c32..8f5b55554 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_GB.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_GB.json
@@ -14,9 +14,12 @@
     "FileReadError": "An error occurred while reading the file.",
     "DeleteUser": "Delete User",
     "DeleteUserConfirmation": "Are you sure you wish to delete this user?",
-    "PasswordResetHeader": "Password Reset",
+    "PasswordResetHeader": "Reset Password",
     "PasswordResetComplete": "The password has been reset.",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "Are you sure you wish to reset the password?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "Password saved.",
     "PasswordMatchError": "Password and password confirmation must match.",
     "OptionRelease": "Official Release",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
index e39a5d9c2..6e884ec40 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
@@ -14,9 +14,12 @@
     "FileReadError": "An error occurred while reading the file.",
     "DeleteUser": "Delete User",
     "DeleteUserConfirmation": "Are you sure you wish to delete this user?",
-    "PasswordResetHeader": "Password Reset",
+    "PasswordResetHeader": "Reset Password",
     "PasswordResetComplete": "The password has been reset.",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "Are you sure you wish to reset the password?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "Password saved.",
     "PasswordMatchError": "Password and password confirmation must match.",
     "OptionRelease": "Official Release",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json
index 5355048b0..501d66e5b 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "Are you sure you wish to delete this user?",
     "PasswordResetHeader": "Restablecer contrase\u00f1a",
     "PasswordResetComplete": "La contrase\u00f1a se ha restablecido.",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "Esta seguro que desea restablecer la contrase\u00f1a?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "Contrase\u00f1a guardada.",
     "PasswordMatchError": "La contrase\u00f1a y la confirmaci\u00f3n de la contrase\u00f1a deben de ser iguales.",
     "OptionRelease": "Release Oficial",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json
index d0222ff16..d365a2c76 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "\u00bfEst\u00e1 seguro de querer eliminar este usuario?",
     "PasswordResetHeader": "Restablecer Contrase\u00f1a",
     "PasswordResetComplete": "La contrase\u00f1a ha sido restablecida.",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "\u00bfEst\u00e1 seguro de querer restablecer la contrase\u00f1a?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "Contrase\u00f1a guardada.",
     "PasswordMatchError": "La Contrase\u00f1a y la confirmaci\u00f3n de la contrase\u00f1a deben coincidir.",
     "OptionRelease": "Versi\u00f3n Oficial",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/fi.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/fi.json
index 9f8340f9b..83069c29e 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/fi.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/fi.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "Oletko varma ett\u00e4 haluat poistaa t\u00e4m\u00e4n k\u00e4ytt\u00e4j\u00e4n?",
     "PasswordResetHeader": "Salasanan Palautus",
     "PasswordResetComplete": "Salasana on palauttettu.",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "Oletko varma, ett\u00e4 haluat palauttaa salasanan?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "Salasana tallennettu.",
     "PasswordMatchError": "Salasana ja salasanan vahvistuksen pit\u00e4\u00e4 olla samat.",
     "OptionRelease": "Virallinen Julkaisu",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
index 1063d8759..074cd146d 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "\u00cates-vous s\u00fbr de vouloir supprimer cet utilisateur?",
     "PasswordResetHeader": "R\u00e9initialisation du mot de passe",
     "PasswordResetComplete": "Le mot de passe a \u00e9t\u00e9 r\u00e9initialis\u00e9.",
+    "PinCodeResetComplete": "Le code Easy Pin a \u00e9t\u00e9 r\u00e9initialis\u00e9.",
     "PasswordResetConfirmation": "\u00cates-vous s\u00fbr de vouloir r\u00e9initialiser le mot de passe?",
+    "PinCodeResetConfirmation": "Etes-vous s\u00fbr de vouloir r\u00e9initialiser le code pin ?",
+    "HeaderPinCodeReset": "R\u00e9initialiser le code Pin",
     "PasswordSaved": "Mot de passe sauvegard\u00e9.",
     "PasswordMatchError": "Le mot de passe et sa confirmation doivent correspondre.",
     "OptionRelease": "Version officielle",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/he.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/he.json
index 8233ee705..30272ddcf 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/he.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/he.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "Are you sure you wish to delete this user?",
     "PasswordResetHeader": "\u05d0\u05d9\u05e4\u05d5\u05e1 \u05e1\u05d9\u05e1\u05de\u05d0",
     "PasswordResetComplete": "\u05d4\u05e1\u05d9\u05e1\u05de\u05d0 \u05d0\u05d5\u05e4\u05e1\u05d4.",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "\u05d4\u05d0\u05dd \u05d0\u05ea\u05d4 \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05d0\u05e4\u05e1 \u05d0\u05ea \u05d4\u05e1\u05d9\u05e1\u05de\u05d0?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "\u05d4\u05e1\u05d9\u05e1\u05de\u05d0 \u05e0\u05e9\u05de\u05e8\u05d4.",
     "PasswordMatchError": "\u05d4\u05e1\u05d9\u05e1\u05de\u05d0 \u05d5\u05d0\u05d9\u05de\u05d5\u05ea \u05d4\u05e1\u05d9\u05e1\u05de\u05d0 \u05e6\u05e8\u05d9\u05db\u05d5\u05ea \u05dc\u05d4\u05d9\u05d5\u05ea \u05d6\u05d4\u05d5\u05ea.",
     "OptionRelease": "\u05e9\u05d9\u05d7\u05e8\u05d5\u05e8 \u05e8\u05e9\u05de\u05d9",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/hr.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/hr.json
index af21fd7a8..de3050845 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/hr.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/hr.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "Da li ste sigurni da \u017eelite izbrisati odabranog korisnika?",
     "PasswordResetHeader": "Resetiraj lozinku",
     "PasswordResetComplete": "Lozinka je resetirana.",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "Da li ste sigurni da \u017eelite resetirati lozinku?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "Lozinka snimljena.",
     "PasswordMatchError": "Lozinka i lozinka potvrde moraju biti identi\u010dne.",
     "OptionRelease": "Slu\u017ebeno izdanje",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/it.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/it.json
index 671992034..4d85f6e34 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/it.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/it.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "Sei sicuro di voler eliminare questo utente",
     "PasswordResetHeader": "Ripristina Password",
     "PasswordResetComplete": "la password \u00e8 stata ripristinata.",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "Sei sicuro di voler ripristinare la password?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "Password salvata.",
     "PasswordMatchError": "Le password non coincidono.",
     "OptionRelease": "Versione Ufficiale",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
index d3f64ca50..fd71dfebf 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "\u0428\u044b\u043d\u044b\u043c\u0435\u043d \u043e\u0441\u044b \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u043d\u044b \u0436\u043e\u044e \u049b\u0430\u0436\u0435\u0442 \u043f\u0435?",
     "PasswordResetHeader": "\u049a\u04b1\u043f\u0438\u044f \u0441\u04e9\u0437\u0434\u0456 \u044b\u0441\u044b\u0440\u0443",
     "PasswordResetComplete": "\u049a\u04b1\u043f\u0438\u044f \u0441\u04e9\u0437 \u044b\u0441\u044b\u0440\u044b\u043b\u0434\u044b.",
+    "PinCodeResetComplete": "PIN-\u043a\u043e\u0434 \u044b\u0441\u044b\u0440\u044b\u043b\u0434\u044b",
     "PasswordResetConfirmation": "\u0428\u044b\u043d\u044b\u043c\u0435\u043d \u049b\u04b1\u043f\u0438\u044f \u0441\u04e9\u0437\u0434\u0456 \u044b\u0441\u044b\u0440\u0443 \u049b\u0430\u0436\u0435\u0442 \u043f\u0435?",
+    "PinCodeResetConfirmation": "\u0428\u044b\u043d\u044b\u043c\u0435\u043d PIN-\u043a\u043e\u0434\u0442\u044b \u044b\u0441\u044b\u0440\u0443 \u049b\u0430\u0436\u0435\u0442 \u043f\u0435?",
+    "HeaderPinCodeReset": "PIN-\u043a\u043e\u0434\u0442\u044b \u044b\u0441\u044b\u0440\u0443",
     "PasswordSaved": "\u049a\u04b1\u043f\u0438\u044f \u0441\u04e9\u0437 \u0441\u0430\u049b\u0442\u0430\u043b\u0434\u044b.",
     "PasswordMatchError": "\u049a\u04b1\u043f\u0438\u044f \u0441\u04e9\u0437\u0456 \u043c\u0435\u043d \u049a\u04b1\u043f\u0438\u044f \u0441\u04e9\u0437\u0434\u0456 \u0440\u0430\u0441\u0442\u0430\u0443 \u04e9\u0440\u0456\u0441\u0442\u0435\u0440\u0456 \u0441\u04d9\u0439\u043a\u0435\u0441 \u0431\u043e\u043b\u0443 \u043a\u0435\u0440\u0435\u043a.",
     "OptionRelease": "\u0420\u0435\u0441\u043c\u0438 \u0448\u044b\u0493\u0430\u0440\u044b\u043b\u044b\u043c",
@@ -631,7 +634,7 @@
     "WebClientTourMobile2": "\u0441\u043e\u043d\u044b\u043c\u0435\u043d \u049b\u0430\u0442\u0430\u0440 \u0431\u0430\u0441\u049b\u0430 \u049b\u04b1\u0440\u044b\u043b\u0493\u044b\u043b\u0430\u0440\u0434\u044b \u0436\u04d9\u043d\u0435 Media Browser \u049b\u043e\u043b\u0434\u0430\u043d\u0431\u0430\u043b\u0430\u0440\u044b\u043d \u0431\u0430\u0441\u049b\u0430\u0440\u0430\u0434\u044b",
     "MessageEnjoyYourStay": "\u0416\u0430\u0493\u044b\u043c\u0434\u044b \u0442\u0430\u043c\u0430\u0448\u0430\u043b\u0430\u04a3\u044b\u0437",
     "DashboardTourDashboard": "\u0421\u0435\u0440\u0432\u0435\u0440\u0434\u0456\u04a3 \u0431\u0430\u049b\u044b\u043b\u0430\u0443 \u0442\u0430\u049b\u0442\u0430\u0441\u044b \u0441\u0435\u0440\u0432\u0435\u0440\u0434\u0456 \u0436\u04d9\u043d\u0435 \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u043b\u0430\u0440\u0434\u044b \u0431\u0430\u049b\u044b\u043b\u0430\u0443\u044b \u043c\u04af\u043c\u043a\u0456\u043d\u0434\u0456\u0433\u0456\u043d\u0435 \u0440\u04b1\u049b\u0441\u0430\u0442 \u0435\u0442\u0435\u0434\u0456. \u041a\u0456\u043c \u043d\u0435 \u0456\u0441\u0442\u0435\u0433\u0435\u043d\u0456\u043d \u0436\u04d9\u043d\u0435 \u049b\u0430\u0439\u0434\u0430 \u0442\u04b1\u0440\u0493\u0430\u043d\u044b\u043d \u0431\u0456\u043b\u0456\u043f \u0436\u0430\u0442\u0430\u0441\u044b\u0437.",
-    "DashboardTourHelp": "\u042d\u043a\u0440\u0430\u043d\u0434\u0430\u0493\u044b \u043c\u0430\u0437\u043c\u04b1\u043d\u0493\u0430 \u049b\u0430\u0442\u044b\u0441\u0442\u044b \u0443\u0438\u043a\u0438 \u0431\u0435\u0442\u0442\u0435\u0440\u0456\u043d \u0430\u0448\u0443 \u04af\u0448\u0456\u043d \u0456\u0448\u043a\u0456 \u0430\u043d\u044b\u049b\u0442\u0430\u043c\u0430 \u043e\u04a3\u0430\u0439 \u0442\u04af\u0439\u043c\u0435\u0448\u0456\u043a\u0442\u0435\u0440\u0434\u0456 \u049b\u0430\u043c\u0442\u0430\u043c\u0430\u0441\u044b\u0437 \u0435\u0442\u0435\u0434\u0456.",
+    "DashboardTourHelp": "\u042d\u043a\u0440\u0430\u043d\u0434\u0430\u0493\u044b \u043c\u0430\u0437\u043c\u04b1\u043d\u0493\u0430 \u049b\u0430\u0442\u044b\u0441\u0442\u044b \u0443\u0438\u043a\u0438 \u0431\u0435\u0442\u0442\u0435\u0440\u0456\u043d \u043e\u04a3\u0430\u0439\u0442\u044b\u043b\u044b\u043f \u0430\u0448\u0443 \u04af\u0448\u0456\u043d \u0456\u0448\u043a\u0456 \u0430\u043d\u044b\u049b\u0442\u0430\u043c\u0430 \u0442\u04af\u0439\u043c\u0435\u0448\u0456\u043a\u0442\u0435\u0440\u0456\u043d \u049b\u0430\u043c\u0442\u0430\u043c\u0430\u0441\u044b\u0437 \u0435\u0442\u0435\u0434\u0456. ",
     "DashboardTourUsers": "\u0414\u043e\u0441\u0442\u0430\u0440\u044b\u04a3\u044b\u0437 \u0431\u0435\u043d \u043e\u0442\u0431\u0430\u0441\u044b\u04a3\u044b\u0437 \u04d9\u0440\u049b\u0430\u0439\u0441\u044b\u043d\u0430 \u04e9\u0437\u0456\u043d\u0456\u04a3 \u049b\u04b1\u049b\u044b\u049b\u0442\u0430\u0440\u044b, \u0442\u0430\u0441\u0443\u0448\u044b\u0445\u0430\u043d\u0430 \u049b\u0430\u0442\u044b\u043d\u0430\u0441\u0443\u044b, \u043c\u0430\u0437\u043c\u04b1\u043d \u0431\u0430\u0441\u049b\u0430\u0440\u0443\u044b \u0436\u04d9\u043d\u0435 \u0442.\u0431. \u0431\u0430\u0440 \u0442\u0456\u0440\u043a\u0435\u043b\u0433\u0456\u043b\u0435\u0440\u0456\u043d \u0436\u0435\u04a3\u0456\u043b \u0436\u0430\u0441\u0430\u04a3\u044b\u0437.",
     "DashboardTourCinemaMode": "\u041a\u0438\u043d\u043e\u0442\u0435\u0430\u0442\u0440 \u0440\u0435\u0436\u0456\u043c\u0456 \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440\u0434\u0456 \u0436\u04d9\u043d\u0435 \u0442\u0435\u04a3\u0448\u0435\u043b\u0433\u0435\u043d \u043a\u04e9\u0440\u043d\u0435\u0443\u0434\u0456 \u0431\u0430\u0441\u0442\u044b \u0435\u0440\u0435\u043a\u0448\u0435\u043b\u0456\u043a\u0442\u0456\u04a3 \u0430\u043b\u0434\u044b\u043d\u0434\u0430 \u043e\u0439\u043d\u0430\u0442\u0443 \u049b\u0430\u0431\u0456\u043b\u0435\u0442\u0456\u043c\u0435\u043d \u043a\u0438\u043d\u043e \u043a\u04e9\u0440\u0441\u0435\u0442\u0435\u0442\u0456\u043d \u0437\u0430\u043b \u04d9\u0441\u0435\u0440\u0456\u043d \u049b\u043e\u043d\u0430\u049b\u0436\u0430\u0439\u044b\u04a3\u044b\u0437\u0493\u0430 \u0442\u0456\u043a\u0435\u043b\u0435\u0439 \u0436\u0435\u0442\u043a\u0456\u0437\u0435\u0434\u0456.",
     "DashboardTourChapters": "\u0411\u0435\u0439\u043d\u0435\u043b\u0435\u0440\u0434\u0456 \u049b\u0430\u0440\u0430\u0493\u0430\u043d \u043a\u0435\u0437\u0434\u0435 \u04b1\u043d\u0430\u043c\u0434\u044b\u043b\u0430\u0443 \u043a\u04e9\u0440\u0441\u0435\u0442\u0456\u043c \u04af\u0448\u0456\u043d \u0441\u0430\u0445\u043d\u0430 \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440\u0456\u043d \u0442\u0443\u0434\u044b\u0440\u0443\u044b\u043d \u049b\u043e\u0441\u044b\u04a3\u044b\u0437.",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/ms.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/ms.json
index 932d37fe0..e16b6c492 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ms.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ms.json
@@ -14,9 +14,12 @@
     "FileReadError": "An error occurred while reading the file.",
     "DeleteUser": "Delete User",
     "DeleteUserConfirmation": "Are you sure you wish to delete this user?",
-    "PasswordResetHeader": "Password Reset",
+    "PasswordResetHeader": "Reset Password",
     "PasswordResetComplete": "The password has been reset.",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "Are you sure you wish to reset the password?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "Password saved.",
     "PasswordMatchError": "Password and password confirmation must match.",
     "OptionRelease": "Official Release",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/nb.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/nb.json
index 2b6a9a67b..4604f8d57 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/nb.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/nb.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "Er du sikker p\u00e5 at du vil slette denne brukeren?",
     "PasswordResetHeader": "Resett passord",
     "PasswordResetComplete": "Passordet har blitt resatt",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "Er du sikker p\u00e5 at du vil resette passordet?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "Passord lagret",
     "PasswordMatchError": "Passord og passord-verifiseringen m\u00e5 matche",
     "OptionRelease": "Offisiell utgivelse",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
index 5a59c1c0c..1594dd761 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "Weet u zeker dat u deze gebruiker wilt verwijderen?",
     "PasswordResetHeader": "Wachtwoord opnieuw instellen",
     "PasswordResetComplete": "Het wachtwoord is opnieuw ingesteld.",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "Weet u zeker dat u het wachtwoord opnieuw in wilt stellen?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "Wachtwoord opgeslagen.",
     "PasswordMatchError": "Wachtwoord en wachtwoord bevestiging moeten hetzelfde zijn.",
     "OptionRelease": "Offici\u00eble Release",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/pl.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/pl.json
index 1e8b9aed5..0b252a4fd 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pl.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pl.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "Czy na pewno chcesz skasowa\u0107 tego u\u017cytkownika?",
     "PasswordResetHeader": "Zresetuj has\u0142o",
     "PasswordResetComplete": "Has\u0142o zosta\u0142o zresetowane.",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "Jeste\u015b pewien \u017ce chcesz zresetowa\u0107 has\u0142o?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "Has\u0142o zapisane.",
     "PasswordMatchError": "Has\u0142o i potwierdzenie has\u0142a musz\u0105 si\u0119 zgadza\u0107.",
     "OptionRelease": "Oficjalne wydanie",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json
index 0ffac1450..5a3e564e4 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "Deseja realmente excluir este usu\u00e1rio?",
     "PasswordResetHeader": "Redefinir Senha",
     "PasswordResetComplete": "A senha foi redefinida.",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "Deseja realmente redefinir a senha?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "Senha salva.",
     "PasswordMatchError": "A senha e a confirma\u00e7\u00e3o da senha devem ser iguais.",
     "OptionRelease": "Lan\u00e7amento Oficial",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
index 2c5786f09..600f1f902 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "Tem a certeza que deseja apagar este utilizador?",
     "PasswordResetHeader": "Redefinir Senha",
     "PasswordResetComplete": "A senha foi redefinida.",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "Tem a certeza que deseja redefinir a senha?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "Senha guardada.",
     "PasswordMatchError": "A senha e a confirma\u00e7\u00e3o da senha devem coincidir.",
     "OptionRelease": "Lan\u00e7amento Oficial",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
index 6ee54c8a4..dd136ff8a 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "\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 \u044d\u0442\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f?",
     "PasswordResetHeader": "\u0421\u0431\u0440\u043e\u0441 \u043f\u0430\u0440\u043e\u043b\u044f",
     "PasswordResetComplete": "\u041f\u0430\u0440\u043e\u043b\u044c \u0431\u044b\u043b \u0441\u0431\u0440\u043e\u0448\u0435\u043d.",
+    "PinCodeResetComplete": "PIN-\u043a\u043e\u0434 \u0431\u044b\u043b \u0441\u0431\u0440\u043e\u0448\u0435\u043d.",
     "PasswordResetConfirmation": "\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0441\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c?",
+    "PinCodeResetConfirmation": "\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0441\u0431\u0440\u043e\u0441\u0438\u0442\u044c PIN-\u043a\u043e\u0434?",
+    "HeaderPinCodeReset": "\u0421\u0431\u0440\u043e\u0441 PIN-\u043a\u043e\u0434\u0430",
     "PasswordSaved": "\u041f\u0430\u0440\u043e\u043b\u044c \u0431\u044b\u043b \u0441\u043e\u0445\u0440\u0430\u043d\u0451\u043d.",
     "PasswordMatchError": "\u041f\u0430\u0440\u043e\u043b\u044c \u0438 \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u043f\u0430\u0440\u043e\u043b\u044f \u0434\u043e\u043b\u0436\u043d\u044b \u0441\u043e\u0432\u043f\u0430\u0434\u0430\u0442\u044c",
     "OptionRelease": "\u041e\u0444\u0438\u0446\u0438\u0430\u043b\u044c\u043d\u044b\u0439 \u0432\u044b\u043f\u0443\u0441\u043a",
@@ -250,7 +253,7 @@
     "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",
-    "HeaderName": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435",
+    "HeaderName": "\u0418\u043c\u044f (\u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435)",
     "HeaderAlbum": "\u0410\u043b\u044c\u0431\u043e\u043c",
     "HeaderAlbumArtist": "\u0410\u043b\u044c\u0431\u043e\u043c\u043d\u044b\u0439 \u0438\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c",
     "HeaderArtist": "\u0418\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c",
@@ -377,13 +380,13 @@
     "HeaderSpecials": "\u0421\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u043e\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",
+    "HeaderResolution": "\u0420\u0430\u0437\u0440-\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",
+    "HeaderRuntime": "\u0414\u043b\u0438\u0442-c\u0442\u044c",
+    "HeaderCommunityRating": "\u041e\u0431\u0449-\u0430\u044f \u043e\u0446\u0435\u043d\u043a\u0430",
+    "HeaderParentalRating": "\u0412\u043e\u0437\u0440-\u0430\u044f \u043a\u0430\u0442-\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",
+    "HeaderDateAdded": "\u0414\u0430\u0442\u0430 \u0434\u043e\u0431-\u0438\u044f",
     "HeaderSeries": "\u0421\u0435\u0440\u0438\u0430\u043b\u044b",
     "HeaderSeason": "\u0421\u0435\u0437\u043e\u043d",
     "HeaderSeasonNumber": "\u041d\u043e\u043c\u0435\u0440 \u0441\u0435\u0437\u043e\u043d\u0430",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/sv.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/sv.json
index fdc185a7f..3d2f9d088 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/sv.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/sv.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "\u00c4r du s\u00e4ker p\u00e5 att du vill radera denna anv\u00e4ndare?",
     "PasswordResetHeader": "\u00c5terst\u00e4ll l\u00f6senordet",
     "PasswordResetComplete": "L\u00f6senordet har \u00e5terst\u00e4llts.",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "\u00c4r du s\u00e4ker p\u00e5 att du vill \u00e5terst\u00e4lla l\u00f6senordet?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "L\u00f6senordet har sparats.",
     "PasswordMatchError": "L\u00f6senordet och bekr\u00e4ftelsen m\u00e5ste \u00f6verensst\u00e4mma.",
     "OptionRelease": "Officiell version",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/tr.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/tr.json
index d0bec1810..3b9a34fe3 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/tr.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/tr.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "Are you sure you wish to delete this user?",
     "PasswordResetHeader": "Sifre S\u0131f\u0131rland\u0131",
     "PasswordResetComplete": "Parolan\u0131z S\u0131f\u0131rlanm\u0131st\u0131r.",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "Sifrenizi S\u0131f\u0131rlamak \u0130stediginizden Eminmisiniz?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "Sifre Kaydedildi",
     "PasswordMatchError": "Parola ve Sifre Eslesmelidir.",
     "OptionRelease": "Resmi Yay\u0131n",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/uk.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/uk.json
index 5894f5c11..74286666d 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/uk.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/uk.json
@@ -14,9 +14,12 @@
     "FileReadError": "An error occurred while reading the file.",
     "DeleteUser": "Delete User",
     "DeleteUserConfirmation": "Are you sure you wish to delete this user?",
-    "PasswordResetHeader": "Password Reset",
+    "PasswordResetHeader": "Reset Password",
     "PasswordResetComplete": "The password has been reset.",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "Are you sure you wish to reset the password?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "Password saved.",
     "PasswordMatchError": "Password and password confirmation must match.",
     "OptionRelease": "Official Release",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/vi.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/vi.json
index 09a98cccf..532953082 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/vi.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/vi.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "Are you sure you wish to delete this user?",
     "PasswordResetHeader": "Reset M\u1eadt kh\u1ea9u",
     "PasswordResetComplete": "M\u1eadt kh\u1ea9u \u0111\u00e3 \u0111\u01b0\u1ee3c reset",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "B\u1ea1n c\u00f3 ch\u1eafc mu\u1ed1n reset m\u1eadt kh\u1ea9u?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "M\u1eadt kh\u1ea9u \u0111\u00e3 \u0111\u01b0\u1ee3c l\u01b0u.",
     "PasswordMatchError": "M\u1eadt kh\u1ea9u v\u00e0 m\u1eadt kh\u1ea9u x\u00e1c nh\u1eadn c\u1ea7n ph\u1ea3i kh\u1edbp nhau .",
     "OptionRelease": "Ph\u00e1t h\u00e0nh ch\u00ednh th\u1ee9c",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_CN.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_CN.json
index c853a83c3..4f5e4b3eb 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_CN.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_CN.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "\u4f60\u786e\u5b9a\u8981\u5220\u9664\u6b64\u7528\u6237\uff1f",
     "PasswordResetHeader": "\u5bc6\u7801\u91cd\u7f6e",
     "PasswordResetComplete": "\u5bc6\u7801\u5df2\u91cd\u7f6e",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "\u4f60\u786e\u5b9a\u8981\u91cd\u7f6e\u5bc6\u7801\uff1f",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "\u5bc6\u7801\u5df2\u4fdd\u5b58\u3002",
     "PasswordMatchError": "\u5bc6\u7801\u548c\u786e\u8ba4\u5bc6\u7801\u5fc5\u987b\u5339\u914d\u3002",
     "OptionRelease": "\u5b98\u65b9\u6b63\u5f0f\u7248",
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json
index ede237bf6..912e833d5 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json
@@ -16,7 +16,10 @@
     "DeleteUserConfirmation": "Are you sure you wish to delete this user?",
     "PasswordResetHeader": "\u91cd\u8a2d\u5bc6\u78bc",
     "PasswordResetComplete": "\u5bc6\u78bc\u5df2\u91cd\u8a2d",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "\u4f60\u78ba\u5b9a\u8981\u91cd\u8a2d\u5bc6\u78bc\uff1f",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "\u5bc6\u78bc\u5df2\u4fdd\u5b58\u3002",
     "PasswordMatchError": "\u5bc6\u78bc\u548c\u5bc6\u78bc\u78ba\u8a8d\u5fc5\u9808\u4e00\u81f4\u3002",
     "OptionRelease": "Official Release",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ar.json b/MediaBrowser.Server.Implementations/Localization/Server/ar.json
index 23d601b47..45ee5df06 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ar.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ar.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Paths",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1119,11 +1120,14 @@
     "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.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Password",
     "HeaderLocalAccess": "Local Access",
     "HeaderViewOrder": "View Order",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "LabelImageRefreshMode": "Image refresh mode:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/bg_BG.json b/MediaBrowser.Server.Implementations/Localization/Server/bg_BG.json
index 9ec39fb8a..6367a6bdc 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/bg_BG.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/bg_BG.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "\u0412\u0438\u0434\u0435\u043e",
     "HeaderPaths": "\u041f\u044a\u0442\u0438\u0449\u0430",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1119,11 +1120,14 @@
     "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.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Password",
     "HeaderLocalAccess": "Local Access",
     "HeaderViewOrder": "View Order",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "LabelImageRefreshMode": "Image refresh mode:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ca.json b/MediaBrowser.Server.Implementations/Localization/Server/ca.json
index a4d8caf82..e1bb9b5cc 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ca.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ca.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Paths",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1119,11 +1120,14 @@
     "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.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Password",
     "HeaderLocalAccess": "Local Access",
     "HeaderViewOrder": "View Order",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "LabelImageRefreshMode": "Image refresh mode:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/cs.json b/MediaBrowser.Server.Implementations/Localization/Server/cs.json
index e55db0322..7dada50ac 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/cs.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/cs.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Paths",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1119,11 +1120,14 @@
     "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.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Password",
     "HeaderLocalAccess": "Local Access",
     "HeaderViewOrder": "View Order",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "LabelImageRefreshMode": "Image refresh mode:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/da.json b/MediaBrowser.Server.Implementations/Localization/Server/da.json
index 5e11736ea..b35932f8e 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/da.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/da.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Paths",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1119,11 +1120,14 @@
     "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.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Password",
     "HeaderLocalAccess": "Local Access",
     "HeaderViewOrder": "View Order",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "LabelImageRefreshMode": "Image refresh mode:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/de.json b/MediaBrowser.Server.Implementations/Localization/Server/de.json
index e8ee154fc..dd05b519e 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/de.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/de.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Pfade",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Synchronisation ben\u00f6tigt eine Supporter-Mitgliedschaft",
     "HeaderEnjoyDayTrial": "Genie\u00dfen Sie eine 14 Tage Testversion",
@@ -1119,11 +1120,14 @@
     "LabelDisplayFoldersView": "Nutze die Verzeichnissansicht f\u00fcr die Darstellung der reinen Medienordner",
     "ViewTypeLiveTvRecordingGroups": "Aufnahmen",
     "ViewTypeLiveTvChannels": "Kan\u00e4le",
-    "LabelAllowLocalAccessWithoutPassword": "Erlaube lokalen Zugriff ohne Passwort",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "Fall aktiviert, wird kein Passwort f\u00fcr einen Zugriff innerhalb deines Heimnetzwerks ben\u00f6tigt.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Passwort",
     "HeaderLocalAccess": "Lokaler Zugriff",
     "HeaderViewOrder": "Reihenfolge f\u00fcr Ansichten",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "W\u00e4hle die Reihenfolge in der die Ansichten innerhalb von Media Browser Apps angezeigt werden.",
     "LabelMetadataRefreshMode": "Metadaten Aktualisierungsmethode:",
     "LabelImageRefreshMode": "Aktualisierungsmethode f\u00fcr Bilder:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/el.json b/MediaBrowser.Server.Implementations/Localization/Server/el.json
index f641d8a24..1d15d4bbf 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/el.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/el.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Paths",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1119,11 +1120,14 @@
     "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.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Password",
     "HeaderLocalAccess": "Local Access",
     "HeaderViewOrder": "View Order",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "LabelImageRefreshMode": "Image refresh mode:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json b/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
index 0959b9cb8..6c1cb185a 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Paths",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1119,11 +1120,14 @@
     "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.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Password",
     "HeaderLocalAccess": "Local Access",
     "HeaderViewOrder": "View Order",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "LabelImageRefreshMode": "Image refresh mode:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/en_US.json b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
index 935cd295b..5dd939774 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Paths",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1119,11 +1120,14 @@
     "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.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Password",
     "HeaderLocalAccess": "Local Access",
     "HeaderViewOrder": "View Order",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "LabelImageRefreshMode": "Image refresh mode:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/es.json b/MediaBrowser.Server.Implementations/Localization/Server/es.json
index 3ccffff17..10fb8f326 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/es.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Paths",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1119,11 +1120,14 @@
     "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.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Password",
     "HeaderLocalAccess": "Local Access",
     "HeaderViewOrder": "View Order",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "LabelImageRefreshMode": "Image refresh mode:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json b/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
index c74d5a42a..c394039c5 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Rutas",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sinc requiere de una Membres\u00eda de Aficionado",
     "HeaderEnjoyDayTrial": "Disfrute de una Prueba Gratuita por 14 D\u00edas",
@@ -1119,11 +1120,14 @@
     "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.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Contrase\u00f1a",
     "HeaderLocalAccess": "Acceso Local",
     "HeaderViewOrder": "Orden de Despliegue",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Seleccione el orden en que sus vistas ser\u00e1n desplegadas dentro de las apps de Media Browser",
     "LabelMetadataRefreshMode": "Modo de actualizaci\u00f3n de metadatos:",
     "LabelImageRefreshMode": "Modo de actualizaci\u00f3n de im\u00e1genes:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/fi.json b/MediaBrowser.Server.Implementations/Localization/Server/fi.json
index b958ca5a3..247e3cc37 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/fi.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/fi.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Paths",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1119,11 +1120,14 @@
     "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.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Password",
     "HeaderLocalAccess": "Local Access",
     "HeaderViewOrder": "View Order",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "LabelImageRefreshMode": "Image refresh mode:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/fr.json b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
index 44ead2cfc..58be84864 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/fr.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Vid\u00e9o",
     "HeaderPaths": "Chemins",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Code Easy Pin",
     "RegisterWithPayPal": "S'enregistrer avec PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync n\u00e9cessite un abonnement actif comme supporteur",
     "HeaderEnjoyDayTrial": "Profitez d'une p\u00e9riode d'essai de 14 jours",
@@ -1119,11 +1120,14 @@
     "LabelDisplayFoldersView": "Afficher une vue mosa\u00efque pour montrer les dossiers media en int\u00e9gralit\u00e9.",
     "ViewTypeLiveTvRecordingGroups": "Enregistrements",
     "ViewTypeLiveTvChannels": "Cha\u00eenes",
-    "LabelAllowLocalAccessWithoutPassword": "Autoriser l'acc\u00e8s local sans un mot de passe",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "Si activ\u00e9, le mot de passe ne sera pas requis pour s'authentifier depuis le r\u00e9seau local.",
+    "LabelEasyPinCode": "Code Easy Pin :",
+    "EasyPasswordHelp": "Votre code Easy Pin permet l'utilisation de l'acc\u00e8s offline dans les applications Media Browser compatibles, ainsi que l'authentification simplifi\u00e9e dans les r\u00e9seaux domestiques.",
+    "LabelInNetworkSignInWithEasyPassword": "Activer l'authentification simplifi\u00e9e dans les r\u00e9seaux domestiques avec mon code Easy Pin",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "L'activation de cette option vous permet d'utiliser votre code Easy Pin pour vous connecter aux applications Media Browser depuis votre r\u00e9seau domestique. Votre mot de passe habituel ne sera n\u00e9cessaire que depuis l'ext\u00e9rieur. Si vous ne saisissez rien pour le code pin, vous n'aurez pas besoin de mot de passe depuis votre r\u00e9seau domestique.",
     "HeaderPassword": "Mot de passe",
     "HeaderLocalAccess": "Acc\u00e8s local",
     "HeaderViewOrder": "Ordre d'affichage",
+    "ButtonResetEasyPassword": "R\u00e9initialiser le code Easy Pin",
     "LabelSelectUserViewOrder": "Choisir l'ordre d'affichage qui sera utilis\u00e9 dans les applications de Media Browser",
     "LabelMetadataRefreshMode": "Mode de mise \u00e0 jour des m\u00e9tadonn\u00e9es :",
     "LabelImageRefreshMode": "Mode de mise \u00e0 jour des images :",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/he.json b/MediaBrowser.Server.Implementations/Localization/Server/he.json
index 289b90ed9..5c80acb6c 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/he.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/he.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Paths",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1119,11 +1120,14 @@
     "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.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Password",
     "HeaderLocalAccess": "Local Access",
     "HeaderViewOrder": "View Order",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "LabelImageRefreshMode": "Image refresh mode:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/hr.json b/MediaBrowser.Server.Implementations/Localization/Server/hr.json
index a7cb646e0..184dae0ad 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/hr.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/hr.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Paths",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1119,11 +1120,14 @@
     "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.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Password",
     "HeaderLocalAccess": "Local Access",
     "HeaderViewOrder": "View Order",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "LabelImageRefreshMode": "Image refresh mode:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/it.json b/MediaBrowser.Server.Implementations/Localization/Server/it.json
index 3b44eccdc..f8899d1fd 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/it.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/it.json
@@ -40,31 +40,32 @@
     "OptionIAcceptTermsOfService": "Accetto i termini di servizio",
     "ButtonPrivacyPolicy": "Informativa sulla privacy",
     "ButtonTermsOfService": "Termini di Servizio",
-    "HeaderDeveloperOptions": "Developer Options",
-    "OptionEnableWebClientResponseCache": "Enable web client response caching",
-    "OptionDisableForDevelopmentHelp": "Configure these as needed for web client development purposes.",
+    "HeaderDeveloperOptions": "Opzioni Sviluppatore",
+    "OptionEnableWebClientResponseCache": "Abilita la cache del client web",
+    "OptionDisableForDevelopmentHelp": "Configura questi parametri per sviluppatori  del client web",
     "OptionEnableWebClientResourceMinification": "Enable web client resource minification",
-    "LabelDashboardSourcePath": "Web client source path:",
-    "LabelDashboardSourcePathHelp": "If running the server from source, specify the path to the dashboard-ui folder. All web client files will be served from this location.",
-    "ButtonConvertMedia": "Convert media",
-    "ButtonOrganize": "Organize",
+    "LabelDashboardSourcePath": "Percorso sorgente client web",
+    "LabelDashboardSourcePathHelp": "se si sta eseguendo il server da una sorgente, specifica il percorso dell'interfaccia. Tutti i file per i client saranno presi da questo percorso",
+    "ButtonConvertMedia": "Converti media",
+    "ButtonOrganize": "Organizza",
     "ButtonOk": "OK",
     "ButtonCancel": "Annulla",
     "ButtonNew": "Nuovo",
     "HeaderTV": "TV",
     "HeaderAudio": "Audio",
     "HeaderVideo": "Video",
-    "HeaderPaths": "Paths",
-    "CategorySync": "Sync",
-    "RegisterWithPayPal": "Register with PayPal",
-    "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
-    "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
-    "LabelSyncTempPath": "Temporary file path:",
-    "LabelSyncTempPathHelp": "Specify a custom sync working folder. Converted media created during the sync process will be stored here.",
-    "LabelCustomCertificatePath": "Custom certificate path:",
-    "LabelCustomCertificatePathHelp": "Supply your own ssl certificate. If omitted, the server will create a self-signed certificate.",
-    "TitleNotifications": "Notifications",
-    "ButtonDonateWithPayPal": "Donate with PayPal",
+    "HeaderPaths": "Percorsi",
+    "CategorySync": "Sinc.zza",
+    "HeaderEasyPinCode": "Codice pin",
+    "RegisterWithPayPal": "Registra con PayPal",
+    "HeaderSyncRequiresSupporterMembership": "La sincronizzazione richiede un'iscrizione come supporter",
+    "HeaderEnjoyDayTrial": "Goditi la tua prova gratuita di 14 giorni",
+    "LabelSyncTempPath": "Percorso file temporanei",
+    "LabelSyncTempPathHelp": "Specifica una cartella per la sincronizzazione. I file multimediali convertiti durante la sincronizzazione verranno collocati qui.",
+    "LabelCustomCertificatePath": "Percorso certificati personalizzato:",
+    "LabelCustomCertificatePathHelp": "Fornisci il tuo certificato SSL. Se non impostato il server ne creer\u00e0 uno gi\u00e0 firmato.",
+    "TitleNotifications": "Notifiche",
+    "ButtonDonateWithPayPal": "Effettua una donazione con PayPal",
     "OptionDetectArchiveFilesAsMedia": "Considera gli archivi come file multimediali",
     "OptionDetectArchiveFilesAsMediaHelp": "se attivato, i file con estensione .rar e .zip saranno considerati come file multimediali.",
     "LabelEnterConnectUserName": "Nome Utente o email:",
@@ -82,14 +83,14 @@
     "FolderTypeTvShows": "Tv",
     "FolderTypeInherit": "ereditare",
     "LabelContentType": "Tipo di contenuto:",
-    "TitleScheduledTasks": "Scheduled Tasks",
+    "TitleScheduledTasks": "Compiti Pianificati",
     "HeaderSetupLibrary": "Configura la tua libreria",
     "ButtonAddMediaFolder": "Aggiungi cartella",
     "LabelFolderType": "Tipo cartella",
     "ReferToMediaLibraryWiki": "Fare riferimento alla wiki libreria multimediale.",
     "LabelCountry": "Nazione:",
     "LabelLanguage": "Lingua:",
-    "ButtonJoinTheDevelopmentTeam": "Join the Development Team",
+    "ButtonJoinTheDevelopmentTeam": "Unisciti al Team di Sviluppo",
     "HeaderPreferredMetadataLanguage": "Lingua dei metadati preferita:",
     "LabelSaveLocalMetadata": "Salva immagini e metadati nelle cartelle multimediali",
     "LabelSaveLocalMetadataHelp": "Il salvataggio di immagini e dei metadati direttamente nelle cartelle multimediali verranno messe in un posto dove possono essere facilmente modificate.",
@@ -108,7 +109,7 @@
     "HeaderDeviceAccess": "Accesso dispositivo",
     "OptionEnableAccessFromAllDevices": "Abilitare l'accesso da tutti i dispositivi",
     "OptionEnableAccessToAllChannels": "Abilita l'accesso a tutti i canali",
-    "OptionEnableAccessToAllLibraries": "Enable access to all libraries",
+    "OptionEnableAccessToAllLibraries": "Abilita l'accesso a tutte le librerie",
     "DeviceAccessHelp": "Questo vale solo per i dispositivi che possono essere identificati in modo univoco e non impedire l'accesso del browser. Filtraggio di accesso al dispositivo dell'utente impedir\u00e0 loro di usare nuovi dispositivi fino a quando non sono state approvate qui.",
     "LabelDisplayMissingEpisodesWithinSeasons": "Visualizza gli episodi mancanti nelle stagioni",
     "LabelUnairedMissingEpisodesWithinSeasons": "Visualizzare episodi mai andati in onda all'interno stagioni",
@@ -298,7 +299,7 @@
     "OptionMetascore": "Punteggio",
     "ButtonSelect": "Seleziona",
     "ButtonGroupVersions": "Versione Gruppo",
-    "ButtonAddToCollection": "Add to Collection",
+    "ButtonAddToCollection": "Aggiungi alla collezione",
     "PismoMessage": "Dona per avere una licenza di Pismo",
     "TangibleSoftwareMessage": "Utilizza Tangible Solutions Java\/C# con una licenza su donazione.",
     "HeaderCredits": "Crediti",
@@ -512,7 +513,7 @@
     "HeaderSystemPaths": "Percorsi di sistema",
     "LinkCommunity": "Comunit\u00e0",
     "LinkGithub": "Github",
-    "LinkApi": "Api",
+    "LinkApi": "API",
     "LinkApiDocumentation": "Documentazione Api",
     "LabelFriendlyServerName": "Nome condiviso del server:",
     "LabelFriendlyServerNameHelp": "Questo nome \u00e8 usato per identificare il server sulla rete.Se lasciato vuoto verra usato il nome del pc",
@@ -522,23 +523,23 @@
     "HeaderNewCollection": "Nuova collezione",
     "ButtonSubmit": "Invia",
     "ButtonCreate": "Crea",
-    "LabelCustomCss": "Custom css:",
-    "LabelCustomCssHelp": "Apply your own custom css to the web interface.",
-    "LabelLocalHttpServerPortNumber": "Local http port number:",
+    "LabelCustomCss": "CSS Personalizzato",
+    "LabelCustomCssHelp": "Applica il tuo CSS personale all'interfaccia web",
+    "LabelLocalHttpServerPortNumber": "Porta HTTP locale",
     "LabelLocalHttpServerPortNumberHelp": "Il numero di porta TCP del server http del browser media a cui dovrebbe  legarsi.",
-    "LabelPublicHttpPort": "Public http port number:",
-    "LabelPublicHttpPortHelp": "The public port number that should be mapped to the local http port.",
-    "LabelPublicHttpsPort": "Public https port number:",
-    "LabelPublicHttpsPortHelp": "The public port number that should be mapped to the local https port.",
-    "LabelEnableHttps": "Report https as external address",
-    "LabelEnableHttpsHelp": "If enabled, the server will report an https url to clients as it's external address. This may break clients that do not yet support https.",
-    "LabelHttpsPort": "Local https port number:",
-    "LabelHttpsPortHelp": "The tcp port number that Media Browser's https server should bind to.",
+    "LabelPublicHttpPort": "Porta HTTP pubblica",
+    "LabelPublicHttpPortHelp": "Il numero di porta pubblica dovrebbe essere mappato verso la porta HTTP locale.",
+    "LabelPublicHttpsPort": "Numero porta HTTP pubblica",
+    "LabelPublicHttpsPortHelp": "Il numero della porta HTTP pubblica dovrebbe essere mappato verso la porta HTTP locale.",
+    "LabelEnableHttps": "Riporta HTTPS come indirizzo esterno",
+    "LabelEnableHttpsHelp": "se abilitato, il server riporter\u00e0 un url HTTPS ai client come il proprio indirizzo esterno. Questo potrebbe non far funzionare i client che ancora non supportano l'HTTPS",
+    "LabelHttpsPort": "Porta HTTPS locale",
+    "LabelHttpsPortHelp": "Il numero di porta TCP a cui il server HTTPS di Media Browser dovrebbe associarsi.",
     "LabelWebSocketPortNumber": "Numero porta web socket:",
     "LabelEnableAutomaticPortMap": "Abilita mappatura delle porte automatiche",
     "LabelEnableAutomaticPortMapHelp": "Tentativo di mappare automaticamente la porta pubblica alla porta locale tramite UPnP. Questo potrebbe non funzionare con alcuni modelli di router.",
-    "LabelExternalDDNS": "External WAN Address:",
-    "LabelExternalDDNSHelp": "If you have a dynamic DNS enter it here. Media Browser apps will use it when connecting remotely. Leave empty for automatic detection.",
+    "LabelExternalDDNS": "Indirizzo WAN esterno",
+    "LabelExternalDDNSHelp": "Se hai un DNS dinamico inseriscilo qui. Le app Media Browser lo useranno durante la connessione in remoto. Lascia vuoto per la rilevazione automatica",
     "TabResume": "Riprendi",
     "TabWeather": "Tempo",
     "TitleAppSettings": "Impostazioni delle app",
@@ -668,7 +669,7 @@
     "NotificationOptionInstallationFailed": "Installazione fallita",
     "NotificationOptionNewLibraryContent": "Nuovo contenuto aggiunto",
     "NotificationOptionNewLibraryContentMultiple": "Nuovi contenuti aggiunti",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+    "NotificationOptionCameraImageUploaded": "Immagine fotocamera caricata",
     "SendNotificationHelp": "Per impostazione predefinita, le notifiche vengono inviate alla casella della pagina principale. Sfoglia il catalogo plugin da installare opzioni di notifica aggiuntive.",
     "NotificationOptionServerRestartRequired": "Riavvio del server necessario",
     "LabelNotificationEnabled": "Abilita questa notifica",
@@ -886,8 +887,8 @@
     "OptionDefaultSort": "Predefinito",
     "OptionCommunityMostWatchedSort": "Pi\u00f9 visti",
     "TabNextUp": "Da vedere",
-    "HeaderBecomeMediaBrowserSupporter": "Become a Media Browser Supporter",
-    "TextEnjoyBonusFeatures": "Enjoy Bonus Features",
+    "HeaderBecomeMediaBrowserSupporter": "Diventa un Media Browser Supporter",
+    "TextEnjoyBonusFeatures": "Goditi le caratteristiche aggiuntive",
     "MessageNoMovieSuggestionsAvailable": "Nessun suggerimento di film attualmente disponibile. Iniziare a guardare e valutare i vostri film, e poi tornare per i suggerimenti.",
     "MessageNoCollectionsAvailable": "Le collezioni ti permettono di goderti raccolte personalizzate di Film, Serie TV, Album, Libri e Giochi. Clicca sul + per iniziare a creare le tue Collezioni",
     "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",
@@ -1119,11 +1120,14 @@
     "LabelDisplayFoldersView": "Visualizza cartelle come normali cartelle dei media",
     "ViewTypeLiveTvRecordingGroups": "Registrazioni",
     "ViewTypeLiveTvChannels": "canali",
-    "LabelAllowLocalAccessWithoutPassword": "Consenti di accedere localmente senza password",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "Quando abilitato la password non \u00e8 necessaria",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Password",
     "HeaderLocalAccess": "Accesso locale",
     "HeaderViewOrder": "Visualizza ordine",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Scegliere l'ordine vostre opinioni verranno visualizzati in applicazioni all'interno del browser media",
     "LabelMetadataRefreshMode": "Metadata (modo Aggiornamento)",
     "LabelImageRefreshMode": "Immagine (modo Aggiornamento)",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/kk.json b/MediaBrowser.Server.Implementations/Localization/Server/kk.json
index b6d581130..1da578855 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/kk.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/kk.json
@@ -34,7 +34,7 @@
     "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",
     "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.",
     "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",
-    "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 \u0436\u043e\u043b \u0436\u043e\u0441\u043f\u0430\u0440\u043b\u0430\u0493\u044b\u0448\u0442\u044b \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.",
+    "LabelEnableAutomaticPortMappingHelp": "\u049a\u0430\u0448\u044b\u049b\u0442\u0430\u043d \u043e\u04a3\u0430\u0439\u0442\u044b\u043b\u044b\u043f \u049b\u0430\u0442\u044b\u043d\u0430\u0441\u0443 \u04af\u0448\u0456\u043d UPnP \u0436\u043e\u043b \u0436\u043e\u0441\u043f\u0430\u0440\u043b\u0430\u0493\u044b\u0448\u0442\u044b \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 \u0436\u043e\u043b \u0436\u043e\u0441\u043f\u0430\u0440\u043b\u0430\u0493\u044b\u0448 \u04af\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.",
     "HeaderTermsOfService": "Media Browser \u049a\u044b\u0437\u043c\u0435\u0442 \u0448\u0430\u0440\u0442\u0442\u0430\u0440\u044b",
     "MessagePleaseAcceptTermsOfService": "\u0416\u0430\u043b\u0493\u0430\u0441\u0442\u044b\u0440\u043c\u0430\u0441 \u0431\u04b1\u0440\u044b\u043d \u049a\u044b\u0437\u043c\u0435\u0442 \u0448\u0430\u0440\u0442\u0442\u0430\u0440\u044b\u043d \u0436\u04d9\u043d\u0435 \u049a\u04b1\u043f\u0438\u044f\u043b\u044b\u043b\u044b\u049b \u0441\u0430\u044f\u0441\u0430\u0442\u044b\u043d \u049b\u0430\u0431\u044b\u043b\u0434\u0430\u04a3\u044b\u0437.",
     "OptionIAcceptTermsOfService": "\u049a\u044b\u0437\u043c\u0435\u0442 \u0448\u0430\u0440\u0442\u0442\u0430\u0440\u044b\u043d \u049b\u0430\u0431\u044b\u043b\u0434\u0430\u0439\u043c\u044b\u043d",
@@ -56,6 +56,7 @@
     "HeaderVideo": "\u0411\u0435\u0439\u043d\u0435",
     "HeaderPaths": "\u0416\u043e\u043b\u0434\u0430\u0440",
     "CategorySync": "\u04ae\u043d\u0434\u0435\u0441\u0442\u0456\u0440\u0443",
+    "HeaderEasyPinCode": "\u041e\u04a3\u0430\u0439\u0442\u044b\u043b\u0493\u0430\u043d PIN-\u043a\u043e\u0434",
     "RegisterWithPayPal": "PayPal \u0430\u0440\u049b\u044b\u043b\u044b \u0442\u0456\u0440\u043a\u0435\u043b\u0443",
     "HeaderSyncRequiresSupporterMembership": "\u04ae\u043d\u0434\u0435\u0441\u0442\u0456\u0440\u0443 \u04af\u0448\u0456\u043d \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u043b\u044b\u049b \u043c\u04af\u0448\u0435\u043b\u0456\u043a \u049b\u0430\u0436\u0435\u0442",
     "HeaderEnjoyDayTrial": "14-\u043a\u04af\u043d\u0434\u0456\u043a \u0442\u0435\u0433\u0456\u043d \u0441\u044b\u043d\u0430\u043c\u0430\u043d\u044b \u0442\u0430\u043c\u0430\u0448\u0430\u043b\u0430\u043d\u044b\u04a3\u044b\u0437",
@@ -507,7 +508,7 @@
     "SystemDlnaProfilesHelp": "\u0416\u04af\u0439\u0435\u043b\u0456\u043a \u043f\u0440\u043e\u0444\u0438\u043b\u044c\u0434\u0435\u0440 \u0442\u0435\u043a \u043e\u049b\u0443 \u04af\u0448\u0456\u043d. \u0416\u04af\u0439\u0435\u043b\u0456\u043a \u043f\u0440\u043e\u0444\u0438\u043b\u044c\u0434\u0456\u04a3 \u04e9\u0437\u0433\u0435\u0440\u0456\u0441\u0442\u0435\u0440\u0456 \u0436\u0430\u04a3\u0430 \u0442\u0435\u04a3\u0448\u0435\u043b\u0433\u0435\u043d \u043f\u0440\u043e\u0444\u0438\u043b\u044c\u0433\u0435 \u0436\u0430\u0437\u044b\u043b\u0430\u0434\u044b.",
     "TitleDashboard": "\u0411\u0430\u049b\u044b\u043b\u0430\u0443 \u0442\u0430\u049b\u0442\u0430\u0441\u044b",
     "TabHome": "\u0411\u0430\u0441\u0442\u044b",
-    "TabInfo": "\u0410\u049b\u043f\u0430\u0440\u0430\u0442",
+    "TabInfo": "\u041f\u0440\u043e\u0444\u0430\u0439\u043b \u0442\u0443\u0440\u0430\u043b\u044b",
     "HeaderLinks": "\u0421\u0456\u043b\u0442\u0435\u043c\u0435\u043b\u0435\u0440",
     "HeaderSystemPaths": "\u0416\u04af\u0439\u0435\u043b\u0456\u043a \u0436\u043e\u043b\u0434\u0430\u0440",
     "LinkCommunity": "\u049a\u0430\u0443\u044b\u043c\u0434\u0430\u0441\u0442\u044b\u049b",
@@ -601,7 +602,7 @@
     "HeaderRunningTasks": "\u041e\u0440\u044b\u043d\u0434\u0430\u043b\u044b\u043f \u0436\u0430\u0442\u049b\u0430\u043d \u0442\u0430\u043f\u0441\u044b\u0440\u043c\u0430\u043b\u0430\u0440",
     "HeaderActiveDevices": "\u0411\u0435\u043b\u0441\u0435\u043d\u0434\u0456 \u049b\u04b1\u0440\u044b\u043b\u0493\u044b\u043b\u0430\u0440",
     "HeaderPendingInstallations": "\u0411\u04e9\u0433\u0435\u043b\u0456\u0441 \u043e\u0440\u043d\u0430\u0442\u044b\u043c\u0434\u0430\u0440",
-    "HeaderServerInformation": "\u0421\u0435\u0440\u0432\u0435\u0440 \u043c\u04d9\u043b\u0456\u043c\u0435\u0442\u0456",
+    "HeaderServerInformation": "\u0421\u0435\u0440\u0432\u0435\u0440 \u0442\u0443\u0440\u0430\u043b\u044b",
     "ButtonRestartNow": "\u049a\u0430\u0437\u0456\u0440 \u049b\u0430\u0439\u0442\u0430 \u0456\u0441\u043a\u0435 \u049b\u043e\u0441\u0443",
     "ButtonRestart": "\u049a\u0430\u0439\u0442\u0430 \u0456\u0441\u043a\u0435 \u049b\u043e\u0441\u0443",
     "ButtonShutdown": "\u0416\u04b1\u043c\u044b\u0441\u0442\u044b \u0430\u044f\u049b\u0442\u0430\u0443",
@@ -758,7 +759,7 @@
     "TabContainers": "\u041a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440\u043b\u0435\u0440",
     "TabCodecs": "\u041a\u043e\u0434\u0435\u043a\u0442\u0435\u0440",
     "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",
+    "HeaderProfileInformation": "\u041f\u0440\u043e\u0444\u0430\u0439\u043b \u043c\u04d9\u043b\u0456\u043c\u0435\u0442\u0442\u0435\u0440\u0456",
     "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 \u049b\u04b1\u0440\u044b\u043b\u0493\u044b\u043b\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:",
@@ -949,7 +950,7 @@
     "OptionLibraryFolders": "\u0422\u0430\u0441\u0443\u0448\u044b \u049b\u0430\u043b\u0442\u0430\u043b\u0430\u0440\u044b",
     "TitleRemoteControl": "\u049a\u0430\u0448\u044b\u049b\u0442\u0430\u043d \u0431\u0430\u0441\u049b\u0430\u0440\u0443",
     "OptionLatestTvRecordings": "\u0415\u04a3 \u043a\u0435\u0439\u0456\u043d\u0433\u0456 \u0436\u0430\u0437\u0431\u0430\u043b\u0430\u0440",
-    "LabelProtocolInfo": "\u041f\u0440\u043e\u0442\u043e\u049b\u043e\u043b \u0430\u049b\u043f\u0430\u0440\u0430\u0442\u044b:",
+    "LabelProtocolInfo": "\u041f\u0440\u043e\u0442\u043e\u049b\u043e\u043b \u0442\u0443\u0440\u0430\u043b\u044b:",
     "LabelProtocolInfoHelp": "\u0411\u04b1\u043b \u043c\u04d9\u043d \u049b\u04b1\u0440\u044b\u043b\u0493\u044b\u043d\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.",
     "TabNfo": "NFO-\u0444\u0430\u0439\u043b\u0434\u0430\u0440",
     "HeaderKodiMetadataHelp": "Media Browser \u0431\u0430\u0493\u0434\u0430\u0440\u043b\u0430\u043c\u0430\u0441\u044b Kodi 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. Kodi \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.",
@@ -1119,11 +1120,14 @@
     "LabelDisplayFoldersView": "\u041a\u04d9\u0434\u0456\u043c\u0433\u0456 \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",
     "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.",
+    "LabelEasyPinCode": "\u041e\u04a3\u0430\u0439\u0442\u044b\u043b\u0493\u0430\u043d PIN-\u043a\u043e\u0434:",
+    "EasyPasswordHelp": "\u041e\u04a3\u0430\u0439\u0442\u044b\u043b\u0493\u0430\u043d PIN-\u043a\u043e\u0434\u044b\u04a3\u044b\u0437 \u049b\u043e\u043b\u0434\u0430\u0443\u0434\u0430\u0493\u044b Media Browser \u049b\u043e\u043b\u0434\u0430\u043d\u0431\u0430\u043b\u0430\u0440\u044b\u043d\u0430\u043d \u0434\u0435\u0440\u0431\u0435\u0441 \u049b\u0430\u0442\u044b\u043d\u0430\u0441\u0443 \u04af\u0448\u0456\u043d \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u044b\u043b\u0430\u0434\u044b, \u0436\u04d9\u043d\u0435 \u0436\u0435\u043b\u0456 \u0456\u0448\u0456\u043d\u0434\u0435 \u043e\u04a3\u0430\u0439\u0442\u044b\u043b\u044b\u043f \u043a\u0456\u0440\u0443 \u04af\u0448\u0456\u043d \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u044b\u043b\u0443\u044b \u043c\u04af\u043c\u043a\u0456\u043d.",
+    "LabelInNetworkSignInWithEasyPassword": "\u041e\u04a3\u0430\u0439\u0442\u044b\u043b\u0493\u0430\u043d PIN-\u043a\u043e\u0434\u044b\u043c \u0430\u0440\u049b\u044b\u043b\u044b \u0436\u0435\u043b\u0456 \u0456\u0448\u0456\u043d\u0434\u0435 \u043e\u04a3\u0430\u0439\u0442\u044b\u043b\u044b\u043f \u043a\u0456\u0440\u0443\u0434\u0456 \u049b\u043e\u0441\u0443",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "\u0415\u0433\u0435\u0440 \u049b\u043e\u0441\u044b\u043b\u0441\u0430, \u04af\u0439 \u0436\u0435\u043b\u0456\u0441\u0456 \u0456\u0448\u0456\u043d\u0435\u043d Media Browser \u049b\u043e\u043b\u0434\u0430\u043d\u0431\u0430\u043b\u0430\u0440\u044b\u043d\u0430 \u043a\u0456\u0440\u0443 \u04af\u0448\u0456\u043d \u043e\u04a3\u0430\u0439\u0442\u044b\u043b\u0493\u0430\u043d PIN-\u043a\u043e\u0434\u044b\u04a3\u044b\u0437\u0434\u044b \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u044b\u04a3\u044b\u0437 \u043c\u04af\u043c\u043a\u0456\u043d. \u0421\u0456\u0437\u0434\u0456\u04a3 \u049b\u0430\u043b\u044b\u043f\u0442\u044b \u049b\u04b1\u043f\u0438\u044f \u0441\u04e9\u0437\u0456\u04a3\u0456\u0437 \u0442\u0435\u043a \u049b\u0430\u043d\u0430 \u04af\u0439 \u0441\u044b\u0440\u0442\u044b\u043d\u0434\u0430 \u049b\u0430\u0436\u0435\u0442 \u0431\u043e\u043b\u0430\u0434\u044b. \u0415\u0433\u0435\u0440 PIN-\u043a\u043e\u0434 \u0431\u043e\u0441 \u049b\u0430\u043b\u0434\u044b\u0440\u044b\u043b\u0441\u0430, \u04af\u0439 \u0436\u0435\u043b\u0456\u0441\u0456\u043d\u0434\u0435 \u049b\u04b1\u043f\u0438\u044f \u0441\u04e9\u0437\u0456\u04a3\u0456\u0437 \u049b\u0430\u0436\u0435\u0442 \u0431\u043e\u043b\u043c\u0430\u0439\u0434\u044b.",
     "HeaderPassword": "\u049a\u04b1\u043f\u0438\u044f \u0441\u04e9\u0437",
     "HeaderLocalAccess": "\u0416\u0435\u0440\u0433\u0456\u043b\u0456\u043a\u0442\u0456 \u049b\u0430\u0442\u044b\u043d\u0430\u0441",
     "HeaderViewOrder": "\u0410\u0441\u043f\u0435\u043a\u0442\u0442\u0435\u0440 \u0440\u0435\u0442\u0456",
+    "ButtonResetEasyPassword": "\u041e\u04a3\u0430\u0439\u0442\u044b\u043b\u0493\u0430\u043d PIN-\u043a\u043e\u0434\u0442\u044b \u044b\u0441\u044b\u0440\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",
     "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:",
     "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:",
@@ -1133,7 +1137,7 @@
     "OptionAddMissingDataOnly": "\u0422\u0435\u043a \u049b\u0430\u043d\u0430 \u0436\u043e\u043a \u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440\u0434\u0456 \u04af\u0441\u0442\u0435\u0443",
     "OptionLocalRefreshOnly": "\u0422\u0435\u043a \u049b\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",
     "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",
-    "HeaderPersonInfo": "\u0422\u04b1\u043b\u0493\u0430 \u0442\u0443\u0440\u0430\u043b\u044b \u0430\u049b\u043f\u0430\u0440\u0430\u0442",
+    "HeaderPersonInfo": "\u0422\u04b1\u043b\u0493\u0430 \u0442\u0443\u0440\u0430\u043b\u044b",
     "HeaderIdentifyItem": "\u042d\u043b\u0435\u043c\u0435\u043d\u0442\u0442\u0456 \u0430\u043d\u044b\u049b\u0442\u0430\u0443",
     "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.",
     "HeaderConfirmDeletion": "\u0416\u043e\u044e\u0434\u044b \u0440\u0430\u0441\u0442\u0430\u0443",
@@ -1167,7 +1171,7 @@
     "LabelPlayers": "\u041e\u0439\u044b\u043d\u0448\u044b\u043b\u0430\u0440:",
     "Label3DFormat": "3D \u043f\u0456\u0448\u0456\u043c\u0456:",
     "HeaderAlternateEpisodeNumbers": "\u0411\u0430\u043b\u0430\u043c\u0430\u043b\u044b \u044d\u043f\u0438\u0437\u043e\u0434 \u043d\u04e9\u043c\u0456\u0440\u043b\u0435\u0440\u0456",
-    "HeaderSpecialEpisodeInfo": "\u0410\u0440\u043d\u0430\u0439\u044b \u044d\u043f\u0438\u0437\u043e\u0434 \u0430\u049b\u043f\u0430\u0440\u0430\u0442\u044b",
+    "HeaderSpecialEpisodeInfo": "\u0410\u0440\u043d\u0430\u0439\u044b \u044d\u043f\u0438\u0437\u043e\u0434 \u0442\u0443\u0440\u0430\u043b\u044b",
     "HeaderExternalIds": "\u0421\u044b\u0440\u0442\u049b\u044b \u0441\u04d9\u0439\u043a\u0435\u0441\u0442\u0435\u043d\u0434\u0456\u0440\u0433\u0456\u0448\u0442\u0435\u0440:",
     "LabelDvdSeasonNumber": "DVD \u043c\u0430\u0443\u0441\u044b\u043c \u043d\u04e9\u043c\u0456\u0440\u0456",
     "LabelDvdEpisodeNumber": "DVD \u044d\u043f\u0438\u0437\u043e\u0434 \u043d\u04e9\u043c\u0456\u0440\u0456",
@@ -1206,15 +1210,15 @@
     "OptionWriter": "\u0421\u0446\u0435\u043d\u0430\u0440\u0438\u0439\u0448\u0456",
     "LabelAirDays": "\u042d\u0444\u0438\u0440 \u043a\u04af\u043d\u0434\u0435\u0440\u0456:",
     "LabelAirTime": "\u042d\u0444\u0438\u0440 \u0443\u0430\u049b\u044b\u0442\u044b:",
-    "HeaderMediaInfo": "\u0422\u0430\u0441\u0443\u0448\u044b\u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440 \u043c\u04d9\u043b\u0456\u043c\u0435\u0442\u0456",
-    "HeaderPhotoInfo": "\u0424\u043e\u0442\u043e\u0441\u0443\u0440\u0435\u0442 \u043c\u04d9\u043b\u0456\u043c\u0435\u0442\u0456",
+    "HeaderMediaInfo": "\u0422\u0430\u0441\u0443\u0448\u044b\u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440 \u0442\u0443\u0440\u0430\u043b\u044b",
+    "HeaderPhotoInfo": "\u0424\u043e\u0442\u043e\u0441\u0443\u0440\u0435\u0442 \u0442\u0443\u0440\u0430\u043b\u044b",
     "HeaderInstall": "\u041e\u0440\u043d\u0430\u0442\u0443",
     "LabelSelectVersionToInstall": "\u041e\u0440\u043d\u0430\u0442\u044b\u043c \u043d\u04b1\u0441\u049b\u0430\u0441\u044b\u043d \u0442\u0430\u04a3\u0434\u0430\u0443:",
     "LinkSupporterMembership": "\u0416\u0430\u049b\u0442\u0430\u0443\u0448\u044b \u043c\u04af\u0448\u0435\u043b\u0456\u0433\u0456 \u0442\u0443\u0440\u0430\u043b\u044b \u0442\u0430\u043d\u044b\u0441\u044b\u04a3\u044b\u0437",
     "MessageSupporterPluginRequiresMembership": "\u0411\u04b1\u043b \u043f\u043b\u0430\u0433\u0438\u043d\u0433\u0435 14 \u043a\u04af\u043d\u0434\u0456\u043a \u0442\u0435\u0433\u0456\u043d \u0441\u044b\u043d\u0430\u043c\u0430\u0434\u0430\u043d \u043a\u0435\u0439\u0456\u043d \u0431\u0435\u043b\u0441\u0435\u043d\u0434\u0456 \u0436\u0430\u049b\u0442\u0430\u0443\u0448\u044b \u043c\u04af\u0448\u0435\u043b\u0456\u0433\u0456\u043d \u049b\u0430\u0436\u0435\u0442 \u0435\u0442\u0435\u0434\u0456.",
     "MessagePremiumPluginRequiresMembership": "\u0411\u04b1\u043b \u043f\u043b\u0430\u0433\u0438\u043d\u0434\u0456 \u0441\u0430\u0442\u044b\u043f \u0430\u043b\u0443 \u04af\u0448\u0456\u043d 14 \u043a\u04af\u043d\u0434\u0456\u043a \u0442\u0435\u0433\u0456\u043d \u0441\u044b\u043d\u0430\u043c\u0430\u0434\u0430\u043d \u043a\u0435\u0439\u0456\u043d \u0431\u0435\u043b\u0441\u0435\u043d\u0434\u0456 \u0436\u0430\u049b\u0442\u0430\u0443\u0448\u044b \u043c\u04af\u0448\u0435\u043b\u0456\u0433\u0456\u043d \u049b\u0430\u0436\u0435\u0442 \u0435\u0442\u0435\u0434\u0456.",
     "HeaderReviews": "\u041f\u0456\u043a\u0456\u0440\u043b\u0435\u0440",
-    "HeaderDeveloperInfo": "\u0416\u0430\u0441\u0430\u049b\u0442\u0430\u0443\u0448\u044b \u0442\u0443\u0440\u0430\u043b\u044b",
+    "HeaderDeveloperInfo": "\u0416\u0430\u0441\u0430\u049b\u0442\u0430\u0443\u0448\u044b\u043b\u0430\u0440 \u0442\u0443\u0440\u0430\u043b\u044b",
     "HeaderRevisionHistory": "\u04e8\u0437\u0433\u0435\u0440\u0456\u0441\u0442\u0435\u0440 \u0442\u0430\u0440\u0438\u0445\u044b",
     "ButtonViewWebsite": "\u0492\u0430\u043b\u0430\u043c\u0442\u043e\u0440 \u0441\u0430\u0439\u0442\u044b\u043d \u049b\u0430\u0440\u0430\u0443",
     "LabelRecurringDonationCanBeCancelledHelp": "\u049a\u0430\u0439\u0442\u0430\u043b\u0430\u043c\u0430 \u049b\u0430\u0439\u044b\u0440\u043c\u0430\u043b\u0434\u044b\u049b\u0442\u0430\u0440 PayPal \u0435\u0441\u0435\u043f \u0448\u043e\u0442\u044b \u0430\u0440\u049b\u044b\u043b\u044b \u04d9\u0440 \u0443\u0430\u049b\u044b\u0442\u0442\u0430 \u0434\u0430 \u0431\u043e\u043b\u0434\u044b\u0440\u044b\u043b\u043c\u0430\u0443\u044b \u043c\u04af\u043c\u043a\u0456\u043d.",
@@ -1227,7 +1231,7 @@
     "LabelExtractChaptersDuringLibraryScanHelp": "\u049a\u043e\u0441\u044b\u043b\u0493\u0430\u043d\u0434\u0430, \u0441\u0430\u0445\u043d\u0430 \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440\u0456 \u0442\u0430\u0441\u0443\u0448\u044b\u0445\u0430\u043d\u0430\u043d\u044b \u0441\u043a\u0430\u043d\u0435\u0440\u043b\u0435\u0443 \u043c\u0435\u0437\u0433\u0456\u043b\u0456\u043d\u0434\u0435, \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0440 \u0441\u044b\u0440\u0442\u0442\u0430\u043d \u0430\u043b\u044b\u043d\u0493\u0430\u043d\u0434\u0430, \u0448\u044b\u0493\u0430\u0440\u044b\u043f \u0430\u043b\u044b\u043d\u0430\u0434\u044b. \u0410\u0436\u044b\u0440\u0430\u0442\u044b\u043b\u0493\u0430\u043d\u0434\u0430, \u0431\u04b1\u043b\u0430\u0440 \u0441\u0430\u0445\u043d\u0430 \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440\u0456\u043d\u0435 \u0436\u043e\u0441\u043f\u0430\u0440\u043b\u0430\u0493\u0430\u043d \u0442\u0430\u043f\u0441\u044b\u0440\u043c\u0430\u0441\u044b \u043c\u0435\u0437\u0433\u0456\u043b\u0456\u043d\u0434\u0435, \u0442\u04b1\u0440\u0430\u049b\u0442\u044b \u0442\u0430\u0441\u0443\u0448\u044b\u0445\u0430\u043d\u0430\u043d\u044b \u0441\u043a\u0430\u043d\u0435\u0440\u043b\u0435\u0443\u0456\u043d \u0436\u044b\u043b\u0434\u0430\u043c\u044b\u0440\u0430\u049b \u0430\u044f\u049b\u0442\u0430\u043b\u0443\u044b \u04b1\u0448\u0456\u043d \u0440\u04b1\u049b\u0441\u0430\u0442 \u0435\u0442\u0456\u043f, \u0448\u044b\u0493\u0430\u0440\u044b\u043f \u0430\u043b\u044b\u043d\u0430\u0434\u044b.",
     "LabelConnectGuestUserName": "\u041e\u043b\u0430\u0440\u0434\u044b\u04a3 Media Browser \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b \u0430\u0442\u044b \u043d\u0435\u043c\u0435\u0441\u0435 \u044d-\u043f\u043e\u0448\u0442\u0430 \u043c\u0435\u043a\u0435\u043d\u0436\u0430\u0439\u044b:",
     "LabelConnectUserName": "Media Browser \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b \u0430\u0442\u044b\/\u044d-\u043f\u043e\u0448\u0442\u0430\u0441\u044b:",
-    "LabelConnectUserNameHelp": "\u0421\u0435\u0440\u0432\u0435\u0440\u0434\u0456\u04a3 IP \u043c\u0435\u043a\u0435\u043d\u0436\u0430\u0439\u044b\u043d \u0431\u0456\u043b\u043c\u0435\u0439 \u0442\u04b1\u0440\u044b\u043f \u04d9\u0440\u049b\u0430\u0439\u0441\u044b Media Browser \u049b\u043e\u043b\u0434\u0430\u043d\u0431\u0430\u0441\u044b\u043d\u0430\u043d \u043a\u0456\u0440\u0443-\u049b\u0430\u0442\u044b\u043d\u0430\u0441\u0442\u044b \u0436\u0435\u04a3\u0456\u043b\u0434\u0435\u0442\u0443\u0456\u043d \u049b\u043e\u0441\u0443 \u04af\u0448\u0456\u043d \u043e\u0441\u044b \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u043d\u044b Media Browser \u0442\u0456\u0440\u043a\u0435\u043b\u0433\u0456\u0441\u0456\u043d\u0435 \u0431\u0430\u0439\u043b\u0430\u043d\u044b\u0441\u0442\u044b\u0440\u044b\u04a3\u044b\u0437.",
+    "LabelConnectUserNameHelp": "\u0421\u0435\u0440\u0432\u0435\u0440\u0434\u0456\u04a3 IP \u043c\u0435\u043a\u0435\u043d\u0436\u0430\u0439\u044b\u043d \u0431\u0456\u043b\u043c\u0435\u0439 \u0442\u04b1\u0440\u044b\u043f \u04d9\u0440\u049b\u0430\u0439\u0441\u044b Media Browser \u049b\u043e\u043b\u0434\u0430\u043d\u0431\u0430\u0441\u044b\u043d\u0430\u043d \u043e\u04a3\u0430\u0439\u0442\u044b\u043b\u0493\u0430\u043d \u043a\u0456\u0440\u0443-\u049b\u0430\u0442\u044b\u043d\u0430\u0441\u0442\u044b \u049b\u043e\u0441\u0443 \u04af\u0448\u0456\u043d \u043e\u0441\u044b \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0448\u044b\u043d\u044b Media Browser \u0442\u0456\u0440\u043a\u0435\u043b\u0433\u0456\u0441\u0456\u043d\u0435 \u0431\u0430\u0439\u043b\u0430\u043d\u044b\u0441\u0442\u044b\u0440\u044b\u04a3\u044b\u0437.",
     "ButtonLearnMoreAboutMediaBrowserConnect": "Media Browser Connect \u0442\u0443\u0440\u0430\u043b\u044b \u043a\u04e9\u0431\u0456\u0440\u0435\u043a \u0431\u0456\u043b\u0443",
     "LabelExternalPlayers": "\u0421\u044b\u0440\u0442\u049b\u044b \u043e\u0439\u043d\u0430\u0442\u049b\u044b\u0448\u0442\u0430\u0440:",
     "LabelExternalPlayersHelp": "\u0421\u044b\u0440\u0442\u049b\u044b \u043e\u0439\u043d\u0430\u0442\u049b\u044b\u0448\u0442\u0430\u0440\u0434\u0430 \u043c\u0430\u0437\u043c\u04b1\u043d\u0434\u044b \u043e\u0439\u043d\u0430\u0442\u0443 \u04af\u0448\u0456\u043d \u0442\u04af\u0439\u043c\u0435\u0448\u0456\u043a\u0442\u0435\u0440\u0434\u0456 \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0443. \u0411\u04b1\u043b \u0442\u0435\u043a \u049b\u0430\u043d\u0430 URL \u0441\u0445\u0435\u043c\u0430\u043b\u0430\u0440\u044b\u043d \u049b\u043e\u043b\u0434\u0430\u0439\u0442\u044b\u043d, \u04d9\u0434\u0435\u0442\u0442\u0435, Android \u0436\u04d9\u043d\u0435 iOS, \u049b\u04b1\u0440\u044b\u043b\u0493\u044b\u043b\u0430\u0440\u0434\u0430 \u049b\u043e\u043b \u0436\u0435\u0442\u0456\u043c\u0434\u0456. \u0421\u044b\u0440\u0442\u049b\u044b \u043e\u0439\u043d\u0430\u0442\u049b\u044b\u0448\u0442\u0430\u0440, \u049b\u0430\u0493\u0438\u0434\u0430 \u0431\u043e\u0439\u044b\u043d\u0448\u0430, \u0430\u043b\u044b\u0441\u0442\u0430\u043d \u0431\u0430\u0441\u049b\u0430\u0440\u0443\u0434\u044b \u0436\u04d9\u043d\u0435 \u0436\u0430\u043b\u0493\u0430\u0441\u0442\u044b\u0440\u0443\u0434\u044b \u049b\u043e\u043b\u0434\u0430\u043c\u0430\u0439\u0434\u044b.",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ko.json b/MediaBrowser.Server.Implementations/Localization/Server/ko.json
index 8fb90b86e..98094e213 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ko.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ko.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Paths",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1119,11 +1120,14 @@
     "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.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Password",
     "HeaderLocalAccess": "Local Access",
     "HeaderViewOrder": "View Order",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "LabelImageRefreshMode": "Image refresh mode:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ms.json b/MediaBrowser.Server.Implementations/Localization/Server/ms.json
index a2dc72110..0b591e6ba 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ms.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ms.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Paths",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1119,11 +1120,14 @@
     "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.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Password",
     "HeaderLocalAccess": "Local Access",
     "HeaderViewOrder": "View Order",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "LabelImageRefreshMode": "Image refresh mode:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/nb.json b/MediaBrowser.Server.Implementations/Localization/Server/nb.json
index 1bf7e3c5b..ebbd9e5a0 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/nb.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/nb.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Stier",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1119,11 +1120,14 @@
     "LabelDisplayFoldersView": "Vis alle mapper som rene lagringsmapper",
     "ViewTypeLiveTvRecordingGroups": "Opptak",
     "ViewTypeLiveTvChannels": "Kanaler",
-    "LabelAllowLocalAccessWithoutPassword": "Tillat lokal tilkobling uten passord",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "N\u00e5r aktivert, vil ikke ett passord v\u00e6re p\u00e5krevd for innlogging fra ditt lokale hjemme nettverk.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Passord",
     "HeaderLocalAccess": "Lokal Tilkobling",
     "HeaderViewOrder": "Visnings rekkef\u00f8lge",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Velg rekkef\u00f8lge dine visninger vil bli vist inn i Media Browser apps",
     "LabelMetadataRefreshMode": "Metadata oppfrisknings modus:",
     "LabelImageRefreshMode": "Bilde oppfrisknings modus:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/nl.json b/MediaBrowser.Server.Implementations/Localization/Server/nl.json
index c6bbd7d56..9912a31dc 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/nl.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/nl.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Paden",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Registreer met PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Vereist een Supporter lidmaatschap",
     "HeaderEnjoyDayTrial": "Geniet van een 14-daagse gratis proefversie",
@@ -1119,11 +1120,14 @@
     "LabelDisplayFoldersView": "Toon een mappenweergave als u gewoon Mediamappen wilt weergeven",
     "ViewTypeLiveTvRecordingGroups": "Opnamen",
     "ViewTypeLiveTvChannels": "Kanalen",
-    "LabelAllowLocalAccessWithoutPassword": "Lokale toegang toestaan zonder wachtwoord",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "Als dit ingeschakeld is dan kan er in het thuisnetwerk zonder wachtwoord aangemeld worden.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Wachtwoord",
     "HeaderLocalAccess": "Lokale toegang",
     "HeaderViewOrder": "Weergave volgorde",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Kies de volgorde van uw weergaven die zullen worden weergegeven in Media Browser applicaties",
     "LabelMetadataRefreshMode": "Metadata vernieuw mode:",
     "LabelImageRefreshMode": "Afbeelding vernieuw mode:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pl.json b/MediaBrowser.Server.Implementations/Localization/Server/pl.json
index dbb120350..42af12177 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pl.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pl.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Paths",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1119,11 +1120,14 @@
     "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.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Password",
     "HeaderLocalAccess": "Local Access",
     "HeaderViewOrder": "View Order",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "LabelImageRefreshMode": "Image refresh mode:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json b/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
index 41848919d..b150edd8d 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "V\u00eddeo",
     "HeaderPaths": "Caminhos",
     "CategorySync": "Sincroniza\u00e7\u00e3o",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Registrar com PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sincroniza\u00e7\u00e3o Necessita de uma Filia\u00e7\u00e3o de Colaborador",
     "HeaderEnjoyDayTrial": "Aproveite um per\u00edodo de 14 dias gr\u00e1tis para testes",
@@ -1119,11 +1120,14 @@
     "LabelDisplayFoldersView": "Exibir visualiza\u00e7\u00e3o de pastas para mostrar pastas simples de m\u00eddia",
     "ViewTypeLiveTvRecordingGroups": "Grava\u00e7\u00f5es",
     "ViewTypeLiveTvChannels": "Canais",
-    "LabelAllowLocalAccessWithoutPassword": "Permtir acesso local sem senha",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "Quando ativado, uma senha n\u00e3o ser\u00e1 necess\u00e1ria para entrar atrav\u00e9s de sua rede dom\u00e9stica.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Senha",
     "HeaderLocalAccess": "Acesso Local",
     "HeaderViewOrder": "Ordem da Visualiza\u00e7\u00e3o",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Escolha a ordem em que suas visualiza\u00e7\u00f5es ser\u00e3o exibidas dentro das apps do Media Browser",
     "LabelMetadataRefreshMode": "Modo de atualiza\u00e7\u00e3o dos metadados:",
     "LabelImageRefreshMode": "Modo de atualiza\u00e7\u00e3o das imagens:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
index c6590062f..d7113fc6f 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Paths",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1119,11 +1120,14 @@
     "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.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Password",
     "HeaderLocalAccess": "Local Access",
     "HeaderViewOrder": "View Order",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "LabelImageRefreshMode": "Image refresh mode:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ru.json b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
index 589b7e515..73bc7ffbc 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ru.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
@@ -34,7 +34,7 @@
     "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",
     "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 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u0438 \u043a\u043b\u0438\u0435\u043d\u0442\u0430\u043c \u0434\u043b\u044f \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. \u041e\u043d \u0440\u0430\u0431\u043e\u0442\u0430\u0435\u0442 \u043a\u0430\u043a \u0437\u0430\u0434\u0430\u0447\u0430, \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u0430\u044f \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\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u0432 \u043e\u0431\u043b\u0430\u0441\u0442\u0438 \u041d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u044b\u0445 \u0437\u0430\u0434\u0430\u0447. \u041d\u0435 \u0440\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u0443\u0435\u0442\u0441\u044f \u0437\u0430\u043f\u0443\u0441\u043a\u0430\u0442\u044c \u0434\u0430\u043d\u043d\u0443\u044e \u0437\u0430\u0434\u0430\u0447\u0443 \u0432 \u0447\u0430\u0441\u044b \u043f\u0438\u043a.",
     "LabelEnableAutomaticPortMapping": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0430\u0432\u0442\u043e\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0435 \u0441\u043e\u043f\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u043e\u0440\u0442\u043e\u0432",
-    "LabelEnableAutomaticPortMappingHelp": "UPnP \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u0438 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u043e\u0433\u043e \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u043c\u0430\u0440\u0448\u0440\u0443\u0442\u0438\u0437\u0430\u0442\u043e\u0440\u0430 \u0434\u043b\u044f \u0443\u0434\u043e\u0431\u043d\u043e\u0433\u043e \u0432\u043d\u0435\u0448\u043d\u0435\u0433\u043e \u0434\u043e\u0441\u0442\u0443\u043f\u0430.\u042d\u0442\u043e \u043c\u043e\u0436\u0435\u0442 \u043d\u0435 \u0441\u0440\u0430\u0431\u043e\u0442\u0430\u0442\u044c \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.",
+    "LabelEnableAutomaticPortMappingHelp": "UPnP \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u0438 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u043e\u0433\u043e \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u043c\u0430\u0440\u0448\u0440\u0443\u0442\u0438\u0437\u0430\u0442\u043e\u0440\u0430 \u0434\u043b\u044f \u0443\u043f\u0440\u043e\u0449\u0451\u043d\u0438\u044f \u0432\u043d\u0435\u0448\u043d\u0435\u0433\u043e \u0434\u043e\u0441\u0442\u0443\u043f\u0430.\u042d\u0442\u043e \u043c\u043e\u0436\u0435\u0442 \u043d\u0435 \u0441\u0440\u0430\u0431\u043e\u0442\u0430\u0442\u044c \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.",
     "HeaderTermsOfService": "\u0423\u0441\u043b\u043e\u0432\u0438\u044f \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0443\u0441\u043b\u0443\u0433 Media Browser",
     "MessagePleaseAcceptTermsOfService": "\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435 \u0441\u043e\u0433\u043b\u0430\u0441\u0438\u0435 \u0441 \u0423\u0441\u043b\u043e\u0432\u0438\u044f\u043c\u0438 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0443\u0441\u043b\u0443\u0433 \u0438 \u041f\u043e\u043b\u0438\u0442\u0438\u043a\u043e\u0439 \u043a\u043e\u043d\u0444\u0438\u0434\u0435\u043d\u0446\u0438\u0430\u043b\u044c\u043d\u043e\u0441\u0442\u0438, \u043f\u0440\u0435\u0436\u0434\u0435 \u0447\u0435\u043c \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c.",
     "OptionIAcceptTermsOfService": "\u042f \u0441\u043e\u0433\u043b\u0430\u0448\u0430\u044e\u0441\u044c \u0441 \u0423\u0441\u043b\u043e\u0432\u0438\u044f\u043c\u0438 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0443\u0441\u043b\u0443\u0433",
@@ -56,6 +56,7 @@
     "HeaderVideo": "\u0412\u0438\u0434\u0435\u043e",
     "HeaderPaths": "\u041f\u0443\u0442\u0438",
     "CategorySync": "\u0421\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u044f",
+    "HeaderEasyPinCode": "\u0423\u043f\u0440\u043e\u0449\u0451\u043d\u043d\u044b\u0439 PIN-\u043a\u043e\u0434",
     "RegisterWithPayPal": "\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0447\u0435\u0440\u0435\u0437 PayPal",
     "HeaderSyncRequiresSupporterMembership": "\u0414\u043b\u044f \u0441\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u0438 \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0447\u043b\u0435\u043d\u0441\u0442\u0432\u043e \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u0430",
     "HeaderEnjoyDayTrial": "\u0412\u043e\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435\u0441\u044c 14-\u0434\u043d\u0435\u0432\u043d\u044b\u043c \u0431\u0435\u0441\u043f\u043b\u0430\u0442\u043d\u044b\u043c \u043f\u0440\u043e\u0431\u043d\u044b\u043c \u043f\u0435\u0440\u0438\u043e\u0434\u043e\u043c",
@@ -507,7 +508,7 @@
     "SystemDlnaProfilesHelp": "\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0435 \u043f\u0440\u043e\u0444\u0438\u043b\u0438 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b \u0442\u043e\u043b\u044c\u043a\u043e \u0434\u043b\u044f \u0447\u0442\u0435\u043d\u0438\u044f. \u0418\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u043a \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u043e\u043c\u0443 \u043f\u0440\u043e\u0444\u0438\u043b\u044e \u0431\u0443\u0434\u0443\u0442 \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u044b \u0432 \u043d\u043e\u0432\u043e\u043c \u043d\u0430\u0441\u0442\u0440\u0430\u0438\u0432\u0430\u0435\u043c\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\u043e\u0435",
-    "TabInfo": "\u0421\u0432\u0435\u0434\u0435\u043d\u0438\u044f",
+    "TabInfo": "\u041e \u043f\u0440\u043e\u0444\u0438\u043b\u0435",
     "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",
@@ -550,7 +551,7 @@
     "LabelMinResumeDurationHelp": "\u041f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043d\u0435 \u0431\u0443\u0434\u0443\u0442 \u0432\u043e\u0437\u043e\u0431\u043d\u043e\u0432\u0438\u043c\u044b\u043c\u0438 \u043f\u0440\u0438 \u0434\u043b\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u0438 \u043c\u0435\u043d\u0435\u0435 \u0434\u0430\u043d\u043d\u043e\u0433\u043e",
     "TitleAutoOrganize": "\u0410\u0432\u0442\u043e\u0440\u0435\u043e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u044f",
     "TabActivityLog": "\u0416\u0443\u0440\u043d\u0430\u043b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0439",
-    "HeaderName": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435",
+    "HeaderName": "\u0418\u043c\u044f (\u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435)",
     "HeaderDate": "\u0414\u0430\u0442\u0430",
     "HeaderSource": "\u041e\u0442\u043a\u0443\u0434\u0430",
     "HeaderDestination": "\u041a\u0443\u0434\u0430",
@@ -601,7 +602,7 @@
     "HeaderRunningTasks": "\u0412\u044b\u043f\u043e\u043b\u043d\u044f\u044e\u0449\u0438\u0435\u0441\u044f \u0437\u0430\u0434\u0430\u0447\u0438",
     "HeaderActiveDevices": "\u0410\u043a\u0442\u0438\u0432\u043d\u044b\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430",
     "HeaderPendingInstallations": "\u041e\u0442\u043b\u043e\u0436\u0435\u043d\u043d\u044b\u0435 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438",
-    "HeaderServerInformation": "\u0421\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043e \u0441\u0435\u0440\u0432\u0435\u0440\u0435",
+    "HeaderServerInformation": "\u041e \u0441\u0435\u0440\u0432\u0435\u0440\u0435",
     "ButtonRestartNow": "\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u043d\u0435\u043c\u0435\u0434\u043b\u0435\u043d\u043d\u043e",
     "ButtonRestart": "\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c",
     "ButtonShutdown": "\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c \u0440\u0430\u0431\u043e\u0442\u0443",
@@ -949,7 +950,7 @@
     "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": "\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0435 \u0437\u0430\u043f\u0438\u0441\u0438",
-    "LabelProtocolInfo": "\u0421\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043e \u043f\u0440\u043e\u0442\u043e\u043a\u043e\u043b\u0435:",
+    "LabelProtocolInfo": "\u041e \u043f\u0440\u043e\u0442\u043e\u043a\u043e\u043b\u0435:",
     "LabelProtocolInfoHelp": "\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u0435, \u043a\u043e\u0442\u043e\u0440\u043e\u0435 \u0431\u0443\u0434\u0435\u0442 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u043f\u0440\u0438 \u043e\u0442\u043a\u043b\u0438\u043a\u0435 \u043d\u0430 \u0437\u0430\u043f\u0440\u043e\u0441\u044b GetProtocolInfo \u043e\u0442 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430.",
     "TabNfo": "NFO-\u0444\u0430\u0439\u043b\u044b",
     "HeaderKodiMetadataHelp": "\u0412 Media Browser \u0438\u043c\u0435\u0435\u0442\u0441\u044f \u0432\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u0430\u044f \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043b\u044f Kodi-\u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445 \u0432 NFO-\u0444\u0430\u0439\u043b\u0430\u0445 \u0438 \u0434\u043b\u044f \u0440\u0438\u0441\u0443\u043d\u043a\u043e\u0432. \u0414\u043b\u044f \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f \u0438\u043b\u0438 \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f Kodi-\u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u0432\u043a\u043b\u0430\u0434\u043a\u0443 \u00ab\u0421\u043b\u0443\u0436\u0431\u044b\u00bb, \u0447\u0442\u043e\u0431\u044b \u0434\u043b\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u0438 \u043f\u043e \u0442\u0438\u043f\u0430\u043c \u043c\u0435\u0434\u0438\u0430\u0434\u0430\u043d\u043d\u044b\u0445.",
@@ -1119,11 +1120,14 @@
     "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",
     "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, \u043f\u0430\u0440\u043e\u043b\u044c \u043d\u0435 \u043f\u043e\u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0434\u043b\u044f \u0432\u0445\u043e\u0434\u0430 \u0432 \u043f\u0440\u0435\u0434\u0435\u043b\u0430\u0445 \u0432\u0430\u0448\u0435\u0439 \u0434\u043e\u043c\u0430\u0448\u043d\u0435\u0439 \u0441\u0435\u0442\u0438.",
+    "LabelEasyPinCode": "\u0423\u043f\u0440\u043e\u0449\u0451\u043d\u043d\u044b\u0439 PIN-\u043a\u043e\u0434:",
+    "EasyPasswordHelp": "\u0412\u0430\u0448 \u0443\u043f\u0440\u043e\u0449\u0451\u043d\u043d\u044b\u0439 PIN-\u043a\u043e\u0434 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0434\u043b\u044f \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u043e\u0433\u043e \u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u0441 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u043c\u044b\u0445 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439 Media Browser, \u0438 \u043c\u043e\u0436\u0435\u0442 \u0442\u0430\u043a\u0436\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u0443\u043f\u0440\u043e\u0449\u0451\u043d\u043d\u043e\u0433\u043e \u0432\u043d\u0443\u0442\u0440\u0438\u0441\u0435\u0442\u0435\u0432\u043e\u0433\u043e \u0432\u0445\u043e\u0434\u0430.",
+    "LabelInNetworkSignInWithEasyPassword": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0432\u043d\u0443\u0442\u0440\u0438\u0441\u0435\u0442\u0435\u0432\u043e\u0439 \u0432\u0445\u043e\u0434 \u0441 \u043c\u043e\u0438\u043c \u0443\u043f\u0440\u043e\u0449\u0451\u043d\u043d\u044b\u043c PIN-\u043a\u043e\u0434\u043e\u043c",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "\u041f\u0440\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438, \u0432\u044b \u0441\u043c\u043e\u0436\u0435\u0442\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0432\u0430\u0448 \u0443\u043f\u0440\u043e\u0449\u0451\u043d\u043d\u044b\u0439 PIN-\u043a\u043e\u0434 \u0434\u043b\u044f \u0432\u0445\u043e\u0434\u0430 \u0432 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f Media Browser \u0438\u0437\u043d\u0443\u0442\u0440\u0438 \u0432\u0430\u0448\u0435\u0439 \u0434\u043e\u043c\u0430\u0448\u043d\u0435\u0439 \u0441\u0435\u0442\u0438. \u0412\u0430\u0448 \u043e\u0431\u044b\u0447\u043d\u044b\u0439 \u043f\u0430\u0440\u043e\u043b\u044c \u0431\u0443\u0434\u0435\u0442 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c \u0442\u043e\u043b\u044c\u043a\u043e \u0432\u043d\u0435 \u0434\u043e\u043c\u0430. \u0415\u0441\u043b\u0438 PIN-\u043a\u043e\u0434 \u043e\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u043f\u0443\u0441\u0442\u044b\u043c, \u0442\u043e \u0432\u0430\u043c \u043d\u0435 \u043f\u043e\u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u043f\u0430\u0440\u043e\u043b\u044c \u0432\u043d\u0443\u0442\u0440\u0438 \u0432\u0430\u0448\u0435\u0439 \u0434\u043e\u043c\u0430\u0448\u043d\u0435\u0439 \u0441\u0435\u0442\u0438.",
     "HeaderPassword": "\u041f\u0430\u0440\u043e\u043b\u044c",
     "HeaderLocalAccess": "\u041b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0439 \u0434\u043e\u0441\u0442\u0443\u043f",
     "HeaderViewOrder": "\u041f\u043e\u0440\u044f\u0434\u043e\u043a \u0430\u0441\u043f\u0435\u043a\u0442\u043e\u0432",
+    "ButtonResetEasyPassword": "\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u0443\u043f\u0440\u043e\u0449\u0451\u043d\u043d\u044b\u0439 PIN-\u043a\u043e\u0434",
     "LabelSelectUserViewOrder": "\u0412\u044b\u0431\u043e\u0440 \u043f\u043e\u0440\u044f\u0434\u043a\u0430 \u0430\u0441\u043f\u0435\u043a\u0442\u043e\u0432, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u0431\u0443\u0434\u0443\u0442 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c\u0441\u044f \u0432 \u043f\u0440\u0435\u0434\u0435\u043b\u0430\u0445 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439 Media Browser",
     "LabelMetadataRefreshMode": "\u0420\u0435\u0436\u0438\u043c \u043f\u043e\u0434\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445:",
     "LabelImageRefreshMode": "\u0420\u0435\u0436\u0438\u043c \u043f\u043e\u0434\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f \u0440\u0438\u0441\u0443\u043d\u043a\u043e\u0432:",
@@ -1133,7 +1137,7 @@
     "OptionAddMissingDataOnly": "\u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0442\u0441\u0443\u0442-\u0438\u0445 \u0434\u0430\u043d\u043d\u044b\u0445",
     "OptionLocalRefreshOnly": "\u041f\u043e\u0434\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u0442\u043e\u043b\u044c\u043a\u043e \u043b\u043e\u043a\u0430\u043b\u044c\u043d\u043e\u0435",
     "HeaderRefreshMetadata": "\u041f\u043e\u0434\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445",
-    "HeaderPersonInfo": "\u0421\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043e \u043f\u0435\u0440\u0441\u043e\u043d\u0435",
+    "HeaderPersonInfo": "\u041e \u043f\u0435\u0440\u0441\u043e\u043d\u0435",
     "HeaderIdentifyItem": "\u0420\u0430\u0441\u043f\u043e\u0437\u043d\u0430\u043d\u0438\u0435 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430",
     "HeaderIdentifyItemHelp": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043e\u0434\u043d\u043e \u0438\u043b\u0438 \u0431\u043e\u043b\u0435\u0435 \u0443\u0441\u043b\u043e\u0432\u0438\u0439 \u043f\u043e\u0438\u0441\u043a\u0430. \u0414\u043b\u044f \u043f\u0440\u0438\u0440\u043e\u0441\u0442\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 \u0443\u0441\u043b\u043e\u0432\u0438\u0435.",
     "HeaderConfirmDeletion": "\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u044f",
@@ -1167,7 +1171,7 @@
     "LabelPlayers": "\u0418\u0433\u0440\u043e\u043a\u0438:",
     "Label3DFormat": "\u0424\u043e\u0440\u043c\u0430\u0442 3D:",
     "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",
-    "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",
+    "HeaderSpecialEpisodeInfo": "\u041e \u0441\u043f\u0435\u0446\u044d\u043f\u0438\u0437\u043e\u0434\u0435",
     "HeaderExternalIds": "\u0412\u043d\u0435\u0448\u043d\u0438\u0435 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u044b:",
     "LabelDvdSeasonNumber": "\u041d\u043e\u043c\u0435\u0440 DVD-\u0441\u0435\u0437\u043e\u043d\u0430:",
     "LabelDvdEpisodeNumber": "\u041d\u043e\u043c\u0435\u0440 DVD-\u044d\u043f\u0438\u0437\u043e\u0434\u0430:",
@@ -1206,15 +1210,15 @@
     "OptionWriter": "\u0421\u0446\u0435\u043d\u0430\u0440\u0438\u0441\u0442",
     "LabelAirDays": "\u0414\u043d\u0438 \u044d\u0444\u0438\u0440\u0430:",
     "LabelAirTime": "\u0412\u0440\u0435\u043c\u044f \u044d\u0444\u0438\u0440\u0430:",
-    "HeaderMediaInfo": "\u0421\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043e \u043c\u0435\u0434\u0438\u0430\u0434\u0430\u043d\u043d\u044b\u0445",
-    "HeaderPhotoInfo": "\u0421\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043e \u0444\u043e\u0442\u043e\u0433\u0440\u0430\u0444\u0438\u0438",
+    "HeaderMediaInfo": "\u041e \u043c\u0435\u0434\u0438\u0430\u0434\u0430\u043d\u043d\u044b\u0445",
+    "HeaderPhotoInfo": "\u041e \u0444\u043e\u0442\u043e\u0433\u0440\u0430\u0444\u0438\u0438",
     "HeaderInstall": "\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430",
     "LabelSelectVersionToInstall": "\u0412\u044b\u0431\u043e\u0440 \u0432\u0435\u0440\u0441\u0438\u0438 \u0434\u043b\u044f \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438:",
     "LinkSupporterMembership": "\u0423\u0437\u043d\u0430\u0442\u044c \u043e \u0447\u043b\u0435\u043d\u0441\u0442\u0432\u0435 \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u0430",
     "MessageSupporterPluginRequiresMembership": "\u0414\u0430\u043d\u043d\u043e\u043c\u0443 \u043f\u043b\u0430\u0433\u0438\u043d\u0443 \u043f\u043e\u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u0447\u043b\u0435\u043d\u0441\u0442\u0432\u043e \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u0430 \u0447\u0435\u0440\u0435\u0437 14 \u0434\u043d\u0435\u0439 \u043f\u0440\u043e\u0431\u043d\u043e\u0433\u043e \u043f\u0435\u0440\u0438\u043e\u0434\u0430.",
     "MessagePremiumPluginRequiresMembership": "\u0414\u0430\u043d\u043d\u043e\u043c\u0443 \u043f\u043b\u0430\u0433\u0438\u043d\u0443 \u043f\u043e\u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u0447\u043b\u0435\u043d\u0441\u0442\u0432\u043e \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u0430 \u0434\u043b\u044f \u043f\u0440\u0438\u043e\u0431\u0440\u0435\u0442\u0435\u043d\u0438\u044f \u0447\u0435\u0440\u0435\u0437 14 \u0434\u043d\u0435\u0439 \u043f\u0440\u043e\u0431\u043d\u043e\u0433\u043e \u043f\u0435\u0440\u0438\u043e\u0434\u0430.",
     "HeaderReviews": "\u041e\u0442\u0437\u044b\u0432\u044b",
-    "HeaderDeveloperInfo": "\u0421\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043e \u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u0430\u0445",
+    "HeaderDeveloperInfo": "\u041e \u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u0430\u0445",
     "HeaderRevisionHistory": "\u0418\u0441\u0442\u043e\u0440\u0438\u044f \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0439",
     "ButtonViewWebsite": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0432\u0435\u0431\u0441\u0430\u0439\u0442",
     "LabelRecurringDonationCanBeCancelledHelp": "\u0420\u0435\u0433\u0443\u043b\u044f\u0440\u043d\u044b\u0435 \u043f\u043e\u0436\u0435\u0440\u0442\u0432\u043e\u0432\u0430\u043d\u0438\u044f \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u0432 \u043b\u044e\u0431\u043e\u0435 \u0432\u0440\u0435\u043c\u044f \u0447\u0435\u0440\u0435\u0437 \u0432\u0430\u0448\u0443 \u0443\u0447\u0451\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c PayPal.",
@@ -1227,7 +1231,7 @@
     "LabelExtractChaptersDuringLibraryScanHelp": "\u041f\u0440\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438, \u0440\u0438\u0441\u0443\u043d\u043a\u0438 \u0441\u0446\u0435\u043d \u0431\u0443\u0434\u0443\u0442 \u0438\u0437\u0432\u043b\u0435\u0447\u0435\u043d\u044b, \u043a\u043e\u0433\u0434\u0430 \u0432\u0438\u0434\u0435\u043e \u0438\u043c\u043f\u043e\u0440\u0442\u0438\u0440\u0443\u0435\u0442\u0441\u044f \u0432\u043e \u0432\u0440\u0435\u043c\u044f \u0441\u043a\u0430\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438. \u041f\u0440\u0438 \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438, \u043e\u043d\u0438 \u0431\u0443\u0434\u0443\u0442 \u0438\u0437\u0432\u043b\u0435\u0447\u0435\u043d\u044b \u0432 \u0442\u0435\u0447\u0435\u043d\u0438\u0435 \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u043e\u0439 \u0437\u0430\u0434\u0430\u0447\u0438 \u00ab\u0420\u0438\u0441\u0443\u043d\u043a\u0438 \u0441\u0446\u0435\u043d\u00bb, \u043f\u043e\u0437\u0432\u043e\u043b\u044f\u044f \u0440\u0435\u0433\u0443\u043b\u044f\u0440\u043d\u043e\u043c\u0443 \u0441\u043a\u0430\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044e \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438 \u0437\u0430\u0432\u0435\u0440\u0448\u0430\u0442\u044c\u0441\u044f \u0431\u044b\u0441\u0442\u0440\u0435\u0435.",
     "LabelConnectGuestUserName": "\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f Media Browser \u0438\u043b\u0438 \u0430\u0434\u0440\u0435\u0441 \u044d-\u043f\u043e\u0447\u0442\u044b:",
     "LabelConnectUserName": "\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f Media Browser \/ \u044d-\u043f\u043e\u0447\u0442\u0430:",
-    "LabelConnectUserNameHelp": "\u0421\u043e\u0435\u0434\u0438\u043d\u0438\u0442\u0435 \u044d\u0442\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f c \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u044c\u044e Media Browser, \u0447\u0442\u043e\u0431\u044b \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f \u043a \u0443\u0434\u043e\u0431\u043d\u043e\u043c\u0443 \u0432\u0445\u043e\u0434\u0443 \u0438\u0437 \u043b\u044e\u0431\u043e\u0433\u043e \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f Media Browser \u0431\u0435\u0437 \u043d\u0430\u0434\u043e\u0431\u043d\u043e\u0441\u0442\u0438 \u0437\u043d\u0430\u0442\u044c IP-\u0430\u0434\u0440\u0435\u0441 \u0441\u0435\u0440\u0432\u0435\u0440\u0430.",
+    "LabelConnectUserNameHelp": "\u0421\u043e\u0435\u0434\u0438\u043d\u0438\u0442\u0435 \u044d\u0442\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f c \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u044c\u044e Media Browser, \u0447\u0442\u043e\u0431\u044b \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f \u043a \u0443\u043f\u0440\u043e\u0449\u0451\u043d\u043d\u043e\u043c\u0443 \u0432\u0445\u043e\u0434\u0443 \u0438\u0437 \u043b\u044e\u0431\u043e\u0433\u043e \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f Media Browser \u0431\u0435\u0437 \u043d\u0430\u0434\u043e\u0431\u043d\u043e\u0441\u0442\u0438 \u0437\u043d\u0430\u0442\u044c IP-\u0430\u0434\u0440\u0435\u0441 \u0441\u0435\u0440\u0432\u0435\u0440\u0430.",
     "ButtonLearnMoreAboutMediaBrowserConnect": "\u0423\u0437\u043d\u0430\u0442\u044c \u0431\u043e\u043b\u044c\u0448\u0435 \u043e Media Browser Connect",
     "LabelExternalPlayers": "\u0412\u043d\u0435\u0448\u043d\u0438\u0435 \u043f\u0440\u043e\u0438\u0433\u0440\u044b\u0432\u0430\u0442\u0435\u043b\u0438:",
     "LabelExternalPlayersHelp": "\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u044e\u0442\u0441\u044f \u043a\u043d\u043e\u043f\u043a\u0438 \u0434\u043b\u044f \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u044f \u0432\u043e \u0432\u043d\u0435\u0448\u043d\u0438\u0445 \u043f\u0440\u043e\u0438\u0433\u0440\u044b\u0432\u0430\u0442\u0435\u043b\u044f\u0445. \u041e\u043d\u0438 \u0438\u043c\u0435\u044e\u0442\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e \u043d\u0430 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430\u0445, \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u044e\u0449\u0438\u0445 URL-\u0441\u0445\u0435\u043c\u044b, \u043e\u0431\u044b\u0447\u043d\u043e, \u0432 Android \u0438 iOS. \u0412\u043e \u0432\u043d\u0435\u0448\u043d\u0438\u0445 \u043f\u0440\u043e\u0438\u0433\u0440\u044b\u0432\u0430\u0442\u0435\u043b\u044f\u0445, \u043a\u0430\u043a \u043f\u0440\u0430\u0432\u0438\u043b\u043e, \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0430 \u0443\u0434\u0430\u043b\u0451\u043d\u043d\u043e\u0433\u043e \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0438\u043b\u0438 \u0432\u043e\u0437\u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f.",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/sv.json b/MediaBrowser.Server.Implementations/Localization/Server/sv.json
index 74d76ab7f..e3d1d54a8 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/sv.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/sv.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Paths",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1119,11 +1120,14 @@
     "LabelDisplayFoldersView": "Vy som visar vanliga lagringsmappar",
     "ViewTypeLiveTvRecordingGroups": "Inspelningar",
     "ViewTypeLiveTvChannels": "Kanaler",
-    "LabelAllowLocalAccessWithoutPassword": "Till\u00e5t lokal \u00e5tkomst utan l\u00f6senord",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "G\u00f6r att l\u00f6senord ej kr\u00e4vs vid inloggning fr\u00e5n hemman\u00e4tverket.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "L\u00f6senord",
     "HeaderLocalAccess": "Lokal \u00e5tkomst",
     "HeaderViewOrder": "Visningsordning",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "V\u00e4lj i vilken ordning dina vyer skall visas i Media Browser-appar",
     "LabelMetadataRefreshMode": "Metod f\u00f6r uppdatering av metadata:",
     "LabelImageRefreshMode": "Metod f\u00f6r uppdatering av bilder:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/tr.json b/MediaBrowser.Server.Implementations/Localization/Server/tr.json
index e6ac2ddea..4fd8a764a 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/tr.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/tr.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Paths",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1119,11 +1120,14 @@
     "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.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Password",
     "HeaderLocalAccess": "Local Access",
     "HeaderViewOrder": "View Order",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "LabelImageRefreshMode": "Image refresh mode:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/uk.json b/MediaBrowser.Server.Implementations/Localization/Server/uk.json
index 452343f32..f6d79e3a7 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/uk.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/uk.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "\u0412\u0456\u0434\u0435\u043e",
     "HeaderPaths": "Paths",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1119,11 +1120,14 @@
     "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.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Password",
     "HeaderLocalAccess": "Local Access",
     "HeaderViewOrder": "View Order",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "LabelImageRefreshMode": "Image refresh mode:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/vi.json b/MediaBrowser.Server.Implementations/Localization/Server/vi.json
index ff69301b5..d6330bf1e 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/vi.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/vi.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Paths",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1119,11 +1120,14 @@
     "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.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Password",
     "HeaderLocalAccess": "Local Access",
     "HeaderViewOrder": "View Order",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "LabelImageRefreshMode": "Image refresh mode:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/zh_CN.json b/MediaBrowser.Server.Implementations/Localization/Server/zh_CN.json
index 3cdfa8126..56bd68f6e 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/zh_CN.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/zh_CN.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "\u89c6\u9891",
     "HeaderPaths": "Paths",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1119,11 +1120,14 @@
     "LabelDisplayFoldersView": "\u663e\u793a\u4e00\u4e2a\u6587\u4ef6\u5939\u89c6\u56fe\u6765\u5448\u73b0\u5e73\u9762\u5a92\u4f53\u6587\u4ef6\u5939",
     "ViewTypeLiveTvRecordingGroups": "\u5f55\u5236",
     "ViewTypeLiveTvChannels": "\u9891\u9053",
-    "LabelAllowLocalAccessWithoutPassword": "\u5141\u8bb8\u672c\u5730\u8bbf\u95ee\u4e0d\u4f7f\u7528\u5bc6\u7801",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "\u5f53\u542f\u7528\u65f6\uff0c\u4ece\u60a8\u7684\u5bb6\u5ead\u7f51\u7edc\u4e2d\u767b\u5f55\u65f6\u5c06\u4e0d\u9700\u8981\u5bc6\u7801\u3002",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "\u5bc6\u7801",
     "HeaderLocalAccess": "\u672c\u5730\u8bbf\u95ee",
     "HeaderViewOrder": "\u67e5\u770b\u987a\u5e8f",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "\u60a8\u6240\u9009\u62e9\u7684\u67e5\u770b\u987a\u5e8f\u5c06\u663e\u793a\u5728Media Browser \u7684\u5404\u79cdApp\u4e0a\u9762",
     "LabelMetadataRefreshMode": "\u5a92\u4f53\u8d44\u6599\u5237\u65b0\u6a21\u5f0f\uff1a",
     "LabelImageRefreshMode": "\u56fe\u7247\u5237\u65b0\u6a21\u5f0f\uff1a",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json b/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
index 543d3a965..2e6f40e43 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
@@ -56,6 +56,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Paths",
     "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
     "RegisterWithPayPal": "Register with PayPal",
     "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
     "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
@@ -1119,11 +1120,14 @@
     "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.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Password",
     "HeaderLocalAccess": "Local Access",
     "HeaderViewOrder": "View Order",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "LabelImageRefreshMode": "Image refresh mode:",
diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec
index b594f3973..ff6e92c6b 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.547</version>
+        <version>3.0.550</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.547" />
+            <dependency id="MediaBrowser.Common" version="3.0.550" />
             <dependency id="NLog" version="3.1.0.0" />
             <dependency id="SimpleInjector" version="2.6.1" />
         </dependencies>
diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec
index 857ab8e87..ea08142be 100644
--- a/Nuget/MediaBrowser.Common.nuspec
+++ b/Nuget/MediaBrowser.Common.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common</id>
-        <version>3.0.547</version>
+        <version>3.0.550</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 2ef4ac4b5..a420f4eae 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.547</version>
+        <version>3.0.550</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 d28a38a8d..bf8c18ad8 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.547</version>
+        <version>3.0.550</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.547" />
+            <dependency id="MediaBrowser.Common" version="3.0.550" />
         </dependencies>
     </metadata>
     <files>
-- 
cgit v1.2.3


From 9110d23710980eecc112753af46f7fcda7558364 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 7 Feb 2015 16:03:09 -0500
Subject: added SupportsExternalStream to MediaStream

---
 MediaBrowser.Controller/Entities/Audio/Audio.cs    |  2 +-
 MediaBrowser.Controller/Entities/BaseItem.cs       |  1 +
 MediaBrowser.Controller/Entities/Video.cs          |  7 +--
 .../Library/IMediaSourceManager.cs                 | 11 +++++
 .../MediaBrowser.Controller.csproj                 |  1 +
 .../MediaEncoding/MediaStreamSelector.cs           | 12 +++--
 MediaBrowser.Model/Dlna/StreamBuilder.cs           |  7 ++-
 MediaBrowser.Model/Entities/MediaStream.cs         |  8 +++-
 .../Subtitles/SubtitleManager.cs                   |  8 ++--
 .../Library/MediaSourceManager.cs                  | 51 ++++++++++++++++++++++
 .../MediaBrowser.Server.Implementations.csproj     |  1 +
 .../Session/SessionManager.cs                      |  8 ++--
 .../Sync/SyncJobProcessor.cs                       |  3 +-
 .../ApplicationHost.cs                             |  9 +++-
 14 files changed, 108 insertions(+), 21 deletions(-)
 create mode 100644 MediaBrowser.Controller/Library/IMediaSourceManager.cs
 create mode 100644 MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs
index a7b91b868..902447999 100644
--- a/MediaBrowser.Controller/Entities/Audio/Audio.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs
@@ -239,7 +239,7 @@ namespace MediaBrowser.Controller.Entities.Audio
             {
                 Id = i.Id.ToString("N"),
                 Protocol = locationType == LocationType.Remote ? MediaProtocol.Http : MediaProtocol.File,
-                MediaStreams = ItemRepository.GetMediaStreams(new MediaStreamQuery { ItemId = i.Id }).ToList(),
+                MediaStreams = MediaSourceManager.GetMediaStreams(new MediaStreamQuery { ItemId = i.Id }).ToList(),
                 Name = i.Name,
                 Path = enablePathSubstituion ? GetMappedPath(i.Path, locationType) : i.Path,
                 RunTimeTicks = i.RunTimeTicks,
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 1443d99d3..1379ba829 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -300,6 +300,7 @@ namespace MediaBrowser.Controller.Entities
         public static IChannelManager ChannelManager { get; set; }
         public static ICollectionManager CollectionManager { get; set; }
         public static IImageProcessor ImageProcessor { get; set; }
+        public static IMediaSourceManager MediaSourceManager { get; set; }
 
         /// <summary>
         /// Returns a <see cref="System.String" /> that represents this instance.
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index 12c377c90..d4507bc33 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -422,7 +422,7 @@ namespace MediaBrowser.Controller.Entities
 
         public virtual IEnumerable<MediaStream> GetMediaStreams()
         {
-            return ItemRepository.GetMediaStreams(new MediaStreamQuery
+            return MediaSourceManager.GetMediaStreams(new MediaStreamQuery
             {
                 ItemId = Id
             });
@@ -435,7 +435,7 @@ namespace MediaBrowser.Controller.Entities
                 return null;
             }
 
-            return ItemRepository.GetMediaStreams(new MediaStreamQuery
+            return MediaSourceManager.GetMediaStreams(new MediaStreamQuery
             {
                 ItemId = Id,
                 Index = DefaultVideoStreamIndex.Value
@@ -474,7 +474,8 @@ namespace MediaBrowser.Controller.Entities
 
         private static MediaSourceInfo GetVersionInfo(bool enablePathSubstitution, Video i, MediaSourceType type)
         {
-            var mediaStreams = ItemRepository.GetMediaStreams(new MediaStreamQuery { ItemId = i.Id }).ToList();
+            var mediaStreams = MediaSourceManager.GetMediaStreams(new MediaStreamQuery { ItemId = i.Id })
+                .ToList();
 
             var locationType = i.LocationType;
 
diff --git a/MediaBrowser.Controller/Library/IMediaSourceManager.cs b/MediaBrowser.Controller/Library/IMediaSourceManager.cs
new file mode 100644
index 000000000..4378bc85d
--- /dev/null
+++ b/MediaBrowser.Controller/Library/IMediaSourceManager.cs
@@ -0,0 +1,11 @@
+using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Model.Entities;
+using System.Collections.Generic;
+
+namespace MediaBrowser.Controller.Library
+{
+    public interface IMediaSourceManager
+    {
+        IEnumerable<MediaStream> GetMediaStreams(MediaStreamQuery query);
+    }
+}
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 27beabcc1..e9531e057 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -170,6 +170,7 @@
     <Compile Include="FileOrganization\IFileOrganizationService.cs" />
     <Compile Include="Library\DeleteOptions.cs" />
     <Compile Include="Library\ILibraryPostScanTask.cs" />
+    <Compile Include="Library\IMediaSourceManager.cs" />
     <Compile Include="Library\IMetadataFileSaver.cs" />
     <Compile Include="Library\IMetadataSaver.cs" />
     <Compile Include="Library\IMusicManager.cs" />
diff --git a/MediaBrowser.Controller/MediaEncoding/MediaStreamSelector.cs b/MediaBrowser.Controller/MediaEncoding/MediaStreamSelector.cs
index b18651a68..57fddb2b1 100644
--- a/MediaBrowser.Controller/MediaEncoding/MediaStreamSelector.cs
+++ b/MediaBrowser.Controller/MediaEncoding/MediaStreamSelector.cs
@@ -90,10 +90,16 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 return index == -1 ? 100 : index;
             })
-                 .ThenBy(i => i.IsDefault)
-                 .ThenBy(i => i.IsTextSubtitleStream)
-                 .ThenBy(i => i.IsExternal)
+                 .ThenBy(i => GetBooleanOrderBy(i.IsDefault))
+                 .ThenBy(i => GetBooleanOrderBy(i.SupportsExternalStream))
+                 .ThenBy(i => GetBooleanOrderBy(i.IsTextSubtitleStream))
+                 .ThenBy(i => GetBooleanOrderBy(i.IsExternal))
                  .ThenBy(i => i.Index);
         }
+
+        private static int GetBooleanOrderBy(bool value)
+        {
+            return value ? 0 : 1;
+        }
     }
 }
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 6076637b4..6fa29a533 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -543,9 +543,12 @@ namespace MediaBrowser.Model.Dlna
             // Look for an external profile that matches the stream type (text/graphical)
             foreach (SubtitleProfile profile in deviceProfile.SubtitleProfiles)
             {
-                if (profile.Method == SubtitleDeliveryMethod.External && subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format))
+                if (subtitleStream.SupportsExternalStream)
                 {
-                    return profile;
+                    if (profile.Method == SubtitleDeliveryMethod.External && subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format))
+                    {
+                        return profile;
+                    }
                 }
             }
 
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index db4a68cff..4af32bb50 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -50,7 +50,7 @@ namespace MediaBrowser.Model.Entities
         /// </summary>
         /// <value>The reference frames.</value>
         public int? RefFrames { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the length of the packet.
         /// </summary>
@@ -156,6 +156,12 @@ namespace MediaBrowser.Model.Entities
                    !StringHelper.EqualsIgnoreCase(codec, "sub");
         }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether [supports external stream].
+        /// </summary>
+        /// <value><c>true</c> if [supports external stream]; otherwise, <c>false</c>.</value>
+        public bool SupportsExternalStream { get; set; }
+
         /// <summary>
         /// Gets or sets the filename.
         /// </summary>
diff --git a/MediaBrowser.Providers/Subtitles/SubtitleManager.cs b/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
index 187f8814b..c449edd07 100644
--- a/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
+++ b/MediaBrowser.Providers/Subtitles/SubtitleManager.cs
@@ -27,18 +27,18 @@ namespace MediaBrowser.Providers.Subtitles
         private readonly IFileSystem _fileSystem;
         private readonly ILibraryMonitor _monitor;
         private readonly ILibraryManager _libraryManager;
-        private readonly IItemRepository _itemRepo;
+        private readonly IMediaSourceManager _mediaSourceManager;
 
         public event EventHandler<SubtitleDownloadEventArgs> SubtitlesDownloaded;
         public event EventHandler<SubtitleDownloadFailureEventArgs> SubtitleDownloadFailure;
 
-        public SubtitleManager(ILogger logger, IFileSystem fileSystem, ILibraryMonitor monitor, ILibraryManager libraryManager, IItemRepository itemRepo)
+        public SubtitleManager(ILogger logger, IFileSystem fileSystem, ILibraryMonitor monitor, ILibraryManager libraryManager, IMediaSourceManager mediaSourceManager)
         {
             _logger = logger;
             _fileSystem = fileSystem;
             _monitor = monitor;
             _libraryManager = libraryManager;
-            _itemRepo = itemRepo;
+            _mediaSourceManager = mediaSourceManager;
         }
 
         public void AddParts(IEnumerable<ISubtitleProvider> subtitleProviders)
@@ -232,7 +232,7 @@ namespace MediaBrowser.Providers.Subtitles
 
         public Task DeleteSubtitles(string itemId, int index)
         {
-            var stream = _itemRepo.GetMediaStreams(new MediaStreamQuery
+            var stream = _mediaSourceManager.GetMediaStreams(new MediaStreamQuery
             {
                 Index = index,
                 ItemId = new Guid(itemId),
diff --git a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
new file mode 100644
index 000000000..a45757d13
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
@@ -0,0 +1,51 @@
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Model.Entities;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace MediaBrowser.Server.Implementations.Library
+{
+    public class MediaSourceManager : IMediaSourceManager
+    {
+        private readonly IItemRepository _itemRepo;
+
+        public MediaSourceManager(IItemRepository itemRepo)
+        {
+            _itemRepo = itemRepo;
+        }
+
+        public IEnumerable<MediaStream> GetMediaStreams(MediaStreamQuery query)
+        {
+            var list = _itemRepo.GetMediaStreams(query)
+                .ToList();
+
+            foreach (var stream in list)
+            {
+                stream.SupportsExternalStream = StreamSupportsExternalStream(stream);
+            }
+
+            return list;
+        }
+
+        private bool StreamSupportsExternalStream(MediaStream stream)
+        {
+            if (stream.IsExternal)
+            {
+                return true;
+            }
+
+            if (stream.IsTextSubtitleStream)
+            {
+                return InternalTextStreamSupportsExternalStream(stream);
+            }
+
+            return false;
+        }
+
+        private bool InternalTextStreamSupportsExternalStream(MediaStream stream)
+        {
+            return true;
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index bf11e4ef6..ce77b3db1 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -185,6 +185,7 @@
     <Compile Include="Library\CoreResolutionIgnoreRule.cs" />
     <Compile Include="Library\LibraryManager.cs" />
     <Compile Include="Library\LocalTrailerPostScanTask.cs" />
+    <Compile Include="Library\MediaSourceManager.cs" />
     <Compile Include="Library\MusicManager.cs" />
     <Compile Include="Library\PathExtensions.cs" />
     <Compile Include="Library\Resolvers\SpecialFolderResolver.cs" />
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 6166e3d65..308f46c23 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -56,7 +56,7 @@ namespace MediaBrowser.Server.Implementations.Session
         private readonly IMusicManager _musicManager;
         private readonly IDtoService _dtoService;
         private readonly IImageProcessor _imageProcessor;
-        private readonly IItemRepository _itemRepo;
+        private readonly IMediaSourceManager _mediaSourceManager;
 
         private readonly IHttpClient _httpClient;
         private readonly IJsonSerializer _jsonSerializer;
@@ -97,7 +97,7 @@ namespace MediaBrowser.Server.Implementations.Session
 
         private readonly SemaphoreSlim _sessionLock = new SemaphoreSlim(1, 1);
 
-        public SessionManager(IUserDataManager userDataRepository, ILogger logger, IUserRepository userRepository, ILibraryManager libraryManager, IUserManager userManager, IMusicManager musicManager, IDtoService dtoService, IImageProcessor imageProcessor, IItemRepository itemRepo, IJsonSerializer jsonSerializer, IServerApplicationHost appHost, IHttpClient httpClient, IAuthenticationRepository authRepo, IDeviceManager deviceManager)
+        public SessionManager(IUserDataManager userDataRepository, ILogger logger, IUserRepository userRepository, ILibraryManager libraryManager, IUserManager userManager, IMusicManager musicManager, IDtoService dtoService, IImageProcessor imageProcessor, IJsonSerializer jsonSerializer, IServerApplicationHost appHost, IHttpClient httpClient, IAuthenticationRepository authRepo, IDeviceManager deviceManager, IMediaSourceManager mediaSourceManager)
         {
             _userDataRepository = userDataRepository;
             _logger = logger;
@@ -107,12 +107,12 @@ namespace MediaBrowser.Server.Implementations.Session
             _musicManager = musicManager;
             _dtoService = dtoService;
             _imageProcessor = imageProcessor;
-            _itemRepo = itemRepo;
             _jsonSerializer = jsonSerializer;
             _appHost = appHost;
             _httpClient = httpClient;
             _authRepo = authRepo;
             _deviceManager = deviceManager;
+            _mediaSourceManager = mediaSourceManager;
 
             _deviceManager.DeviceOptionsUpdated += _deviceManager_DeviceOptionsUpdated;
         }
@@ -1560,7 +1560,7 @@ namespace MediaBrowser.Server.Implementations.Session
 
             if (!string.IsNullOrWhiteSpace(mediaSourceId))
             {
-                info.MediaStreams = _itemRepo.GetMediaStreams(new MediaStreamQuery
+                info.MediaStreams = _mediaSourceManager.GetMediaStreams(new MediaStreamQuery
                 {
                     ItemId = new Guid(mediaSourceId)
 
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
index c299bf155..e9d9dc46f 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
@@ -616,7 +616,8 @@ namespace MediaBrowser.Server.Implementations.Sync
                     IsForced = subtitle.IsForced,
                     IsExternal = true,
                     Language = subtitle.Language,
-                    Path = fileInfo.Path
+                    Path = fileInfo.Path,
+                    SupportsExternalStream = true
                 });
 
                 startingIndex++;
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index 0bf9b9142..08c32204f 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -196,6 +196,7 @@ namespace MediaBrowser.Server.Startup.Common
         private ISyncRepository SyncRepository { get; set; }
         private ITVSeriesManager TVSeriesManager { get; set; }
         private ICollectionManager CollectionManager { get; set; }
+        private IMediaSourceManager MediaSourceManager { get; set; }
 
         private readonly StartupOptions _startupOptions;
         private readonly string _remotePackageName;
@@ -459,7 +460,10 @@ namespace MediaBrowser.Server.Startup.Common
             DeviceManager = new DeviceManager(new DeviceRepository(ApplicationPaths, JsonSerializer, Logger, FileSystemManager), UserManager, FileSystemManager, LibraryMonitor, ConfigurationManager, LogManager.GetLogger("DeviceManager"));
             RegisterSingleInstance(DeviceManager);
 
-            SessionManager = new SessionManager(UserDataManager, Logger, UserRepository, LibraryManager, UserManager, musicManager, DtoService, ImageProcessor, ItemRepository, JsonSerializer, this, HttpClient, AuthenticationRepository, DeviceManager);
+            MediaSourceManager = new MediaSourceManager(ItemRepository);
+            RegisterSingleInstance(MediaSourceManager);
+
+            SessionManager = new SessionManager(UserDataManager, Logger, UserRepository, LibraryManager, UserManager, musicManager, DtoService, ImageProcessor, JsonSerializer, this, HttpClient, AuthenticationRepository, DeviceManager, MediaSourceManager);
             RegisterSingleInstance(SessionManager);
 
             var newsService = new Implementations.News.NewsService(ApplicationPaths, JsonSerializer);
@@ -503,7 +507,7 @@ namespace MediaBrowser.Server.Startup.Common
             NotificationManager = new NotificationManager(LogManager, UserManager, ServerConfigurationManager);
             RegisterSingleInstance(NotificationManager);
 
-            SubtitleManager = new SubtitleManager(LogManager.GetLogger("SubtitleManager"), FileSystemManager, LibraryMonitor, LibraryManager, ItemRepository);
+            SubtitleManager = new SubtitleManager(LogManager.GetLogger("SubtitleManager"), FileSystemManager, LibraryMonitor, LibraryManager, MediaSourceManager);
             RegisterSingleInstance(SubtitleManager);
 
             ChapterManager = new ChapterManager(LibraryManager, LogManager.GetLogger("ChapterManager"), ServerConfigurationManager, ItemRepository);
@@ -696,6 +700,7 @@ namespace MediaBrowser.Server.Startup.Common
             Folder.UserViewManager = UserViewManager;
             UserView.TVSeriesManager = TVSeriesManager;
             BaseItem.CollectionManager = CollectionManager;
+            BaseItem.MediaSourceManager = MediaSourceManager;
         }
 
         /// <summary>
-- 
cgit v1.2.3