3.0.5233.40306

MediaBrowser.Api/SessionsService.cs

@@ -63,15 +63,6 @@ namespace MediaBrowser.Api
         /// <value>The name of the item.</value>
         [ApiMember(Name = "ItemName", Description = "The name of the item.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
         public string ItemName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the context (Movies, Music, TvShows, etc)
-        /// Applicable to genres, studios and persons only because the context of items and artists can be inferred.
-        /// This is optional to supply and clients are free to ignore it.
-        /// </summary>
-        /// <value>The context.</value>
-        [ApiMember(Name = "Context", Description = "The ui context for the client (movies, music, tv, games etc). This is optional to supply and clients are free to ignore it.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string Context { get; set; }
     }
 
     [Route("/Sessions/{Id}/Playing", "POST", Summary = "Instructs a session to play an item")]
@@ -311,7 +302,6 @@ namespace MediaBrowser.Api
         {
             var command = new BrowseRequest
             {
-                Context = request.Context,
                 ItemId = request.ItemId,
                 ItemName = request.ItemName,
                 ItemType = request.ItemType

MediaBrowser.Controller/Session/ISessionManager.cs

@@ -191,16 +191,14 @@ namespace MediaBrowser.Controller.Session
         /// </summary>
         /// <param name="sessionId">The session identifier.</param>
         /// <param name="itemId">The item identifier.</param>
-        /// <param name="context">The context.</param>
-        void ReportNowViewingItem(string sessionId, string itemId, string context);
+        void ReportNowViewingItem(string sessionId, string itemId);
 
         /// <summary>
         /// Reports the now viewing item.
         /// </summary>
         /// <param name="sessionId">The session identifier.</param>
         /// <param name="item">The item.</param>
-        /// <param name="context">The context.</param>
-        void ReportNowViewingItem(string sessionId, BaseItemInfo item, string context);
+        void ReportNowViewingItem(string sessionId, BaseItemInfo item);
         
         /// <summary>
         /// Authenticates the new session.

MediaBrowser.Controller/Session/SessionInfo.cs

@@ -86,12 +86,6 @@ namespace MediaBrowser.Controller.Session
         /// <value>The name of the device.</value>
         public string DeviceName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the now viewing context.
-        /// </summary>
-        /// <value>The now viewing context.</value>
-        public string NowViewingContext { get; set; }
-
         /// <summary>
         /// Gets or sets the name of the now viewing item.
         /// </summary>

MediaBrowser.Dlna/Main/DlnaEntryPoint.cs

@@ -151,7 +151,7 @@ namespace MediaBrowser.Dlna.Main
                     "urn:schemas-upnp-org:service:ContentDirectory:1", 
                     "uuid:" + guid.ToString("N")
                 };
-
+                
                 _ssdpHandler.RegisterNotification(guid, uri, IPAddress.Parse(address), services);
 
                 _registeredServerIds.Add(guid);

MediaBrowser.Dlna/Server/ContentDirectory.cs

@@ -82,7 +82,8 @@ namespace MediaBrowser.Dlna.Server
                 _imageProcessor,
                 _userDataManager,
                 user,
-                SystemUpdateId)
+                SystemUpdateId,
+                _config)
                 .ProcessControlRequest(request);
         }
 

MediaBrowser.Dlna/Server/ControlHandler.cs

@@ -1,14 +1,15 @@
 using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Drawing;
-using MediaBrowser.Controller.Dto;
-using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Dlna.Didl;
 using MediaBrowser.Model.Dlna;
+using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Querying;
@@ -27,6 +28,7 @@ namespace MediaBrowser.Dlna.Server
         private readonly ILogger _logger;
         private readonly ILibraryManager _libraryManager;
         private readonly IUserDataManager _userDataManager;
+        private readonly IServerConfigurationManager _config;
         private readonly User _user;
 
         private const string NS_DC = "http://purl.org/dc/elements/1.1/";
@@ -42,13 +44,14 @@ namespace MediaBrowser.Dlna.Server
 
         private readonly DeviceProfile _profile;
 
-        public ControlHandler(ILogger logger, ILibraryManager libraryManager, DeviceProfile profile, string serverAddress, IDtoService dtoService, IImageProcessor imageProcessor, IUserDataManager userDataManager, User user, int systemUpdateId)
+        public ControlHandler(ILogger logger, ILibraryManager libraryManager, DeviceProfile profile, string serverAddress, IDtoService dtoService, IImageProcessor imageProcessor, IUserDataManager userDataManager, User user, int systemUpdateId, IServerConfigurationManager config)
         {
             _logger = logger;
             _libraryManager = libraryManager;
             _userDataManager = userDataManager;
             _user = user;
             _systemUpdateId = systemUpdateId;
+            _config = config;
             _profile = profile;
 
             _didlBuilder = new DidlBuilder(profile, imageProcessor, serverAddress, dtoService);
@@ -58,6 +61,11 @@ namespace MediaBrowser.Dlna.Server
         {
             try
             {
+                if (_config.Configuration.DlnaOptions.EnableDebugLogging)
+                {
+                    LogRequest(request);
+                }
+
                 return ProcessControlRequestInternal(request);
             }
             catch (Exception ex)
@@ -68,6 +76,18 @@ namespace MediaBrowser.Dlna.Server
             }
         }
 
+        private void LogRequest(ControlRequest request)
+        {
+            var builder = new StringBuilder();
+
+            var headers = string.Join(", ", request.Headers.Select(i => string.Format("{0}={1}", i.Key, i.Value)).ToArray());
+            builder.AppendFormat("Headers: {0}", headers);
+            builder.AppendLine();
+            builder.Append(request.InputXml);
+
+            _logger.LogMultiline("Control request", LogSeverity.Debug, builder);
+        }
+
         private ControlResponse ProcessControlRequestInternal(ControlRequest request)
         {
             var soap = new XmlDocument();

MediaBrowser.Dlna/Ssdp/Datagram.cs

@@ -8,8 +8,8 @@ namespace MediaBrowser.Dlna.Ssdp
 {
     public class Datagram
     {
-        public IPEndPoint EndPoint { get; private set; }
-        public IPAddress LocalAddress { get; private set; }
+        public IPEndPoint ToEndPoint { get; private set; }
+        public IPAddress FromEndPoint { get; private set; }
         public string Message { get; private set; }
 
         /// <summary>
@@ -24,13 +24,13 @@ namespace MediaBrowser.Dlna.Ssdp
 
         private readonly ILogger _logger;
 
-        public Datagram(IPEndPoint endPoint, IPAddress localAddress, ILogger logger, string message, int totalSendCount)
+        public Datagram(IPEndPoint toEndPoint, IPAddress fromEndPoint, ILogger logger, string message, int totalSendCount)
         {
             Message = message;
             _logger = logger;
             TotalSendCount = totalSendCount;
-            LocalAddress = localAddress;
-            EndPoint = endPoint;
+            FromEndPoint = fromEndPoint;
+            ToEndPoint = toEndPoint;
         }
 
         public void Send()
@@ -40,9 +40,12 @@ namespace MediaBrowser.Dlna.Ssdp
             {
                 var client = CreateSocket();
 
-                client.Bind(new IPEndPoint(LocalAddress, 0));
+                if (FromEndPoint != null)
+                {
+                    client.Bind(new IPEndPoint(FromEndPoint, 0));
+                }
 
-                client.BeginSendTo(msg, 0, msg.Length, SocketFlags.None, EndPoint, result =>
+                client.BeginSendTo(msg, 0, msg.Length, SocketFlags.None, ToEndPoint, result =>
                 {
                     try
                     {

MediaBrowser.Dlna/Ssdp/SsdpHandler.cs

@@ -145,7 +145,7 @@ namespace MediaBrowser.Dlna.Ssdp
                     values["ST"] = d.Type;
                     values["USN"] = d.USN;
 
-                    SendDatagram(header, values, endpoint, d.Address);
+                    SendDatagram(header, values, endpoint, null);
 
                     _logger.Info("{1} - Responded to a {0} request to {2}", d.Type, endpoint, d.Address.ToString());
                 }

MediaBrowser.Model/Dto/MediaVersionInfo.cs

@@ -1,6 +1,6 @@
 using MediaBrowser.Model.Entities;
-using System.Collections.Generic;
 using MediaBrowser.Model.MediaInfo;
+using System.Collections.Generic;
 
 namespace MediaBrowser.Model.Dto
 {

MediaBrowser.Model/Session/BrowseRequest.cs

@@ -23,13 +23,5 @@ namespace MediaBrowser.Model.Session
         /// </summary>
         /// <value>The name of the item.</value>
         public string ItemName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the context (Movies, Music, Tv, etc)
-        /// Applicable to genres, studios and persons only because the context of items and artists can be inferred.
-        /// This is optional to supply and clients are free to ignore it.
-        /// </summary>
-        /// <value>The context.</value>
-        public string Context { get; set; }
     }
 }

MediaBrowser.Model/Session/SessionInfoDto.cs

@@ -87,12 +87,6 @@ namespace MediaBrowser.Model.Session
         /// <value>The last activity date.</value>
         public DateTime LastActivityDate { get; set; }
 
-        /// <summary>
-        /// Gets or sets the now viewing context.
-        /// </summary>
-        /// <value>The now viewing context.</value>
-        public string NowViewingContext { get; set; }
-
         /// <summary>
         /// Gets or sets the now viewing item.
         /// </summary>

MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json

@@ -26,5 +26,5 @@
     "UninstallPluginConfirmation": "\u00bfEst\u00e1 seguro que desea desinstalar {0}?",
     "NoPluginConfigurationMessage": "El complemento no requiere configuraci\u00f3n",
     "NoPluginsInstalledMessage": "No tiene complementos instalados.",
-    "BrowsePluginCatalogMessage": "Navege en el catalogo de complementos para ver los complementos disponibles."
+    "BrowsePluginCatalogMessage": "Explore el catalogo de complementos para ver los complementos disponibles."
 }

MediaBrowser.Server.Implementations/Localization/Server/ar.json

@@ -600,6 +600,7 @@
     "LetterButtonAbbreviation": "A",
     "TabNowPlaying": "Now Playing",
     "TabNavigation": "Navigation",
+    "TabControls": "Controls",
     "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Scenes",
     "ButtonSubtitles": "Subtitles",
@@ -610,5 +611,8 @@
     "ButtonPause": "Pause",
     "LabelGroupMoviesIntoCollections": "Group movies into collections",
     "LabelGroupMoviesIntoCollectionsHelp": "When displaying movie lists, movies belonging to a collection will be displayed as one grouped item.",
-    "NotificationOptionPluginError": "Plugin failure"
+    "NotificationOptionPluginError": "Plugin failure",
+    "ButtonVolumeUp": "Volume up",
+    "ButtonVolumeDown": "Volume down",
+    "ButtonMute": "Mute"
 }

MediaBrowser.Server.Implementations/Localization/Server/ca.json

@@ -600,6 +600,7 @@
     "LetterButtonAbbreviation": "A",
     "TabNowPlaying": "Now Playing",
     "TabNavigation": "Navigation",
+    "TabControls": "Controls",
     "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Scenes",
     "ButtonSubtitles": "Subtitles",
@@ -610,5 +611,8 @@
     "ButtonPause": "Pause",
     "LabelGroupMoviesIntoCollections": "Group movies into collections",
     "LabelGroupMoviesIntoCollectionsHelp": "When displaying movie lists, movies belonging to a collection will be displayed as one grouped item.",
-    "NotificationOptionPluginError": "Plugin failure"
+    "NotificationOptionPluginError": "Plugin failure",
+    "ButtonVolumeUp": "Volume up",
+    "ButtonVolumeDown": "Volume down",
+    "ButtonMute": "Mute"
 }

MediaBrowser.Server.Implementations/Localization/Server/cs.json

@@ -600,6 +600,7 @@
     "LetterButtonAbbreviation": "A",
     "TabNowPlaying": "Now Playing",
     "TabNavigation": "Navigation",
+    "TabControls": "Controls",
     "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Scenes",
     "ButtonSubtitles": "Subtitles",
@@ -610,5 +611,8 @@
     "ButtonPause": "Pause",
     "LabelGroupMoviesIntoCollections": "Group movies into collections",
     "LabelGroupMoviesIntoCollectionsHelp": "When displaying movie lists, movies belonging to a collection will be displayed as one grouped item.",
-    "NotificationOptionPluginError": "Plugin failure"
+    "NotificationOptionPluginError": "Plugin failure",
+    "ButtonVolumeUp": "Volume up",
+    "ButtonVolumeDown": "Volume down",
+    "ButtonMute": "Mute"
 }

MediaBrowser.Server.Implementations/Localization/Server/de.json

@@ -600,6 +600,7 @@
     "LetterButtonAbbreviation": "A",
     "TabNowPlaying": "Aktuelle Wiedergabe",
     "TabNavigation": "Navigation",
+    "TabControls": "Controls",
     "ButtonFullscreen": "Schalte Vollbild um",
     "ButtonScenes": "Szenen",
     "ButtonSubtitles": "Untertitel",
@@ -610,5 +611,8 @@
     "ButtonPause": "Pause",
     "LabelGroupMoviesIntoCollections": "Gruppiere Filme in Collections",
     "LabelGroupMoviesIntoCollectionsHelp": "When displaying movie lists, movies belonging to a collection will be displayed as one grouped item.",
-    "NotificationOptionPluginError": "Plugin failure"
+    "NotificationOptionPluginError": "Plugin failure",
+    "ButtonVolumeUp": "Volume up",
+    "ButtonVolumeDown": "Volume down",
+    "ButtonMute": "Mute"
 }

MediaBrowser.Server.Implementations/Localization/Server/el.json

@@ -600,6 +600,7 @@
     "LetterButtonAbbreviation": "A",
     "TabNowPlaying": "Now Playing",
     "TabNavigation": "Navigation",
+    "TabControls": "Controls",
     "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Scenes",
     "ButtonSubtitles": "Subtitles",
@@ -610,5 +611,8 @@
     "ButtonPause": "Pause",
     "LabelGroupMoviesIntoCollections": "Group movies into collections",
     "LabelGroupMoviesIntoCollectionsHelp": "When displaying movie lists, movies belonging to a collection will be displayed as one grouped item.",
-    "NotificationOptionPluginError": "Plugin failure"
+    "NotificationOptionPluginError": "Plugin failure",
+    "ButtonVolumeUp": "Volume up",
+    "ButtonVolumeDown": "Volume down",
+    "ButtonMute": "Mute"
 }

MediaBrowser.Server.Implementations/Localization/Server/en_GB.json

@@ -600,6 +600,7 @@
     "LetterButtonAbbreviation": "A",
     "TabNowPlaying": "Now Playing",
     "TabNavigation": "Navigation",
+    "TabControls": "Controls",
     "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Scenes",
     "ButtonSubtitles": "Subtitles",
@@ -610,5 +611,8 @@
     "ButtonPause": "Pause",
     "LabelGroupMoviesIntoCollections": "Group movies into collections",
     "LabelGroupMoviesIntoCollectionsHelp": "When displaying movie lists, movies belonging to a collection will be displayed as one grouped item.",
-    "NotificationOptionPluginError": "Plugin failure"
+    "NotificationOptionPluginError": "Plugin failure",
+    "ButtonVolumeUp": "Volume up",
+    "ButtonVolumeDown": "Volume down",
+    "ButtonMute": "Mute"
 }

