From f756e39b9d5b461e6bcaa4e71006038983d28213 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 30 Mar 2014 12:49:40 -0400
Subject: restored live tv playback in the web client

---
 MediaBrowser.Controller/Dto/IDtoService.cs         |  7 ++
 MediaBrowser.Controller/Library/IMusicManager.cs   | 38 +++++++++++
 MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs |  4 +-
 .../MediaBrowser.Controller.csproj                 |  4 ++
 .../MediaEncoding/EncodingOptions.cs               | 79 ++++++++++++++++++++++
 .../MediaEncoding/EncodingResult.cs                | 13 ++++
 .../MediaEncoding/VideoEncodingOptions.cs          | 26 +++++++
 7 files changed, 170 insertions(+), 1 deletion(-)
 create mode 100644 MediaBrowser.Controller/Library/IMusicManager.cs
 create mode 100644 MediaBrowser.Controller/MediaEncoding/EncodingOptions.cs
 create mode 100644 MediaBrowser.Controller/MediaEncoding/EncodingResult.cs
 create mode 100644 MediaBrowser.Controller/MediaEncoding/VideoEncodingOptions.cs

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Dto/IDtoService.cs b/MediaBrowser.Controller/Dto/IDtoService.cs
index a02851a9f..2704959e4 100644
--- a/MediaBrowser.Controller/Dto/IDtoService.cs
+++ b/MediaBrowser.Controller/Dto/IDtoService.cs
@@ -85,6 +85,13 @@ namespace MediaBrowser.Controller.Dto
         /// <returns>ChapterInfoDto.</returns>
         ChapterInfoDto GetChapterInfoDto(ChapterInfo chapterInfo, BaseItem item);
 
+        /// <summary>
+        /// Gets the media sources.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <returns>List{MediaSourceInfo}.</returns>
+        List<MediaSourceInfo> GetMediaSources(BaseItem item);
+
         /// <summary>
         /// Gets the item by name dto.
         /// </summary>
diff --git a/MediaBrowser.Controller/Library/IMusicManager.cs b/MediaBrowser.Controller/Library/IMusicManager.cs
new file mode 100644
index 000000000..192ce2e83
--- /dev/null
+++ b/MediaBrowser.Controller/Library/IMusicManager.cs
@@ -0,0 +1,38 @@
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Audio;
+using System.Collections.Generic;
+
+namespace MediaBrowser.Controller.Library
+{
+    public interface IMusicManager
+    {
+        /// <summary>
+        /// Gets the instant mix from song.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <param name="user">The user.</param>
+        /// <returns>IEnumerable{Audio}.</returns>
+        IEnumerable<Audio> GetInstantMixFromSong(Audio item, User user);
+        /// <summary>
+        /// Gets the instant mix from artist.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="user">The user.</param>
+        /// <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 genre.
+        /// </summary>
+        /// <param name="genres">The genres.</param>
+        /// <param name="user">The user.</param>
+        /// <returns>IEnumerable{Audio}.</returns>
+        IEnumerable<Audio> GetInstantMixFromGenres(IEnumerable<string> genres, User user);
+    }
+}
diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs b/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs
index edf86cae8..f8cdc6eee 100644
--- a/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs
+++ b/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs
@@ -1,8 +1,8 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Library;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Model.Library;
 
 namespace MediaBrowser.Controller.LiveTv
 {
@@ -14,6 +14,8 @@ namespace MediaBrowser.Controller.LiveTv
 
         RecordingInfo RecordingInfo { get; set; }
 
+        long? RunTimeTicks { get; set; }
+
         string GetClientTypeName();
 
         string GetUserDataKey();
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 9915ac044..16834a945 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -134,6 +134,7 @@
     <Compile Include="Library\DeleteOptions.cs" />
     <Compile Include="Library\ILibraryPostScanTask.cs" />
     <Compile Include="Library\IMetadataSaver.cs" />
+    <Compile Include="Library\IMusicManager.cs" />
     <Compile Include="Library\ItemUpdateType.cs" />
     <Compile Include="Library\IUserDataManager.cs" />
     <Compile Include="Library\UserDataSaveEventArgs.cs" />
@@ -155,11 +156,14 @@
     <Compile Include="LiveTv\SeriesTimerInfo.cs" />
     <Compile Include="LiveTv\TimerInfo.cs" />
     <Compile Include="Localization\ILocalizationManager.cs" />
+    <Compile Include="MediaEncoding\EncodingOptions.cs" />
     <Compile Include="MediaEncoding\ChapterImageRefreshOptions.cs" />
+    <Compile Include="MediaEncoding\EncodingResult.cs" />
     <Compile Include="MediaEncoding\IEncodingManager.cs" />
     <Compile Include="MediaEncoding\ImageEncodingOptions.cs" />
     <Compile Include="MediaEncoding\IMediaEncoder.cs" />
     <Compile Include="MediaEncoding\InternalMediaInfoResult.cs" />
+    <Compile Include="MediaEncoding\VideoEncodingOptions.cs" />
     <Compile Include="Net\IHasResultFactory.cs" />
     <Compile Include="Net\IHttpResultFactory.cs" />
     <Compile Include="Net\IHttpServer.cs" />
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingOptions.cs b/MediaBrowser.Controller/MediaEncoding/EncodingOptions.cs
new file mode 100644
index 000000000..74235becd
--- /dev/null
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingOptions.cs
@@ -0,0 +1,79 @@
+using MediaBrowser.Controller.Dlna;
+
+namespace MediaBrowser.Controller.MediaEncoding
+{
+    public class EncodingOptions
+    {
+        /// <summary>
+        /// Gets or sets the item identifier.
+        /// </summary>
+        /// <value>The item identifier.</value>
+        public string ItemId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the media source identifier.
+        /// </summary>
+        /// <value>The media source identifier.</value>
+        public string MediaSourceId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the device profile.
+        /// </summary>
+        /// <value>The device profile.</value>
+        public DeviceProfile DeviceProfile { get; set; }
+        
+        /// <summary>
+        /// Gets or sets the output path.
+        /// </summary>
+        /// <value>The output path.</value>
+        public string OutputPath { get; set; }
+
+        /// <summary>
+        /// Gets or sets the container.
+        /// </summary>
+        /// <value>The container.</value>
+        public string Container { get; set; }
+        
+        /// <summary>
+        /// Gets or sets the audio codec.
+        /// </summary>
+        /// <value>The audio codec.</value>
+        public string AudioCodec { get; set; }
+        
+        /// <summary>
+        /// Gets or sets the start time ticks.
+        /// </summary>
+        /// <value>The start time ticks.</value>
+        public long? StartTimeTicks { get; set; }
+
+        /// <summary>
+        /// Gets or sets the maximum channels.
+        /// </summary>
+        /// <value>The maximum channels.</value>
+        public int? MaxAudioChannels { get; set; }
+
+        /// <summary>
+        /// Gets or sets the channels.
+        /// </summary>
+        /// <value>The channels.</value>
+        public int? AudioChannels { get; set; }
+
+        /// <summary>
+        /// Gets or sets the sample rate.
+        /// </summary>
+        /// <value>The sample rate.</value>
+        public int? AudioSampleRate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the bit rate.
+        /// </summary>
+        /// <value>The bit rate.</value>
+        public int? AudioBitRate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the maximum audio bit rate.
+        /// </summary>
+        /// <value>The maximum audio bit rate.</value>
+        public int? MaxAudioBitRate { get; set; }
+    }
+}
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingResult.cs b/MediaBrowser.Controller/MediaEncoding/EncodingResult.cs
new file mode 100644
index 000000000..75ee90e42
--- /dev/null
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingResult.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Controller.MediaEncoding
+{
+    public class EncodingResult
+    {
+        public string OutputPath { get; set; }
+    }
+}
diff --git a/MediaBrowser.Controller/MediaEncoding/VideoEncodingOptions.cs b/MediaBrowser.Controller/MediaEncoding/VideoEncodingOptions.cs
new file mode 100644
index 000000000..773f0ea46
--- /dev/null
+++ b/MediaBrowser.Controller/MediaEncoding/VideoEncodingOptions.cs
@@ -0,0 +1,26 @@
+
+namespace MediaBrowser.Controller.MediaEncoding
+{
+    public class VideoEncodingOptions : EncodingOptions
+    {
+        public string VideoCodec { get; set; }
+
+        public string VideoProfile { get; set; }
+
+        public double? VideoLevel { get; set; }
+        
+        public int? VideoStreamIndex { get; set; }
+
+        public int? AudioStreamIndex { get; set; }
+
+        public int? SubtitleStreamIndex { get; set; }
+
+        public int? MaxWidth { get; set; }
+
+        public int? MaxHeight { get; set; }
+
+        public int? Height { get; set; }
+
+        public int? Width { get; set; }
+    }
+}
-- 
cgit v1.2.3


From 5a014b093ccefed72fa09c3b19b18d4ee7578218 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 30 Mar 2014 21:00:47 -0400
Subject: add localization stub

---
 MediaBrowser.Api/LocalizationService.cs            |  15 +
 MediaBrowser.Api/Playback/Hls/BaseHlsService.cs    |   2 +-
 .../Localization/ILocalizationManager.cs           |  32 +-
 .../Configuration/ServerConfiguration.cs           |   4 +
 MediaBrowser.Model/Globalization/CountryInfo.cs    |   6 +
 .../Localization/JavaScript/javascript.json        |   3 +
 .../Localization/LocalizationManager.cs            | 113 +++++-
 .../Localization/Server/server.json                |  17 +
 .../MediaBrowser.Server.Implementations.csproj     |   3 +
 MediaBrowser.ServerApplication/ApplicationHost.cs  |   8 +-
 MediaBrowser.ServerApplication/LibraryViewer.cs    |   6 +-
 MediaBrowser.ServerApplication/MainStartup.cs      |   2 +-
 MediaBrowser.ServerApplication/ServerNotifyIcon.cs |  50 ++-
 .../Splash/SplashForm.Designer.cs                  |   4 +-
 MediaBrowser.WebDashboard/Api/DashboardService.cs  | 428 +++++++++++++--------
 .../MediaBrowser.WebDashboard.csproj               |  13 +-
 MediaBrowser.WebDashboard/app.config               |  30 ++
 MediaBrowser.WebDashboard/packages.config          |   1 +
 18 files changed, 531 insertions(+), 206 deletions(-)
 create mode 100644 MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/Server/server.json
 create mode 100644 MediaBrowser.WebDashboard/app.config

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Api/LocalizationService.cs b/MediaBrowser.Api/LocalizationService.cs
index 60270a389..be86090ac 100644
--- a/MediaBrowser.Api/LocalizationService.cs
+++ b/MediaBrowser.Api/LocalizationService.cs
@@ -31,6 +31,14 @@ namespace MediaBrowser.Api
     {
     }
 
+    /// <summary>
+    /// Class ParentalRatings
+    /// </summary>
+    [Route("/Localization/Options", "GET", Summary = "Gets localization options")]
+    public class GetLocalizationOptions : IReturn<List<LocalizatonOption>>
+    {
+    }
+
     /// <summary>
     /// Class CulturesService
     /// </summary>
@@ -62,6 +70,13 @@ namespace MediaBrowser.Api
             return ToOptimizedSerializedResultUsingCache(result);
         }
 
+        public object Get(GetLocalizationOptions request)
+        {
+            var result = _localization.GetLocalizationOptions().ToList();
+
+            return ToOptimizedSerializedResultUsingCache(result);
+        }
+
         /// <summary>
         /// Gets the specified request.
         /// </summary>
diff --git a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
index 96b36ac7f..1a190b75e 100644
--- a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
@@ -276,7 +276,7 @@ namespace MediaBrowser.Api.Playback.Hls
                                        ? 0
                                        : ((GetHlsVideoStream)state.VideoRequest).TimeStampOffsetMs;
 
-            var itsOffset = itsOffsetMs == 0 ? string.Empty : string.Format("-itsoffset {0} ", TimeSpan.FromMilliseconds(itsOffsetMs).TotalSeconds);
+            var itsOffset = itsOffsetMs == 0 ? string.Empty : string.Format("-itsoffset {0} ", TimeSpan.FromMilliseconds(itsOffsetMs).TotalSeconds.ToString(UsCulture));
 
             var threads = GetNumberOfThreads(state, false);
 
diff --git a/MediaBrowser.Controller/Localization/ILocalizationManager.cs b/MediaBrowser.Controller/Localization/ILocalizationManager.cs
index dde2f7878..5993c7ac5 100644
--- a/MediaBrowser.Controller/Localization/ILocalizationManager.cs
+++ b/MediaBrowser.Controller/Localization/ILocalizationManager.cs
@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
+using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace MediaBrowser.Controller.Localization
 {
@@ -31,5 +31,35 @@ namespace MediaBrowser.Controller.Localization
         /// <param name="rating">The rating.</param>
         /// <returns>System.Int32.</returns>
         int? GetRatingLevel(string rating);
+
+        /// <summary>
+        /// Gets the localized string.
+        /// </summary>
+        /// <param name="phrase">The phrase.</param>
+        /// <param name="culture">The culture.</param>
+        /// <returns>System.String.</returns>
+        string GetLocalizedString(string phrase, string culture);
+
+        /// <summary>
+        /// Gets the localized string.
+        /// </summary>
+        /// <param name="phrase">The phrase.</param>
+        /// <returns>System.String.</returns>
+        string GetLocalizedString(string phrase);
+
+        /// <summary>
+        /// Localizes the document.
+        /// </summary>
+        /// <param name="document">The document.</param>
+        /// <param name="culture">The culture.</param>
+        /// <param name="tokenBuilder">The token builder.</param>
+        /// <returns>System.String.</returns>
+        string LocalizeDocument(string document, string culture, Func<string, string> tokenBuilder);
+
+        /// <summary>
+        /// Gets the localization options.
+        /// </summary>
+        /// <returns>IEnumerable{LocalizatonOption}.</returns>
+        IEnumerable<LocalizatonOption> GetLocalizationOptions();
     }
 }
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index d0caa3ad2..932d5d63d 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -218,6 +218,8 @@ namespace MediaBrowser.Model.Configuration
         public string ServerName { get; set; }
         public string WanDdns { get; set; }
 
+        public string UICulture { get; set; }
+        
         public DlnaOptions DlnaOptions { get; set; }
 
         /// <summary>
@@ -281,6 +283,8 @@ namespace MediaBrowser.Model.Configuration
             MetadataOptions = options.ToArray();
 
             DlnaOptions = new DlnaOptions();
+
+            UICulture = "en-us";
         }
     }
 
diff --git a/MediaBrowser.Model/Globalization/CountryInfo.cs b/MediaBrowser.Model/Globalization/CountryInfo.cs
index 16aea8436..9f5f00d80 100644
--- a/MediaBrowser.Model/Globalization/CountryInfo.cs
+++ b/MediaBrowser.Model/Globalization/CountryInfo.cs
@@ -30,4 +30,10 @@ namespace MediaBrowser.Model.Globalization
         /// <value>The name of the three letter ISO region.</value>
         public string ThreeLetterISORegionName { get; set; }
     }