MediaBrowser.Server.Implementations/Localization/Server/en_US.json

@@ -600,6 +600,7 @@
     "LetterButtonAbbreviation": "A",
     "TabNowPlaying": "Now Playing",
     "TabNavigation": "Navigation",
+    "TabControls": "Controls",
     "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Scenes",
     "ButtonSubtitles": "Subtitles",
@@ -610,5 +611,8 @@
     "ButtonPause": "Pause",
     "LabelGroupMoviesIntoCollections": "Group movies into collections",
     "LabelGroupMoviesIntoCollectionsHelp": "When displaying movie lists, movies belonging to a collection will be displayed as one grouped item.",
-    "NotificationOptionPluginError": "Plugin failure"
+    "NotificationOptionPluginError": "Plugin failure",
+    "ButtonVolumeUp": "Volume up",
+    "ButtonVolumeDown": "Volume down",
+    "ButtonMute": "Mute"
 }

MediaBrowser.Server.Implementations/Localization/Server/es.json

@@ -574,7 +574,7 @@
     "LabelUseNotificationServices": "Usar los siguientes servicios:",
     "CategoryUser": "Usuario",
     "CategorySystem": "Sistema",
-    "CategoryApplication": "Application",
+    "CategoryApplication": "Aplicaci\u00f3n",
     "CategoryPlugin": "Plugin",
     "LabelMessageTitle": "T\u00edtulo del mensaje:",
     "LabelAvailableTokens": "Tokens disponibles:",
@@ -600,6 +600,7 @@
     "LetterButtonAbbreviation": "A",
     "TabNowPlaying": "Reproduciendo ahora",
     "TabNavigation": "Navegaci\u00f3n",
+    "TabControls": "Controles",
     "ButtonFullscreen": "Pantalla completa",
     "ButtonScenes": "Escenas",
     "ButtonSubtitles": "Subt\u00edtulos",
@@ -610,5 +611,8 @@
     "ButtonPause": "Pausa",
     "LabelGroupMoviesIntoCollections": "Agrupar pel\u00edculas en colecciones",
     "LabelGroupMoviesIntoCollectionsHelp": "Cuando se muestran las listas de pel\u00edculas, las pel\u00edculas pertenecientes a una colecci\u00f3n se mostrar\u00e1n como un elemento agrupado.",
-    "NotificationOptionPluginError": "Plugin failure"
+    "NotificationOptionPluginError": "Error en plugin",
+    "ButtonVolumeUp": "Subir volumen",
+    "ButtonVolumeDown": "Bajar volumen",
+    "ButtonMute": "Silencio"
 }

MediaBrowser.Server.Implementations/Localization/Server/es_MX.json

@@ -5,7 +5,7 @@
     "LabelSwagger": "Swagger",
     "LabelStandard": "Est\u00e1ndar",
     "LabelViewApiDocumentation": "Ver documentaci\u00f3n del Api",
-    "LabelBrowseLibrary": "Navegar Biblioteca",
+    "LabelBrowseLibrary": "Explorar Biblioteca",
     "LabelConfigureMediaBrowser": "Configurar Media Browser",
     "LabelOpenLibraryViewer": "Abrir el Visor de la Biblioteca",
     "LabelRestartServer": "Reiniciar el Servidor",
@@ -51,7 +51,7 @@
     "TabPreferences": "Preferencias",
     "TabPassword": "Contrase\u00f1a",
     "TabLibraryAccess": "Acceso a biblioteca",
-    "TabImage": "imagen",
+    "TabImage": "Imagen",
     "TabProfile": "Perf\u00edl",
     "TabMetadata": "Metadatos",
     "TabImages": "Im\u00e1genes",
@@ -142,7 +142,7 @@
     "OptionCriticRating": "Calificaci\u00f3n de la Cr\u00edtica",
     "OptionVideoBitrate": "Tasa de Bits de Video",
     "OptionResumable": "Reanudable",
-    "ScheduledTasksHelp": "Click en una tarea para ajustar su programaci\u00f3n.",
+    "ScheduledTasksHelp": "Da click en una tarea para ajustar su programaci\u00f3n.",
     "ScheduledTasksTitle": "Tareas Programadas",
     "TabMyPlugins": "Mis Complementos",
     "TabCatalog": "Cat\u00e1logo",
@@ -224,7 +224,7 @@
     "ButtonSelect": "Seleccionar",
     "ButtonSearch": "B\u00fasqueda",
     "ButtonGroupVersions": "Agrupar Versiones",
-    "PismoMessage": "Utilizando Primo File Mount a trav\u00e9s de una licencia donada.",
+    "PismoMessage": "Utilizando Pismo File Mount a trav\u00e9s de una licencia donada.",
     "PleaseSupportOtherProduces": "Por favor apoye otros productos libres que utilizamos:",
     "VersionNumber": "Versi\u00f3n {0}",
     "TabPaths": "Rutas",
@@ -248,7 +248,7 @@
     "LabelImagesByNamePathHelp": "Esta carpeta contiene im\u00e1genes de actor, artista, g\u00e9nero y estudio.",
     "LabelMetadataPath": "Ruta para metadatos:",
     "LabelMetadataPathHelp": "Esta ubicaci\u00f3n contiene ilustraciones descargadas y metadatos cuando no han sido configurados para almacenarse en carpetas de medios.",
-    "LabelTranscodingTempPath": "Ruta para  transcodificaci\u00f3n temporal:",
+    "LabelTranscodingTempPath": "Ruta para transcodificaci\u00f3n temporal:",
     "LabelTranscodingTempPathHelp": "Esta carpeta contiene archivos de trabajo usados por el transcodificador.",
     "TabBasics": "B\u00e1sicos",
     "TabTV": "TV",
@@ -410,7 +410,7 @@
     "OptionUpscalingHelp": "En algunos casos esto resultar\u00e1 en una mejora de la calidad del video pero incrementar\u00e1 el uso del CPU.",
     "EditCollectionItemsHelp": "A\u00f1adir o quitar pel\u00edculas, series, discos, libros o juegos que usted desee agrupar dentro de esta colecci\u00f3n.",
     "HeaderAddTitles": "Agregar T\u00edtulos",