+
+    public class LocalizatonOption
+    {
+        public string Name { get; set; }
+        public string Value { get; set; }
+    }
 }
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
new file mode 100644
index 000000000..44600aa35
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -0,0 +1,3 @@
+{
+    "LabelTest": "Text"
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs b/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
index 0d428742c..badf5f93c 100644
--- a/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
+++ b/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
@@ -1,9 +1,9 @@
 using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Localization;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.Serialization;
 using MoreLinq;
 using System;
 using System.Collections.Concurrent;
@@ -11,6 +11,8 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Reflection;
+using MediaBrowser.Common.Extensions;
 
 namespace MediaBrowser.Server.Implementations.Localization
 {
@@ -33,15 +35,17 @@ namespace MediaBrowser.Server.Implementations.Localization
             new ConcurrentDictionary<string, Dictionary<string, ParentalRating>>(StringComparer.OrdinalIgnoreCase);
 
         private readonly IFileSystem _fileSystem;
-        
+        private readonly IJsonSerializer _jsonSerializer;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="LocalizationManager"/> class.
         /// </summary>
         /// <param name="configurationManager">The configuration manager.</param>
-        public LocalizationManager(IServerConfigurationManager configurationManager, IFileSystem fileSystem)
+        public LocalizationManager(IServerConfigurationManager configurationManager, IFileSystem fileSystem, IJsonSerializer jsonSerializer)
         {
             _configurationManager = configurationManager;
             _fileSystem = fileSystem;
+            _jsonSerializer = jsonSerializer;
 
             ExtractAll();
         }
@@ -241,5 +245,108 @@ namespace MediaBrowser.Server.Implementations.Localization
 
             return value == null ? (int?)null : value.Value;
         }
+
+        public string GetLocalizedString(string phrase)
+        {
+            return GetLocalizedString(phrase, _configurationManager.Configuration.UICulture);
+        }
+
+        public string GetLocalizedString(string phrase, string culture)
+        {
+            var dictionary = GetLocalizationDictionary(culture);
+
+            string value;
+
+            if (dictionary.TryGetValue(phrase, out value))
+            {
+                return value;
+            }
+
+            return phrase;
+        }
+
+        private readonly ConcurrentDictionary<string, Dictionary<string, string>> _dictionaries =
+            new ConcurrentDictionary<string, Dictionary<string, string>>(StringComparer.OrdinalIgnoreCase);
+
+        public Dictionary<string, string> GetLocalizationDictionary(string culture)
+        {
+            const string prefix = "Server";
+            var key = prefix + culture;
+
+            return _dictionaries.GetOrAdd(key, k => GetDictionary(prefix, culture, "server.json"));
+        }
+
+        public Dictionary<string, string> GetJavaScriptLocalizationDictionary(string culture)
+        {
+            const string prefix = "JavaScript";
+            var key = prefix + culture;
+
+            return _dictionaries.GetOrAdd(key, k => GetDictionary(prefix, culture, "javascript.json"));
+        }
+
+        private Dictionary<string, string> GetDictionary(string prefix, string culture, string baseFilename)
+        {
+            var dictionary = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+
+            var assembly = GetType().Assembly;
+            var namespaceName = GetType().Namespace + "." + prefix;
+
+            CopyInto(dictionary, namespaceName + "." + baseFilename, assembly);
+            CopyInto(dictionary, namespaceName + "." + GetResourceFilename(culture), assembly);
+
+            return dictionary;
+        }
+
+        private void CopyInto(IDictionary<string, string> dictionary, string resourcePath, Assembly assembly)
+        {
+            using (var stream = assembly.GetManifestResourceStream(resourcePath))
+            {
+                if (stream != null)
+                {
+                    var dict = _jsonSerializer.DeserializeFromStream<Dictionary<string, string>>(stream);
+
+                    foreach (var key in dict.Keys)
+                    {
+                        dictionary[key] = dict[key];
+                    }
+                }
+            }
+        }
+
+        private string GetResourceFilename(string culture)
+        {
+            var parts = culture.Split('-');
+
+            if (parts.Length == 2)
+            {
+                culture = parts[0].ToLower() + "_" + parts[1].ToUpper();
+            }
+            else
+            {
+                culture = culture.ToLower();
+            }
+
+            return culture + ".json";
+        }
+
+        public IEnumerable<LocalizatonOption> GetLocalizationOptions()
+        {
+            return new List<LocalizatonOption>
+            {
+                new LocalizatonOption{ Name="English (United States)", Value="en-us"}
+            };
+        }
+
+        public string LocalizeDocument(string document, string culture, Func<string,string> tokenBuilder)
+        {
+            foreach (var pair in GetLocalizationDictionary(culture).ToList())
+            {
+                var token = tokenBuilder(pair.Key);
+
+                document = document.Replace(token, pair.Value, StringComparison.Ordinal);
+            }
+
+            return document;
+        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
new file mode 100644
index 000000000..62a418391
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -0,0 +1,17 @@
+{
+    "LabelExit": "Exit",
+	"LabelVisitCommunity": "Visit Community",
+	"LabelGithubWiki": "Github Wiki",
+	"LabelSwagger": "Swagger",
+	"LabelStandard": "Standard",
+	"LabelViewApiDocumentation": "View Api Documentation",
+	"LabelBrowseLibrary": "Browse Library",
+	"LabelConfigureMediaBrowser": "Configure Media Browser",
+	"LabelOpenLibraryViewer": "Open Library Viewer",
+	"LabelRestartServer": "Restart Server",
+	"LabelShowLogWindow": "Show Log Window",
+	"LabelPrevious": "Previous",
+	"LabelFinish": "Finish",
+	"LabelNext": "Next",
+	"LabelYoureDone": "You're Done!"
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 115bc0136..ac8dc9431 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -282,6 +282,8 @@
     <EmbeddedResource Include="Localization\Ratings\ru.txt" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Localization\JavaScript\javascript.json" />
+    <EmbeddedResource Include="Localization\Server\server.json" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -386,6 +388,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" Condition=" '$(ConfigurationName)' != 'Release Mono' " />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 4c75b6502..2575434f4 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -170,7 +170,7 @@ namespace MediaBrowser.ServerApplication
 
         private ILiveTvManager LiveTvManager { get; set; }
 
-        private ILocalizationManager LocalizationManager { get; set; }
+        internal ILocalizationManager LocalizationManager { get; set; }
 
         private IEncodingManager EncodingManager { get; set; }
         private IChannelManager ChannelManager { get; set; }
@@ -421,6 +421,9 @@ namespace MediaBrowser.ServerApplication
 
             RegisterSingleInstance(ServerConfigurationManager);
 
+            LocalizationManager = new LocalizationManager(ServerConfigurationManager, FileSystemManager, JsonSerializer);
+            RegisterSingleInstance(LocalizationManager);
+
             RegisterSingleInstance<IWebSocketServer>(() => new AlchemyServer(Logger));
 
             RegisterSingleInstance<IBlurayExaminer>(() => new BdInfoExaminer());
@@ -472,9 +475,6 @@ namespace MediaBrowser.ServerApplication
             ServerManager = new ServerManager(this, JsonSerializer, LogManager.GetLogger("ServerManager"), ServerConfigurationManager);
             RegisterSingleInstance(ServerManager);
 
-            LocalizationManager = new LocalizationManager(ServerConfigurationManager, FileSystemManager);
-            RegisterSingleInstance(LocalizationManager);
-
             var innerProgress = new ActionableProgress<double>();
             innerProgress.RegisterAction(p => progress.Report((.75 * p) + 15));
 
diff --git a/MediaBrowser.ServerApplication/LibraryViewer.cs b/MediaBrowser.ServerApplication/LibraryViewer.cs
index 6c40b549b..8e9091906 100644
--- a/MediaBrowser.ServerApplication/LibraryViewer.cs
+++ b/MediaBrowser.ServerApplication/LibraryViewer.cs
@@ -16,18 +16,16 @@ namespace MediaBrowser.ServerApplication
     {
         private readonly IJsonSerializer _jsonSerializer;
         private readonly ILibraryManager _libraryManager;
-        private readonly IDisplayPreferencesRepository _displayPreferencesManager;
         private readonly IItemRepository _itemRepository;
 
         private User _currentUser;
 
-        public LibraryViewer(IJsonSerializer jsonSerializer, IUserManager userManager, ILibraryManager libraryManager, IDisplayPreferencesRepository displayPreferencesManager, IItemRepository itemRepo)
+        public LibraryViewer(IJsonSerializer jsonSerializer, IUserManager userManager, ILibraryManager libraryManager, IItemRepository itemRepo)
         {
             InitializeComponent();
 
             _jsonSerializer = jsonSerializer;
             _libraryManager = libraryManager;
-            _displayPreferencesManager = displayPreferencesManager;
             _itemRepository = itemRepo;
 
             foreach (var user in userManager.Users)
@@ -44,7 +42,7 @@ namespace MediaBrowser.ServerApplication
             if (e.Node != null)
             {
                 var item = (BaseItem)e.Node.Tag;
-                lblType.Text = "Type: " + item.GetType().Name;
+                lblType.Text = item.GetType().Name;
 
                 var json = FormatJson(_jsonSerializer.SerializeToString(item));
 
diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs
index 3d490a1f8..d8bd3938e 100644
--- a/MediaBrowser.ServerApplication/MainStartup.cs
+++ b/MediaBrowser.ServerApplication/MainStartup.cs
@@ -253,7 +253,7 @@ namespace MediaBrowser.ServerApplication
         {
             //Application.EnableVisualStyles();
             //Application.SetCompatibleTextRenderingDefault(false);
-            _serverNotifyIcon = new ServerNotifyIcon(_appHost.LogManager, _appHost, _appHost.ServerConfigurationManager, _appHost.UserManager, _appHost.LibraryManager, _appHost.JsonSerializer, _appHost.DisplayPreferencesRepository, _appHost.ItemRepository);
+            _serverNotifyIcon = new ServerNotifyIcon(_appHost.LogManager, _appHost, _appHost.ServerConfigurationManager, _appHost.UserManager, _appHost.LibraryManager, _appHost.JsonSerializer, _appHost.DisplayPreferencesRepository, _appHost.ItemRepository, _appHost.LocalizationManager);
             Application.Run();
         }
 
diff --git a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
index 99b6db2d7..27f47787f 100644
--- a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
+++ b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
@@ -4,6 +4,7 @@ using System.Windows.Forms;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
@@ -41,6 +42,7 @@ namespace MediaBrowser.ServerApplication
         private readonly IJsonSerializer _jsonSerializer;
         private readonly IDisplayPreferencesRepository _displayPreferencesManager;
         private readonly IItemRepository _itemRepository;
+        private readonly ILocalizationManager _localization;
         private LogForm _logForm;
 
         public bool Visible
@@ -56,10 +58,17 @@ namespace MediaBrowser.ServerApplication
             }
         }
 
-        public ServerNotifyIcon(ILogManager logManager, IServerApplicationHost appHost, IServerConfigurationManager configurationManager, IUserManager userManager, ILibraryManager libraryManager, IJsonSerializer jsonSerializer, IDisplayPreferencesRepository displayPreferencesManager, IItemRepository itemRepo)
+        public ServerNotifyIcon(ILogManager logManager, 
+            IServerApplicationHost appHost, 
+            IServerConfigurationManager configurationManager, 
+            IUserManager userManager, ILibraryManager libraryManager, 
+            IJsonSerializer jsonSerializer, 
+            IDisplayPreferencesRepository displayPreferencesManager, 
+            IItemRepository itemRepo, ILocalizationManager localization)
         {
             _logger = logManager.GetLogger("MainWindow");
             _itemRepository = itemRepo;
+            _localization = localization;
             _appHost = appHost;
             _logManager = logManager;
             _configurationManager = configurationManager;
@@ -118,20 +127,17 @@ namespace MediaBrowser.ServerApplication
             // 
             cmdExit.Name = "cmdExit";
             cmdExit.Size = new System.Drawing.Size(208, 22);
-            cmdExit.Text = "Exit";
             // 
             // cmdCommunity
             // 
             cmdCommunity.Name = "cmdCommunity";
             cmdCommunity.Size = new System.Drawing.Size(208, 22);
-            cmdCommunity.Text = "Visit Community";
             // 
             // cmdLogWindow
             // 
             cmdLogWindow.CheckOnClick = true;
             cmdLogWindow.Name = "cmdLogWindow";
             cmdLogWindow.Size = new System.Drawing.Size(208, 22);
-            cmdLogWindow.Text = "Show Log Window";
             // 
             // toolStripSeparator1
             // 
@@ -142,13 +148,11 @@ namespace MediaBrowser.ServerApplication
             // 
             cmdRestart.Name = "cmdRestart";
             cmdRestart.Size = new System.Drawing.Size(208, 22);
-            cmdRestart.Text = "Restart Server";
             // 
             // cmdLibraryExplorer
             // 
             cmdLibraryExplorer.Name = "cmdLibraryExplorer";
             cmdLibraryExplorer.Size = new System.Drawing.Size(208, 22);
-            cmdLibraryExplorer.Text = "Open Library Explorer";
             // 
             // toolStripSeparator2
             // 
@@ -159,13 +163,11 @@ namespace MediaBrowser.ServerApplication
             // 
             cmdConfigure.Name = "cmdConfigure";
             cmdConfigure.Size = new System.Drawing.Size(208, 22);
-            cmdConfigure.Text = "Configure Media Browser";
             // 
             // cmdBrowse
             // 
             cmdBrowse.Name = "cmdBrowse";
             cmdBrowse.Size = new System.Drawing.Size(208, 22);
-            cmdBrowse.Text = "Browse Library";
             // 
             // cmdApiDocs
             // 
@@ -175,25 +177,21 @@ namespace MediaBrowser.ServerApplication
             cmdGtihub});
             cmdApiDocs.Name = "cmdApiDocs";
             cmdApiDocs.Size = new System.Drawing.Size(208, 22);
-            cmdApiDocs.Text = "View Api Documentation";
             // 
             // cmdStandardDocs
             // 
             cmdStandardDocs.Name = "cmdStandardDocs";
             cmdStandardDocs.Size = new System.Drawing.Size(136, 22);
-            cmdStandardDocs.Text = "Standard";
             // 
             // cmdSwagger
             // 
             cmdSwagger.Name = "cmdSwagger";
             cmdSwagger.Size = new System.Drawing.Size(136, 22);
-            cmdSwagger.Text = "Swagger";
             // 
             // cmdGtihub
             // 
             cmdGtihub.Name = "cmdGtihub";
             cmdGtihub.Size = new System.Drawing.Size(136, 22);
-            cmdGtihub.Text = "Github Wiki";
 
             cmdExit.Click += cmdExit_Click;
             cmdRestart.Click += cmdRestart_Click;
@@ -211,6 +209,8 @@ namespace MediaBrowser.ServerApplication
             _logManager.LoggerLoaded += LoadLogWindow;
             _configurationManager.ConfigurationUpdated += Instance_ConfigurationUpdated;
 
+            LocalizeText();
+
             if (_appHost.IsFirstRun)
             {
                 Action action = () => notifyIcon1.ShowBalloonTip(5000, "Media Browser", "Welcome to Media Browser Server!", ToolTipIcon.Info);
@@ -219,6 +219,24 @@ namespace MediaBrowser.ServerApplication
             }
         }
 
+        private void LocalizeText()
+        {
+            _uiCulture = _configurationManager.Configuration.UICulture;
+
+            cmdExit.Text = _localization.GetLocalizedString("LabelExit");
+            cmdCommunity.Text = _localization.GetLocalizedString("LabelVisitCommunity");
+            cmdGtihub.Text = _localization.GetLocalizedString("LabelGithubWiki");
+            cmdSwagger.Text = _localization.GetLocalizedString("LabelSwagger");
+            cmdStandardDocs.Text = _localization.GetLocalizedString("LabelStandard");
+            cmdApiDocs.Text = _localization.GetLocalizedString("LabelViewApiDocumentation");
+            cmdBrowse.Text = _localization.GetLocalizedString("LabelBrowseLibrary");
+            cmdConfigure.Text = _localization.GetLocalizedString("LabelConfigureMediaBrowser");
+            cmdLibraryExplorer.Text = _localization.GetLocalizedString("LabelOpenLibraryViewer");
+            cmdRestart.Text = _localization.GetLocalizedString("LabelRestartServer");
+            cmdLogWindow.Text = _localization.GetLocalizedString("LabelShowLogWindow");
+        }
+
+        private string _uiCulture;
         /// <summary>
         /// Handles the ConfigurationUpdated event of the Instance control.
         /// </summary>
@@ -226,6 +244,12 @@ namespace MediaBrowser.ServerApplication
         /// <param name="e">The <see cref="EventArgs" /> instance containing the event data.</param>
         void Instance_ConfigurationUpdated(object sender, EventArgs e)
         {
+            if (!string.Equals(_configurationManager.Configuration.UICulture, _uiCulture,
+                    StringComparison.OrdinalIgnoreCase))
+            {
+                LocalizeText();
+            }
+
             Action action = () =>
             {
                 var isLogWindowOpen = _logForm != null;
@@ -307,7 +331,7 @@ namespace MediaBrowser.ServerApplication
 
         void cmdLibraryExplorer_Click(object sender, EventArgs e)
         {
-            new LibraryViewer(_jsonSerializer, _userManager, _libraryManager, _displayPreferencesManager, _itemRepository).Show();
+            new LibraryViewer(_jsonSerializer, _userManager, _libraryManager, _itemRepository).Show();
         }
 
         void cmdRestart_Click(object sender, EventArgs e)
diff --git a/MediaBrowser.ServerApplication/Splash/SplashForm.Designer.cs b/MediaBrowser.ServerApplication/Splash/SplashForm.Designer.cs
index e9ba17bc1..ef3b79699 100644
--- a/MediaBrowser.ServerApplication/Splash/SplashForm.Designer.cs
+++ b/MediaBrowser.ServerApplication/Splash/SplashForm.Designer.cs
@@ -121,9 +121,9 @@
             this.lblStatus.Location = new System.Drawing.Point(3, 0);
             this.lblStatus.MaximumSize = new System.Drawing.Size(0, 100);
             this.lblStatus.Name = "lblStatus";
-            this.lblStatus.Size = new System.Drawing.Size(599, 59);
+            this.lblStatus.Size = new System.Drawing.Size(469, 59);
             this.lblStatus.TabIndex = 0;
-            this.lblStatus.Text = "Loading Media Browser Server";
+            this.lblStatus.Text = "Loading Media Browser";
             this.lblStatus.UseWaitCursor = true;
             // 
             // panel1
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 369fb2a07..597381529 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -3,6 +3,7 @@ using MediaBrowser.Common.IO;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Model.Logging;
@@ -15,6 +16,8 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
+using WebMarkupMin.Core.Minifiers;
+using WebMarkupMin.Core.Settings;
 
 namespace MediaBrowser.WebDashboard.Api
 {
@@ -96,6 +99,7 @@ namespace MediaBrowser.WebDashboard.Api
         private readonly IServerConfigurationManager _serverConfigurationManager;
 
         private readonly IFileSystem _fileSystem;
+        private readonly ILocalizationManager _localization;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DashboardService" /> class.
@@ -103,11 +107,12 @@ namespace MediaBrowser.WebDashboard.Api
         /// <param name="appHost">The app host.</param>
         /// <param name="serverConfigurationManager">The server configuration manager.</param>
         /// <param name="fileSystem">The file system.</param>
-        public DashboardService(IServerApplicationHost appHost, IServerConfigurationManager serverConfigurationManager, IFileSystem fileSystem)
+        public DashboardService(IServerApplicationHost appHost, IServerConfigurationManager serverConfigurationManager, IFileSystem fileSystem, ILocalizationManager localization)
         {
             _appHost = appHost;
             _serverConfigurationManager = serverConfigurationManager;
             _fileSystem = fileSystem;
+            _localization = localization;
         }
 
         /// <summary>
@@ -148,7 +153,7 @@ namespace MediaBrowser.WebDashboard.Api
         {
             var page = ServerEntryPoint.Instance.PluginConfigurationPages.First(p => p.Name.Equals(request.Name, StringComparison.OrdinalIgnoreCase));
 
-            return ResultFactory.GetStaticResult(Request, page.Plugin.Version.ToString().GetMD5(), page.Plugin.AssemblyDateLastModified, null, MimeTypes.GetMimeType("page.html"), () => ModifyHtml(page.GetHtmlStream()));
+            return ResultFactory.GetStaticResult(Request, page.Plugin.Version.ToString().GetMD5(), page.Plugin.AssemblyDateLastModified, null, MimeTypes.GetMimeType("page.html"), () => ModifyHtml(page.GetHtmlStream(), null));
         }
 
         /// <summary>
@@ -210,13 +215,16 @@ namespace MediaBrowser.WebDashboard.Api
 
             var contentType = MimeTypes.GetMimeType(path);
 
+            var isHtml = IsHtml(path);
+            var localizationCulture = isHtml ? GetLocalizationCulture() : null;
+
             // Don't cache if not configured to do so
             // But always cache images to simulate production
-            if (!_serverConfigurationManager.Configuration.EnableDashboardResponseCaching && 
-                !contentType.StartsWith("image/", StringComparison.OrdinalIgnoreCase) && 
+            if (!_serverConfigurationManager.Configuration.EnableDashboardResponseCaching &&
+                !contentType.StartsWith("image/", StringComparison.OrdinalIgnoreCase) &&
                 !contentType.StartsWith("font/", StringComparison.OrdinalIgnoreCase))
             {
-                return ResultFactory.GetResult(GetResourceStream(path).Result, contentType);
+                return ResultFactory.GetResult(GetResourceStream(path, isHtml, localizationCulture).Result, contentType);
             }
 
             TimeSpan? cacheDuration = null;
@@ -230,17 +238,24 @@ namespace MediaBrowser.WebDashboard.Api
 
             var assembly = GetType().Assembly.GetName();
 
-            var cacheKey = (assembly.Version + path).GetMD5();
+            var cacheKey = (assembly.Version + (localizationCulture ?? string.Empty) + path).GetMD5();
 
-            return ResultFactory.GetStaticResult(Request, cacheKey, null, cacheDuration, contentType, () => GetResourceStream(path));
+            return ResultFactory.GetStaticResult(Request, cacheKey, null, cacheDuration, contentType, () => GetResourceStream(path, isHtml, localizationCulture));
+        }
+
+        private string GetLocalizationCulture()
+        {
+            return _serverConfigurationManager.Configuration.UICulture;
         }
 
         /// <summary>
         /// Gets the resource stream.
         /// </summary>
         /// <param name="path">The path.</param>
+        /// <param name="isHtml">if set to <c>true</c> [is HTML].</param>
+        /// <param name="localizationCulture">The localization culture.</param>
         /// <returns>Task{Stream}.</returns>
-        private async Task<Stream> GetResourceStream(string path)
+        private async Task<Stream> GetResourceStream(string path, bool isHtml, string localizationCulture)
         {
             Stream resourceStream;
 
@@ -259,13 +274,11 @@ namespace MediaBrowser.WebDashboard.Api
 
             if (resourceStream != null)
             {
-                var isHtml = IsHtml(path);
-
                 // Don't apply any caching for html pages
                 // jQuery ajax doesn't seem to handle if-modified-since correctly
                 if (isHtml)
                 {
-                    resourceStream = await ModifyHtml(resourceStream).ConfigureAwait(false);
+                    resourceStream = await ModifyHtml(resourceStream, localizationCulture).ConfigureAwait(false);
                 }
             }
 
@@ -297,26 +310,48 @@ namespace MediaBrowser.WebDashboard.Api
         /// </summary>
         /// <param name="sourceStream">The source stream.</param>
         /// <returns>Task{Stream}.</returns>
-        internal async Task<Stream> ModifyHtml(Stream sourceStream)
+        private async Task<Stream> ModifyHtml(Stream sourceStream, string localizationCulture)
         {
-            string html;
-
-            using (var memoryStream = new MemoryStream())
+            using (sourceStream)
             {
-                await sourceStream.CopyToAsync(memoryStream).ConfigureAwait(false);
+                string html;
 
-                html = Encoding.UTF8.GetString(memoryStream.ToArray());
-            }
+                using (var memoryStream = new MemoryStream())
+                {
+                    await sourceStream.CopyToAsync(memoryStream).ConfigureAwait(false);
 
-            var version = GetType().Assembly.GetName().Version;
+                    html = Encoding.UTF8.GetString(memoryStream.ToArray());
 
-            html = html.Replace("<head>", "<head>" + GetMetaTags() + GetCommonCss(version) + GetCommonJavascript(version));
+                    if (!string.IsNullOrWhiteSpace(localizationCulture))
+                    {
+                        html = _localization.LocalizeDocument(html, localizationCulture, GetLocalizationToken);
+                    }
 
-            var bytes = Encoding.UTF8.GetBytes(html);
+                    try
+                    {
+                        var minifier = new HtmlMinifier(new HtmlMinificationSettings(true));
+
+                        html = minifier.Minify(html).MinifiedContent;
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.ErrorException("Error minifying html", ex);
+                    }
+                }
 
-            sourceStream.Dispose();
+                var version = GetType().Assembly.GetName().Version;
 
-            return new MemoryStream(bytes);
+                html = html.Replace("<head>", "<head>" + GetMetaTags() + GetCommonCss(version) + GetCommonJavascript(version));
+
+                var bytes = Encoding.UTF8.GetBytes(html);
+
+                return new MemoryStream(bytes);
+            }
+        }
+
+        private string GetLocalizationToken(string phrase)
+        {
+            return "${" + phrase + "}";
         }
 
         /// <summary>
@@ -393,154 +428,200 @@ namespace MediaBrowser.WebDashboard.Api
         /// <returns>Task{Stream}.</returns>
         private async Task<Stream> GetAllJavascript()
         {
-            var scriptFiles = new[]
-                                  {
-                                      "extensions.js",
-                                      "site.js",
-                                      "librarybrowser.js",
-                                      "librarylist.js",
-                                      "editorsidebar.js",
-                                      "librarymenu.js",
-                                      "chromecast.js",
-                                      "contextmenu.js",
-
-                                      "mediacontroller.js",
-                                      "mediaplayer.js",
-                                      "mediaplayer-video.js",
-
-                                      "ratingdialog.js",
-                                      "aboutpage.js",
-                                      "allusersettings.js",
-                                      "alphapicker.js",
-                                      "addpluginpage.js",
-                                      "advancedconfigurationpage.js",
-                                      "advancedpaths.js",
-                                      "advancedserversettings.js",
-                                      "metadataadvanced.js",
-                                      "appsplayback.js",
-                                      "appsweather.js",
-                                      "autoorganizetv.js",
-                                      "autoorganizelog.js",
-                                      "channels.js",
-                                      "channelitems.js",
-                                      "dashboardinfo.js",
-                                      "dashboardpage.js",
-                                      "directorybrowser.js",
-                                      "dlnaprofile.js",
-                                      "dlnaprofiles.js",
-                                      "dlnasettings.js",
-                                      "editcollectionitems.js",
-                                      "edititemmetadata.js",
-                                      "edititempeople.js",
-                                      "edititemimages.js",
-                                      "encodingsettings.js",
-                                      "gamesrecommendedpage.js",
-                                      "gamesystemspage.js",
-                                      "gamespage.js",
-                                      "gamegenrepage.js",
-                                      "gamestudiospage.js",
-                                      "indexpage.js",
-                                      "itembynamedetailpage.js",
-                                      "itemdetailpage.js",
-                                      "itemgallery.js",
-                                      "itemlistpage.js",
-                                      "librarypathmapping.js",
-                                      "libraryreport.js",
-                                      "librarysettings.js",
-                                      "livetvchannel.js",
-                                      "livetvchannels.js",
-                                      "livetvguide.js",
-                                      "livetvnewrecording.js",
-                                      "livetvprogram.js",
-                                      "livetvrecording.js",
-                                      "livetvrecordinglist.js",
-                                      "livetvrecordings.js",
-                                      "livetvtimer.js",
-                                      "livetvseriestimer.js",
-                                      "livetvseriestimers.js",
-                                      "livetvsettings.js",
-                                      "livetvsuggested.js",
-                                      "livetvstatus.js",
-                                      "livetvtimers.js",
-                                      "loginpage.js",
-                                      "logpage.js",
-                                      "medialibrarypage.js",
-                                      "metadataconfigurationpage.js",
-                                      "metadataimagespage.js",
-                                      "moviegenres.js",
-                                      "moviecollections.js",
-                                      "movies.js",
-                                      "movieslatest.js",
-                                      "moviepeople.js",
-                                      "moviesrecommended.js",
-                                      "moviestudios.js",
-                                      "movietrailers.js",
-                                      "musicalbums.js",
-                                      "musicalbumartists.js",
-                                      "musicartists.js",
-                                      "musicgenres.js",
-                                      "musicrecommended.js",
-                                      "musicvideos.js",
-                                      "notifications.js",
-                                      "playlist.js",
-                                      "plugincatalogpage.js",
-                                      "pluginspage.js",
-                                      "pluginupdatespage.js",
-                                      "remotecontrol.js",
-                                      "scheduledtaskpage.js",
-                                      "scheduledtaskspage.js",
-                                      "search.js",
-                                      "songs.js",
-                                      "supporterkeypage.js",
-                                      "supporterpage.js",
-                                      "episodes.js",
-                                      "tvgenres.js",
-                                      "tvlatest.js",
-                                      "tvpeople.js",
-                                      "tvrecommended.js",
-                                      "tvshows.js",
-                                      "tvstudios.js",
-                                      "tvupcoming.js",
-                                      "useredit.js",
-                                      "userpassword.js",
-                                      "userimagepage.js",
-                                      "userprofilespage.js",
-                                      "usersettings.js",
-                                      "userparentalcontrol.js",
-                                      "wizardfinishpage.js",
-                                      "wizardimagesettings.js",
-                                      "wizardservice.js",
-                                      "wizardstartpage.js",
-                                      "wizardsettings.js",
-                                      "wizarduserpage.js"
-                                  };
-
             var memoryStream = new MemoryStream();
             var newLineBytes = Encoding.UTF8.GetBytes(Environment.NewLine);
 
+            // jQuery + jQuery mobile
             await AppendResource(memoryStream, "thirdparty/jquery-2.0.3.min.js", newLineBytes).ConfigureAwait(false);
             await AppendResource(memoryStream, "thirdparty/jquerymobile-1.4.2/jquery.mobile-1.4.2.min.js", newLineBytes).ConfigureAwait(false);
 
+            await AppendLocalization(memoryStream).ConfigureAwait(false);
+            await memoryStream.WriteAsync(newLineBytes, 0, newLineBytes.Length).ConfigureAwait(false);
+
+            // Write the version string for the dashboard comparison function
             var versionString = string.Format("window.dashboardVersion='{0}';", _appHost.ApplicationVersion);
             var versionBytes = Encoding.UTF8.GetBytes(versionString);
 
             await memoryStream.WriteAsync(versionBytes, 0, versionBytes.Length).ConfigureAwait(false);
             await memoryStream.WriteAsync(newLineBytes, 0, newLineBytes.Length).ConfigureAwait(false);
 
-            await AppendResource(memoryStream, "thirdparty/autonumeric/autoNumeric.min.js", newLineBytes).ConfigureAwait(false);
-            
+            var builder = new StringBuilder();
             var assembly = GetType().Assembly;
-            await AppendResource(assembly, memoryStream, "MediaBrowser.WebDashboard.ApiClient.js", newLineBytes).ConfigureAwait(false);
+            using (var stream = assembly.GetManifestResourceStream("MediaBrowser.WebDashboard.ApiClient.js"))
+            {
+                using (var streamReader = new StreamReader(stream))
+                {
+                    var text = await streamReader.ReadToEndAsync().ConfigureAwait(false);
+                    builder.Append(text);
+                    builder.Append(Environment.NewLine);
+                }
+            }
+
+            foreach (var file in GetScriptFiles())
+            {
+                var path = GetDashboardResourcePath("scripts/" + file);
+
+                using (var fs = _fileSystem.GetFileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, true))
+                {
+                    using (var streamReader = new StreamReader(fs))
+                    {
+                        var text = await streamReader.ReadToEndAsync().ConfigureAwait(false);
+                        builder.Append(text);
+                        builder.Append(Environment.NewLine);
+                    }
+                }
+            }
+
+            var js = builder.ToString();
+
+            try
+            {
+                var result = new CrockfordJsMinifier().Minify(js, false, Encoding.UTF8);
 
-            foreach (var file in scriptFiles)
+                js = result.MinifiedContent;
+            }
+            catch (Exception ex)
             {
-                await AppendResource(memoryStream, "scripts/" + file, newLineBytes).ConfigureAwait(false);
+                Logger.ErrorException("Error minifying javascript", ex);
             }
+            
+            var bytes = Encoding.UTF8.GetBytes(js);
+            await memoryStream.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
 
             memoryStream.Position = 0;
             return memoryStream;
         }
 
+        private IEnumerable<string> GetScriptFiles()
+        {
+            return new[]
+                            {
+                                "extensions.js",
+                                "site.js",
+                                "librarybrowser.js",
+                                "librarylist.js",
+                                "editorsidebar.js",
+                                "librarymenu.js",
+                                "chromecast.js",
+                                "contextmenu.js",
+
+                                "mediacontroller.js",
+                                "mediaplayer.js",
+                                "mediaplayer-video.js",
+
+                                "ratingdialog.js",
+                                "aboutpage.js",
+                                "allusersettings.js",
+                                "alphapicker.js",
+                                "addpluginpage.js",
+                                "advancedconfigurationpage.js",
+                                "advancedpaths.js",
+                                "advancedserversettings.js",
+                                "metadataadvanced.js",
+                                "appsplayback.js",
+                                "appsweather.js",
+                                "autoorganizetv.js",
+                                "autoorganizelog.js",
+                                "channels.js",
+                                "channelitems.js",
+                                "dashboardinfo.js",
+                                "dashboardpage.js",
+                                "directorybrowser.js",
+                                "dlnaprofile.js",
+                                "dlnaprofiles.js",
+                                "dlnasettings.js",
+                                "editcollectionitems.js",
+                                "edititemmetadata.js",
+                                "edititempeople.js",
+                                "edititemimages.js",
+                                "encodingsettings.js",
+                                "gamesrecommendedpage.js",
+                                "gamesystemspage.js",
+                                "gamespage.js",
+                                "gamegenrepage.js",
+                                "gamestudiospage.js",
+                                "indexpage.js",
+                                "itembynamedetailpage.js",
+                                "itemdetailpage.js",
+                                "itemgallery.js",
+                                "itemlistpage.js",
+                                "librarypathmapping.js",
+                                "libraryreport.js",
+                                "librarysettings.js",
+                                "livetvchannel.js",
+                                "livetvchannels.js",
+                                "livetvguide.js",
+                                "livetvnewrecording.js",
+                                "livetvprogram.js",
+                                "livetvrecording.js",
+                                "livetvrecordinglist.js",
+                                "livetvrecordings.js",
+                                "livetvtimer.js",
+                                "livetvseriestimer.js",
+                                "livetvseriestimers.js",
+                                "livetvsettings.js",
+                                "livetvsuggested.js",
+                                "livetvstatus.js",
+                                "livetvtimers.js",
+                                "loginpage.js",
+                                "logpage.js",
+                                "medialibrarypage.js",
+                                "metadataconfigurationpage.js",
+                                "metadataimagespage.js",
+                                "moviegenres.js",
+                                "moviecollections.js",
+                                "movies.js",
+                                "movieslatest.js",
+                                "moviepeople.js",
+                                "moviesrecommended.js",
+                                "moviestudios.js",
+                                "movietrailers.js",
+                                "musicalbums.js",
+                                "musicalbumartists.js",
+                                "musicartists.js",
+                                "musicgenres.js",
+                                "musicrecommended.js",
+                                "musicvideos.js",
+                                "notifications.js",
+                                "playlist.js",
+                                "plugincatalogpage.js",
+                                "pluginspage.js",
+                                "pluginupdatespage.js",
+                                "remotecontrol.js",
+                                "scheduledtaskpage.js",
+                                "scheduledtaskspage.js",
+                                "search.js",
+                                "songs.js",
+                                "supporterkeypage.js",
+                                "supporterpage.js",
+                                "episodes.js",
+                                "tvgenres.js",
+                                "tvlatest.js",
+                                "tvpeople.js",
+                                "tvrecommended.js",
+                                "tvshows.js",
+                                "tvstudios.js",
+                                "tvupcoming.js",
+                                "useredit.js",
+                                "userpassword.js",
+                                "userimagepage.js",
+                                "userprofilespage.js",
+                                "usersettings.js",
+                                "userparentalcontrol.js",
+                                "wizardfinishpage.js",
+                                "wizardimagesettings.js",
+                                "wizardservice.js",
+                                "wizardstartpage.js",
+                                "wizardsettings.js",
+                                "wizarduserpage.js"
+                            };
+        }
+
+        private async Task AppendLocalization(Stream stream)
+        {
+
+        }
+
         /// <summary>
         /// Gets all CSS.
         /// </summary>
@@ -568,35 +649,40 @@ namespace MediaBrowser.WebDashboard.Api
                                       "icons.css"
                                   };
 
-            var memoryStream = new MemoryStream();
-
-            var newLineBytes = Encoding.UTF8.GetBytes(Environment.NewLine);
+            var builder = new StringBuilder();
 
             foreach (var file in files)
             {
-                await AppendResource(memoryStream, "css/" + file, newLineBytes).ConfigureAwait(false);
+                var path = GetDashboardResourcePath("css/" + file);
+
+                using (var fs = _fileSystem.GetFileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, true))
+                {
+                    using (var streamReader = new StreamReader(fs))
+                    {
+                        var text = await streamReader.ReadToEndAsync().ConfigureAwait(false);
+                        builder.Append(text);
+                        builder.Append(Environment.NewLine);
+                    }
+                }
             }
-            
-            memoryStream.Position = 0;
-            return memoryStream;
-        }
 
-        /// <summary>
-        /// Appends the resource.
-        /// </summary>
-        /// <param name="assembly">The assembly.</param>
-        /// <param name="outputStream">The output stream.</param>
-        /// <param name="path">The path.</param>
-        /// <param name="newLineBytes">The new line bytes.</param>
-        /// <returns>Task.</returns>
-        private async Task AppendResource(Assembly assembly, Stream outputStream, string path, byte[] newLineBytes)
-        {
-            using (var stream = assembly.GetManifestResourceStream(path))
+            var css = builder.ToString();
+
+            try
             {
-                await stream.CopyToAsync(outputStream).ConfigureAwait(false);
+                var result = new KristensenCssMinifier().Minify(builder.ToString(), false, Encoding.UTF8);
 
-                await outputStream.WriteAsync(newLineBytes, 0, newLineBytes.Length).ConfigureAwait(false);
+                //css = result.MinifiedContent;
+            }
+            catch (Exception ex)
+            {
+                Logger.ErrorException("Error minifying css", ex);
             }
+
+            var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(css));
+
+            memoryStream.Position = 0;
+            return memoryStream;
         }
 
         /// <summary>
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 6c6487cc2..211f216d5 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -57,6 +57,9 @@
     <Reference Include="ServiceStack.Interfaces">
       <HintPath>..\ThirdParty\ServiceStack\ServiceStack.Interfaces.dll</HintPath>
     </Reference>