-    "LabelEnableDlnaPlayTo": "Habilitar la reproducci\u00f3n por DLNA",
+    "LabelEnableDlnaPlayTo": "Habilitar \"Reproducir en\" por DLNA",
     "LabelEnableDlnaPlayToHelp": "Media Browser puede detectar dispositivos en su red y ofrecer la posibilidad de controlarlos remotamente.",
     "LabelEnableDlnaDebugLogging": "Habilitar el registro de DLNA en la bit\u00e1cora",
     "LabelEnableDlnaDebugLoggingHelp": "Esto crear\u00e1 archivos de bit\u00e1cora muy grandes y solo se recomienda cuando se requiera solucionar problemas.",
@@ -441,7 +441,7 @@
     "LabelWebSocketPortNumber": "N\u00famero de puerto WebSocket:",
     "LabelEnableAutomaticPortHelp": "UPnP permite la configuraci\u00f3n autom\u00e1tica del router para acceso remoto. Esto puede no funcionar en algunos modelos de routers.",
     "LabelExternalDDNS": "DDNS Externo:",
-    "LabelExternalDDNSHelp": "Si dispone de una  DNS din\u00e1mica, capt\u00farela aqu\u00ed. Media Brower la utilizar\u00e1 para las conexiones remotas.",
+    "LabelExternalDDNSHelp": "Si dispone de una  DNS din\u00e1mica, introducirla aqu\u00ed. Media Brower la utilizar\u00e1 para las conexiones remotas.",
     "TabResume": "Reanudar",
     "TabWeather": "El tiempo",
     "TitleAppSettings": "Configuraci\u00f3n de la App",
@@ -519,17 +519,17 @@
     "LabelDownMixAudioScaleHelp": "Fortalezca el audio cuando se hace down mix. Coloque 1 para preservar el valor del volumen original.",
     "ButtonLinkKeys": "Ligar Claves:",
     "LabelOldSupporterKey": "Clave de aficionado vieja",
-    "LabelNewSupporterKey": "Clave de aficionado vieja",
+    "LabelNewSupporterKey": "Clave de aficionado nueva",
     "HeaderMultipleKeyLinking": "Enlace de M\u00faltiples Claves",
     "MultipleKeyLinkingHelp": "Si usted cuenta con m\u00e1s de una clave de aficionado, utilice esta forma para ligar las claves viejas con la nueva.",
     "LabelCurrentEmailAddress": "Direcci\u00f3n de correo electr\u00f3nico actual",
     "LabelCurrentEmailAddressHelp": "La direcci\u00f3n de correo electr\u00f3nico actual a la que se envi\u00f3 la clave nueva.",
-    "HeaderForgotKey": "Olvid\u00e9 Clave",
+    "HeaderForgotKey": "No recuerdo mi clave",
     "LabelEmailAddress": "Correo Electr\u00f3nico",
     "LabelSupporterEmailAddress": "La direcci\u00f3n de correo electr\u00f3nico que fue utilizada para comprar la clave.",
     "ButtonRetrieveKey": "Recuperar Clave",
     "LabelSupporterKey": "Clave de Aficionado (pegue desde el correo electr\u00f3nico)",
-    "LabelSupporterKeyHelp": "Capture su clave de aficionado para comenzar a disfrutar beneficios adicionales que la comunidad ha desarrollado para Media Browser.",
+    "LabelSupporterKeyHelp": "Introduzca su clave de aficionado para comenzar a disfrutar beneficios adicionales que la comunidad ha desarrollado para Media Browser.",
     "MessageInvalidKey": "Falta Clave de MB3 o es Inv\u00e1lida",
     "ErrorMessageInvalidKey": "Para que cualquier contenido Premium sea registrado, tambi\u00e9n debe ser un Aficionado MB3. Por favor done y ayude a continuar con el desarrollo del producto base. Gracias.",
     "HeaderDisplaySettings": "Configuraci\u00f3n de Pantalla",
@@ -540,7 +540,7 @@
     "LabelEnableBlastAliveMessagesHelp": "Habilite esto si el servidor no es detectado de manera confiable por otros dispositivos UPnP en su red.",
     "LabelBlastMessageInterval": "Intervalo de mensajes de vida (segundos)",
     "LabelBlastMessageIntervalHelp": "Determina la duraci\u00f3n en segundos del intervalo entre mensajes de vida.",
-    "LabelDefaultUser": "Usuario por omisi\u00f3n:",
+    "LabelDefaultUser": "Usuario por defecto:",
     "LabelDefaultUserHelp": "Determina que usuario de la biblioteca ser\u00e1 desplegado en los dispositivos conectados. Este puede ser reemplazado para cada dispositivo empleando perf\u00edles.",
     "TitleDlna": "DLNA",
     "HeaderServerSettings": "Configuraci\u00f3n del Servidor",
@@ -565,7 +565,7 @@
     "NotificationOptionTaskFailed": "Falla de tarea programada",
     "NotificationOptionInstallationFailed": "Falla de instalaci\u00f3n",
     "NotificationOptionNewLibraryContent": "Adici\u00f3n de nuevos contenidos",
-    "SendNotificationHelp": "Por omisi\u00f3n, las notificaciones son enviadas a la bandeja de entrada del panel de control. Navegue el cat\u00e1logo de  complementos para instalar opciones de notificaci\u00f3n adiconales.",
+    "SendNotificationHelp": "Por defecto, las notificaciones son enviadas a la bandeja de entrada del panel de control. Navegue el cat\u00e1logo de  complementos para instalar opciones de notificaci\u00f3n adicionales.",
     "NotificationOptionServerRestartRequired": "Reinicio del servidor requerido",
     "LabelNotificationEnabled": "Habilitar esta notificaci\u00f3n",
     "LabelMonitorUsers": "Monitorear actividad desde:",
@@ -574,11 +574,11 @@
     "LabelUseNotificationServices": "Utilizar los siguientes servicios:",
     "CategoryUser": "Usuario",
     "CategorySystem": "Sistema",
-    "CategoryApplication": "Application",
-    "CategoryPlugin": "Plugin",
+    "CategoryApplication": "Aplicaci\u00f3n",
+    "CategoryPlugin": "Complemento",
     "LabelMessageTitle": "T\u00edtulo del Mensaje:",
     "LabelAvailableTokens": "Detalles disponibles:",
-    "AdditionalNotificationServices": "Navegue el cat\u00e1logo de complementos para instalar servicios de notificaci\u00f3n adiconales.",
+    "AdditionalNotificationServices": "Explore el cat\u00e1logo de complementos para instalar servicios de notificaci\u00f3n adicionales.",
     "OptionAllUsers": "Todos los usuarios",
     "OptionAdminUsers": "Administradores",
     "OptionCustomUsers": "Personalizado",
@@ -590,16 +590,17 @@
     "ButtonInfo": "Info",
     "ButtonPageUp": "P\u00e1gina arriba",
     "ButtonPageDown": "P\u00e1gina abajo",
-    "PageAbbreviation": "PG",
+    "PageAbbreviation": "Pag.",
     "ButtonHome": "Inicio",
     "ButtonSettings": "Configuraci\u00f3n",
     "ButtonTakeScreenshot": "Capturar Pantalla",
     "ButtonLetterUp": "Siguiente letra",
     "ButtonLetterDown": "Letra anterior",
-    "PageButtonAbbreviation": "PG",
+    "PageButtonAbbreviation": "Pag.",
     "LetterButtonAbbreviation": "A",
     "TabNowPlaying": "Reproduci\u00e9ndo Ahora",
     "TabNavigation": "Navegaci\u00f3n",
+    "TabControls": "Controles",
     "ButtonFullscreen": "Alternar pantalla completa",
     "ButtonScenes": "Escenas",
     "ButtonSubtitles": "Subt\u00edtulos",
@@ -610,5 +611,8 @@
     "ButtonPause": "Pausar",
     "LabelGroupMoviesIntoCollections": "Agrupar pel\u00edculas en colecciones",
     "LabelGroupMoviesIntoCollectionsHelp": "Cuando se despliegan listados de pel\u00edculas, las pel\u00edculas que pertenecen a una colecci\u00f3n ser\u00e1n desplegadas agrupadas en un solo \u00edtem.",
-    "NotificationOptionPluginError": "Plugin failure"
+    "NotificationOptionPluginError": "Falla de complemento",
+    "ButtonVolumeUp": "Subir Volumen",
+    "ButtonVolumeDown": "Bajar Volumen",
+    "ButtonMute": "Mudo"
 }

MediaBrowser.Server.Implementations/Localization/Server/fr.json

@@ -600,6 +600,7 @@
     "LetterButtonAbbreviation": "A",
     "TabNowPlaying": "Now Playing",
     "TabNavigation": "Navigation",
+    "TabControls": "Controls",
     "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Scenes",
     "ButtonSubtitles": "Subtitles",
@@ -610,5 +611,8 @@
     "ButtonPause": "Pause",
     "LabelGroupMoviesIntoCollections": "Group movies into collections",
     "LabelGroupMoviesIntoCollectionsHelp": "When displaying movie lists, movies belonging to a collection will be displayed as one grouped item.",
-    "NotificationOptionPluginError": "Plugin failure"
+    "NotificationOptionPluginError": "Plugin failure",
+    "ButtonVolumeUp": "Volume up",
+    "ButtonVolumeDown": "Volume down",
+    "ButtonMute": "Mute"
 }

MediaBrowser.Server.Implementations/Localization/Server/he.json

@@ -600,6 +600,7 @@
     "LetterButtonAbbreviation": "A",
     "TabNowPlaying": "Now Playing",
     "TabNavigation": "Navigation",
+    "TabControls": "Controls",
     "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Scenes",
     "ButtonSubtitles": "Subtitles",
@@ -610,5 +611,8 @@
     "ButtonPause": "Pause",
     "LabelGroupMoviesIntoCollections": "Group movies into collections",
     "LabelGroupMoviesIntoCollectionsHelp": "When displaying movie lists, movies belonging to a collection will be displayed as one grouped item.",
-    "NotificationOptionPluginError": "Plugin failure"
+    "NotificationOptionPluginError": "Plugin failure",
+    "ButtonVolumeUp": "Volume up",
+    "ButtonVolumeDown": "Volume down",
+    "ButtonMute": "Mute"
 }

MediaBrowser.Server.Implementations/Localization/Server/it.json

@@ -271,7 +271,7 @@
     "ButtonAutoScroll": "Auto-scroll",
     "LabelImageSavingConvention": "Convenzione per il salvataggio di immagini:",
     "LabelImageSavingConventionHelp": "Media Browser riconosce le immagini dalla maggior parte delle principali applicazioni multimediali. Scegliere la convenzione piu adatta a te.",
-    "OptionImageSavingCompatible": "Compatible - MB3\/Plex\/Xbmc",
+    "OptionImageSavingCompatible": "Compatibile - MB3\/Plex\/Xbmc",
     "OptionImageSavingStandard": "Standard - MB3\/MB2",
     "ButtonSignIn": "Accedi",
     "TitleSignIn": "Accedi",
@@ -574,7 +574,7 @@
     "LabelUseNotificationServices": "Utilizzare i seguenti servizi:",
     "CategoryUser": "Utente",
     "CategorySystem": "Sistema",
-    "CategoryApplication": "Application",
+    "CategoryApplication": "Applicazione",
     "CategoryPlugin": "Plugin",
     "LabelMessageTitle": "Titolo messaggio:",
     "LabelAvailableTokens": "Gettoni disponibili:",
@@ -600,15 +600,19 @@
     "LetterButtonAbbreviation": "e",
     "TabNowPlaying": "In esecuzione",
     "TabNavigation": "Navigazione",
-    "ButtonFullscreen": "Toggle fullscreen",
-    "ButtonScenes": "Scenes",
-    "ButtonSubtitles": "Subtitles",
-    "ButtonAudioTracks": "Audio tracks",
-    "ButtonPreviousTrack": "Previous track",
-    "ButtonNextTrack": "Next track",
+    "TabControls": "Controlli",
+    "ButtonFullscreen": "Schermo intero",
+    "ButtonScenes": "Scene",
+    "ButtonSubtitles": "Sottotitoli",
+    "ButtonAudioTracks": "Traccia Audio",
+    "ButtonPreviousTrack": "Precedente",
+    "ButtonNextTrack": "Prossimo",
     "ButtonStop": "Stop",
-    "ButtonPause": "Pause",
-    "LabelGroupMoviesIntoCollections": "Group movies into collections",
-    "LabelGroupMoviesIntoCollectionsHelp": "When displaying movie lists, movies belonging to a collection will be displayed as one grouped item.",
-    "NotificationOptionPluginError": "Plugin failure"
+    "ButtonPause": "Pausa",
+    "LabelGroupMoviesIntoCollections": "Raggruppa i film nelle collection",
+    "LabelGroupMoviesIntoCollectionsHelp": "Quando si visualizzano le liste di film,i film appartenenti ad una collezione saranno visualizzati come un elemento raggruppato.",
+    "NotificationOptionPluginError": "Plugin fallito",
+    "ButtonVolumeUp": "Aumenta Volume",
+    "ButtonVolumeDown": "Diminuisci volume",
+    "ButtonMute": "Muto"
 }

MediaBrowser.Server.Implementations/Localization/Server/ms.json

@@ -600,6 +600,7 @@
     "LetterButtonAbbreviation": "A",
     "TabNowPlaying": "Now Playing",
     "TabNavigation": "Navigation",
+    "TabControls": "Controls",
     "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Scenes",
     "ButtonSubtitles": "Subtitles",
@@ -610,5 +611,8 @@
     "ButtonPause": "Pause",
     "LabelGroupMoviesIntoCollections": "Group movies into collections",
     "LabelGroupMoviesIntoCollectionsHelp": "When displaying movie lists, movies belonging to a collection will be displayed as one grouped item.",
-    "NotificationOptionPluginError": "Plugin failure"
+    "NotificationOptionPluginError": "Plugin failure",
+    "ButtonVolumeUp": "Volume up",
+    "ButtonVolumeDown": "Volume down",
+    "ButtonMute": "Mute"
 }

MediaBrowser.Server.Implementations/Localization/Server/nb.json

@@ -600,6 +600,7 @@
     "LetterButtonAbbreviation": "A",
     "TabNowPlaying": "Now Playing",
     "TabNavigation": "Navigation",
+    "TabControls": "Controls",
     "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Scenes",
     "ButtonSubtitles": "Subtitles",
@@ -610,5 +611,8 @@
     "ButtonPause": "Pause",
     "LabelGroupMoviesIntoCollections": "Group movies into collections",
     "LabelGroupMoviesIntoCollectionsHelp": "When displaying movie lists, movies belonging to a collection will be displayed as one grouped item.",