+    <Reference Include="WebMarkupMin.Core">
+      <HintPath>..\packages\WebMarkupMin.Core.0.8.18\lib\net40\WebMarkupMin.Core.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedVersion.cs">
@@ -641,9 +644,6 @@
     <Content Include="dashboard-ui\livetvseriestimers.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\autonumeric\autoNumeric.min.js">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\thirdparty\jquery-2.0.3.min.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -1477,9 +1477,6 @@
     <Content Include="dashboard-ui\scripts\tvstudios.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\thirdparty\autonumeric\autoNumeric.js">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\thirdparty\jstree1.0\jquery.jstree.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -1970,6 +1967,7 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="dashboard-ui\css\fonts\OpenSans-ExtraBold.woff">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -1983,6 +1981,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="packages.config" />
+    <None Include="WebMarkupMin.Configuration.xsd">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/MediaBrowser.WebDashboard/app.config b/MediaBrowser.WebDashboard/app.config
new file mode 100644
index 000000000..8c2c664cd
--- /dev/null
+++ b/MediaBrowser.WebDashboard/app.config
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <configSections>
+		<sectionGroup name="webMarkupMin">
+			<section name="core" type="WebMarkupMin.Core.Configuration.CoreConfiguration, WebMarkupMin.Core" />
+		</sectionGroup>
+	</configSections>
+  <webMarkupMin xmlns="http://tempuri.org/WebMarkupMin.Configuration.xsd">
+		<core>
+			<css>
+				<minifiers>
+					<add name="NullCssMinifier" displayName="Null CSS Minifier" type="WebMarkupMin.Core.Minifiers.NullCssMinifier, WebMarkupMin.Core" />
+					<add name="KristensenCssMinifier" displayName="Mads Kristensen's CSS minifier" type="WebMarkupMin.Core.Minifiers.KristensenCssMinifier, WebMarkupMin.Core" />
+				</minifiers>
+			</css>
+			<js>
+				<minifiers>
+					<add name="NullJsMinifier" displayName="Null JS Minifier" type="WebMarkupMin.Core.Minifiers.NullJsMinifier, WebMarkupMin.Core" />
+					<add name="CrockfordJsMinifier" displayName="Douglas Crockford's JS Minifier" type="WebMarkupMin.Core.Minifiers.CrockfordJsMinifier, WebMarkupMin.Core" />
+				</minifiers>
+			</js>
+			<logging>
+				<loggers>
+				  <add name="NullLogger" displayName="Null Logger" type="WebMarkupMin.Core.Loggers.NullLogger, WebMarkupMin.Core" />
+				  <add name="ThrowExceptionLogger" displayName="Throw exception logger" type="WebMarkupMin.Core.Loggers.ThrowExceptionLogger, WebMarkupMin.Core" />
+				</loggers>
+			</logging>
+		</core>
+	</webMarkupMin>
+</configuration>
\ No newline at end of file
diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config
index a874d5f6f..b867f7a92 100644
--- a/MediaBrowser.WebDashboard/packages.config
+++ b/MediaBrowser.WebDashboard/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MediaBrowser.ApiClient.Javascript" version="3.0.249" targetFramework="net45" />
+  <package id="WebMarkupMin.Core" version="0.8.18" targetFramework="net45" />
 </packages>
\ No newline at end of file
-- 
cgit v1.2.3


From c0801e4f6de87f6a14409b7f399cfd52b3ce88e8 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 30 Mar 2014 22:33:10 -0400
Subject: added web client localization

---
 .../Localization/ILocalizationManager.cs           |  7 ++++++
 .../IO/LibraryMonitor.cs                           |  8 ++++--
 .../Localization/JavaScript/en_US.json             | 21 ++++++++++++++++
 .../Localization/JavaScript/javascript.json        | 20 ++++++++++++++-
 .../Localization/JavaScript/pt_PT.json             | 21 ++++++++++++++++
 .../Localization/LocalizationManager.cs            |  8 ++++--
 .../Localization/Server/de.json                    | 17 +++++++++++++
 .../Localization/Server/en_US.json                 | 17 +++++++++++++
 .../Localization/Server/pt_PT.json                 | 17 +++++++++++++
 .../Localization/Server/ru.json                    | 17 +++++++++++++
 .../MediaBrowser.Server.Implementations.csproj     |  6 +++++
 MediaBrowser.WebDashboard/Api/DashboardService.cs  | 29 ++++++++++++++--------
 .../MediaBrowser.WebDashboard.csproj               |  6 +++++
 13 files changed, 178 insertions(+), 16 deletions(-)
 create mode 100644 MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/Server/de.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/Server/en_US.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/Server/ru.json

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Localization/ILocalizationManager.cs b/MediaBrowser.Controller/Localization/ILocalizationManager.cs
index 5993c7ac5..f41940ed4 100644
--- a/MediaBrowser.Controller/Localization/ILocalizationManager.cs
+++ b/MediaBrowser.Controller/Localization/ILocalizationManager.cs
@@ -61,5 +61,12 @@ namespace MediaBrowser.Controller.Localization
         /// </summary>
         /// <returns>IEnumerable{LocalizatonOption}.</returns>
         IEnumerable<LocalizatonOption> GetLocalizationOptions();
+
+        /// <summary>
+        /// Gets the java script localization dictionary.
+        /// </summary>
+        /// <param name="culture">The culture.</param>
+        /// <returns>Dictionary{System.StringSystem.String}.</returns>
+        Dictionary<string, string> GetJavaScriptLocalizationDictionary(string culture);
     }
 }
diff --git a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
index 08add952a..5b65a60c8 100644
--- a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
+++ b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
@@ -257,8 +257,12 @@ namespace MediaBrowser.Server.Implementations.IO
                         InternalBufferSize = 32767
                     };
 