-    "NotificationOptionPluginError": "Plugin failure"
+    "NotificationOptionPluginError": "Plugin failure",
+    "ButtonVolumeUp": "Volume up",
+    "ButtonVolumeDown": "Volume down",
+    "ButtonMute": "Mute"
 }

MediaBrowser.Server.Implementations/Localization/Server/nl.json

@@ -28,7 +28,7 @@
     "WizardCompleted": "Dit is alles wat we nodig hebben voor nu. Media Browser is begonnen met het verzamelen van informatie over uw mediabibliotheek. Bekijk enkele van onze apps, en klik vervolgens op <b>Voltooien<\/b> om het <b>Dashboard te bekijken<\/b>.",
     "LabelConfigureSettings": "Configureer instellingen",
     "LabelEnableVideoImageExtraction": "Videobeeld extractie inschakelen",
-    "VideoImageExtractionHelp": "Voor video's die nog geen afbeeldingen hebben, en waarvoor geen afbeeldingen op Internet te vinden zijn. Dit zal enige tijd extra aan de oorspronkelijke bibliotheek scan toevoegen, maar zal resulteren in een mooiere weergave.",
+    "VideoImageExtractionHelp": "Voor video's die nog geen afbeeldingen hebben, en waarvoor geen afbeeldingen op Internet te vinden zijn. Dit voegt extra tijd toe aan de oorspronkelijke bibliotheek scan, maar resulteert in een mooiere weergave.",
     "LabelEnableChapterImageExtractionForMovies": "Extraheer hoofdstuk afbeeldingen voor Films",
     "LabelChapterImageExtractionForMoviesHelp": "Extraheren van hoofdstuk afbeeldingen geeft de Cli\u00ebnt de mogelijkheid om grafische scene selectie menu's te tonen. Het proces kan traag en cpu-intensief zijn en kan enkele gigabytes aan ruimte vereisen. Het word uitgevoerd als nachtelijke taak om 4:00, maar dit is instelbaar via de geplande taken. Het wordt niet aanbevolen om deze taak uit te voeren tijdens de piekuren.",
     "LabelEnableAutomaticPortMapping": "Automatische poorttoewijzing inschakelen",
@@ -58,7 +58,7 @@
     "TabNotifications": "Meldingen",
     "TabCollectionTitles": "Titels",
     "LabelDisplayMissingEpisodesWithinSeasons": "Toon ontbrekende afleveringen binnen een seizoen",
-    "LabelUnairedMissingEpisodesWithinSeasons": "Toon toekomstige afleveringen binnen een seizoen",
+    "LabelUnairedMissingEpisodesWithinSeasons": "Toon komende afleveringen binnen een seizoen",
     "HeaderVideoPlaybackSettings": "Video afspeel instellingen",
     "HeaderPlaybackSettings": "Afspeel instellingen",
     "LabelAudioLanguagePreference": "Voorkeurs taal geluid:",
@@ -358,7 +358,7 @@
     "TitleMediaLibrary": "Media Bibliotheek",
     "TabFolders": "Mappen",
     "TabPathSubstitution": "Pad Vervangen",
-    "LabelSeasonZeroDisplayName": "Seizoen 0 weergave naam:",
+    "LabelSeasonZeroDisplayName": "Weergave naam voor Seizoen 0:",
     "LabelEnableRealtimeMonitor": "Real time monitoring inschakelen",
     "LabelEnableRealtimeMonitorHelp": "Wijzigingen worden direct verwerkt, op ondersteunde bestandssystemen.",
     "ButtonScanLibrary": "Scan Bibliotheek",
@@ -405,15 +405,15 @@
     "OptionHighQualityTranscoding": "Hogere kwaliteit",
     "OptionMaxQualityTranscoding": "Max kwaliteit",
     "OptionEnableDebugTranscodingLogging": "Transcodeer Foutopsporings logboek inschakelen",
-    "OptionEnableDebugTranscodingLoggingHelp": "Dit zal zeer grote logbestanden maken en wordt alleen aanbevolen wanneer het nodig is voor het oplossen van problemen.",
+    "OptionEnableDebugTranscodingLoggingHelp": "Dit zal zeer grote logboekbestanden maken en wordt alleen aanbevolen wanneer het nodig is voor het oplossen van problemen.",
     "OptionUpscaling": "Cli\u00ebnts kunnen opgeschaalde video aanvragen",
-    "OptionUpscalingHelp": "In sommige gevallen zal dit resulteren in een betere videokwaliteit, maar zal het CPU-gebruik verhogen.",
+    "OptionUpscalingHelp": "In sommige gevallen zal dit resulteren in een betere videokwaliteit, maar verhoogd het CPU-gebruik.",
     "EditCollectionItemsHelp": "Toevoegen of verwijderen van alle films, series, albums, boeken of games die je wilt groeperen in deze collectie.",
     "HeaderAddTitles": "Titels toevoegen",
     "LabelEnableDlnaPlayTo": "DLNA Afspelen met inschakelen",
     "LabelEnableDlnaPlayToHelp": "Media Browser kan apparaten detecteren binnen uw netwerk en de mogelijkheid bieden om ze op afstand te besturen.",
     "LabelEnableDlnaDebugLogging": "DLNA foutopsporings log inschakelen",
-    "LabelEnableDlnaDebugLoggingHelp": "Dit zal grote logbestanden maken en mag alleen worden gebruikt als dat nodig is voor het oplossen van problemen.",
+    "LabelEnableDlnaDebugLoggingHelp": "Dit zal grote logboekbestanden maken en mag alleen worden gebruikt als dat nodig is voor het oplossen van problemen.",
     "LabelEnableDlnaClientDiscoveryInterval": "Interval voor het zoeken naar Cli\u00ebnts (seconden)",
     "LabelEnableDlnaClientDiscoveryIntervalHelp": "Bepaalt de duur in seconden van de interval tussen SSDP zoekopdrachten uitgevoerd door Media Browser.",
     "HeaderCustomDlnaProfiles": "Aangepaste profielen",
@@ -473,23 +473,23 @@
     "HeaderSupportTheTeamHelp": "Door te doneren draagt u mee aan de verdere ontwikkeling van dit project. Een deel van alle donaties zal worden bijgedragen aan de andere gratis tools waarvan we afhankelijk zijn.",
     "ButtonEnterSupporterKey": "Voer supporter sleutel in",
     "DonationNextStep": "Eenmaal voltooid, gaat u terug en voert U Uw supporter sleutel in, die u ontvangt per e-mail.",
-    "AutoOrganizeHelp": "Automatisch organiseren monitort de download mappen voor nieuwe bestanden en verplaatst ze naar uw media mappen.",
-    "AutoOrganizeTvHelp": "TV bestanden Organiseren zal alleen afleveringen toe te voegen aan de bestaande series. Het zal geen nieuwe serie mappen aanmaken.",
+    "AutoOrganizeHelp": "Automatisch organiseren monitort de download mappen op nieuwe bestanden en verplaatst ze naar uw mediamappen.",
+    "AutoOrganizeTvHelp": "TV bestanden Organiseren voegt alleen afleveringen toe aan de bestaande series. Het zal geen nieuwe serie mappen aanmaken.",
     "OptionEnableEpisodeOrganization": "Nieuwe aflevering organisatie inschakelen",
     "LabelWatchFolder": "Bewaakte map:",
     "LabelWatchFolderHelp": "De server zal deze map doorzoeken tijdens de geplande taak voor 'Organiseren van nieuwe mediabestanden'",
     "ButtonViewScheduledTasks": "Bekijk geplande taken",
     "LabelMinFileSizeForOrganize": "Minimale bestandsgrootte (MB):",
-    "LabelMinFileSizeForOrganizeHelp": "Bestanden onder dit formaat zullen worden genegeerd.",
-    "LabelSeasonFolderPattern": "Seizoens map opmaak:",
-    "LabelSeasonZeroFolderName": "Seizoen Nul mapnaam:",
+    "LabelMinFileSizeForOrganizeHelp": "Kleinere bestanden dan dit formaat zullen worden genegeerd.",
+    "LabelSeasonFolderPattern": "Mapnaam voor Seizoenen:",
+    "LabelSeasonZeroFolderName": "Mapnaam voor Specials:",
     "HeaderEpisodeFilePattern": "Afleverings bestandsopmaak",
     "LabelEpisodePattern": "Afleverings opmaak:",
     "LabelMultiEpisodePattern": "Meerdere afleveringen opmaak:",
     "HeaderSupportedPatterns": "Ondersteunde Opmaak",
     "HeaderTerm": "Term",
     "HeaderPattern": "Opmaak",
-    "HeaderResult": "Resultaat",
+    "HeaderResult": "Resulteert in:",
     "LabelDeleteEmptyFolders": "Verwijder lege mappen na het organiseren",
     "LabelDeleteEmptyFoldersHelp": "Schakel in om de download map schoon te houden.",
     "LabelDeleteLeftOverFiles": "Verwijder overgebleven bestanden met de volgende extensies:",
@@ -550,7 +550,7 @@
     "OptionCelsius": "Celsius",
     "OptionFahrenheit": "Fahrenheit",
     "HeaderRequireManualLogin": "Vereist handmatig aanmelden met gebruikersnaam voor:",
-    "HeaderRequireManualLoginHelp": "Indien uitgeschaleld dan toont de cli\u00ebnt een login-scherm met een visuele selectie van gebruikers.",
+    "HeaderRequireManualLoginHelp": "Indien uitgeschakeld dan toont de cli\u00ebnt een aanmeld scherm met een visuele selectie van gebruikers.",
     "OptionOtherApps": "Overige apps",
     "OptionMobileApps": "Mobiele apps",
     "HeaderNotificationList": "Klik op een melding om de opties voor het versturen ervan te configureren .",
@@ -574,8 +574,8 @@
     "LabelUseNotificationServices": "Gebruik de volgende diensten:",
     "CategoryUser": "Gebruiker",
     "CategorySystem": "Systeem",
-    "CategoryApplication": "Application",
-    "CategoryPlugin": "Plugin",
+    "CategoryApplication": "Toepassing",
+    "CategoryPlugin": "Plug-in",
     "LabelMessageTitle": "Titel van het bericht:",
     "LabelAvailableTokens": "Beschikbaar tokens:",
     "AdditionalNotificationServices": "Blader door de plug-in catalogus om aanvullende meldingsdiensten te installeren.",
@@ -600,6 +600,7 @@
     "LetterButtonAbbreviation": "A",
     "TabNowPlaying": "Wordt nu afgespeeld",
     "TabNavigation": "Navigatie",
+    "TabControls": "Besturing",
     "ButtonFullscreen": "Volledig scherm in-\/uitschakelen",
     "ButtonScenes": "Scenes",
     "ButtonSubtitles": "Ondertitels",
@@ -610,5 +611,8 @@
     "ButtonPause": "Pauze",
     "LabelGroupMoviesIntoCollections": "Groepeer films in verzamelingen",
     "LabelGroupMoviesIntoCollectionsHelp": "Bij de weergave van film lijsten, zullen films die behoren tot een verzameling worden weergegeven als een gegroepeerd object.",
-    "NotificationOptionPluginError": "Plugin failure"
+    "NotificationOptionPluginError": "Plug-in fout",
+    "ButtonVolumeUp": "Volume omhoog",
+    "ButtonVolumeDown": "Volume omlaag",
+    "ButtonMute": "Dempen"
 }

MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json

@@ -574,7 +574,7 @@
     "LabelUseNotificationServices": "Usar os seguintes servi\u00e7os:",
     "CategoryUser": "Usu\u00e1rio",
     "CategorySystem": "Sistema",
-    "CategoryApplication": "Application",
+    "CategoryApplication": "Aplica\u00e7\u00e3o",
     "CategoryPlugin": "Plugin",
     "LabelMessageTitle": "T\u00edtulo da mensagem:",
     "LabelAvailableTokens": "Tokens dispon\u00edveis:",
@@ -600,6 +600,7 @@
     "LetterButtonAbbreviation": "A",
     "TabNowPlaying": "Reproduzindo Agora",
     "TabNavigation": "Navega\u00e7\u00e3o",
+    "TabControls": "Controls",
     "ButtonFullscreen": "Alternar tela cheia",
     "ButtonScenes": "Cenas",
     "ButtonSubtitles": "Legendas",
@@ -610,5 +611,8 @@
     "ButtonPause": "Pausar",
     "LabelGroupMoviesIntoCollections": "Agrupar filmes nas cole\u00e7\u00f5es",
     "LabelGroupMoviesIntoCollectionsHelp": "Ao exibir listas de filmes, filmes que perten\u00e7am a uma cole\u00e7\u00e3o ser\u00e3o exibidos como um \u00fanico item agrupado.",
-    "NotificationOptionPluginError": "Plugin failure"
+    "NotificationOptionPluginError": "Falha no plugin",
+    "ButtonVolumeUp": "Volume up",
+    "ButtonVolumeDown": "Volume down",
+    "ButtonMute": "Mute"
 }

MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json

@@ -600,6 +600,7 @@
     "LetterButtonAbbreviation": "A",
     "TabNowPlaying": "Now Playing",
     "TabNavigation": "Navigation",
+    "TabControls": "Controls",
     "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Scenes",
     "ButtonSubtitles": "Subtitles",
@@ -610,5 +611,8 @@
     "ButtonPause": "Pause",
     "LabelGroupMoviesIntoCollections": "Group movies into collections",
     "LabelGroupMoviesIntoCollectionsHelp": "When displaying movie lists, movies belonging to a collection will be displayed as one grouped item.",
-    "NotificationOptionPluginError": "Plugin failure"
+    "NotificationOptionPluginError": "Plugin failure",
+    "ButtonVolumeUp": "Volume up",
+    "ButtonVolumeDown": "Volume down",
+    "ButtonMute": "Mute"
 }

MediaBrowser.Server.Implementations/Localization/Server/sv.json

@@ -574,8 +574,8 @@
     "LabelUseNotificationServices": "Anv\u00e4nd f\u00f6ljande tj\u00e4nster:",
     "CategoryUser": "Anv\u00e4ndare",
     "CategorySystem": "System",
-    "CategoryApplication": "Application",
-    "CategoryPlugin": "Plugin",
+    "CategoryApplication": "App",
+    "CategoryPlugin": "Till\u00e4gg",
     "LabelMessageTitle": "Meddelande titel",
     "LabelAvailableTokens": "Tillg\u00e4ngliga tokens:",
     "AdditionalNotificationServices": "Bl\u00e4ddra i plugin katalogen f\u00f6r att installera ytterligare notifikations tj\u00e4nster",