-                    newWatcher.NotifyFilter = NotifyFilters.CreationTime | NotifyFilters.DirectoryName |
-                                              NotifyFilters.FileName | NotifyFilters.LastWrite | NotifyFilters.Size;
+                    newWatcher.NotifyFilter = NotifyFilters.CreationTime |
+                        NotifyFilters.DirectoryName |
+                        NotifyFilters.FileName |
+                        NotifyFilters.LastWrite |
+                        NotifyFilters.Size |
+                        NotifyFilters.Attributes;
 
                     newWatcher.Created += watcher_Changed;
                     newWatcher.Deleted += watcher_Changed;
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
new file mode 100644
index 000000000..45f0d7e13
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
@@ -0,0 +1,21 @@
+{
+	"SettingsSaved": "Settings saved.",
+	"AddUser": "Add User",
+	"Users": "Users",
+	"Delete": "Delete",
+	"Administrator": "Administrator",
+	"Password": "Password",
+	"CreatePassword": "Create Password",
+	"DeleteImage": "Delete Image",
+	"DeleteImageConfirmation": "Are you sure you wish to delete this image?",
+	"FileReadCancelled": "The file read has been cancelled.",
+	"FileNotFound": "File not found.",
+	"FileReadError": "An error occurred while reading the file.",
+	"DeleteUser": "Delete User",
+	"DeleteUserConfirmation": "Are you sure you wish to delete {0}?",
+	"PasswordResetHeader": "Password Reset",
+	"PasswordResetComplete": "The password has been reset.",
+	"PasswordResetConfirmation": "Are you sure you wish to reset the password?",
+	"PasswordSaved": "Password saved.",
+	"PasswordMatchError": "Password and password confirmation must match."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
index 44600aa35..41f8508a5 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -1,3 +1,21 @@
 {
-    "LabelTest": "Text"
+    "SettingsSaved": "Settings saved.",
+	"AddUser": "Add User",
+	"Users": "Users",
+	"Delete": "Delete",
+	"Administrator": "Administrator",
+	"Password": "Password",
+	"CreatePassword": "Create Password",
+	"DeleteImage": "Delete Image",
+	"DeleteImageConfirmation": "Are you sure you wish to delete this image?",
+	"FileReadCancelled": "The file read has been cancelled.",
+	"FileNotFound": "File not found.",
+	"FileReadError": "An error occurred while reading the file.",
+	"DeleteUser": "Delete User",
+	"DeleteUserConfirmation": "Are you sure you wish to delete {0}?",
+	"PasswordResetHeader": "Password Reset",
+	"PasswordResetComplete": "The password has been reset.",
+	"PasswordResetConfirmation": "Are you sure you wish to reset the password?",
+	"PasswordSaved": "Password saved.",
+	"PasswordMatchError": "Password and password confirmation must match."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
new file mode 100644
index 000000000..25d3ff944
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
@@ -0,0 +1,21 @@
+{
+	"SettingsSaved": "Configura\u00e7\u00f5es guardadas.",
+	"AddUser": "Adicionar Utilizador",
+	"Users": "Utilizadores",
+	"Delete": "Apagar",
+	"Administrator": "Administrador",
+	"Password": "Senha",
+	"CreatePassword": "Criar Senha",
+	"DeleteImage": "Apagar Imagem",
+	"DeleteImageConfirmation": "Tem a certeza que pretende apagar a imagem?",
+	"FileReadCancelled": "The file read has been cancelled.",
+	"FileNotFound": "Ficheiro n\u00e3o encontrado",
+	"FileReadError": "Ocorreu um erro ao ler o ficheiro.",
+	"DeleteUser": "Apagar Utilizador",
+	"DeleteUserConfirmation": "Tem a certeza que pretende apagar {0}?",
+	"PasswordResetHeader": "Password Reset",
+	"PasswordResetComplete": "The password has been reset.",
+	"PasswordResetConfirmation": "Are you sure you wish to reset the password?",
+	"PasswordSaved": "Senha guardada.",
+	"PasswordMatchError": "Password and password confirmation must match."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs b/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
index badf5f93c..6f39c6759 100644
--- a/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
+++ b/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
@@ -333,8 +333,12 @@ namespace MediaBrowser.Server.Implementations.Localization
         {
             return new List<LocalizatonOption>
             {
-                new LocalizatonOption{ Name="English (United States)", Value="en-us"}
-            };
+                new LocalizatonOption{ Name="English (United States)", Value="en-us"},
+                new LocalizatonOption{ Name="German", Value="de"},
+                new LocalizatonOption{ Name="Portuguese (Portugal)", Value="pt-PT"},
+                new LocalizatonOption{ Name="Russian", Value="ru"}
+
+            }.OrderBy(i => i.Name);
         }
 
         public string LocalizeDocument(string document, string culture, Func<string,string> tokenBuilder)
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/de.json b/MediaBrowser.Server.Implementations/Localization/Server/de.json
new file mode 100644
index 000000000..ab3271b50
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/Server/de.json
@@ -0,0 +1,17 @@
+{
+	"LabelExit": "Ende",
+	"LabelVisitCommunity": "Besuche die Community",
+	"LabelGithubWiki": "Github Wiki",
+	"LabelSwagger": "Swagger",
+	"LabelStandard": "Standard",
+	"LabelViewApiDocumentation": "Zeige Api Dokumentation",
+	"LabelBrowseLibrary": "Durchsuche Bibliothek",
+	"LabelConfigureMediaBrowser": "Konfiguriere Media Browser",
+	"LabelOpenLibraryViewer": "\u00d6ffne Bibliothekenansicht",
+	"LabelRestartServer": "Server neustarten",
+	"LabelShowLogWindow": "Zeige Log Fenster",
+	"LabelPrevious": "Vorheriges",
+	"LabelFinish": "Ende",
+	"LabelNext": "N\u00e4chstes",
+	"LabelYoureDone": "Du bist fertig!"
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/en_US.json b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
new file mode 100644
index 000000000..f74cca1eb
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
@@ -0,0 +1,17 @@
+{
+	"LabelExit": "Exit",
+	"LabelVisitCommunity": "Visit Community",
+	"LabelGithubWiki": "Github Wiki",
+	"LabelSwagger": "Swagger",
+	"LabelStandard": "Standard",
+	"LabelViewApiDocumentation": "View Api Documentation",
+	"LabelBrowseLibrary": "Browse Library",
+	"LabelConfigureMediaBrowser": "Configure Media Browser",
+	"LabelOpenLibraryViewer": "Open Library Viewer",
+	"LabelRestartServer": "Restart Server",
+	"LabelShowLogWindow": "Show Log Window",
+	"LabelPrevious": "Previous",
+	"LabelFinish": "Finish",
+	"LabelNext": "Next",
+	"LabelYoureDone": "You're Done!"
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
new file mode 100644
index 000000000..700314708
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
@@ -0,0 +1,17 @@
+{
+	"LabelExit": "Sair",
+	"LabelVisitCommunity": "Visitar a Comunidade",
+	"LabelGithubWiki": "Wiki Github",
+	"LabelSwagger": "Swagger",
+	"LabelStandard": "Padr\u00e3o",
+	"LabelViewApiDocumentation": "Ver Documenta\u00e7\u00e3o da API",
+	"LabelBrowseLibrary": "Navegar na Biblioteca",
+	"LabelConfigureMediaBrowser": "Configurar Media Browser",
+	"LabelOpenLibraryViewer": "Abrir Visualizador da Biblioteca",
+	"LabelRestartServer": "Reiniciar Servidor",
+	"LabelShowLogWindow": "Mostrar Janela de Log",
+	"LabelPrevious": "Anterior",
+	"LabelFinish": "Terminar",
+	"LabelNext": "Seguinte",
+	"LabelYoureDone": "Concluiu!"
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ru.json b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
new file mode 100644
index 000000000..4cc6b90f7
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
@@ -0,0 +1,17 @@
+{
+	"LabelExit": "\u0412\u044b\u0445\u043e\u0434",
+	"LabelVisitCommunity": "\u041f\u043e\u0441\u0435\u0442\u0438\u0442\u044c \u0421\u043e\u043e\u0431\u0449\u0435\u0441\u0442\u0432\u043e",
+	"LabelGithubWiki": "\u0412\u0438\u043a\u0438 \u043d\u0430 Github",
+	"LabelSwagger": "\u041e\u0444\u043e\u0440\u043c\u043b\u0435\u043d\u0438\u0435",
+	"LabelStandard": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u044b\u0439",
+	"LabelViewApiDocumentation": "\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u044f \u043f\u043e API",
+	"LabelBrowseLibrary": "\u041e\u0431\u043e\u0437\u0440\u0435\u0432\u0430\u0442\u0435\u043b\u044c \u041c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438",
+	"LabelConfigureMediaBrowser": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 Media Browser",
+	"LabelOpenLibraryViewer": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u041c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438",
+	"LabelRestartServer": "\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0441\u0435\u0440\u0432\u0435\u0440",
+	"LabelShowLogWindow": "\u041e\u043a\u043d\u043e \u0416\u0443\u0440\u043d\u0430\u043b\u0430",
+	"LabelPrevious": "\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0435\u0435",
+	"LabelFinish": "\u0417\u0430\u043a\u043e\u043d\u0447\u0438\u0442\u044c",
+	"LabelNext": "\u0421\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u0435",
+	"LabelYoureDone": "\u0412\u044b \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u043b\u0438!"
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index ac8dc9431..539b968c7 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -284,6 +284,12 @@
   <ItemGroup>
     <EmbeddedResource Include="Localization\JavaScript\javascript.json" />
     <EmbeddedResource Include="Localization\Server\server.json" />
+    <EmbeddedResource Include="Localization\Server\de.json" />
+    <EmbeddedResource Include="Localization\Server\pt_PT.json" />
+    <EmbeddedResource Include="Localization\Server\ru.json" />
+    <EmbeddedResource Include="Localization\JavaScript\en_US.json" />
+    <EmbeddedResource Include="Localization\JavaScript\pt_PT.json" />
+    <EmbeddedResource Include="Localization\Server\en_US.json" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 597381529..7313c089f 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -7,6 +7,7 @@ using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Serialization;
 using ServiceStack;
 using ServiceStack.Web;
 using System;
@@ -100,6 +101,7 @@ namespace MediaBrowser.WebDashboard.Api
 
         private readonly IFileSystem _fileSystem;
         private readonly ILocalizationManager _localization;
+        private readonly IJsonSerializer _jsonSerializer;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DashboardService" /> class.
@@ -107,12 +109,13 @@ namespace MediaBrowser.WebDashboard.Api
         /// <param name="appHost">The app host.</param>
         /// <param name="serverConfigurationManager">The server configuration manager.</param>
         /// <param name="fileSystem">The file system.</param>
-        public DashboardService(IServerApplicationHost appHost, IServerConfigurationManager serverConfigurationManager, IFileSystem fileSystem, ILocalizationManager localization)
+        public DashboardService(IServerApplicationHost appHost, IServerConfigurationManager serverConfigurationManager, IFileSystem fileSystem, ILocalizationManager localization, IJsonSerializer jsonSerializer)
         {
             _appHost = appHost;
             _serverConfigurationManager = serverConfigurationManager;
             _fileSystem = fileSystem;
             _localization = localization;
+            _jsonSerializer = jsonSerializer;
         }
 
         /// <summary>
@@ -484,7 +487,7 @@ namespace MediaBrowser.WebDashboard.Api
             {
                 Logger.ErrorException("Error minifying javascript", ex);
             }
-            
+
             var bytes = Encoding.UTF8.GetBytes(js);
             await memoryStream.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
 
@@ -524,6 +527,7 @@ namespace MediaBrowser.WebDashboard.Api
                                 "autoorganizelog.js",
                                 "channels.js",
                                 "channelitems.js",
+                                "dashboardgeneral.js",
                                 "dashboardinfo.js",
                                 "dashboardpage.js",
                                 "directorybrowser.js",
@@ -619,7 +623,10 @@ namespace MediaBrowser.WebDashboard.Api
 
         private async Task AppendLocalization(Stream stream)
         {
+            var js = "window.localizationGlossary=" + _jsonSerializer.SerializeToString(_localization.GetJavaScriptLocalizationDictionary(GetLocalizationCulture()));
 
+            var bytes = Encoding.UTF8.GetBytes(js);
+            await stream.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -668,16 +675,16 @@ namespace MediaBrowser.WebDashboard.Api
 
             var css = builder.ToString();
 
-            try
-            {
-                var result = new KristensenCssMinifier().Minify(builder.ToString(), false, Encoding.UTF8);
+            //try
+            //{
+            //    var result = new KristensenCssMinifier().Minify(builder.ToString(), false, Encoding.UTF8);
 
-                //css = result.MinifiedContent;
-            }
-            catch (Exception ex)
-            {
-                Logger.ErrorException("Error minifying css", ex);
-            }
+            //    css = result.MinifiedContent;
+            //}
+            //catch (Exception ex)
+            //{
+            //    Logger.ErrorException("Error minifying css", ex);
+            //}
 
             var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(css));
 
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 211f216d5..0ddb05577 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -224,6 +224,9 @@
     <Content Include="dashboard-ui\css\mediaplayer.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\dashboardgeneral.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\dashboardinfopage.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -518,6 +521,9 @@
     <Content Include="dashboard-ui\scripts\contextmenu.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\scripts\dashboardgeneral.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\scripts\dashboardinfo.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-- 
cgit v1.2.3


From bb5386bb3a8b71406728f8bd2249cf6e02a34ed2 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 31 Mar 2014 17:04:22 -0400
Subject: added more remote control commands

---
 MediaBrowser.Api/Playback/BaseStreamingService.cs  |  4 +-
 MediaBrowser.Api/SessionsService.cs                | 74 +++++++++++++++++++++-
 .../Session/ISessionController.cs                  | 10 +--
 MediaBrowser.Controller/Session/ISessionManager.cs |  8 +--
 MediaBrowser.Dlna/PlayTo/DlnaController.cs         | 44 +++++++------
 .../Encoder/EncodingUtils.cs                       |  4 +-
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs |  2 +-
 .../MediaBrowser.Model.Portable.csproj             |  7 +-
 .../MediaBrowser.Model.net35.csproj                |  7 +-
 MediaBrowser.Model/ApiClient/IApiClient.cs         | 10 +--
 MediaBrowser.Model/ApiClient/IServerEvents.cs      |  5 +-
 MediaBrowser.Model/ApiClient/ServerEventArgs.cs    |  4 +-
 MediaBrowser.Model/MediaBrowser.Model.csproj       |  3 +-
 MediaBrowser.Model/Session/GeneralCommand.cs       | 48 ++++++++++++++
 MediaBrowser.Model/Session/GenericCommand.cs       | 48 --------------
 MediaBrowser.Model/Session/SystemCommand.cs        | 14 ----
 MediaBrowser.Model/System/SystemInfo.cs            |  6 ++
 .../Library/Resolvers/Movies/MovieResolver.cs      |  9 +--
 .../Localization/JavaScript/de.json                | 31 +++++++++
 .../Localization/JavaScript/en_US.json             | 12 +++-
 .../Localization/JavaScript/es.json                | 31 +++++++++
 .../Localization/JavaScript/fr.json                | 31 +++++++++
 .../Localization/JavaScript/javascript.json        | 12 +++-
 .../Localization/JavaScript/nl.json                | 31 +++++++++
 .../Localization/JavaScript/pt_PT.json             | 20 ++++--
 .../Localization/JavaScript/ru.json                | 31 +++++++++
 .../Localization/JavaScript/zh_TW.json             | 31 +++++++++
 .../Localization/LocalizationManager.cs            | 11 +++-
 .../Localization/Server/de.json                    | 37 ++++++++++-
 .../Localization/Server/en_US.json                 | 35 +++++++++-
 .../Localization/Server/es.json                    | 50 +++++++++++++++
 .../Localization/Server/fr.json                    | 50 +++++++++++++++
 .../Localization/Server/nl.json                    | 50 +++++++++++++++
 .../Localization/Server/pt_BR.json                 | 50 +++++++++++++++
 .../Localization/Server/pt_PT.json                 | 35 +++++++++-
 .../Localization/Server/ru.json                    | 49 +++++++++++---
 .../Localization/Server/server.json                | 35 +++++++++-
 .../Localization/Server/zh_TW.json                 | 50 +++++++++++++++
 .../MediaBrowser.Server.Implementations.csproj     | 11 ++++
 .../Roku/RokuSessionController.cs                  | 14 +---
 .../Session/SessionManager.cs                      |  8 +--
 .../Session/WebSocketController.cs                 | 18 +-----
 MediaBrowser.ServerApplication/ApplicationHost.cs  |  1 +
 MediaBrowser.WebDashboard/Api/DashboardService.cs  |  2 +-
 44 files changed, 855 insertions(+), 188 deletions(-)
 create mode 100644 MediaBrowser.Model/Session/GeneralCommand.cs
 delete mode 100644 MediaBrowser.Model/Session/GenericCommand.cs
 delete mode 100644 MediaBrowser.Model/Session/SystemCommand.cs
 create mode 100644 MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/JavaScript/es.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/Server/es.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/Server/fr.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/Server/nl.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 5ed77356b..e6ec38846 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -734,7 +734,9 @@ namespace MediaBrowser.Api.Playback
         {
             if (audioStream != null)
             {
-                if (audioStream.Channels > 2 && string.Equals(request.AudioCodec, "wma", StringComparison.OrdinalIgnoreCase))
+                var codec = request.AudioCodec ?? string.Empty;
+
+                if (audioStream.Channels > 2 && codec.IndexOf("wma", StringComparison.OrdinalIgnoreCase) != -1)
                 {
                     // wmav2 currently only supports two channel output
                     return 2;
diff --git a/MediaBrowser.Api/SessionsService.cs b/MediaBrowser.Api/SessionsService.cs
index a509c876c..1f3bcf75b 100644
--- a/MediaBrowser.Api/SessionsService.cs
+++ b/MediaBrowser.Api/SessionsService.cs
@@ -146,7 +146,36 @@ namespace MediaBrowser.Api
         /// </summary>
         /// <value>The play command.</value>
         [ApiMember(Name = "Command", Description = "The command to send.", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public SystemCommand Command { get; set; }
+        public string Command { get; set; }
+    }
+
+    [Route("/Sessions/{Id}/Command/{Command}", "POST", Summary = "Issues a system command to a client")]
+    public class SendGeneralCommand : IReturnVoid
+    {
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public Guid Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets the command.
+        /// </summary>
+        /// <value>The play command.</value>
+        [ApiMember(Name = "Command", Description = "The command to send.", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public string Command { get; set; }
+    }
+
+    [Route("/Sessions/{Id}/Command", "POST", Summary = "Issues a system command to a client")]
+    public class SendFullGeneralCommand : GeneralCommand, IReturnVoid
+    {
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public Guid Id { get; set; }
     }
 
     [Route("/Sessions/{Id}/Message", "POST", Summary = "Issues a command to a client to display a message to the user")]
@@ -301,9 +330,22 @@ namespace MediaBrowser.Api
         /// <param name="request">The request.</param>
         public void Post(SendSystemCommand request)
         {
-            var task = _sessionManager.SendSystemCommand(GetSession().Id, request.Id, request.Command, CancellationToken.None);
+            GeneralCommandType commandType;
 
-            Task.WaitAll(task);
+            if (Enum.TryParse(request.Command, true, out commandType))
+            {
+                var currentSession = GetSession();
+
+                var command = new GeneralCommand
+                {
+                    Name = commandType.ToString(),
+                    ControllingUserId = currentSession.UserId.HasValue ? currentSession.UserId.Value.ToString("N") : null
+                };
+
+                var task = _sessionManager.SendGeneralCommand(currentSession.Id, request.Id, command, CancellationToken.None);
+
+                Task.WaitAll(task);
+            }
         }
 
         /// <summary>
@@ -343,6 +385,32 @@ namespace MediaBrowser.Api
             Task.WaitAll(task);
         }
 
+        public void Post(SendGeneralCommand request)
+        {
+            var currentSession = GetSession();
+
+            var command = new GeneralCommand
+            {
+                Name = request.Command,
+                ControllingUserId = currentSession.UserId.HasValue ? currentSession.UserId.Value.ToString("N") : null
+            };
+
+            var task = _sessionManager.SendGeneralCommand(currentSession.Id, request.Id, command, CancellationToken.None);
+
+            Task.WaitAll(task);
+        }
+
+        public void Post(SendFullGeneralCommand request)
+        {
+            var currentSession = GetSession();
+
+            request.ControllingUserId = currentSession.UserId.HasValue ? currentSession.UserId.Value.ToString("N") : null;
+
+            var task = _sessionManager.SendGeneralCommand(currentSession.Id, request.Id, request, CancellationToken.None);
+
+            Task.WaitAll(task);
+        }
+
         public void Post(AddUserToSession request)
         {
             _sessionManager.AddAdditionalUser(request.Id, request.UserId);
diff --git a/MediaBrowser.Controller/Session/ISessionController.cs b/MediaBrowser.Controller/Session/ISessionController.cs
index 02cc875bd..cf57f6621 100644
--- a/MediaBrowser.Controller/Session/ISessionController.cs
+++ b/MediaBrowser.Controller/Session/ISessionController.cs
@@ -19,14 +19,6 @@ namespace MediaBrowser.Controller.Session
         /// <value><c>true</c> if this instance is session active; otherwise, <c>false</c>.</value>
         bool IsSessionActive { get; }
 
-        /// <summary>
-        /// Sends the system command.
-        /// </summary>
-        /// <param name="command">The command.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        Task SendSystemCommand(SystemCommand command, CancellationToken cancellationToken);
-
         /// <summary>
         /// Sends the message command.
         /// </summary>
@@ -65,7 +57,7 @@ namespace MediaBrowser.Controller.Session
         /// <param name="command">The command.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        Task SendGenericCommand(GenericCommand command, CancellationToken cancellationToken);
+        Task SendGeneralCommand(GeneralCommand command, CancellationToken cancellationToken);
         
         /// <summary>
         /// Sends the library update info.
diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs
index 459e43d08..434c51336 100644
--- a/MediaBrowser.Controller/Session/ISessionManager.cs
+++ b/MediaBrowser.Controller/Session/ISessionManager.cs
@@ -84,15 +84,15 @@ namespace MediaBrowser.Controller.Session
         Task ReportSessionEnded(Guid sessionId);
 
         /// <summary>
-        /// Sends the system command.
+        /// Sends the general command.
         /// </summary>
         /// <param name="controllingSessionId">The controlling session identifier.</param>
-        /// <param name="sessionId">The session id.</param>
+        /// <param name="sessionId">The session identifier.</param>
         /// <param name="command">The command.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        Task SendSystemCommand(Guid controllingSessionId, Guid sessionId, SystemCommand command, CancellationToken cancellationToken);
-
+        Task SendGeneralCommand(Guid controllingSessionId, Guid sessionId, GeneralCommand command, CancellationToken cancellationToken);
+        
         /// <summary>
         /// Sends the message command.
         /// </summary>
diff --git a/MediaBrowser.Dlna/PlayTo/DlnaController.cs b/MediaBrowser.Dlna/PlayTo/DlnaController.cs
index 0c9f292ad..96df8c862 100644
--- a/MediaBrowser.Dlna/PlayTo/DlnaController.cs
+++ b/MediaBrowser.Dlna/PlayTo/DlnaController.cs
@@ -308,25 +308,6 @@ namespace MediaBrowser.Dlna.PlayTo
             return Task.FromResult(true);
         }
 
-        public Task SendSystemCommand(SystemCommand command, CancellationToken cancellationToken)
-        {
-            switch (command)
-            {
-                case SystemCommand.VolumeDown:
-                    return _device.VolumeDown();
-                case SystemCommand.VolumeUp:
-                    return _device.VolumeUp();
-                case SystemCommand.Mute:
-                    return _device.VolumeDown(true);
-                case SystemCommand.Unmute:
-                    return _device.VolumeUp(true);
-                case SystemCommand.ToggleMute:
-                    return _device.ToggleMute();
-                default:
-                    return Task.FromResult(true);
-            }
-        }
-
         public Task SendUserDataChangeInfo(UserDataChangeInfo info, CancellationToken cancellationToken)
         {
             return Task.FromResult(true);
@@ -620,9 +601,30 @@ namespace MediaBrowser.Dlna.PlayTo
             }
         }
 
-        public Task SendGenericCommand(GenericCommand command, CancellationToken cancellationToken)
+        public Task SendGeneralCommand(GeneralCommand command, CancellationToken cancellationToken)
         {
-            throw new NotImplementedException();
+            GeneralCommandType commandType;
+
+            if (!Enum.TryParse(command.Name, true, out commandType))
+            {
+                switch (commandType)
+                {
+                    case GeneralCommandType.VolumeDown:
+                        return _device.VolumeDown();
+                    case GeneralCommandType.VolumeUp:
+                        return _device.VolumeUp();
+                    case GeneralCommandType.Mute:
+                        return _device.VolumeDown(true);
+                    case GeneralCommandType.Unmute:
+                        return _device.VolumeUp(true);
+                    case GeneralCommandType.ToggleMute:
+                        return _device.ToggleMute();
+                    default:
+                        return Task.FromResult(true);
+                }
+            }
+
+            return Task.FromResult(true);
         }
     }
 }
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs
index 79d512dc1..4a9023c7f 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs
@@ -180,7 +180,9 @@ namespace MediaBrowser.MediaEncoding.Encoder
         {
             if (audioStream != null)
             {
-                if (audioStream.Channels > 2 && string.Equals(request.AudioCodec, "wma", StringComparison.OrdinalIgnoreCase))
+                var codec = request.AudioCodec ?? string.Empty;
+
+                if (audioStream.Channels > 2 && codec.IndexOf("wma", StringComparison.OrdinalIgnoreCase) != -1)
                 {
                     // wmav2 currently only supports two channel output
                     return 2;
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 93df0c8b9..675d43be7 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -768,7 +768,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
             }
 
             // Use ffmpeg to sample 100 (we can drop this if required using thumbnail=50 for 50 frames) frames and pick the best thumbnail. Have a fall back just in case.
-            var args = useIFrame ? string.Format("-i {0} -threads 0 -v quiet -vframes 1 -vf \"{2},thumbnail=80\" -f image2 \"{1}\"", inputPath, "-", vf) :
+            var args = useIFrame ? string.Format("-i {0} -threads 0 -v quiet -vframes 1 -vf \"{2},thumbnail=50\" -f image2 \"{1}\"", inputPath, "-", vf) :
                 string.Format("-i {0} -threads 0 -v quiet -vframes 1 -vf \"{2}\" -f image2 \"{1}\"", inputPath, "-", vf);
 
             var probeSize = GetProbeSizeArgument(type);
diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
index 6c4d9d9e2..00fb2131c 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -428,8 +428,8 @@
     <Compile Include="..\MediaBrowser.Model\Session\BrowseRequest.cs">
       <Link>Session\BrowseRequest.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Session\GenericCommand.cs">
-      <Link>Session\GenericCommand.cs</Link>
+    <Compile Include="..\MediaBrowser.Model\Session\GeneralCommand.cs">
+      <Link>Session\GeneralCommand.cs</Link>
     </Compile>
     <Compile Include="..\MediaBrowser.Model\Session\MessageCommand.cs">
       <Link>Session\MessageCommand.cs</Link>
@@ -449,9 +449,6 @@
     <Compile Include="..\MediaBrowser.Model\Session\SessionInfoDto.cs">
       <Link>Session\SessionInfoDto.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Session\SystemCommand.cs">
-      <Link>Session\SystemCommand.cs</Link>
-    </Compile>
     <Compile Include="..\MediaBrowser.Model\Session\UserDataChangeInfo.cs">
       <Link>Session\UserDataChangeInfo.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
index b39cecc61..f8bc2a600 100644
--- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
+++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
@@ -415,8 +415,8 @@
     <Compile Include="..\MediaBrowser.Model\Session\BrowseRequest.cs">
       <Link>Session\BrowseRequest.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Session\GenericCommand.cs">
-      <Link>Session\GenericCommand.cs</Link>
+    <Compile Include="..\MediaBrowser.Model\Session\GeneralCommand.cs">
+      <Link>Session\GeneralCommand.cs</Link>
     </Compile>
     <Compile Include="..\MediaBrowser.Model\Session\MessageCommand.cs">
       <Link>Session\MessageCommand.cs</Link>
@@ -436,9 +436,6 @@
     <Compile Include="..\MediaBrowser.Model\Session\SessionInfoDto.cs">
       <Link>Session\SessionInfoDto.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Session\SystemCommand.cs">
-      <Link>Session\SystemCommand.cs</Link>
-    </Compile>
     <Compile Include="..\MediaBrowser.Model\Session\UserDataChangeInfo.cs">
       <Link>Session\UserDataChangeInfo.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index 28c5822e9..dc5e26be3 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -593,17 +593,9 @@ namespace MediaBrowser.Model.ApiClient
         /// Sends the command asynchronous.
         /// </summary>
         /// <param name="sessionId">The session identifier.</param>
-        /// <param name="request">The request.</param>
-        /// <returns>Task.</returns>
-        Task SendCommandAsync(string sessionId, GenericCommand request);
-        
-        /// <summary>
-        /// Sends a system command to the client
-        /// </summary>
-        /// <param name="sessionId">The session id.</param>
         /// <param name="command">The command.</param>
         /// <returns>Task.</returns>
-        Task SendSystemCommandAsync(string sessionId, SystemCommand command);
+        Task SendCommandAsync(string sessionId, GeneralCommand command);
 
         /// <summary>
         /// Instructs the client to display a message to the user
diff --git a/MediaBrowser.Model/ApiClient/IServerEvents.cs b/MediaBrowser.Model/ApiClient/IServerEvents.cs
index 0a38c63ad..63135baa2 100644
--- a/MediaBrowser.Model/ApiClient/IServerEvents.cs
+++ b/MediaBrowser.Model/ApiClient/IServerEvents.cs
@@ -1,4 +1,5 @@
-using System;
+using MediaBrowser.Model.Session;
+using System;
 
 namespace MediaBrowser.Model.ApiClient
 {
@@ -66,7 +67,7 @@ namespace MediaBrowser.Model.ApiClient
         /// <summary>
         /// Occurs when [system command].
         /// </summary>
-        event EventHandler<SystemCommandEventArgs> SystemCommand;
+        event EventHandler<GeneralCommandEventArgs> GeneralCommand;
         /// <summary>
         /// Occurs when [notification added].
         /// </summary>
diff --git a/MediaBrowser.Model/ApiClient/ServerEventArgs.cs b/MediaBrowser.Model/ApiClient/ServerEventArgs.cs
index d3212caf4..b7f709e95 100644
--- a/MediaBrowser.Model/ApiClient/ServerEventArgs.cs
+++ b/MediaBrowser.Model/ApiClient/ServerEventArgs.cs
@@ -152,13 +152,13 @@ namespace MediaBrowser.Model.ApiClient
     /// <summary>
     /// Class SystemCommandEventArgs
     /// </summary>
-    public class SystemCommandEventArgs : EventArgs
+    public class GeneralCommandEventArgs : EventArgs
     {
         /// <summary>
         /// Gets or sets the command.
         /// </summary>
         /// <value>The command.</value>
-        public SystemCommand Command { get; set; }
+        public GeneralCommand Command { get; set; }
     }
 
     /// <summary>
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 207543fe8..0859f6999 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -132,7 +132,7 @@
     <Compile Include="Querying\UserQuery.cs" />
     <Compile Include="Search\SearchQuery.cs" />
     <Compile Include="Session\BrowseRequest.cs" />
-    <Compile Include="Session\GenericCommand.cs" />
+    <Compile Include="Session\GeneralCommand.cs" />
     <Compile Include="Session\MessageCommand.cs" />
     <Compile Include="Session\PlaybackReports.cs" />
     <Compile Include="Session\PlayRequest.cs" />
@@ -171,7 +171,6 @@
     <Compile Include="Serialization\IXmlSerializer.cs" />
     <Compile Include="Session\SessionCapabilities.cs" />
     <Compile Include="Session\SessionInfoDto.cs" />
-    <Compile Include="Session\SystemCommand.cs" />
     <Compile Include="Session\UserDataChangeInfo.cs" />
     <Compile Include="Themes\AppTheme.cs" />
     <Compile Include="Themes\ThemeImage.cs" />
diff --git a/MediaBrowser.Model/Session/GeneralCommand.cs b/MediaBrowser.Model/Session/GeneralCommand.cs
new file mode 100644
index 000000000..0de7d6dd8
--- /dev/null
+++ b/MediaBrowser.Model/Session/GeneralCommand.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+
+namespace MediaBrowser.Model.Session
+{
+    public class GeneralCommand
+    {
+        public string Name { get; set; }
+
+        public string ControllingUserId { get; set; }
+
+        public Dictionary<string, string> Arguments { get; set; }
+
+        public GeneralCommand()
+        {
+            Arguments = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        }
+    }
+
+    /// <summary>
+    /// This exists simply to identify a set of known commands.
+    /// </summary>
+    public enum GeneralCommandType
+    {
+        MoveUp = 0,
+        MoveDown = 1,
+        MoveLeft = 2,
+        MoveRight = 3,
+        PageUp = 4,
+        PageDown = 5,
+        PreviousLetter = 6,
+        NextLetter = 7,
+        ToggleOsd = 8,
+        ToggleContextMenu = 9,
+        Select = 10,
+        Back = 11,
+        TakeScreenshot = 12,
+        SendKey = 13,
+        SendString = 14,
+        GoHome = 15,
+        GoToSettings = 16,
+        VolumeUp = 17,
+        VolumeDown = 18,
+        Mute = 19,
+        Unmute = 20,
+        ToggleMute = 21
+    }
+}
diff --git a/MediaBrowser.Model/Session/GenericCommand.cs b/MediaBrowser.Model/Session/GenericCommand.cs
deleted file mode 100644
index f7ea0a84a..000000000
--- a/MediaBrowser.Model/Session/GenericCommand.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MediaBrowser.Model.Session
-{
-    public class GenericCommand
-    {
-        public string Name { get; set; }
-
-        public string ControllingUserId { get; set; }
-
-        public Dictionary<string, string> Arguments { get; set; }
-
-        public GenericCommand()
-        {
-            Arguments = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-        }
-    }
-
-    /// <summary>
-    /// This exists simply to identify a set of known commands.
-    /// </summary>
-    public enum CoreGenericCommand
-    {
-        MoveUp = 0,
-        MoveDown = 1,
-        MoveLeft = 2,
-        MoveRight = 3,
-        PageUp = 4,
-        PageDown = 5,
-        PreviousLetter = 6,
-        NextLetter = 7,
-        ToggleOsd = 8,
-        ToggleContextMenu = 9,
-        Select = 10,
-        Back = 11,
-        TakeScreenshot = 12,
-        SendKey = 13,
-        SendString = 14,
-        GoHome = 15,
-        GoToSettings = 16,
-        VolumeUp = 17,
-        VolumeDown = 18,
-        Mute = 19,
-        Unmute = 20,
-        ToggleMute = 21
-    }
-}
diff --git a/MediaBrowser.Model/Session/SystemCommand.cs b/MediaBrowser.Model/Session/SystemCommand.cs
deleted file mode 100644
index 2fcaef6e3..000000000
--- a/MediaBrowser.Model/Session/SystemCommand.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-
-namespace MediaBrowser.Model.Session
-{
-    public enum SystemCommand
-    {
-        GoHome,
-        GoToSettings,
-        VolumeUp,
-        VolumeDown,
-        Mute,
-        Unmute,
-        ToggleMute
-    }
-}
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index ec31c5529..5b1e7d6bb 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -116,6 +116,12 @@ namespace MediaBrowser.Model.System
         /// <value>The log path.</value>
         public string LogPath { get; set; }
 
+        /// <summary>
+        /// Gets or sets the internal metadata path.
+        /// </summary>
+        /// <value>The internal metadata path.</value>
+        public string InternalMetadataPath { get; set; }
+        
         /// <summary>
         /// Gets or sets the transcoding temporary path.
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index 13a1e8f16..558087a25 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -115,22 +115,19 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
             }
 
             // Find movies that are mixed in the same folder
-            if (args.Path.IndexOf("[trailers]", StringComparison.OrdinalIgnoreCase) != -1 ||
-                string.Equals(collectionType, CollectionType.Trailers, StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(collectionType, CollectionType.Trailers, StringComparison.OrdinalIgnoreCase))
             {
                 return ResolveVideo<Trailer>(args);
             }
 
             Video item = null;
 
-            if (args.Path.IndexOf("[musicvideos]", StringComparison.OrdinalIgnoreCase) != -1 ||
-                string.Equals(collectionType, CollectionType.MusicVideos, StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(collectionType, CollectionType.MusicVideos, StringComparison.OrdinalIgnoreCase))
             {
                 item = ResolveVideo<MusicVideo>(args);
             }
 
-            if (args.Path.IndexOf("[adultvideos]", StringComparison.OrdinalIgnoreCase) != -1 ||
-                string.Equals(collectionType, CollectionType.AdultVideos, StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(collectionType, CollectionType.AdultVideos, StringComparison.OrdinalIgnoreCase))
             {
                 item = ResolveVideo<AdultVideo>(args);
             }
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
new file mode 100644
index 000000000..12cdb7035
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
@@ -0,0 +1,31 @@
+{
+	"SettingsSaved": "Einstellungen gespeichert",
+	"AddUser": "Benutzer hinzuf\u00fcgen",
+	"Users": "Benutzer",
+	"Delete": "L\u00f6schen",
+	"Administrator": "Administrator",
+	"Password": "Passwort",
+	"CreatePassword": "Passwort erstellen",
+	"DeleteImage": "Bild l\u00f6schen",
+	"DeleteImageConfirmation": "M\u00f6chten Sie das Bild wirklich l\u00f6schen?",
+	"FileReadCancelled": "Das Einlesen der Datei wurde abgebrochen.",
+	"FileNotFound": "Datei nicht gefunden",
+	"FileReadError": "Beim Lesen der Datei ist ein Fehler aufgetreten.",
+	"DeleteUser": "Benutzer l\u00f6schen",
+	"DeleteUserConfirmation": "M\u00f6chten Sie {0} wirklich l\u00f6schen?",
+	"PasswordResetHeader": "Passwort zur\u00fccksetzen",
+	"PasswordResetComplete": "Das Passwort wurde zur\u00fcckgesetzt.",
+	"PasswordResetConfirmation": "M\u00f6chten Sie das Passwort wirklich zur\u00fccksetzen?",
+	"PasswordSaved": "Passwort gespeichert",
+	"PasswordMatchError": "Passwort und Passwortbest\u00e4tigung stimmen nicht \u00fcberein.",
+	"OptionOff": "Aus",
+	"OptionOn": "Ein",
+	"OptionRelease": "Release",
+	"OptionBeta": "Beta",
+	"OptionDev": "Dev",
+	"UninstallPluginHeader": "Deinstalliere Plugin",
+	"UninstallPluginConfirmation": "M\u00f6chten Sie {0} wirklich deinstallieren?",
+	"NoPluginConfigurationMessage": "Bei diesem Plugin kann nichts eingestellt werden.",
+	"NoPluginsInstalledMessage": "Sie haben keine Plugins installiert.",
+	"BrowsePluginCatalogMessage": "Durchsuchen Sie unsere Bibliothek um alle verf\u00fcgbaren Plugins anzuzeigen."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
index 45f0d7e13..7184d4724 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
@@ -17,5 +17,15 @@
 	"PasswordResetComplete": "The password has been reset.",
 	"PasswordResetConfirmation": "Are you sure you wish to reset the password?",
 	"PasswordSaved": "Password saved.",
-	"PasswordMatchError": "Password and password confirmation must match."
+	"PasswordMatchError": "Password and password confirmation must match.",
+	"OptionOff": "Off",
+	"OptionOn": "On",
+	"OptionRelease": "Release",
+	"OptionBeta": "Beta",
+	"OptionDev": "Dev",
+	"UninstallPluginHeader": "Uninstall Plugin",
+	"UninstallPluginConfirmation": "Are you sure you wish to uninstall {0}?",
+	"NoPluginConfigurationMessage": "This plugin has nothing to configure.",
+	"NoPluginsInstalledMessage": "You have no plugins installed.",
+	"BrowsePluginCatalogMessage": "Browse our plugin catalog to view available plugins."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json
new file mode 100644
index 000000000..b0b9fd1a9
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json
@@ -0,0 +1,31 @@
+{
+	"SettingsSaved": "Configuracion guardada",
+	"AddUser": "Agregar usuario",
+	"Users": "Usuarios",
+	"Delete": "Borrar",
+	"Administrator": "Administrador",
+	"Password": "Contrase\u00f1a",
+	"CreatePassword": "Crear Contrase\u00f1a",
+	"DeleteImage": "Borrar Imagen",
+	"DeleteImageConfirmation": "Esta seguro que desea borrar esta imagen?",
+	"FileReadCancelled": "La lectura del archivo se ha cancelado.",
+	"FileNotFound": "Archivo no encontrado.",
+	"FileReadError": "Se encontr\u00f3 un error al leer el archivo.",
+	"DeleteUser": "Borrar Usuario",
+	"DeleteUserConfirmation": "Esta seguro que desea eliminar a {0}?",
+	"PasswordResetHeader": "Restablecer contrase\u00f1a",
+	"PasswordResetComplete": "La contrase\u00f1a se ha restablecido.",
+	"PasswordResetConfirmation": "Esta seguro que desea restablecer la contrase\u00f1a?",
+	"PasswordSaved": "Contrase\u00f1a guardada.",
+	"PasswordMatchError": "La contrase\u00f1a y la confirmaci\u00f3n de la contrase\u00f1a deben de ser iguales.",
+	"OptionOff": "Apagado",
+	"OptionOn": "Prendido",
+	"OptionRelease": "Liberar",
+	"OptionBeta": "Beta",
+	"OptionDev": "Desarrollo",
+	"UninstallPluginHeader": "Desinstalar Plugin",
+	"UninstallPluginConfirmation": "Esta seguro que desea desinstalar {0}?",
+	"NoPluginConfigurationMessage": "El plugin no requiere configuraci\u00f3n",
+	"NoPluginsInstalledMessage": "No tiene plugins instalados.",
+	"BrowsePluginCatalogMessage": "Navegar el catalogo de plugins para ver los plugins disponibles."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
new file mode 100644
index 000000000..9e1ebbfee
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
@@ -0,0 +1,31 @@
+{
+	"SettingsSaved": "Param\u00e8tres sauvegard\u00e9s.",
+	"AddUser": "Ajout\u00e9 Usager",
+	"Users": "Usagers",
+	"Delete": "Supprimer",
+	"Administrator": "Administrateur",
+	"Password": "Mot de passe",
+	"CreatePassword": "Cr\u00e9er mot de passe",
+	"DeleteImage": "Supprimer Image",
+	"DeleteImageConfirmation": "\u00cates-vous s\u00fbr de vouloir supprimer l'image?",
+	"FileReadCancelled": "La lecture du fichier a \u00e9t\u00e9 annul\u00e9e.",
+	"FileNotFound": "Fichier non trouv\u00e9",
+	"FileReadError": "Un erreur est survenue pendant la lecture du fichier.",
+	"DeleteUser": "Supprimer Usager",
+	"DeleteUserConfirmation": "\u00cates-vous s\u00fbr de vouloir supprimer {0}?",
+	"PasswordResetHeader": "Red\u00e9marrage du mot de passe",
+	"PasswordResetComplete": "Le mot de passe a \u00e9t\u00e9 red\u00e9marr\u00e9.",
+	"PasswordResetConfirmation": "\u00cates-vous s\u00fbr de vouloir red\u00e9marrer le mot de passe?",
+	"PasswordSaved": "Mot de passe sauvegard\u00e9.",
+	"PasswordMatchError": "Mot de passe et confirmation de mot de passe doivent correspondre.",
+	"OptionOff": "Off",
+	"OptionOn": "On",
+	"OptionRelease": "Lancement",
+	"OptionBeta": "Beta",
+	"OptionDev": "Dev",
+	"UninstallPluginHeader": "D\u00e9sinstaller module d'extention",
+	"UninstallPluginConfirmation": "\u00cates-vous s\u00fbr de vouloir d\u00e9sinstaller {0}?",
+	"NoPluginConfigurationMessage": "Ce module d'extension n'a rien \u00e0 configurer.",
+	"NoPluginsInstalledMessage": "Vous n'avez aucun module d'extension install\u00e9.",
+	"BrowsePluginCatalogMessage": "Explorer notre catalogue de modules d'extension pour voir ce qui est disponible."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
index 41f8508a5..6b014bf34 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -17,5 +17,15 @@
 	"PasswordResetComplete": "The password has been reset.",
 	"PasswordResetConfirmation": "Are you sure you wish to reset the password?",
 	"PasswordSaved": "Password saved.",
-	"PasswordMatchError": "Password and password confirmation must match."
+	"PasswordMatchError": "Password and password confirmation must match.",
+	"OptionOff": "Off",
+	"OptionOn": "On",
+	"OptionRelease": "Release",
+	"OptionBeta": "Beta",
+	"OptionDev": "Dev",
+	"UninstallPluginHeader": "Uninstall Plugin",
+	"UninstallPluginConfirmation": "Are you sure you wish to uninstall {0}?",
+	"NoPluginConfigurationMessage": "This plugin has nothing to configure.",
+	"NoPluginsInstalledMessage": "You have no plugins installed.",
+	"BrowsePluginCatalogMessage": "Browse our plugin catalog to view available plugins."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
new file mode 100644
index 000000000..17a343283
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
@@ -0,0 +1,31 @@
+{
+	"SettingsSaved": "Instellingen opgeslagen.",
+	"AddUser": "Gebruiker toevoegen",
+	"Users": "Gebruikers",
+	"Delete": "Verwijderen",
+	"Administrator": "Beheerder",
+	"Password": "Wachtwoord",
+	"CreatePassword": "Maak wachtwoord",
+	"DeleteImage": "Verwijder afbeelding",
+	"DeleteImageConfirmation": "Weet je zeker dat je deze afbeelding wilt verwijderen?",
+	"FileReadCancelled": "Het lezen van het bestand is geannuleerd",
+	"FileNotFound": "Bestand niet gevonden.",
+	"FileReadError": "Er is een fout opgetreden bij het lezen van het bestand.",
+	"DeleteUser": "Verwijder gebruiker",
+	"DeleteUserConfirmation": "Weet je zeker dat je {0} wilt verwijderen?",
+	"PasswordResetHeader": "Wachtwoord opnieuw instellen",
+	"PasswordResetComplete": "Het wachtwoord is opnieuw ingesteld.",
+	"PasswordResetConfirmation": "Weet je zeker dat je het wachtwoord opnieuw in wilt stellen?",
+	"PasswordSaved": "Wachtwoord opgeslagen.",
+	"PasswordMatchError": "Wachtwoord en wachtwoord bevestiging moeten hetzelfde zijn.",
+	"OptionOff": "Uit",
+	"OptionOn": "Aan",
+	"OptionRelease": "Release",
+	"OptionBeta": "Beta",
+	"OptionDev": "Dev",
+	"UninstallPluginHeader": "Deinstalleer Plugin",
+	"UninstallPluginConfirmation": "Weet u zeker dat u {0} wilt deinstalleren?",
+	"NoPluginConfigurationMessage": "Deze plugin heeft niets in te stellen",
+	"NoPluginsInstalledMessage": "U heeft geen plugins geinstalleerd",
+	"BrowsePluginCatalogMessage": "Blader door de Plugincatalogus voor beschikbare plugins."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
index 25d3ff944..e81a18e79 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
@@ -8,14 +8,24 @@
 	"CreatePassword": "Criar Senha",
 	"DeleteImage": "Apagar Imagem",
 	"DeleteImageConfirmation": "Tem a certeza que pretende apagar a imagem?",
-	"FileReadCancelled": "The file read has been cancelled.",
+	"FileReadCancelled": "A leitura do ficheiro foi cancelada.",
 	"FileNotFound": "Ficheiro n\u00e3o encontrado",
 	"FileReadError": "Ocorreu um erro ao ler o ficheiro.",
 	"DeleteUser": "Apagar Utilizador",
 	"DeleteUserConfirmation": "Tem a certeza que pretende apagar {0}?",
-	"PasswordResetHeader": "Password Reset",
-	"PasswordResetComplete": "The password has been reset.",
-	"PasswordResetConfirmation": "Are you sure you wish to reset the password?",
+	"PasswordResetHeader": "Redefinir Senha",
+	"PasswordResetComplete": "A senha foi redefinida.",
+	"PasswordResetConfirmation": "Tem a certeza que pretende redefinir a senha?",
 	"PasswordSaved": "Senha guardada.",
-	"PasswordMatchError": "Password and password confirmation must match."
+	"PasswordMatchError": "A senha e a confirma\u00e7\u00e3o da senha devem coincidir.",
+	"OptionOff": "Desligado",
+	"OptionOn": "Ligado",
+	"OptionRelease": "Final",
+	"OptionBeta": "Beta",
+	"OptionDev": "Dev",
+	"UninstallPluginHeader": "Desinstalar extens\u00e3o",
+	"UninstallPluginConfirmation": "Tem a certeza que pretende desinstalar {0}?",
+	"NoPluginConfigurationMessage": "Esta extens\u00e3o n\u00e3o \u00e9 configur\u00e1vel.",
+	"NoPluginsInstalledMessage": "N\u00e3o tem extens\u00f5es instaladas.",
+	"BrowsePluginCatalogMessage": "Navegue o nosso cat\u00e1logo de extens\u00f5es para ser as extens\u00f5es dispon\u00edveis."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
new file mode 100644
index 000000000..b54e3f129
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
@@ -0,0 +1,31 @@
+{
+	"SettingsSaved": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u044b",
+	"AddUser": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f",
+	"Users": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438",
+	"Delete": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c",
+	"Administrator": "\u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440",
+	"Password": "\u041f\u0430\u0440\u043e\u043b\u044c",
+	"CreatePassword": "\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c",
+	"DeleteImage": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
+	"DeleteImageConfirmation": "\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0436\u0435\u043b\u0430\u0435\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435?",
+	"FileReadCancelled": "\u0427\u0442\u0435\u043d\u0438\u0435 \u0444\u0430\u0439\u043b\u0430 \u0431\u044b\u043b\u043e \u043e\u0442\u043c\u0435\u043d\u0435\u043d\u043e",
+	"FileNotFound": "\u0424\u0430\u0439\u043b \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d",
+	"FileReadError": "\u0412\u043e \u0432\u0440\u0435\u043c\u044f \u0447\u0442\u0435\u043d\u0438\u044f \u0444\u0430\u0439\u043b\u0430 \u043f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430 \u043e\u0448\u0438\u0431\u043a\u0430",
+	"DeleteUser": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f",
+	"DeleteUserConfirmation": "\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0436\u0435\u043b\u0430\u0435\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c {0}?",
+	"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",
+	"PasswordResetConfirmation": "\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0436\u0435\u043b\u0430\u0435\u0442\u0435 \u0441\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c?",
+	"PasswordSaved": "\u041f\u0430\u0440\u043e\u043b\u044c \u0441\u043e\u0445\u0440\u0430\u043d\u0451\u043d",
+	"PasswordMatchError": "\u041f\u043e\u043b\u044f \u041f\u0430\u0440\u043e\u043b\u044c \u0438 \u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u044f \u043f\u0430\u0440\u043e\u043b\u044f \u0434\u043e\u043b\u0436\u043d\u044b \u0441\u043e\u0432\u043f\u0430\u0434\u0430\u0442\u044c",
+	"OptionOff": "\u0412\u044b\u043a\u043b.",
+	"OptionOn": "\u0412\u043a\u043b.",
+	"OptionRelease": "\u0412\u044b\u043f\u0443\u0441\u043a",
+	"OptionBeta": "\u0411\u0435\u0442\u0430",
+	"OptionDev": "\u0420\u0430\u0437\u0440\u0430\u0431.",
+	"UninstallPluginHeader": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u043b\u0430\u0433\u0438\u043d",
+	"UninstallPluginConfirmation": "\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0436\u0435\u043b\u0430\u0435\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c {0}?",
+	"NoPluginConfigurationMessage": "\u0414\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u043f\u043b\u0430\u0433\u0438\u043d\u0430 \u043d\u0435\u0442 \u043d\u0438\u043a\u0430\u043a\u0438\u0445 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a",
+	"NoPluginsInstalledMessage": "\u0423 \u0412\u0430\u0441 \u043d\u0435 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e \u043d\u0438 \u043e\u0434\u043d\u043e\u0433\u043e \u043f\u043b\u0430\u0433\u0438\u043d\u0430.",
+	"BrowsePluginCatalogMessage": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0438\u0442\u0435 \u043d\u0430\u0448 \u043a\u0430\u0442\u0430\u043b\u043e\u0433 \u0434\u043b\u044f \u043e\u0431\u0437\u043e\u0440\u0430 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0445 \u043f\u043b\u0430\u0433\u0438\u043d\u043e\u0432."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json
new file mode 100644
index 000000000..ca7b3a7c7
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json
@@ -0,0 +1,31 @@
+{
+	"SettingsSaved": "\u8a2d\u7f6e\u5df2\u4fdd\u5b58",
+	"AddUser": "Add User",
+	"Users": "\u7528\u6236",
+	"Delete": "\u522a\u9664",
+	"Administrator": "\u7ba1\u7406\u54e1",
+	"Password": "\u5bc6\u78bc",
+	"CreatePassword": "\u5275\u5efa\u5bc6\u78bc",
+	"DeleteImage": "\u522a\u9664\u5716\u50cf",
+	"DeleteImageConfirmation": "\u4f60\u78ba\u5b9a\u8981\u522a\u9664\u9019\u5f35\u5716\u7247\uff1f",
+	"FileReadCancelled": "The file read has been cancelled.",
+	"FileNotFound": "File not found.",
+	"FileReadError": "An error occurred while reading the file.",
+	"DeleteUser": "\u522a\u9664\u7528\u6236",
+	"DeleteUserConfirmation": "Are you sure you wish to delete {0}?",
+	"PasswordResetHeader": "\u91cd\u8a2d\u5bc6\u78bc",
+	"PasswordResetComplete": "\u5bc6\u78bc\u5df2\u91cd\u8a2d",
+	"PasswordResetConfirmation": "\u4f60\u78ba\u5b9a\u8981\u91cd\u8a2d\u5bc6\u78bc\uff1f",
+	"PasswordSaved": "\u5bc6\u78bc\u5df2\u4fdd\u5b58\u3002",
+	"PasswordMatchError": "\u5bc6\u78bc\u548c\u78ba\u8a8d\u5bc6\u78bc\u5fc5\u9808\u4e00\u81f4\u3002",
+	"OptionOff": "Off",
+	"OptionOn": "On",
+	"OptionRelease": "Release",
+	"OptionBeta": "Beta",
+	"OptionDev": "Dev",
+	"UninstallPluginHeader": "Uninstall Plugin",
+	"UninstallPluginConfirmation": "Are you sure you wish to uninstall {0}?",
+	"NoPluginConfigurationMessage": "This plugin has nothing to configure.",
+	"NoPluginsInstalledMessage": "You have no plugins installed.",
+	"BrowsePluginCatalogMessage": "Browse our plugin catalog to view available plugins."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs b/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
index 6f39c6759..9b907ef74 100644
--- a/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
+++ b/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.IO;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Localization;
 using MediaBrowser.Model.Entities;
@@ -12,7 +13,6 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using MediaBrowser.Common.Extensions;
 
 namespace MediaBrowser.Server.Implementations.Localization
 {
@@ -334,9 +334,14 @@ namespace MediaBrowser.Server.Implementations.Localization
             return new List<LocalizatonOption>
             {
                 new LocalizatonOption{ Name="English (United States)", Value="en-us"},
+                new LocalizatonOption{ Name="Chinese Traditional", Value="zh-TW"},
+                new LocalizatonOption{ Name="Dutch", Value="nl"},
+                new LocalizatonOption{ Name="French", Value="fr"},
                 new LocalizatonOption{ Name="German", Value="de"},
+                new LocalizatonOption{ Name="Portuguese (Brazil)", Value="pt-BR"},
                 new LocalizatonOption{ Name="Portuguese (Portugal)", Value="pt-PT"},
-                new LocalizatonOption{ Name="Russian", Value="ru"}
+                new LocalizatonOption{ Name="Russian", Value="ru"},
+                new LocalizatonOption{ Name="Spanish", Value="es"}
 
             }.OrderBy(i => i.Name);
         }
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/de.json b/MediaBrowser.Server.Implementations/Localization/Server/de.json
index ab3271b50..0aeaf3c50 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/de.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/de.json
@@ -4,7 +4,7 @@
 	"LabelGithubWiki": "Github Wiki",
 	"LabelSwagger": "Swagger",
 	"LabelStandard": "Standard",
-	"LabelViewApiDocumentation": "Zeige Api Dokumentation",
+	"LabelViewApiDocumentation": "Zeige API Dokumentation",
 	"LabelBrowseLibrary": "Durchsuche Bibliothek",
 	"LabelConfigureMediaBrowser": "Konfiguriere Media Browser",
 	"LabelOpenLibraryViewer": "\u00d6ffne Bibliothekenansicht",
@@ -13,5 +13,38 @@
 	"LabelPrevious": "Vorheriges",
 	"LabelFinish": "Ende",
 	"LabelNext": "N\u00e4chstes",
-	"LabelYoureDone": "Du bist fertig!"
+	"LabelYoureDone": "Du bist fertig!",
+	"WelcomeToMediaBrowser": "Welcome to Media Browser!",
+	"LabelMediaBrowser": "Media Browser",
+	"ThisWizardWillGuideYou": "This wizard will help guide you through the setup process.",
+	"TellUsAboutYourself": "Tell us about yourself",
+	"LabelYourFirstName": "Your first name:",
+	"MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
+	"UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
+	"LabelWindowsService": "Windows Service",
+	"AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
+	"WindowsServiceIntro1": "Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.",
+	"WindowsServiceIntro2": "If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.",
+	"WizardCompleted": "That's all we need for now. Media Browser has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish<\/b> to view the <b>Dashboard<\/b>.",
+	"LabelConfigureSettings": "Configure settings",
+	"LabelEnableVideoImageExtraction": "Enable video image extraction",
+	"VideoImageExtractionHelp": "For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.",
+	"LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
+	"LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+	"LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
+	"LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
+	"ButtonOk": "Ok",
+	"ButtonCancel": "Cancel",
+	"HeaderSetupLibrary": "Setup your media library",
+	"ButtonAddMediaFolder": "Add media folder",
+	"LabelFolderType": "Folder type:",
+	"MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
+	"ReferToMediaLibraryWiki": "Refer to the media library wiki.",
+	"LabelCountry": "Country:",
+	"LabelLanguage": "Language:",
+	"HeaderPreferredMetadataLanguage": "Preferred metadata language:",
+	"LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
+	"LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
+	"LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
+	"LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/en_US.json b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
index f74cca1eb..40269bde3 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
@@ -13,5 +13,38 @@
 	"LabelPrevious": "Previous",
 	"LabelFinish": "Finish",
 	"LabelNext": "Next",
-	"LabelYoureDone": "You're Done!"
+	"LabelYoureDone": "You're Done!",
+	"WelcomeToMediaBrowser": "Welcome to Media Browser!",
+	"LabelMediaBrowser": "Media Browser",
+	"ThisWizardWillGuideYou": "This wizard will help guide you through the setup process.",
+	"TellUsAboutYourself": "Tell us about yourself",
+	"LabelYourFirstName": "Your first name:",
+	"MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
+	"UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
+	"LabelWindowsService": "Windows Service",
+	"AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
+	"WindowsServiceIntro1": "Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.",
+	"WindowsServiceIntro2": "If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.",
+	"WizardCompleted": "That's all we need for now. Media Browser has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish<\/b> to view the <b>Dashboard<\/b>.",
+	"LabelConfigureSettings": "Configure settings",
+	"LabelEnableVideoImageExtraction": "Enable video image extraction",
+	"VideoImageExtractionHelp": "For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.",
+	"LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
+	"LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+	"LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
+	"LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
+	"ButtonOk": "Ok",
+	"ButtonCancel": "Cancel",
+	"HeaderSetupLibrary": "Setup your media library",
+	"ButtonAddMediaFolder": "Add media folder",
+	"LabelFolderType": "Folder type:",
+	"MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
+	"ReferToMediaLibraryWiki": "Refer to the media library wiki.",
+	"LabelCountry": "Country:",
+	"LabelLanguage": "Language:",
+	"HeaderPreferredMetadataLanguage": "Preferred metadata language:",
+	"LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
+	"LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
+	"LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
+	"LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/es.json b/MediaBrowser.Server.Implementations/Localization/Server/es.json
new file mode 100644
index 000000000..f475e1db4
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es.json
@@ -0,0 +1,50 @@
+{
+	"LabelExit": "Salir",
+	"LabelVisitCommunity": "Visitar la comunidad",
+	"LabelGithubWiki": "Wiki de Github",
+	"LabelSwagger": "Swagger",
+	"LabelStandard": "Estandar",
+	"LabelViewApiDocumentation": "Ver documentacion de Api",
+	"LabelBrowseLibrary": "Navegar biblioteca",
+	"LabelConfigureMediaBrowser": "Configurar Media Browser",
+	"LabelOpenLibraryViewer": "Abrir el visor de la biblioteca",
+	"LabelRestartServer": "reiniciar el servidor",
+	"LabelShowLogWindow": "Mostrar la ventana del log",
+	"LabelPrevious": "Anterior",
+	"LabelFinish": "Terminar",
+	"LabelNext": "Siguiente",
+	"LabelYoureDone": "Ha Terminado!",
+	"WelcomeToMediaBrowser": "Welcome to Media Browser!",
+	"LabelMediaBrowser": "Media Browser",
+	"ThisWizardWillGuideYou": "This wizard will help guide you through the setup process.",
+	"TellUsAboutYourself": "Tell us about yourself",
+	"LabelYourFirstName": "Your first name:",
+	"MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
+	"UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
+	"LabelWindowsService": "Windows Service",
+	"AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
+	"WindowsServiceIntro1": "Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.",
+	"WindowsServiceIntro2": "If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.",
+	"WizardCompleted": "That's all we need for now. Media Browser has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish<\/b> to view the <b>Dashboard<\/b>.",
+	"LabelConfigureSettings": "Configure settings",
+	"LabelEnableVideoImageExtraction": "Enable video image extraction",
+	"VideoImageExtractionHelp": "For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.",
+	"LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
+	"LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+	"LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
+	"LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
+	"ButtonOk": "Ok",
+	"ButtonCancel": "Cancel",
+	"HeaderSetupLibrary": "Setup your media library",
+	"ButtonAddMediaFolder": "Add media folder",
+	"LabelFolderType": "Folder type:",
+	"MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
+	"ReferToMediaLibraryWiki": "Refer to the media library wiki.",
+	"LabelCountry": "Country:",
+	"LabelLanguage": "Language:",
+	"HeaderPreferredMetadataLanguage": "Preferred metadata language:",
+	"LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
+	"LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
+	"LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
+	"LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/fr.json b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
new file mode 100644
index 000000000..038fb5607
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
@@ -0,0 +1,50 @@
+{
+	"LabelExit": "Quitter",
+	"LabelVisitCommunity": "Visiter Communaut\u00e9",
+	"LabelGithubWiki": "GitHub Wiki",
+	"LabelSwagger": "Swagger",
+	"LabelStandard": "Standard",
+	"LabelViewApiDocumentation": "Consulter la documentation API",
+	"LabelBrowseLibrary": "Naviguer la biblioth\u00e8que",
+	"LabelConfigureMediaBrowser": "Configurer Media Browser",
+	"LabelOpenLibraryViewer": "Ouvrir le navigateur de biblioth\u00e8que",
+	"LabelRestartServer": "Red\u00e9marrer Serveur",
+	"LabelShowLogWindow": "Afficher la fen\u00eatre du journal d'\u00e9v\u00e8nements",
+	"LabelPrevious": "Pr\u00e9c\u00e9dant",
+	"LabelFinish": "Termin\u00e9",
+	"LabelNext": "Suivant",
+	"LabelYoureDone": "Vous avez Termin\u00e9!",
+	"WelcomeToMediaBrowser": "Welcome to Media Browser!",
+	"LabelMediaBrowser": "Media Browser",
+	"ThisWizardWillGuideYou": "This wizard will help guide you through the setup process.",
+	"TellUsAboutYourself": "Tell us about yourself",
+	"LabelYourFirstName": "Your first name:",
+	"MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
+	"UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
+	"LabelWindowsService": "Windows Service",
+	"AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
+	"WindowsServiceIntro1": "Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.",
+	"WindowsServiceIntro2": "If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.",
+	"WizardCompleted": "That's all we need for now. Media Browser has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish<\/b> to view the <b>Dashboard<\/b>.",
+	"LabelConfigureSettings": "Configure settings",
+	"LabelEnableVideoImageExtraction": "Enable video image extraction",
+	"VideoImageExtractionHelp": "For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.",
+	"LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
+	"LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+	"LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
+	"LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
+	"ButtonOk": "Ok",
+	"ButtonCancel": "Cancel",
+	"HeaderSetupLibrary": "Setup your media library",
+	"ButtonAddMediaFolder": "Add media folder",
+	"LabelFolderType": "Folder type:",
+	"MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
+	"ReferToMediaLibraryWiki": "Refer to the media library wiki.",
+	"LabelCountry": "Country:",
+	"LabelLanguage": "Language:",
+	"HeaderPreferredMetadataLanguage": "Preferred metadata language:",
+	"LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
+	"LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
+	"LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
+	"LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/nl.json b/MediaBrowser.Server.Implementations/Localization/Server/nl.json
new file mode 100644
index 000000000..0fcf20a53
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/Server/nl.json
@@ -0,0 +1,50 @@
+{
+	"LabelExit": "Afsluiten",
+	"LabelVisitCommunity": "Bezoek de community",
+	"LabelGithubWiki": "Github Wiki",
+	"LabelSwagger": "Swagger",
+	"LabelStandard": "Standaard",
+	"LabelViewApiDocumentation": "Bekijk Api documentatie",
+	"LabelBrowseLibrary": "Bekijk bibliotheek",
+	"LabelConfigureMediaBrowser": "Configureer Media Browser",
+	"LabelOpenLibraryViewer": "Open bibliotheek verkenner",
+	"LabelRestartServer": "Herstart server",
+	"LabelShowLogWindow": "Toon log venster",
+	"LabelPrevious": "Vorige",
+	"LabelFinish": "Finish",
+	"LabelNext": "Volgende",
+	"LabelYoureDone": "Gereed!",
+	"WelcomeToMediaBrowser": "Welcome to Media Browser!",
+	"LabelMediaBrowser": "Media Browser",
+	"ThisWizardWillGuideYou": "This wizard will help guide you through the setup process.",
+	"TellUsAboutYourself": "Tell us about yourself",
+	"LabelYourFirstName": "Your first name:",
+	"MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
+	"UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
+	"LabelWindowsService": "Windows Service",
+	"AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
+	"WindowsServiceIntro1": "Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.",
+	"WindowsServiceIntro2": "If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.",
+	"WizardCompleted": "That's all we need for now. Media Browser has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish<\/b> to view the <b>Dashboard<\/b>.",
+	"LabelConfigureSettings": "Configure settings",
+	"LabelEnableVideoImageExtraction": "Enable video image extraction",
+	"VideoImageExtractionHelp": "For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.",
+	"LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
+	"LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+	"LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
+	"LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
+	"ButtonOk": "Ok",
+	"ButtonCancel": "Cancel",
+	"HeaderSetupLibrary": "Setup your media library",
+	"ButtonAddMediaFolder": "Add media folder",
+	"LabelFolderType": "Folder type:",
+	"MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
+	"ReferToMediaLibraryWiki": "Refer to the media library wiki.",
+	"LabelCountry": "Country:",
+	"LabelLanguage": "Language:",
+	"HeaderPreferredMetadataLanguage": "Preferred metadata language:",
+	"LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
+	"LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
+	"LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
+	"LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json b/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
new file mode 100644
index 000000000..a7997e5a2
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
@@ -0,0 +1,50 @@
+{
+	"LabelExit": "Sair",
+	"LabelVisitCommunity": "Visite o Community",
+	"LabelGithubWiki": "Wiki do Github",
+	"LabelSwagger": "Swagger",
+	"LabelStandard": "Standard",
+	"LabelViewApiDocumentation": "View Api Documentation",
+	"LabelBrowseLibrary": "Browse Library",
+	"LabelConfigureMediaBrowser": "Configure Media Browser",
+	"LabelOpenLibraryViewer": "Open Library Viewer",
+	"LabelRestartServer": "Restart Server",
+	"LabelShowLogWindow": "Show Log Window",
+	"LabelPrevious": "Previous",
+	"LabelFinish": "Finish",
+	"LabelNext": "Next",
+	"LabelYoureDone": "You're Done!",
+	"WelcomeToMediaBrowser": "Welcome to Media Browser!",
+	"LabelMediaBrowser": "Media Browser",
+	"ThisWizardWillGuideYou": "This wizard will help guide you through the setup process.",
+	"TellUsAboutYourself": "Tell us about yourself",
+	"LabelYourFirstName": "Your first name:",
+	"MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
+	"UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
+	"LabelWindowsService": "Windows Service",
+	"AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
+	"WindowsServiceIntro1": "Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.",
+	"WindowsServiceIntro2": "If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.",
+	"WizardCompleted": "That's all we need for now. Media Browser has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish<\/b> to view the <b>Dashboard<\/b>.",
+	"LabelConfigureSettings": "Configure settings",
+	"LabelEnableVideoImageExtraction": "Enable video image extraction",
+	"VideoImageExtractionHelp": "For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.",
+	"LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
+	"LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+	"LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
+	"LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
+	"ButtonOk": "Ok",
+	"ButtonCancel": "Cancel",
+	"HeaderSetupLibrary": "Setup your media library",
+	"ButtonAddMediaFolder": "Add media folder",
+	"LabelFolderType": "Folder type:",
+	"MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
+	"ReferToMediaLibraryWiki": "Refer to the media library wiki.",
+	"LabelCountry": "Country:",
+	"LabelLanguage": "Language:",
+	"HeaderPreferredMetadataLanguage": "Preferred metadata language:",
+	"LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
+	"LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
+	"LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
+	"LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
index 700314708..9fddc4f98 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
@@ -13,5 +13,38 @@
 	"LabelPrevious": "Anterior",
 	"LabelFinish": "Terminar",
 	"LabelNext": "Seguinte",
-	"LabelYoureDone": "Concluiu!"
+	"LabelYoureDone": "Concluiu!",
+	"WelcomeToMediaBrowser": "Welcome to Media Browser!",
+	"LabelMediaBrowser": "Media Browser",
+	"ThisWizardWillGuideYou": "This wizard will help guide you through the setup process.",
+	"TellUsAboutYourself": "Tell us about yourself",
+	"LabelYourFirstName": "Your first name:",
+	"MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
+	"UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
+	"LabelWindowsService": "Windows Service",
+	"AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
+	"WindowsServiceIntro1": "Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.",
+	"WindowsServiceIntro2": "If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.",
+	"WizardCompleted": "That's all we need for now. Media Browser has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish<\/b> to view the <b>Dashboard<\/b>.",
+	"LabelConfigureSettings": "Configure settings",
+	"LabelEnableVideoImageExtraction": "Enable video image extraction",
+	"VideoImageExtractionHelp": "For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.",
+	"LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
+	"LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+	"LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
+	"LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
+	"ButtonOk": "Ok",
+	"ButtonCancel": "Cancel",
+	"HeaderSetupLibrary": "Setup your media library",
+	"ButtonAddMediaFolder": "Add media folder",
+	"LabelFolderType": "Folder type:",
+	"MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
+	"ReferToMediaLibraryWiki": "Refer to the media library wiki.",
+	"LabelCountry": "Country:",
+	"LabelLanguage": "Language:",
+	"HeaderPreferredMetadataLanguage": "Preferred metadata language:",
+	"LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
+	"LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
+	"LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
+	"LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ru.json b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
index 4cc6b90f7..5b673132e 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ru.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
@@ -2,16 +2,49 @@
 	"LabelExit": "\u0412\u044b\u0445\u043e\u0434",
 	"LabelVisitCommunity": "\u041f\u043e\u0441\u0435\u0442\u0438\u0442\u044c \u0421\u043e\u043e\u0431\u0449\u0435\u0441\u0442\u0432\u043e",
 	"LabelGithubWiki": "\u0412\u0438\u043a\u0438 \u043d\u0430 Github",
-	"LabelSwagger": "\u041e\u0444\u043e\u0440\u043c\u043b\u0435\u043d\u0438\u0435",
-	"LabelStandard": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u044b\u0439",
+	"LabelSwagger": "\u0418\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441 Swagger",
+	"LabelStandard": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u0430\u044f",
 	"LabelViewApiDocumentation": "\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u044f \u043f\u043e API",
 	"LabelBrowseLibrary": "\u041e\u0431\u043e\u0437\u0440\u0435\u0432\u0430\u0442\u0435\u043b\u044c \u041c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438",
-	"LabelConfigureMediaBrowser": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 Media Browser",
-	"LabelOpenLibraryViewer": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u041c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438",
-	"LabelRestartServer": "\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0441\u0435\u0440\u0432\u0435\u0440",
-	"LabelShowLogWindow": "\u041e\u043a\u043d\u043e \u0416\u0443\u0440\u043d\u0430\u043b\u0430",
+	"LabelConfigureMediaBrowser": "\u041d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c Media Browser",
+	"LabelOpenLibraryViewer": "\u0418\u0441\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u044c \u041c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0443",
+	"LabelRestartServer": "\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0441\u0435\u0440\u0432\u0435\u0440",
+	"LabelShowLogWindow": "\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u0416\u0443\u0440\u043d\u0430\u043b \u0432 \u043e\u043a\u043d\u0435",
 	"LabelPrevious": "\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0435\u0435",
-	"LabelFinish": "\u0417\u0430\u043a\u043e\u043d\u0447\u0438\u0442\u044c",
+	"LabelFinish": "\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c",
 	"LabelNext": "\u0421\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u0435",
-	"LabelYoureDone": "\u0412\u044b \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u043b\u0438!"
+	"LabelYoureDone": "\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u043e!",
+	"WelcomeToMediaBrowser": "Welcome to Media Browser!",
+	"LabelMediaBrowser": "Media Browser",
+	"ThisWizardWillGuideYou": "This wizard will help guide you through the setup process.",
+	"TellUsAboutYourself": "Tell us about yourself",
+	"LabelYourFirstName": "Your first name:",
+	"MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
+	"UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
+	"LabelWindowsService": "Windows Service",
+	"AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
+	"WindowsServiceIntro1": "Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.",
+	"WindowsServiceIntro2": "If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.",
+	"WizardCompleted": "That's all we need for now. Media Browser has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish<\/b> to view the <b>Dashboard<\/b>.",
+	"LabelConfigureSettings": "Configure settings",
+	"LabelEnableVideoImageExtraction": "Enable video image extraction",
+	"VideoImageExtractionHelp": "For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.",
+	"LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
+	"LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+	"LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
+	"LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
+	"ButtonOk": "Ok",
+	"ButtonCancel": "Cancel",
+	"HeaderSetupLibrary": "Setup your media library",
+	"ButtonAddMediaFolder": "Add media folder",
+	"LabelFolderType": "Folder type:",
+	"MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
+	"ReferToMediaLibraryWiki": "Refer to the media library wiki.",
+	"LabelCountry": "Country:",
+	"LabelLanguage": "Language:",
+	"HeaderPreferredMetadataLanguage": "Preferred metadata language:",
+	"LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
+	"LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
+	"LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
+	"LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 62a418391..9630509d3 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -13,5 +13,38 @@
 	"LabelPrevious": "Previous",
 	"LabelFinish": "Finish",
 	"LabelNext": "Next",
-	"LabelYoureDone": "You're Done!"
+	"LabelYoureDone": "You're Done!",
+	"WelcomeToMediaBrowser": "Welcome to Media Browser!",
+	"LabelMediaBrowser": "Media Browser",
+	"ThisWizardWillGuideYou": "This wizard will help guide you through the setup process.",
+	"TellUsAboutYourself": "Tell us about yourself",
+	"LabelYourFirstName": "Your first name:",
+	"MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
+	"UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
+	"LabelWindowsService": "Windows Service",
+	"AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
+	"WindowsServiceIntro1": "Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.",
+	"WindowsServiceIntro2": "If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.",
+	"WizardCompleted": "That's all we need for now. Media Browser has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish</b> to view the <b>Dashboard</b>.",
+	"LabelConfigureSettings": "Configure settings",
+	"LabelEnableVideoImageExtraction": "Enable video image extraction",
+	"VideoImageExtractionHelp": "For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.",
+	"LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
+	"LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+	"LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
+	"LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
+	"ButtonOk": "Ok",
+	"ButtonCancel": "Cancel",
+	"HeaderSetupLibrary": "Setup your media library",
+	"ButtonAddMediaFolder": "Add media folder",
+	"LabelFolderType": "Folder type:",
+	"MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
+	"ReferToMediaLibraryWiki": "Refer to the media library wiki.",
+	"LabelCountry": "Country:",
+	"LabelLanguage": "Language:",
+	"HeaderPreferredMetadataLanguage": "Preferred metadata language:",
+	"LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
+	"LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
+	"LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
+	"LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json b/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
new file mode 100644
index 000000000..6084c1511
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
@@ -0,0 +1,50 @@
+{
+	"LabelExit": "\u96e2\u958b",
+	"LabelVisitCommunity": "\u8a2a\u554f\u793e\u5340",
+	"LabelGithubWiki": "Github Wiki",
+	"LabelSwagger": "Swagger",
+	"LabelStandard": "\u6a19\u6dee",
+	"LabelViewApiDocumentation": "View Api Documentation",
+	"LabelBrowseLibrary": "Browse Library",
+	"LabelConfigureMediaBrowser": "Configure Media Browser",
+	"LabelOpenLibraryViewer": "Open Library Viewer",
+	"LabelRestartServer": "\u91cd\u65b0\u555f\u52d5\u670d\u52d9\u5668",
+	"LabelShowLogWindow": "\u986f\u793a\u65e5\u8a8c\u8996\u7a97",
+	"LabelPrevious": "\u4e0a\u4e00\u500b",
+	"LabelFinish": "\u5b8c\u7d50",
+	"LabelNext": "\u4e0b\u4e00\u500b",
+	"LabelYoureDone": "You're Done!",
+	"WelcomeToMediaBrowser": "Welcome to Media Browser!",
+	"LabelMediaBrowser": "Media Browser",
+	"ThisWizardWillGuideYou": "This wizard will help guide you through the setup process.",
+	"TellUsAboutYourself": "Tell us about yourself",
+	"LabelYourFirstName": "Your first name:",
+	"MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
+	"UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
+	"LabelWindowsService": "Windows Service",
+	"AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
+	"WindowsServiceIntro1": "Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.",
+	"WindowsServiceIntro2": "If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.",
+	"WizardCompleted": "That's all we need for now. Media Browser has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish<\/b> to view the <b>Dashboard<\/b>.",
+	"LabelConfigureSettings": "Configure settings",
+	"LabelEnableVideoImageExtraction": "Enable video image extraction",
+	"VideoImageExtractionHelp": "For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.",
+	"LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
+	"LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+	"LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
+	"LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
+	"ButtonOk": "Ok",
+	"ButtonCancel": "Cancel",
+	"HeaderSetupLibrary": "Setup your media library",
+	"ButtonAddMediaFolder": "Add media folder",
+	"LabelFolderType": "Folder type:",
+	"MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
+	"ReferToMediaLibraryWiki": "Refer to the media library wiki.",
+	"LabelCountry": "Country:",
+	"LabelLanguage": "Language:",
+	"HeaderPreferredMetadataLanguage": "Preferred metadata language:",
+	"LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
+	"LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
+	"LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
+	"LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 539b968c7..d06cf0181 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -290,6 +290,17 @@
     <EmbeddedResource Include="Localization\JavaScript\en_US.json" />
     <EmbeddedResource Include="Localization\JavaScript\pt_PT.json" />
     <EmbeddedResource Include="Localization\Server\en_US.json" />
+    <EmbeddedResource Include="Localization\JavaScript\de.json" />
+    <EmbeddedResource Include="Localization\JavaScript\fr.json" />
+    <EmbeddedResource Include="Localization\JavaScript\nl.json" />
+    <EmbeddedResource Include="Localization\JavaScript\ru.json" />
+    <EmbeddedResource Include="Localization\JavaScript\zh_TW.json" />
+    <EmbeddedResource Include="Localization\Server\fr.json" />
+    <EmbeddedResource Include="Localization\Server\nl.json" />
+    <EmbeddedResource Include="Localization\Server\zh_TW.json" />
+    <EmbeddedResource Include="Localization\JavaScript\es.json" />
+    <EmbeddedResource Include="Localization\Server\es.json" />
+    <EmbeddedResource Include="Localization\Server\pt_BR.json" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs b/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs
index 7c8d71b4f..608e92b24 100644
--- a/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs
+++ b/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs
@@ -41,16 +41,6 @@ namespace MediaBrowser.Server.Implementations.Roku
             }
         }
 
-        public Task SendSystemCommand(SystemCommand command, CancellationToken cancellationToken)
-        {
-            return SendCommand(new WebSocketMessage<string>
-            {
-                MessageType = "SystemCommand",
-                Data = command.ToString()
-
-            }, cancellationToken);
-        }
-
         public Task SendMessageCommand(MessageCommand command, CancellationToken cancellationToken)
         {
             return SendCommand(new WebSocketMessage<MessageCommand>
@@ -148,9 +138,9 @@ namespace MediaBrowser.Server.Implementations.Roku
         }
 
 
-        public Task SendGenericCommand(GenericCommand command, CancellationToken cancellationToken)
+        public Task SendGeneralCommand(GeneralCommand command, CancellationToken cancellationToken)
         {
-            return SendCommand(new WebSocketMessage<GenericCommand>
+            return SendCommand(new WebSocketMessage<GeneralCommand>
             {
                 MessageType = "Command",
                 Data = command
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 00d2aa992..3b6e9fefb 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -661,24 +661,24 @@ namespace MediaBrowser.Server.Implementations.Session
             return session;
         }
 
-        public Task SendSystemCommand(Guid controllingSessionId, Guid sessionId, SystemCommand command, CancellationToken cancellationToken)
+        public Task SendMessageCommand(Guid controllingSessionId, Guid sessionId, MessageCommand command, CancellationToken cancellationToken)
         {
             var session = GetSessionForRemoteControl(sessionId);
 
             var controllingSession = GetSession(controllingSessionId);
             AssertCanControl(session, controllingSession);
 
-            return session.SessionController.SendSystemCommand(command, cancellationToken);
+            return session.SessionController.SendMessageCommand(command, cancellationToken);
         }
 
-        public Task SendMessageCommand(Guid controllingSessionId, Guid sessionId, MessageCommand command, CancellationToken cancellationToken)
+        public Task SendGeneralCommand(Guid controllingSessionId, Guid sessionId, GeneralCommand command, CancellationToken cancellationToken)
         {
             var session = GetSessionForRemoteControl(sessionId);
 
             var controllingSession = GetSession(controllingSessionId);
             AssertCanControl(session, controllingSession);
 
-            return session.SessionController.SendMessageCommand(command, cancellationToken);
+            return session.SessionController.SendGeneralCommand(command, cancellationToken);
         }
 
         public Task SendPlayCommand(Guid controllingSessionId, Guid sessionId, PlayRequest command, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Server.Implementations/Session/WebSocketController.cs b/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
index ddf4ec2ca..3bb84fa0e 100644
--- a/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
+++ b/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
@@ -57,18 +57,6 @@ namespace MediaBrowser.Server.Implementations.Session
             return socket;
         }
 
-        public Task SendSystemCommand(SystemCommand command, CancellationToken cancellationToken)
-        {
-            var socket = GetActiveSocket();
-
-            return socket.SendAsync(new WebSocketMessage<string>
-            {
-                MessageType = "SystemCommand",
-                Data = command.ToString()
-
-            }, cancellationToken);
-        }
-
         public Task SendMessageCommand(MessageCommand command, CancellationToken cancellationToken)
         {
             var socket = GetActiveSocket();
@@ -199,13 +187,13 @@ namespace MediaBrowser.Server.Implementations.Session
             }, cancellationToken);
         }
 
-        public Task SendGenericCommand(GenericCommand command, CancellationToken cancellationToken)
+        public Task SendGeneralCommand(GeneralCommand command, CancellationToken cancellationToken)
         {
             var socket = GetActiveSocket();
 
-            return socket.SendAsync(new WebSocketMessage<GenericCommand>
+            return socket.SendAsync(new WebSocketMessage<GeneralCommand>
             {
-                MessageType = "Command",
+                MessageType = "GeneralCommand",
                 Data = command
 
             }, cancellationToken);
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 2575434f4..b545156ec 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -879,6 +879,7 @@ namespace MediaBrowser.ServerApplication
                 ProgramDataPath = ApplicationPaths.ProgramDataPath,
                 LogPath = ApplicationPaths.LogDirectoryPath,
                 ItemsByNamePath = ApplicationPaths.ItemsByNamePath,
+                InternalMetadataPath = ApplicationPaths.InternalMetadataPath,
                 CachePath = ApplicationPaths.CachePath,
                 MacAddress = GetMacAddress(),
                 HttpServerPortNumber = HttpServerPort,
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 7313c089f..1b83fb2e9 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -219,7 +219,7 @@ namespace MediaBrowser.WebDashboard.Api
             var contentType = MimeTypes.GetMimeType(path);
 
             var isHtml = IsHtml(path);
-            var localizationCulture = isHtml ? GetLocalizationCulture() : null;
+            var localizationCulture = GetLocalizationCulture();
 
             // Don't cache if not configured to do so
             // But always cache images to simulate production
-- 
cgit v1.2.3


From 4afe2c3f731562efbe42147d1bcbdc0a7542cfeb Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 1 Apr 2014 00:16:25 -0400
Subject: updated dlna profile format

---
 MediaBrowser.Api/Playback/BaseStreamingService.cs  | 30 ++++---------
 MediaBrowser.Controller/Dlna/DeviceProfile.cs      | 16 +++----
 MediaBrowser.Controller/Dlna/MediaProfile.cs       | 49 ----------------------
 MediaBrowser.Controller/Dlna/ResponseProfile.cs    | 49 ++++++++++++++++++++++
 MediaBrowser.Controller/Dlna/TranscodingProfile.cs | 23 +---------
 .../MediaBrowser.Controller.csproj                 |  2 +-
 MediaBrowser.Dlna/PlayTo/PlaylistItem.cs           |  8 ----
 MediaBrowser.Dlna/PlayTo/PlaylistItemFactory.cs    |  3 --
 MediaBrowser.Dlna/Profiles/DefaultProfile.cs       |  6 +--
 .../Profiles/SamsungSmartTvProfile.cs              |  6 +--
 .../Profiles/SonyBlurayPlayerProfile.cs            | 16 +++----
 .../Profiles/SonyBravia2010Profile.cs              | 12 +++---
 .../Profiles/SonyBravia2011Profile.cs              | 12 +++---
 .../Profiles/SonyBravia2012Profile.cs              | 12 +++---
 .../Profiles/SonyBravia2013Profile.cs              | 12 +++---
 MediaBrowser.Dlna/Profiles/SonyPs3Profile.cs       |  8 ++--
 MediaBrowser.Dlna/Profiles/WdtvLiveProfile.cs      | 10 ++---
 MediaBrowser.Dlna/Profiles/Xbox360Profile.cs       | 12 ++----
 MediaBrowser.Dlna/Profiles/XboxOneProfile.cs       |  4 +-
 MediaBrowser.Dlna/Profiles/Xml/Default.xml         | 12 ++----
 MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml       | 12 ++----
 MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml     | 14 ++-----
 MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml | 12 ++----
 MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml | 14 ++-----
 .../Profiles/Xml/Samsung Smart TV.xml              | 24 ++++-------
 .../Profiles/Xml/Sony Blu-ray Player 2013.xml      | 14 ++-----
 .../Profiles/Xml/Sony Blu-ray Player.xml           | 44 +++++++++----------
 .../Profiles/Xml/Sony Bravia (2010).xml            | 36 +++++++---------
 .../Profiles/Xml/Sony Bravia (2011).xml            | 36 +++++++---------
 .../Profiles/Xml/Sony Bravia (2012).xml            | 36 +++++++---------
 .../Profiles/Xml/Sony Bravia (2013).xml            | 36 +++++++---------
 .../Profiles/Xml/Sony PlayStation 3.xml            | 28 +++++--------
 MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml       | 22 ++++------
 MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml        | 22 ++++------
 MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml        | 16 +++----
 MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml      | 12 ++----
 .../Encoder/InternalEncodingTaskFactory.cs         | 16 +------
 .../Localization/Server/fr.json                    |  2 +-
 38 files changed, 264 insertions(+), 434 deletions(-)
 delete mode 100644 MediaBrowser.Controller/Dlna/MediaProfile.cs
 create mode 100644 MediaBrowser.Controller/Dlna/ResponseProfile.cs

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index e6ec38846..6c406a11c 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -1492,21 +1492,9 @@ namespace MediaBrowser.Api.Playback
                 state.EnableMpegtsM2TsMode = transcodingProfile.EnableMpegtsM2TsMode;
                 state.TranscodeSeekInfo = transcodingProfile.TranscodeSeekInfo;
 
-                foreach (var setting in transcodingProfile.Settings)
+                if (state.VideoRequest != null && string.IsNullOrWhiteSpace(state.VideoRequest.Profile))
                 {
-                    switch (setting.Name)
-                    {
-                        case TranscodingSettingType.VideoProfile:
-                        {
-                            if (state.VideoRequest != null && string.IsNullOrWhiteSpace(state.VideoRequest.Profile))
-                            {
-                                state.VideoRequest.Profile = setting.Value;
-                            }
-                            break;
-                        }
-                        default:
-                            throw new ArgumentException("Unrecognized TranscodingSettingType");
-                    }
+                    state.VideoRequest.Profile = transcodingProfile.VideoProfile;
                 }
             }
         }
@@ -1523,12 +1511,6 @@ namespace MediaBrowser.Api.Playback
         {
             var timeSeek = GetHeader("TimeSeekRange.dlna.org");
 
-            if (!string.IsNullOrEmpty(timeSeek))
-            {
-                ResultFactory.ThrowError(406, "Time seek not supported during encoding.", responseHeaders);
-                return;
-            }
-
             var transferMode = GetHeader("transferMode.dlna.org");
             responseHeaders["transferMode.dlna.org"] = string.IsNullOrEmpty(transferMode) ? "Streaming" : transferMode;
             responseHeaders["realTimeInfo.dlna.org"] = "DLNA.ORG_TLAG=*";
@@ -1537,7 +1519,13 @@ namespace MediaBrowser.Api.Playback
             var extension = GetOutputFileExtension(state);
 
             // first bit means Time based seek supported, second byte range seek supported (not sure about the order now), so 01 = only byte seek, 10 = time based, 11 = both, 00 = none
-            var orgOp = isStaticallyStreamed || state.TranscodeSeekInfo == TranscodeSeekInfo.Bytes ? ";DLNA.ORG_OP=01" : ";DLNA.ORG_OP=00";
+            var orgOp = ";DLNA.ORG_OP=";
+
+            // Time-based seeking currently only possible when transcoding
+            orgOp += isStaticallyStreamed ? "0" : "1";
+
+            // Byte-based seeking only possible when not transcoding
+            orgOp += isStaticallyStreamed || state.TranscodeSeekInfo == TranscodeSeekInfo.Bytes ? "1" : "0";
 
             // 0 = native, 1 = transcoded
             var orgCi = isStaticallyStreamed ? ";DLNA.ORG_CI=0" : ";DLNA.ORG_CI=1";
diff --git a/MediaBrowser.Controller/Dlna/DeviceProfile.cs b/MediaBrowser.Controller/Dlna/DeviceProfile.cs
index c1fc713e4..bb9629c28 100644
--- a/MediaBrowser.Controller/Dlna/DeviceProfile.cs
+++ b/MediaBrowser.Controller/Dlna/DeviceProfile.cs
@@ -74,13 +74,13 @@ namespace MediaBrowser.Controller.Dlna
         public ContainerProfile[] ContainerProfiles { get; set; }
 
         public CodecProfile[] CodecProfiles { get; set; }
-        public MediaProfile[] MediaProfiles { get; set; }
+        public ResponseProfile[] ResponseProfiles { get; set; }
 
         public DeviceProfile()
         {
             DirectPlayProfiles = new DirectPlayProfile[] { };
             TranscodingProfiles = new TranscodingProfile[] { };
-            MediaProfiles = new MediaProfile[] { };
+            ResponseProfiles = new ResponseProfile[] { };
             CodecProfiles = new CodecProfile[] { };
             ContainerProfiles = new ContainerProfile[] { };
 
@@ -147,11 +147,11 @@ namespace MediaBrowser.Controller.Dlna
             });
         }
 
-        public MediaProfile GetAudioMediaProfile(string container, string audioCodec, MediaStream audioStream)
+        public ResponseProfile GetAudioMediaProfile(string container, string audioCodec, MediaStream audioStream)
         {
             container = (container ?? string.Empty).TrimStart('.');
 
-            return MediaProfiles.FirstOrDefault(i =>
+            return ResponseProfiles.FirstOrDefault(i =>
             {
                 if (i.Type != DlnaProfileType.Audio)
                 {
@@ -174,11 +174,11 @@ namespace MediaBrowser.Controller.Dlna
             });
         }
 
-        public MediaProfile GetVideoMediaProfile(string container, string audioCodec, string videoCodec, MediaStream audioStream, MediaStream videoStream)
+        public ResponseProfile GetVideoMediaProfile(string container, string audioCodec, string videoCodec, MediaStream audioStream, MediaStream videoStream)
         {
             container = (container ?? string.Empty).TrimStart('.');
 
-            return MediaProfiles.FirstOrDefault(i =>
+            return ResponseProfiles.FirstOrDefault(i =>
             {
                 if (i.Type != DlnaProfileType.Video)
                 {
@@ -207,11 +207,11 @@ namespace MediaBrowser.Controller.Dlna
             });
         }
 
-        public MediaProfile GetPhotoMediaProfile(string container)
+        public ResponseProfile GetPhotoMediaProfile(string container)
         {
             container = (container ?? string.Empty).TrimStart('.');
 
-            return MediaProfiles.FirstOrDefault(i =>
+            return ResponseProfiles.FirstOrDefault(i =>
             {
                 if (i.Type != DlnaProfileType.Photo)
                 {
diff --git a/MediaBrowser.Controller/Dlna/MediaProfile.cs b/MediaBrowser.Controller/Dlna/MediaProfile.cs
deleted file mode 100644
index bf3057294..000000000
--- a/MediaBrowser.Controller/Dlna/MediaProfile.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml.Serialization;
-
-namespace MediaBrowser.Controller.Dlna
-{
-    public class MediaProfile
-    {
-        [XmlAttribute("container")]
-        public string Container { get; set; }
-
-        [XmlAttribute("audioCodec")]
-        public string AudioCodec { get; set; }
-
-        [XmlAttribute("videoCodec")]
-        public string VideoCodec { get; set; }
-
-        [XmlAttribute("type")]
-        public DlnaProfileType Type { get; set; }
-
-        [XmlAttribute("orgPn")]
-        public string OrgPn { get; set; }
-
-        [XmlAttribute("mimeType")]
-        public string MimeType { get; set; }
-
-        public ProfileCondition[] Conditions { get; set; }
-
-        public MediaProfile()
-        {
-            Conditions = new ProfileCondition[] {};
-        }
-
-        public List<string> GetContainers()
-        {
-            return (Container ?? string.Empty).Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToList();
-        }
-        
-        public List<string> GetAudioCodecs()
-        {
-            return (AudioCodec ?? string.Empty).Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToList();
-        }
-
-        public List<string> GetVideoCodecs()
-        {
-            return (VideoCodec ?? string.Empty).Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToList();
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/Dlna/ResponseProfile.cs b/MediaBrowser.Controller/Dlna/ResponseProfile.cs
new file mode 100644
index 000000000..163a95d5a
--- /dev/null
+++ b/MediaBrowser.Controller/Dlna/ResponseProfile.cs
@@ -0,0 +1,49 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Serialization;
+
+namespace MediaBrowser.Controller.Dlna
+{
+    public class ResponseProfile
+    {
+        [XmlAttribute("container")]
+        public string Container { get; set; }
+
+        [XmlAttribute("audioCodec")]
+        public string AudioCodec { get; set; }
+
+        [XmlAttribute("videoCodec")]
+        public string VideoCodec { get; set; }
+
+        [XmlAttribute("type")]
+        public DlnaProfileType Type { get; set; }
+
+        [XmlAttribute("orgPn")]
+        public string OrgPn { get; set; }
+
+        [XmlAttribute("mimeType")]
+        public string MimeType { get; set; }
+
+        public ProfileCondition[] Conditions { get; set; }
+
+        public ResponseProfile()
+        {
+            Conditions = new ProfileCondition[] {};
+        }
+
+        public List<string> GetContainers()
+        {
+            return (Container ?? string.Empty).Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToList();
+        }
+        
+        public List<string> GetAudioCodecs()
+        {
+            return (AudioCodec ?? string.Empty).Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToList();
+        }
+
+        public List<string> GetVideoCodecs()
+        {
+            return (VideoCodec ?? string.Empty).Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToList();
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/Dlna/TranscodingProfile.cs b/MediaBrowser.Controller/Dlna/TranscodingProfile.cs
index 707f0c573..704ba54d2 100644
--- a/MediaBrowser.Controller/Dlna/TranscodingProfile.cs
+++ b/MediaBrowser.Controller/Dlna/TranscodingProfile.cs
@@ -30,13 +30,8 @@ namespace MediaBrowser.Controller.Dlna
         [XmlAttribute("transcodeSeekInfo")]
         public TranscodeSeekInfo TranscodeSeekInfo { get; set; }
 
-        public TranscodingSetting[] Settings { get; set; }
-
-        public TranscodingProfile()
-        {
-            Settings = new TranscodingSetting[] { };
-        }
-
+        [XmlAttribute("videoProfile")]
+        public string VideoProfile { get; set; }
 
         public List<string> GetAudioCodecs()
         {
@@ -44,20 +39,6 @@ namespace MediaBrowser.Controller.Dlna
         }
     }
 
-    public class TranscodingSetting
-    {
-        [XmlAttribute("name")]
-        public TranscodingSettingType Name { get; set; }
-
-        [XmlAttribute("value")]
-        public string Value { get; set; }
-    }
-
-    public enum TranscodingSettingType
-    {
-        VideoProfile = 0
-    }
-
     public enum TranscodeSeekInfo
     {
         Auto = 0,
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 16834a945..a233c1f12 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -84,7 +84,7 @@
     <Compile Include="Dlna\DirectPlayProfile.cs" />
     <Compile Include="Dlna\IDlnaManager.cs" />
     <Compile Include="Dlna\DeviceProfile.cs" />
-    <Compile Include="Dlna\MediaProfile.cs" />
+    <Compile Include="Dlna\ResponseProfile.cs" />
     <Compile Include="Dlna\TranscodingProfile.cs" />
     <Compile Include="Drawing\IImageProcessor.cs" />
     <Compile Include="Drawing\ImageFormat.cs" />
diff --git a/MediaBrowser.Dlna/PlayTo/PlaylistItem.cs b/MediaBrowser.Dlna/PlayTo/PlaylistItem.cs
index 50605c61f..9f990bcb7 100644
--- a/MediaBrowser.Dlna/PlayTo/PlaylistItem.cs
+++ b/MediaBrowser.Dlna/PlayTo/PlaylistItem.cs
@@ -1,5 +1,4 @@
 using MediaBrowser.Controller.Dlna;
-using System.Collections.Generic;
 
 namespace MediaBrowser.Dlna.PlayTo
 {
@@ -27,8 +26,6 @@ namespace MediaBrowser.Dlna.PlayTo
 
         public string AudioCodec { get; set; }
 
-        public List<TranscodingSetting> TranscodingSettings { get; set; }
-
         public int? AudioStreamIndex { get; set; }
 
         public int? SubtitleStreamIndex { get; set; }
@@ -47,10 +44,5 @@ namespace MediaBrowser.Dlna.PlayTo
         public int? MaxFramerate { get; set; }
 
         public string DeviceProfileId { get; set; }
-
-        public PlaylistItem()
-        {
-            TranscodingSettings = new List<TranscodingSetting>();
-        }
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/PlayTo/PlaylistItemFactory.cs b/MediaBrowser.Dlna/PlayTo/PlaylistItemFactory.cs
index c14a851ca..6a42e6a75 100644
--- a/MediaBrowser.Dlna/PlayTo/PlaylistItemFactory.cs
+++ b/MediaBrowser.Dlna/PlayTo/PlaylistItemFactory.cs
@@ -48,7 +48,6 @@ namespace MediaBrowser.Dlna.PlayTo
             if (transcodingProfile != null)
             {
                 playlistItem.Transcode = true;
-                playlistItem.TranscodingSettings = transcodingProfile.Settings.ToList();
                 playlistItem.Container = "." + transcodingProfile.Container.TrimStart('.');
                 playlistItem.AudioCodec = transcodingProfile.AudioCodec;
 
@@ -88,7 +87,6 @@ namespace MediaBrowser.Dlna.PlayTo
             if (transcodingProfile != null)
             {
                 playlistItem.Transcode = true;
-                playlistItem.TranscodingSettings = transcodingProfile.Settings.ToList();
                 playlistItem.Container = "." + transcodingProfile.Container.TrimStart('.');
             }
 
@@ -137,7 +135,6 @@ namespace MediaBrowser.Dlna.PlayTo
             if (transcodingProfile != null)
             {
                 playlistItem.Transcode = true;
-                playlistItem.TranscodingSettings = transcodingProfile.Settings.ToList();
                 playlistItem.Container = "." + transcodingProfile.Container.TrimStart('.');
                 playlistItem.AudioCodec = transcodingProfile.AudioCodec.Split(',').FirstOrDefault();
                 playlistItem.VideoCodec = transcodingProfile.VideoCodec;
diff --git a/MediaBrowser.Dlna/Profiles/DefaultProfile.cs b/MediaBrowser.Dlna/Profiles/DefaultProfile.cs
index 6b5513e28..e6b5668fa 100644
--- a/MediaBrowser.Dlna/Profiles/DefaultProfile.cs
+++ b/MediaBrowser.Dlna/Profiles/DefaultProfile.cs
@@ -35,11 +35,7 @@ namespace MediaBrowser.Dlna.Profiles
                     Type = DlnaProfileType.Video,
                     AudioCodec = "aac",
                     VideoCodec = "h264",
-
-                    Settings = new []
-                    {
-                        new TranscodingSetting {Name = TranscodingSettingType.VideoProfile, Value = "baseline"}
-                    }
+                    VideoProfile= "baseline"
                 }
             };
 
diff --git a/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs b/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs
index 122bde875..b008947d3 100644
--- a/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs
+++ b/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs
@@ -302,16 +302,16 @@ namespace MediaBrowser.Dlna.Profiles
                }
            };
 
-            MediaProfiles = new[]
+            ResponseProfiles = new[]
             {
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "avi",
                     MimeType = "video/x-msvideo",
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "mkv",
                     MimeType = "video/x-mkv",
diff --git a/MediaBrowser.Dlna/Profiles/SonyBlurayPlayerProfile.cs b/MediaBrowser.Dlna/Profiles/SonyBlurayPlayerProfile.cs
index c5025edbb..972fc48ed 100644
--- a/MediaBrowser.Dlna/Profiles/SonyBlurayPlayerProfile.cs
+++ b/MediaBrowser.Dlna/Profiles/SonyBlurayPlayerProfile.cs
@@ -206,9 +206,9 @@ namespace MediaBrowser.Dlna.Profiles
                 }
             };
 
-            MediaProfiles = new[]
+            ResponseProfiles = new[]
             {
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "ts",
                     VideoCodec = "h264,mpeg4,vc1",
@@ -218,42 +218,42 @@ namespace MediaBrowser.Dlna.Profiles
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "avi",
                     MimeType = "video/mpeg",
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "mkv",
                     MimeType = "video/vnd.dlna.mpeg-tts",
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "ts",
                     MimeType = "video/vnd.dlna.mpeg-tts",
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "mp4",
                     MimeType = "video/mpeg",
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "mpeg",
                     MimeType = "video/mpeg",
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "mp3",
                     MimeType = "audio/mpeg",
diff --git a/MediaBrowser.Dlna/Profiles/SonyBravia2010Profile.cs b/MediaBrowser.Dlna/Profiles/SonyBravia2010Profile.cs
index 8f29ad76e..870b97fe7 100644
--- a/MediaBrowser.Dlna/Profiles/SonyBravia2010Profile.cs
+++ b/MediaBrowser.Dlna/Profiles/SonyBravia2010Profile.cs
@@ -89,9 +89,9 @@ namespace MediaBrowser.Dlna.Profiles
                 }
             };
 
-            MediaProfiles = new[]
+            ResponseProfiles = new[]
             {
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "ts",
                     VideoCodec="h264",
@@ -101,7 +101,7 @@ namespace MediaBrowser.Dlna.Profiles
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "ts",
                     VideoCodec="h264",
@@ -111,7 +111,7 @@ namespace MediaBrowser.Dlna.Profiles
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "ts",
                     VideoCodec="h264",
@@ -121,7 +121,7 @@ namespace MediaBrowser.Dlna.Profiles
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "ts",
                     VideoCodec="mpeg2video",
@@ -130,7 +130,7 @@ namespace MediaBrowser.Dlna.Profiles
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "mpeg",
                     VideoCodec="mpeg1video,mpeg2video",
diff --git a/MediaBrowser.Dlna/Profiles/SonyBravia2011Profile.cs b/MediaBrowser.Dlna/Profiles/SonyBravia2011Profile.cs
index eaf6979a6..2bba58696 100644
--- a/MediaBrowser.Dlna/Profiles/SonyBravia2011Profile.cs
+++ b/MediaBrowser.Dlna/Profiles/SonyBravia2011Profile.cs
@@ -131,9 +131,9 @@ namespace MediaBrowser.Dlna.Profiles
                 }
             };
 
-            MediaProfiles = new[]
+            ResponseProfiles = new[]
             {
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "ts",
                     VideoCodec="h264",
@@ -143,7 +143,7 @@ namespace MediaBrowser.Dlna.Profiles
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "ts",
                     VideoCodec="h264",
@@ -153,7 +153,7 @@ namespace MediaBrowser.Dlna.Profiles
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "ts",
                     VideoCodec="h264",
@@ -163,7 +163,7 @@ namespace MediaBrowser.Dlna.Profiles
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "ts",
                     VideoCodec="mpeg2video",
@@ -172,7 +172,7 @@ namespace MediaBrowser.Dlna.Profiles
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "mpeg",
                     VideoCodec="mpeg1video,mpeg2video",
diff --git a/MediaBrowser.Dlna/Profiles/SonyBravia2012Profile.cs b/MediaBrowser.Dlna/Profiles/SonyBravia2012Profile.cs
index 41d057ef8..f8a6dcfbd 100644
--- a/MediaBrowser.Dlna/Profiles/SonyBravia2012Profile.cs
+++ b/MediaBrowser.Dlna/Profiles/SonyBravia2012Profile.cs
@@ -119,9 +119,9 @@ namespace MediaBrowser.Dlna.Profiles
                 }
             };
 
-            MediaProfiles = new[]
+            ResponseProfiles = new[]
             {
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "ts",
                     VideoCodec="h264",
@@ -131,7 +131,7 @@ namespace MediaBrowser.Dlna.Profiles
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "ts",
                     VideoCodec="h264",
@@ -141,7 +141,7 @@ namespace MediaBrowser.Dlna.Profiles
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "ts",
                     VideoCodec="h264",
@@ -151,7 +151,7 @@ namespace MediaBrowser.Dlna.Profiles
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "ts",
                     VideoCodec="mpeg2video",
@@ -160,7 +160,7 @@ namespace MediaBrowser.Dlna.Profiles
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "mpeg",
                     VideoCodec="mpeg1video,mpeg2video",
diff --git a/MediaBrowser.Dlna/Profiles/SonyBravia2013Profile.cs b/MediaBrowser.Dlna/Profiles/SonyBravia2013Profile.cs
index 386a36ae0..56eaf47f4 100644
--- a/MediaBrowser.Dlna/Profiles/SonyBravia2013Profile.cs
+++ b/MediaBrowser.Dlna/Profiles/SonyBravia2013Profile.cs
@@ -175,9 +175,9 @@ namespace MediaBrowser.Dlna.Profiles
                 }
             };
 
-            MediaProfiles = new[]
+            ResponseProfiles = new[]
             {
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "ts",
                     VideoCodec="h264",
@@ -187,7 +187,7 @@ namespace MediaBrowser.Dlna.Profiles
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "ts",
                     VideoCodec="h264",
@@ -197,7 +197,7 @@ namespace MediaBrowser.Dlna.Profiles
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "ts",
                     VideoCodec="h264",
@@ -207,7 +207,7 @@ namespace MediaBrowser.Dlna.Profiles
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "ts",
                     VideoCodec="mpeg2video",
@@ -216,7 +216,7 @@ namespace MediaBrowser.Dlna.Profiles
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "mpeg",
                     VideoCodec="mpeg1video,mpeg2video",
diff --git a/MediaBrowser.Dlna/Profiles/SonyPs3Profile.cs b/MediaBrowser.Dlna/Profiles/SonyPs3Profile.cs
index 351a13f00..06d721f52 100644
--- a/MediaBrowser.Dlna/Profiles/SonyPs3Profile.cs
+++ b/MediaBrowser.Dlna/Profiles/SonyPs3Profile.cs
@@ -207,9 +207,9 @@ namespace MediaBrowser.Dlna.Profiles
                 }
             };
 
-            MediaProfiles = new[]
+            ResponseProfiles = new[]
             {
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "mp4,mov",
                     AudioCodec="aac",
@@ -217,7 +217,7 @@ namespace MediaBrowser.Dlna.Profiles
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "avi",
                     MimeType = "video/divx",
@@ -225,7 +225,7 @@ namespace MediaBrowser.Dlna.Profiles
                     Type = DlnaProfileType.Video
                 },
 
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "wav",
                     MimeType = "audio/wav",
diff --git a/MediaBrowser.Dlna/Profiles/WdtvLiveProfile.cs b/MediaBrowser.Dlna/Profiles/WdtvLiveProfile.cs
index f0b95d4e8..c3b88f7bf 100644
--- a/MediaBrowser.Dlna/Profiles/WdtvLiveProfile.cs
+++ b/MediaBrowser.Dlna/Profiles/WdtvLiveProfile.cs
@@ -43,11 +43,7 @@ namespace MediaBrowser.Dlna.Profiles
                     Type = DlnaProfileType.Video,
                     VideoCodec = "h264",
                     AudioCodec = "aac",
-
-                    Settings = new []
-                    {
-                        new TranscodingSetting {Name = TranscodingSettingType.VideoProfile, Value = "baseline"}
-                    }
+                    VideoProfile= "baseline"
                 },
                 new TranscodingProfile
                 {
@@ -157,9 +153,9 @@ namespace MediaBrowser.Dlna.Profiles
                 }
             };
 
-            MediaProfiles = new[]
+            ResponseProfiles = new[]
             {
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "ts",
                     OrgPn = "MPEG_TS_SD_NA",
diff --git a/MediaBrowser.Dlna/Profiles/Xbox360Profile.cs b/MediaBrowser.Dlna/Profiles/Xbox360Profile.cs
index 38d08adef..3fae85f59 100644
--- a/MediaBrowser.Dlna/Profiles/Xbox360Profile.cs
+++ b/MediaBrowser.Dlna/Profiles/Xbox360Profile.cs
@@ -25,7 +25,7 @@ namespace MediaBrowser.Dlna.Profiles
             {
                 ModelName = "Xbox 360",
 
-                Headers = new []
+                Headers = new[]
                 {
                     new HttpHeaderInfo {Name = "User-Agent", Value = "Xbox", Match = HeaderMatchType.Substring},
                     new HttpHeaderInfo {Name = "User-Agent", Value = "Xenon", Match = HeaderMatchType.Substring}
@@ -48,11 +48,7 @@ namespace MediaBrowser.Dlna.Profiles
                     Type = DlnaProfileType.Video,
                     TranscodeSeekInfo = TranscodeSeekInfo.Bytes,
                     EstimateContentLength = true,
-
-                    Settings = new []
-                    {
-                        new TranscodingSetting {Name = TranscodingSettingType.VideoProfile, Value = "baseline"}
-                    }
+                    VideoProfile= "baseline"
                 },
                 new TranscodingProfile
                 {
@@ -110,9 +106,9 @@ namespace MediaBrowser.Dlna.Profiles
                 }
             };
 
-            MediaProfiles = new[]
+            ResponseProfiles = new[]
             {
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "avi",
                     MimeType = "video/avi",
diff --git a/MediaBrowser.Dlna/Profiles/XboxOneProfile.cs b/MediaBrowser.Dlna/Profiles/XboxOneProfile.cs
index 058c69e1f..59372655c 100644
--- a/MediaBrowser.Dlna/Profiles/XboxOneProfile.cs
+++ b/MediaBrowser.Dlna/Profiles/XboxOneProfile.cs
@@ -42,9 +42,9 @@ namespace MediaBrowser.Dlna.Profiles
                 }
             };
 
-            MediaProfiles = new[]
+            ResponseProfiles = new[]
             {
-                new MediaProfile
+                new ResponseProfile
                 {
                     Container = "avi",
                     MimeType = "video/x-msvideo",
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Default.xml b/MediaBrowser.Dlna/Profiles/Xml/Default.xml
index 895cb99d3..9d72d68d2 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Default.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/Default.xml
@@ -20,16 +20,10 @@
     <DirectPlayProfile container="avi,mp4" type="Video" />
   </DirectPlayProfiles>
   <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings>
-        <TranscodingSetting name="VideoProfile" value="baseline" />
-      </Settings>
-    </TranscodingProfile>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" videoProfile="baseline" />
   </TranscodingProfiles>
   <ContainerProfiles />
   <CodecProfiles />
-  <MediaProfiles />
+  <ResponseProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml b/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml
index 58c5cefbc..31ab8b85c 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml	
@@ -24,16 +24,10 @@
     <DirectPlayProfile container="mp3,flac,m4a,wma" type="Audio" />
   </DirectPlayProfiles>
   <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings>
-        <TranscodingSetting name="VideoProfile" value="baseline" />
-      </Settings>
-    </TranscodingProfile>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" videoProfile="baseline" />
   </TranscodingProfiles>
   <ContainerProfiles />
   <CodecProfiles />
-  <MediaProfiles />
+  <ResponseProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml b/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml
index 53781ad32..0e9ce618e 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml	
@@ -29,15 +29,9 @@
     <DirectPlayProfile container="jpeg" type="Photo" />
   </DirectPlayProfiles>
   <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
   </TranscodingProfiles>
   <ContainerProfiles>
     <ContainerProfile type="Photo">
@@ -69,5 +63,5 @@
       </Conditions>
     </CodecProfile>
   </CodecProfiles>
-  <MediaProfiles />
+  <ResponseProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml b/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml
index fc833b918..39822e0a3 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml	
@@ -24,16 +24,10 @@
     <DirectPlayProfile container="avi,mp4,mkv,ts" type="Video" />
   </DirectPlayProfiles>
   <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings>
-        <TranscodingSetting name="VideoProfile" value="baseline" />
-      </Settings>
-    </TranscodingProfile>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" videoProfile="baseline" />
   </TranscodingProfiles>
   <ContainerProfiles />
   <CodecProfiles />
-  <MediaProfiles />
+  <ResponseProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml
index 49fd05b1e..ab815a645 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml	
@@ -35,15 +35,9 @@
     <DirectPlayProfile container="jpeg" type="Photo" />
   </DirectPlayProfiles>
   <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
   </TranscodingProfiles>
   <ContainerProfiles>
     <ContainerProfile type="Photo">
@@ -62,5 +56,5 @@
       </Conditions>
     </CodecProfile>
   </CodecProfiles>
-  <MediaProfiles />
+  <ResponseProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml
index 75c50aae3..bd17802a2 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml	
@@ -33,15 +33,9 @@
     <DirectPlayProfile container="jpeg" type="Photo" />
   </DirectPlayProfiles>
   <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
   </TranscodingProfiles>
   <ContainerProfiles>
     <ContainerProfile type="Photo">
@@ -91,12 +85,12 @@
       </Conditions>
     </CodecProfile>
   </CodecProfiles>
-  <MediaProfiles>
-    <MediaProfile container="avi" type="Video" mimeType="video/x-msvideo">
+  <ResponseProfiles>
+    <ResponseProfile container="avi" type="Video" mimeType="video/x-msvideo">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="mkv" type="Video" mimeType="video/x-mkv">
+    </ResponseProfile>
+    <ResponseProfile container="mkv" type="Video" mimeType="video/x-mkv">
       <Conditions />
-    </MediaProfile>
-  </MediaProfiles>
+    </ResponseProfile>
+  </ResponseProfiles>
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml
index 5bd27c771..53b515e10 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml	
@@ -33,15 +33,9 @@
     <DirectPlayProfile container="jpeg" type="Photo" />
   </DirectPlayProfiles>
   <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
   </TranscodingProfiles>
   <ContainerProfiles>
     <ContainerProfile type="Photo">
@@ -65,5 +59,5 @@
       </Conditions>
     </CodecProfile>
   </CodecProfiles>
-  <MediaProfiles />
+  <ResponseProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml
index f5502ca14..76b52c743 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml	
@@ -32,15 +32,9 @@
     <DirectPlayProfile container="jpeg" type="Photo" />
   </DirectPlayProfiles>
   <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="ts" type="Video" videoCodec="mpeg2video" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="mpeg2video" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
   </TranscodingProfiles>
   <ContainerProfiles>
     <ContainerProfile type="Photo">
@@ -71,27 +65,27 @@
       </Conditions>
     </CodecProfile>
   </CodecProfiles>
-  <MediaProfiles>
-    <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264,mpeg4,vc1" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
+  <ResponseProfiles>
+    <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264,mpeg4,vc1" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="avi" type="Video" mimeType="video/mpeg">
+    </ResponseProfile>
+    <ResponseProfile container="avi" type="Video" mimeType="video/mpeg">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="mkv" type="Video" mimeType="video/vnd.dlna.mpeg-tts">
+    </ResponseProfile>
+    <ResponseProfile container="mkv" type="Video" mimeType="video/vnd.dlna.mpeg-tts">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="ts" type="Video" mimeType="video/vnd.dlna.mpeg-tts">
+    </ResponseProfile>
+    <ResponseProfile container="ts" type="Video" mimeType="video/vnd.dlna.mpeg-tts">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="mp4" type="Video" mimeType="video/mpeg">
+    </ResponseProfile>
+    <ResponseProfile container="mp4" type="Video" mimeType="video/mpeg">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="mpeg" type="Video" mimeType="video/mpeg">
+    </ResponseProfile>
+    <ResponseProfile container="mpeg" type="Video" mimeType="video/mpeg">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="mp3" type="Audio" mimeType="audio/mpeg">
+    </ResponseProfile>
+    <ResponseProfile container="mp3" type="Audio" mimeType="audio/mpeg">
       <Conditions />
-    </MediaProfile>
-  </MediaProfiles>
+    </ResponseProfile>
+  </ResponseProfiles>
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml
index 1337b5936..8c41cc3b7 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml	
@@ -30,15 +30,9 @@
     <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" />
   </DirectPlayProfiles>
   <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
   </TranscodingProfiles>
   <ContainerProfiles>
     <ContainerProfile type="Photo">
@@ -80,21 +74,21 @@
       </Conditions>
     </CodecProfile>
   </CodecProfiles>
-  <MediaProfiles>
-    <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
+  <ResponseProfiles>
+    <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
+    </ResponseProfile>
+    <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
+    </ResponseProfile>
+    <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="ts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
+    </ResponseProfile>
+    <ResponseProfile container="ts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
+    </ResponseProfile>
+    <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
       <Conditions />
-    </MediaProfile>
-  </MediaProfiles>
+    </ResponseProfile>
+  </ResponseProfiles>
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml
index b022c10a5..1ccd5f1de 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml	
@@ -33,15 +33,9 @@
     <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
   </DirectPlayProfiles>
   <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
   </TranscodingProfiles>
   <ContainerProfiles>
     <ContainerProfile type="Photo">
@@ -83,21 +77,21 @@
       </Conditions>
     </CodecProfile>
   </CodecProfiles>
-  <MediaProfiles>
-    <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
+  <ResponseProfiles>
+    <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
+    </ResponseProfile>
+    <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
+    </ResponseProfile>
+    <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="ts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
+    </ResponseProfile>
+    <ResponseProfile container="ts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
+    </ResponseProfile>
+    <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
       <Conditions />
-    </MediaProfile>
-  </MediaProfiles>
+    </ResponseProfile>
+  </ResponseProfiles>
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml
index cbef70b37..b578a98b6 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml	
@@ -35,15 +35,9 @@
     <DirectPlayProfile container="jpeg" type="Photo" />
   </DirectPlayProfiles>
   <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
   </TranscodingProfiles>
   <ContainerProfiles>
     <ContainerProfile type="Photo">
@@ -66,21 +60,21 @@
       </Conditions>
     </CodecProfile>
   </CodecProfiles>
-  <MediaProfiles>
-    <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
+  <ResponseProfiles>
+    <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
+    </ResponseProfile>
+    <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
+    </ResponseProfile>
+    <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="ts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
+    </ResponseProfile>
+    <ResponseProfile container="ts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
+    </ResponseProfile>
+    <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
       <Conditions />
-    </MediaProfile>
-  </MediaProfiles>
+    </ResponseProfile>
+  </ResponseProfiles>
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml
index 47db46ce1..fe5c63f90 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml	
@@ -40,15 +40,9 @@
     <DirectPlayProfile container="jpeg" type="Photo" />
   </DirectPlayProfiles>
   <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
+    <TranscodingProfile container="mp3" type="Audio" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
   </TranscodingProfiles>
   <ContainerProfiles>
     <ContainerProfile type="Photo">
@@ -66,21 +60,21 @@
       </Conditions>
     </CodecProfile>
   </CodecProfiles>
-  <MediaProfiles>
-    <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
+  <ResponseProfiles>
+    <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
+    </ResponseProfile>
+    <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
+    </ResponseProfile>
+    <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="ts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
+    </ResponseProfile>
+    <ResponseProfile container="ts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
+    </ResponseProfile>
+    <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg">
       <Conditions />
-    </MediaProfile>
-  </MediaProfiles>
+    </ResponseProfile>
+  </ResponseProfiles>
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml
index d9aa441bb..f0db13e2a 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml	
@@ -29,15 +29,9 @@
     <DirectPlayProfile container="avi,mp4" type="Video" />
   </DirectPlayProfiles>
   <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
   </TranscodingProfiles>
   <ContainerProfiles>
     <ContainerProfile type="Photo">
@@ -80,15 +74,15 @@
       </Conditions>
     </CodecProfile>
   </CodecProfiles>
-  <MediaProfiles>
-    <MediaProfile container="mp4,mov" audioCodec="aac" type="Video" mimeType="video/mp4">
+  <ResponseProfiles>
+    <ResponseProfile container="mp4,mov" audioCodec="aac" type="Video" mimeType="video/mp4">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="avi" type="Video" orgPn="AVI" mimeType="video/divx">
+    </ResponseProfile>
+    <ResponseProfile container="avi" type="Video" orgPn="AVI" mimeType="video/divx">
       <Conditions />
-    </MediaProfile>
-    <MediaProfile container="wav" type="Audio" mimeType="audio/wav">
+    </ResponseProfile>
+    <ResponseProfile container="wav" type="Audio" mimeType="audio/wav">
       <Conditions />
-    </MediaProfile>
-  </MediaProfiles>
+    </ResponseProfile>
+  </ResponseProfiles>
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml b/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml
index 0f4ad54a7..bebdb2b45 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml	
@@ -38,17 +38,9 @@
     <DirectPlayProfile container="jpeg,png,gif,bmp,tiff" type="Photo" />
   </DirectPlayProfiles>
   <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings>
-        <TranscodingSetting name="VideoProfile" value="baseline" />
-      </Settings>
-    </TranscodingProfile>
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" videoProfile="baseline" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
   </TranscodingProfiles>
   <ContainerProfiles>
     <ContainerProfile type="Photo">
@@ -72,9 +64,9 @@
       </Conditions>
     </CodecProfile>
   </CodecProfiles>
-  <MediaProfiles>
-    <MediaProfile container="ts" type="Video" orgPn="MPEG_TS_SD_NA">
+  <ResponseProfiles>
+    <ResponseProfile container="ts" type="Video" orgPn="MPEG_TS_SD_NA">
       <Conditions />
-    </MediaProfile>
-  </MediaProfiles>
+    </ResponseProfile>
+  </ResponseProfiles>
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml b/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml
index 1e8d8164c..a2ac02ff9 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml	
@@ -33,17 +33,9 @@
     <DirectPlayProfile container="jpeg" type="Photo" />
   </DirectPlayProfiles>
   <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="asf" type="Video" videoCodec="wmv2" audioCodec="wmav2" estimateContentLength="true" enableMpegtsM2TsMode="false" transcodeSeekInfo="Bytes">
-      <Settings>
-        <TranscodingSetting name="VideoProfile" value="baseline" />
-      </Settings>
-    </TranscodingProfile>
-    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="asf" type="Video" videoCodec="wmv2" audioCodec="wmav2" estimateContentLength="true" enableMpegtsM2TsMode="false" transcodeSeekInfo="Bytes" videoProfile="baseline" />
+    <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
   </TranscodingProfiles>
   <ContainerProfiles>
     <ContainerProfile type="Video" container="mp4,mov">
@@ -95,9 +87,9 @@
       </Conditions>
     </CodecProfile>
   </CodecProfiles>
-  <MediaProfiles>
-    <MediaProfile container="avi" type="Video" mimeType="video/avi">
+  <ResponseProfiles>
+    <ResponseProfile container="avi" type="Video" mimeType="video/avi">
       <Conditions />
-    </MediaProfile>
-  </MediaProfiles>
+    </ResponseProfile>
+  </ResponseProfiles>
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml
index f6c338b2f..aa2081dc0 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml	
+++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml	
@@ -24,18 +24,14 @@
     <DirectPlayProfile container="mp3,wma" type="Audio" />
   </DirectPlayProfiles>
   <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
   </TranscodingProfiles>
   <ContainerProfiles />
   <CodecProfiles />
-  <MediaProfiles>
-    <MediaProfile container="avi" type="Video" mimeType="video/x-msvideo">
+  <ResponseProfiles>
+    <ResponseProfile container="avi" type="Video" mimeType="video/x-msvideo">
       <Conditions />
-    </MediaProfile>
-  </MediaProfiles>
+    </ResponseProfile>
+  </ResponseProfiles>
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml b/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml
index f682e4c42..02a1529f3 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml
@@ -26,16 +26,10 @@
     <DirectPlayProfile container="avi,mp4" type="Video" />
   </DirectPlayProfiles>
   <TranscodingProfiles>
-    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings />
-    </TranscodingProfile>
-    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto">
-      <Settings>
-        <TranscodingSetting name="VideoProfile" value="baseline" />
-      </Settings>
-    </TranscodingProfile>
+    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" videoProfile="baseline" />
   </TranscodingProfiles>
   <ContainerProfiles />
   <CodecProfiles />
-  <MediaProfiles />
+  <ResponseProfiles />
 </Profile>
\ No newline at end of file
diff --git a/MediaBrowser.MediaEncoding/Encoder/InternalEncodingTaskFactory.cs b/MediaBrowser.MediaEncoding/Encoder/InternalEncodingTaskFactory.cs
index fa9b87906..e6b67b0df 100644
--- a/MediaBrowser.MediaEncoding/Encoder/InternalEncodingTaskFactory.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/InternalEncodingTaskFactory.cs
@@ -282,21 +282,9 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 state.EnableMpegtsM2TsMode = transcodingProfile.EnableMpegtsM2TsMode;
                 //state.TranscodeSeekInfo = transcodingProfile.TranscodeSeekInfo;
 
-                foreach (var setting in transcodingProfile.Settings)
+                if (state.VideoRequest != null && string.IsNullOrWhiteSpace(state.VideoRequest.VideoProfile))
                 {
-                    switch (setting.Name)
-                    {
-                        case TranscodingSettingType.VideoProfile:
-                            {
-                                if (state.VideoRequest != null && string.IsNullOrWhiteSpace(state.VideoRequest.VideoProfile))
-                                {
-                                    state.VideoRequest.VideoProfile = setting.Value;
-                                }
-                                break;
-                            }
-                        default:
-                            throw new ArgumentException("Unrecognized TranscodingSettingType");
-                    }
+                    state.VideoRequest.VideoProfile = transcodingProfile.VideoProfile;
                 }
             }
         }
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/fr.json b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
index 2c7e1b52b..c2934807c 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/fr.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
@@ -30,7 +30,7 @@
 	"LabelEnableVideoImageExtraction": "Activer l'extraction d'image des videos",
 	"VideoImageExtractionHelp": "Pour les vid\u00e9os sans images et que nous n'avons pas trouv\u00e9 par Internet. Ce processus  prolongera la mise \u00e0 jour initiale de biblioth\u00e8que mais offrira une meilleure pr\u00e9sentation visuelle.",
 	"LabelEnableChapterImageExtractionForMovies": "Extraire les images de chapitre pour les films",
-	"LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+	"LabelChapterImageExtractionForMoviesHelp": "L'extraction d'images de chapitre permettra aux clients d'afficher des menus graphiques des sc\u00e8nes. Le processus peut \u00eatre long et exigeant en ressource processeur et de stockage (plusieurs Gigabytes). Il s'ex\u00e9cute par d\u00e9faut dans les t\u00e2ches programm\u00e9es \u00e0 4:00 AM mais peut \u00eatre modifi\u00e9 dans les options de t\u00e2ches programm\u00e9es. Il n'est pas recommand\u00e9 d'ex\u00e9cuter cette t\u00e2che dans les heures d'utilisation standard.",
 	"LabelEnableAutomaticPortMapping": "Activer la configuration automatique de port",
 	"LabelEnableAutomaticPortMappingHelp": "UPnP permet la configuration automatique de routeur pour un acc\u00e8s distance facile. Ceci peut ne pas fonctionner sur certains mod\u00e8les de routeur.",
 	"ButtonOk": "Ok",
-- 
cgit v1.2.3