@@ -600,6 +600,7 @@
     "LetterButtonAbbreviation": "A",
     "TabNowPlaying": "Nu spelas",
     "TabNavigation": "Navigering",
+    "TabControls": "Kontroller",
     "ButtonFullscreen": "V\u00e4xla fullsk\u00e4rmsl\u00e4ge",
     "ButtonScenes": "Scener",
     "ButtonSubtitles": "Undertexter",
@@ -610,5 +611,8 @@
     "ButtonPause": "Paus",
     "LabelGroupMoviesIntoCollections": "Gruppera filmer i samlingsboxar",
     "LabelGroupMoviesIntoCollectionsHelp": "I filmlistor visas filmer som ing\u00e5r i en samlingsbox som ett enda objekt.",
-    "NotificationOptionPluginError": "Plugin failure"
+    "NotificationOptionPluginError": "Fel uppstod med till\u00e4gget",
+    "ButtonVolumeUp": "H\u00f6j Volymen",
+    "ButtonVolumeDown": "S\u00e4nk Volymen",
+    "ButtonMute": "Tyst"
 }

MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json

@@ -600,6 +600,7 @@
     "LetterButtonAbbreviation": "A",
     "TabNowPlaying": "Now Playing",
     "TabNavigation": "Navigation",
+    "TabControls": "Controls",
     "ButtonFullscreen": "Toggle fullscreen",
     "ButtonScenes": "Scenes",
     "ButtonSubtitles": "Subtitles",
@@ -610,5 +611,8 @@
     "ButtonPause": "Pause",
     "LabelGroupMoviesIntoCollections": "Group movies into collections",
     "LabelGroupMoviesIntoCollectionsHelp": "When displaying movie lists, movies belonging to a collection will be displayed as one grouped item.",
-    "NotificationOptionPluginError": "Plugin failure"
+    "NotificationOptionPluginError": "Plugin failure",
+    "ButtonVolumeUp": "Volume up",
+    "ButtonVolumeDown": "Volume down",
+    "ButtonMute": "Mute"
 }

MediaBrowser.Server.Implementations/Notifications/CoreNotificationTypes.cs

@@ -27,6 +27,7 @@ namespace MediaBrowser.Server.Implementations.Notifications
                 new NotificationTypeInfo
                 {
                      Type = NotificationType.ApplicationUpdateInstalled.ToString(),
+                     DefaultDescription = "{ReleaseNotes}",
                      DefaultTitle = "A new version of Media Browser Server has been installed.",
                      Variables = new List<string>{"Version"}
                 },

MediaBrowser.Server.Implementations/Notifications/NotificationManager.cs

@@ -46,7 +46,7 @@ namespace MediaBrowser.Server.Implementations.Notifications
             var description = GetDescription(request, options);
 
             var tasks = _services.Where(i => IsEnabled(i, notificationType))
-                .Select(i => SendNotification(request, i, users, description, title, cancellationToken));
+                .Select(i => SendNotification(request, i, users, title, description, cancellationToken));
 
             return Task.WhenAll(tasks);
         }
@@ -176,7 +176,7 @@ namespace MediaBrowser.Server.Implementations.Notifications
                 {
                     if (options != null)
                     {
-                        text = options.Title;
+                        text = options.Description;
                     }
                 }
             }

MediaBrowser.Server.Implementations/Session/SessionManager.cs

@@ -855,7 +855,6 @@ namespace MediaBrowser.Server.Implementations.Session
                 Name = GeneralCommandType.DisplayContent.ToString()
             };
 
-            generalCommand.Arguments["Context"] = command.Context;
             generalCommand.Arguments["ItemId"] = command.ItemId;
             generalCommand.Arguments["ItemName"] = command.ItemName;
             generalCommand.Arguments["ItemType"] = command.ItemType;
@@ -1139,7 +1138,6 @@ namespace MediaBrowser.Server.Implementations.Session
                 SupportsRemoteControl = session.SupportsRemoteControl,
                 IsPaused = session.PlayState.IsPaused,
                 IsMuted = session.PlayState.IsMuted,
-                NowViewingContext = session.NowViewingContext,
                 NowViewingItem = session.NowViewingItem,
                 ApplicationVersion = session.ApplicationVersion,
                 CanSeek = session.PlayState.CanSeek,
@@ -1345,21 +1343,20 @@ namespace MediaBrowser.Server.Implementations.Session
             return _dtoService.GetDtoId(item);
         }
 
-        public void ReportNowViewingItem(string sessionId, string itemId, string context)
+        public void ReportNowViewingItem(string sessionId, string itemId)
         {
             var item = _libraryManager.GetItemById(new Guid(itemId));
 
             var info = GetItemInfo(item, item.RunTimeTicks);
 
-            ReportNowViewingItem(sessionId, info, context);
+            ReportNowViewingItem(sessionId, info);
         }
 
-        public void ReportNowViewingItem(string sessionId, BaseItemInfo item, string context)
+        public void ReportNowViewingItem(string sessionId, BaseItemInfo item)
         {
             var session = GetSession(sessionId);
 
             session.NowViewingItem = item;
-            session.NowViewingContext = context;
         }
     }
 }

MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs

@@ -163,8 +163,7 @@ namespace MediaBrowser.Server.Implementations.Session
             {
                 var vals = message.Data.Split('|');
 
-                var context = vals.Length > 3 ? vals[3] : null;
-                _sessionManager.ReportNowViewingItem(session.Id, vals[1], context);
+                _sessionManager.ReportNowViewingItem(session.Id, vals[1]);
             }
         }
 

MediaBrowser.WebDashboard/Api/ConfigurationPageInfo.cs

@@ -1,5 +1,4 @@
-using System;
-using MediaBrowser.Controller.Plugins;
+using MediaBrowser.Controller.Plugins;
 
 namespace MediaBrowser.WebDashboard.Api
 {

MediaBrowser.WebDashboard/Api/DashboardService.cs

@@ -155,7 +155,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(), null));
+            return ResultFactory.GetStaticResult(Request, page.Plugin.Version.ToString().GetMD5(), null, null, MimeTypes.GetMimeType("page.html"), () => ModifyHtml(page.GetHtmlStream(), null));
         }
 
         /// <summary>

Nuget/MediaBrowser.Common.Internal.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common.Internal</id>
-        <version>3.0.357</version>
+        <version>3.0.358</version>
         <title>MediaBrowser.Common.Internal</title>
         <authors>Luke</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.357" />
+            <dependency id="MediaBrowser.Common" version="3.0.358" />
             <dependency id="NLog" version="2.1.0" />
             <dependency id="SimpleInjector" version="2.4.1" />
             <dependency id="sharpcompress" version="0.10.2" />

Nuget/MediaBrowser.Common.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common</id>
-        <version>3.0.357</version>
+        <version>3.0.358</version>
         <title>MediaBrowser.Common</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>

Nuget/MediaBrowser.Server.Core.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Server.Core</id>
-        <version>3.0.357</version>
+        <version>3.0.358</version>
         <title>Media Browser.Server.Core</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains core components required to build plugins for Media Browser Server.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.357" />
+            <dependency id="MediaBrowser.Common" version="3.0.358" />
         </dependencies>
     </metadata>
     <files>