diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs index d2b276ba50..fdddc0c37f 100644 --- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs +++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs @@ -957,6 +957,11 @@ namespace MediaBrowser.Api.Playback.Hls return false; } + if (string.Equals(state.OutputVideoCodec, "copy", StringComparison.OrdinalIgnoreCase)) + { + return false; + } + return state.RunTimeTicks.HasValue && state.IsOutputVideo; } diff --git a/MediaBrowser.Api/PluginService.cs b/MediaBrowser.Api/PluginService.cs index 2fbf65f3fd..4af9bfe58a 100644 --- a/MediaBrowser.Api/PluginService.cs +++ b/MediaBrowser.Api/PluginService.cs @@ -1,7 +1,9 @@ using MediaBrowser.Common; using MediaBrowser.Common.Extensions; +using MediaBrowser.Common.Net; using MediaBrowser.Common.Security; using MediaBrowser.Common.Updates; +using MediaBrowser.Controller.Devices; using MediaBrowser.Controller.Net; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Plugins; @@ -134,8 +136,10 @@ namespace MediaBrowser.Api private readonly ISecurityManager _securityManager; private readonly IInstallationManager _installationManager; + private readonly INetworkManager _network; + private readonly IDeviceManager _deviceManager; - public PluginService(IJsonSerializer jsonSerializer, IApplicationHost appHost, ISecurityManager securityManager, IInstallationManager installationManager) + public PluginService(IJsonSerializer jsonSerializer, IApplicationHost appHost, ISecurityManager securityManager, IInstallationManager installationManager, INetworkManager network, IDeviceManager deviceManager) : base() { if (jsonSerializer == null) @@ -146,6 +150,8 @@ namespace MediaBrowser.Api _appHost = appHost; _securityManager = securityManager; _installationManager = installationManager; + _network = network; + _deviceManager = deviceManager; _jsonSerializer = jsonSerializer; } @@ -165,13 +171,15 @@ namespace MediaBrowser.Api { var result = await _securityManager.GetRegistrationStatus(request.Name).ConfigureAwait(false); - return ToOptimizedResult(new RegistrationInfo + var info = new RegistrationInfo { ExpirationDate = result.ExpirationDate, IsRegistered = result.IsRegistered, IsTrial = result.TrialVersion, Name = request.Name - }); + }; + + return ToOptimizedResult(info); } /// diff --git a/MediaBrowser.Dlna/Profiles/DefaultProfile.cs b/MediaBrowser.Dlna/Profiles/DefaultProfile.cs index 18d9dbcfa1..18a595d5b5 100644 --- a/MediaBrowser.Dlna/Profiles/DefaultProfile.cs +++ b/MediaBrowser.Dlna/Profiles/DefaultProfile.cs @@ -31,8 +31,8 @@ namespace MediaBrowser.Dlna.Profiles MaxIconWidth = 48; MaxIconHeight = 48; - MaxStreamingBitrate = 12000000; - MaxStaticBitrate = 12000000; + MaxStreamingBitrate = 10000000; + MaxStaticBitrate = 10000000; MusicStreamingTranscodingBitrate = 128000; MusicSyncBitrate = 128000; diff --git a/MediaBrowser.Dlna/Profiles/Xml/BubbleUPnp.xml b/MediaBrowser.Dlna/Profiles/Xml/BubbleUPnp.xml index 29612e37ae..a537cbfcf6 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/BubbleUPnp.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/BubbleUPnp.xml @@ -22,8 +22,8 @@ 480 48 48 - 12000000 - 12000000 + 10000000 + 10000000 128000 128000 DMS-1.50 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Default.xml b/MediaBrowser.Dlna/Profiles/Xml/Default.xml index 4f5c70dd1e..72cad45136 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Default.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Default.xml @@ -16,8 +16,8 @@ 480 48 48 - 12000000 - 12000000 + 10000000 + 10000000 128000 128000 DMS-1.50 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml b/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml index bac02ea3a6..bbaf23cc57 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml @@ -21,8 +21,8 @@ 480 48 48 - 12000000 - 12000000 + 10000000 + 10000000 128000 128000 DMS-1.50 diff --git a/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml b/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml index 3afa9907b7..5de643b026 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml @@ -22,8 +22,8 @@ 480 48 48 - 12000000 - 12000000 + 10000000 + 10000000 128000 128000 DMS-1.50 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Dish Hopper-Joey.xml b/MediaBrowser.Dlna/Profiles/Xml/Dish Hopper-Joey.xml index 62f4907e0b..bf65212b9d 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Dish Hopper-Joey.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Dish Hopper-Joey.xml @@ -23,8 +23,8 @@ 480 48 48 - 12000000 - 12000000 + 10000000 + 10000000 128000 128000 DMS-1.50 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Generic Device.xml b/MediaBrowser.Dlna/Profiles/Xml/Generic Device.xml deleted file mode 100644 index 1c611d47a4..0000000000 --- a/MediaBrowser.Dlna/Profiles/Xml/Generic Device.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - Generic Device - Emby - Emby - http://emby.media/ - Emby - Emby - Emby - http://emby.media/ - false - false - Audio,Photo,Video - JPEG_SM - 480 - 480 - 48 - 48 - 8000000 - 8000000 - 128000 - 128000 - DMS-1.50 - http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_AC3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_HD_50_AC3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/mpeg:DLNA.ORG_PN=MP3;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=44100;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=1:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/L16;rate=48000;channels=2:DLNA.ORG_PN=LPCM;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_BASE;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:audio/x-ms-wma:DLNA.ORG_PN=WMA_FULL;DLNA.ORG_OP=01;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_MED;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_LRG;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN;DLNA.ORG_OP=00;DLNA.ORG_FLAGS=00D00000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG1;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_NTSC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_EU_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_EU_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_NA_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_NA_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=MPEG_TS_SD_KO_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_TS_SD_KO_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-msvideo:DLNA.ORG_PN=AVI;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-matroska:DLNA.ORG_PN=MATROSKA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_SD_AC3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_720p_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_MP_HD_1080i_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_HP_HD_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=AVC_MP4_LPCM;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_ASP_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_SP_L6_AAC;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mp4:DLNA.ORG_PN=MPEG4_P2_MP4_NDSD;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_SD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_AAC_MULT5_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/mpeg:DLNA.ORG_PN=AVC_TS_MP_HD_MPEG1_L3_ISO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/vnd.dlna.mpeg-tts:DLNA.ORG_PN=AVC_TS_HD_50_LPCM_T;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_BASE;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_FULL;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVMED_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-wmv:DLNA.ORG_PN=WMVHIGH_PRO;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L1_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L2_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000,http-get:*:video/x-ms-asf:DLNA.ORG_PN=VC1_ASF_AP_L3_WMA;DLNA.ORG_OP=11;DLNA.ORG_FLAGS=01500000000000000000000000000000 - 0 - false - false - false - - - - - - - - - - - - - - - \ 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 b7f61b006d..044baaa70b 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml @@ -22,8 +22,8 @@ 480 48 48 - 12000000 - 12000000 + 10000000 + 10000000 128000 128000 DMS-1.50 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml b/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml index a2c5bff0bd..ca64d36d4d 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml @@ -20,8 +20,8 @@ 480 48 48 - 12000000 - 12000000 + 10000000 + 10000000 128000 128000 DMS-1.50 diff --git a/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml b/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml index 9b8907637e..61e7fedf86 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml @@ -22,8 +22,8 @@ 480 48 48 - 12000000 - 12000000 + 10000000 + 10000000 128000 128000 DMS-1.50 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml index 95e0013663..147182b7ed 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml @@ -23,8 +23,8 @@ 480 48 48 - 12000000 - 12000000 + 10000000 + 10000000 128000 128000 DMS-1.50 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Popcorn Hour.xml b/MediaBrowser.Dlna/Profiles/Xml/Popcorn Hour.xml index 351ebc5225..1378341fb0 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Popcorn Hour.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Popcorn Hour.xml @@ -16,8 +16,8 @@ 480 48 48 - 12000000 - 12000000 + 10000000 + 10000000 128000 128000 DMS-1.50 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml index baf3c88619..af16eec107 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml @@ -22,8 +22,8 @@ 480 48 48 - 12000000 - 12000000 + 10000000 + 10000000 128000 128000 DMS-1.50 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 b0f8a7fb55..7eb9db7f6f 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml @@ -22,8 +22,8 @@ 480 48 48 - 12000000 - 12000000 + 10000000 + 10000000 128000 128000 DMS-1.50 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml index a07be6920a..013600f87a 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml @@ -24,8 +24,8 @@ 480 48 48 - 12000000 - 12000000 + 10000000 + 10000000 128000 128000 DMS-1.50 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml index 26573b1e8b..2990df4e31 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml @@ -23,8 +23,8 @@ 480 48 48 - 12000000 - 12000000 + 10000000 + 10000000 128000 128000 DMS-1.50 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml index 76aef07f66..a74c3a4164 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml @@ -23,8 +23,8 @@ 480 48 48 - 12000000 - 12000000 + 10000000 + 10000000 128000 128000 DMS-1.50 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml index 4f168a6ce4..f13b40e00d 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml @@ -23,8 +23,8 @@ 480 48 48 - 12000000 - 12000000 + 10000000 + 10000000 128000 128000 DMS-1.50 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml index 2877e2d4e0..118afaa180 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml @@ -23,8 +23,8 @@ 480 48 48 - 12000000 - 12000000 + 10000000 + 10000000 128000 128000 DMS-1.50 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml index 52bae8bc94..33066d8ef9 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml @@ -23,8 +23,8 @@ 480 48 48 - 12000000 - 12000000 + 10000000 + 10000000 128000 128000 DMS-1.50 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Vlc.xml b/MediaBrowser.Dlna/Profiles/Xml/Vlc.xml index 4243247def..6b341671ce 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Vlc.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Vlc.xml @@ -22,8 +22,8 @@ 480 48 48 - 12000000 - 12000000 + 10000000 + 10000000 128000 128000 DMS-1.50 diff --git a/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml b/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml index 4f8000c3bd..7f216a65c9 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml @@ -23,8 +23,8 @@ 480 48 48 - 12000000 - 12000000 + 10000000 + 10000000 128000 128000 DMS-1.50 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml b/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml index f60729bea9..1182243807 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml @@ -23,8 +23,8 @@ 480 48 48 - 12000000 - 12000000 + 10000000 + 10000000 128000 128000 DMS-1.50 diff --git a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml index 7167108a7c..4c6287442b 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml @@ -23,8 +23,8 @@ 480 48 48 - 12000000 - 12000000 + 10000000 + 10000000 128000 128000 DMS-1.50 diff --git a/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml b/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml index 55f86e5d21..ca95ecde31 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml @@ -22,8 +22,8 @@ 480 48 48 - 12000000 - 12000000 + 10000000 + 10000000 128000 128000 DMS-1.50 diff --git a/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs b/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs index fb64a6d285..04337dda6a 100644 --- a/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs +++ b/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs @@ -1,6 +1,7 @@ using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Events; using MediaBrowser.Common.IO; +using MediaBrowser.Common.Net; using MediaBrowser.Controller.Devices; using MediaBrowser.Controller.Library; using MediaBrowser.Model.Devices; @@ -26,6 +27,7 @@ namespace MediaBrowser.Server.Implementations.Devices private readonly ILibraryMonitor _libraryMonitor; private readonly IConfigurationManager _config; private readonly ILogger _logger; + private readonly INetworkManager _network; public event EventHandler> CameraImageUploaded; @@ -34,7 +36,7 @@ namespace MediaBrowser.Server.Implementations.Devices /// public event EventHandler> DeviceOptionsUpdated; - public DeviceManager(IDeviceRepository repo, IUserManager userManager, IFileSystem fileSystem, ILibraryMonitor libraryMonitor, IConfigurationManager config, ILogger logger) + public DeviceManager(IDeviceRepository repo, IUserManager userManager, IFileSystem fileSystem, ILibraryMonitor libraryMonitor, IConfigurationManager config, ILogger logger, INetworkManager network) { _repo = repo; _userManager = userManager; @@ -42,6 +44,7 @@ namespace MediaBrowser.Server.Implementations.Devices _libraryMonitor = libraryMonitor; _config = config; _logger = logger; + _network = network; } public async Task RegisterDevice(string reportedId, string name, string appName, string appVersion, string usedByUserId) diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json index 546da05c94..768007718b 100644 --- a/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json +++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json @@ -399,7 +399,7 @@ "TabMetadata": "Metadata", "TabDLNA": "DLNA", "TabLiveTV": "Live-TV", - "TabAutoOrganize": "Automatische Organisation", + "TabAutoOrganize": "Autom.Organisation", "TabPlugins": "Plugins", "TabAdvanced": "Erweitert", "TabHelp": "Hilfe", @@ -587,7 +587,7 @@ "TooltipLike": "Like", "TooltipDislike": "Dislike", "TooltipPlayed": "Gespielt", - "ValueSeriesYearToPresent": "{0}-vorhanden", + "ValueSeriesYearToPresent": "{0}-heute", "ValueAwards": "Auszeichnungen: {0}", "ValueBudget": "Budget: {0}", "ValueRevenue": "Einnahmen: {0}", @@ -689,7 +689,7 @@ "DashboardTourHelp": "Die In-App-Hilfe Schaltfl\u00e4che bietet eine schnelle M\u00f6glichkeit um eine Wiki-Seite zum aktuellen Inhalt zu \u00f6ffnen.", "DashboardTourUsers": "Erstelle einfach Benutzeraccounts f\u00fcr Freunde und Familie. Jeder mit seinen individuellen Einstellungen bei Berechtigungen, Blibliothekenzugriff, Kindersicherung und mehr.", "DashboardTourCinemaMode": "Der Kino-Modus bringt das Kinoerlebnis direkt in dein Wohnzimmer, mit der F\u00e4higkeit Trailer und benutzerdefinierte Intros vor dem Hauptfilm zu spielen.", - "DashboardTourChapters": "Aktiviere die Bildgenerierung f\u00fcr die Kapitel deiner Videos f\u00fcr eine bessere Darstellung w\u00e4hrend des Ansehens.", + "DashboardTourChapters": "Aktiviere Kapitel-Bilder Generierung f\u00fcr Videos f\u00fcr eine bessere Darstellung.", "DashboardTourSubtitles": "Lade automatisch Untertitel f\u00fcr jede Sprache f\u00fcr deine Videos herunter.", "DashboardTourPlugins": "Installiere Plugins wie Internet Videoportale, Live-TV, Metadatenscanner und mehr.", "DashboardTourNotifications": "Sende automatisch Benachrichtigungen von Serverereignissen auf dein mobiles Endger\u00e4t, per E-Mail und mehr.", diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/nb.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/nb.json index 2f65f3ed24..7e2083d6cd 100644 --- a/MediaBrowser.Server.Implementations/Localization/JavaScript/nb.json +++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/nb.json @@ -6,8 +6,8 @@ "Administrator": "Administrator", "Password": "Passord", "DeleteImage": "Slett bilde", - "MessageThankYouForSupporting": "Thank you for supporting Emby.", - "MessagePleaseSupportProject": "Please support Emby.", + "MessageThankYouForSupporting": "Takk for at du st\u00f8tter Emby.", + "MessagePleaseSupportProject": "Vennligst st\u00f8tt Emby.", "DeleteImageConfirmation": "Er du sikker p\u00e5 at du vil slette bildet?", "FileReadCancelled": "Lesing av filen kansellert.", "FileNotFound": "Fil ikke funnet", @@ -41,24 +41,24 @@ "TitleSync": "Synk", "ButtonDonate": "Don\u00e9r", "LabelRecurringDonationCanBeCancelledHelp": "Gjentakende donasjoner kan avbrytes n\u00e5r som helst fra din PayPal-konto.", - "HeaderMyMedia": "My Media", + "HeaderMyMedia": "Mine media", "TitleNotifications": "Beskjeder", "ErrorLaunchingChromecast": "Det var en feil ved start av Chromecast. Vennligst forsikre deg om at enheten har korrekt forbindelse til ditt tr\u00e5dl\u00f8se nettverk.", "MessageErrorLoadingSupporterInfo": "There was an error loading supporter information. Please try again later.", "MessageLinkYourSupporterKey": "Link your supporter key with up to {0} Emby Connect members to enjoy free access to the following apps:", - "HeaderConfirmRemoveUser": "Remove User", + "HeaderConfirmRemoveUser": "Fjern bruker", "MessageSwipeDownOnRemoteControl": "Welcome to remote control. Select the device to control by clicking the cast icon in the upper right corner. Swipe down anywhere on this screen to go back to where you came from.", "MessageConfirmRemoveConnectSupporter": "Are you sure you wish to remove additional supporter benefits from this user?", "ValueTimeLimitSingleHour": "Time limit: 1 hour", "ValueTimeLimitMultiHour": "Time limit: {0} hours", "HeaderUsers": "Brukere", - "PluginCategoryGeneral": "General", - "PluginCategoryContentProvider": "Content Providers", - "PluginCategoryScreenSaver": "Screen Savers", - "PluginCategoryTheme": "Themes", - "PluginCategorySync": "Sync", - "PluginCategorySocialIntegration": "Social Networks", - "PluginCategoryNotifications": "Notifications", + "PluginCategoryGeneral": "Generelt", + "PluginCategoryContentProvider": "Innholdstilbydere", + "PluginCategoryScreenSaver": "Skjermspar", + "PluginCategoryTheme": "Temaer", + "PluginCategorySync": "Synk", + "PluginCategorySocialIntegration": "Sosiale nettverk", + "PluginCategoryNotifications": "Varslinger", "PluginCategoryMetadata": "Metadata", "PluginCategoryLiveTV": "Live TV", "PluginCategoryChannel": "Channels", @@ -98,10 +98,10 @@ "HeaderSupporterBenefit": "St\u00f8ttemedlemskap gir ytterligere fordeler som for eksempel tilgang til synkronisering, premium plugins, internett-kanaler og mer. {0}L\u00e6r mer{1}.", "LabelSyncNoTargetsHelp": "Det ser ikke ut til at du har noen applikasjoner som st\u00f8tter synkronisering.", "HeaderWelcomeToProjectServerDashboard": "Welcome to the Emby Server Dashboard", - "HeaderWelcomeToProjectWebClient": "Welcome to Emby", + "HeaderWelcomeToProjectWebClient": "Velkommen til Emby", "ButtonTakeTheTour": "Bli med p\u00e5 omvisning", "HeaderWelcomeBack": "Velkommen tilbake!", - "TitlePlugins": "Plugins", + "TitlePlugins": "Programtillegg", "ButtonTakeTheTourToSeeWhatsNew": "Ta en titt p\u00e5 hva som er nytt", "MessageNoSyncJobsFound": "Ingen synkroniseringsjobber funnet. Opprett en synkroniseringsjobb ved hjelp av Synkroniseringsknappene i biblioteket", "HeaderLibraryAccess": "Bibliotek tilgang", @@ -181,8 +181,8 @@ "OptionFriday": "Fredag", "OptionSaturday": "L\u00f8rdag", "OptionEveryday": "Hver dag", - "OptionWeekend": "Weekends", - "OptionWeekday": "Weekdays", + "OptionWeekend": "Helger", + "OptionWeekday": "Ukedager", "HeaderConfirmDeletion": "Bekreft Kansellering", "MessageConfirmPathSubstitutionDeletion": "Er du sikker p\u00e5 at du vil slette sti erstatter?", "LiveTvUpdateAvailable": "(Oppdatering tilgjengelig)", @@ -252,8 +252,8 @@ "OrganizePatternResult": "Resultat: {0}", "HeaderRestart": "Omstart", "HeaderShutdown": "Sl\u00e5 Av", - "MessageConfirmRestart": "Are you sure you wish to restart Emby Server?", - "MessageConfirmShutdown": "Are you sure you wish to shutdown Emby Server?", + "MessageConfirmRestart": "Er du sikker p\u00e5 at du vil starte Emby Server p\u00e5 ny?", + "MessageConfirmShutdown": "Er du sikker p\u00e5 at du vil avslutte Emby Server", "ButtonUpdateNow": "Oppdater N\u00e5", "ValueItemCount": "{0} element", "ValueItemCountPlural": "{0} elementer", @@ -542,7 +542,7 @@ "MessageYouHaveALifetimeMembership": "You have a lifetime supporter membership. You can provide additional donations on a one-time or recurring basis using the options below. Thank you for supporting Emby.", "MessageYouHaveAnActiveRecurringMembership": "Du har et aktivt {0} medlemskap. Du kan oppgradere din plan ved hjelp av alternativene nedenfor.", "ButtonDelete": "Slett", - "HeaderEmbyAccountAdded": "Emby Account Added", + "HeaderEmbyAccountAdded": "Emby konto lagt til", "MessageEmbyAccountAdded": "The Emby account has been added to this user.", "MessagePendingEmbyAccountAdded": "The Emby account has been added to this user. An email will be sent to the owner of the account. The invitation will need to be confirmed by clicking a link within the email.", "HeaderEmbyAccountRemoved": "Emby Account Removed", @@ -727,7 +727,7 @@ "MessageInvalidForgotPasswordPin": "Ugyldig eller utg\u00e5tt PIN kode angitt. Vennligst pr\u00f8v igjen.", "MessagePasswordResetForUsers": "Passordet er fjernet for f\u00f8lgende brukere:", "HeaderInviteGuest": "Inviter gjest", - "ButtonLinkMyEmbyAccount": "Link my account now", + "ButtonLinkMyEmbyAccount": "Link kontoen min n\u00e5", "MessageConnectAccountRequiredToInviteGuest": "In order to invite guests you need to first link your Emby account to this server.", "ButtonSync": "Synk", "SyncMedia": "Synkroniser media", @@ -756,15 +756,15 @@ "SyncJobItemStatusFailed": "Feilet", "SyncJobItemStatusRemovedFromDevice": "Fjernet fra enheten", "SyncJobItemStatusCancelled": "Kansellert", - "LabelProfile": "Profile:", + "LabelProfile": "Profil:", "LabelBitrateMbps": "Bitrate (Mbps):", - "EmbyIntroDownloadMessage": "To download and install Emby Server visit {0}.", - "ButtonNewServer": "New Server", - "ButtonSignInWithConnect": "Sign in with Emby Connect", - "HeaderNewServer": "New Server", - "MyDevice": "My Device", - "ButtonRemote": "Remote", + "EmbyIntroDownloadMessage": "For \u00e5 laste ned og installere Emby Server bes\u00f8k {0}.", + "ButtonNewServer": "Ny server", + "ButtonSignInWithConnect": "Logg inn med Emby Connect", + "HeaderNewServer": "Ny server", + "MyDevice": "Min(e) enhet(er)", + "ButtonRemote": "Fjernkont.", "TabInfo": "Info", "TabCast": "Cast", - "TabScenes": "Scenes" + "TabScenes": "Scener" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ar.json b/MediaBrowser.Server.Implementations/Localization/Server/ar.json index 157917bc88..88e99a85d2 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/ar.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/ar.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Grouping", "HeaderExport": "Export", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/bg-BG.json b/MediaBrowser.Server.Implementations/Localization/Server/bg-BG.json index e16ee91e68..dcbe6e107b 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/bg-BG.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/bg-BG.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Grouping", "HeaderExport": "Export", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ca.json b/MediaBrowser.Server.Implementations/Localization/Server/ca.json index 984600f659..38206a132d 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/ca.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/ca.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Grouping", "HeaderExport": "Export", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/cs.json b/MediaBrowser.Server.Implementations/Localization/Server/cs.json index d1a7299eff..0cb91e28a8 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/cs.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/cs.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Grouping", "HeaderExport": "Export", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/da.json b/MediaBrowser.Server.Implementations/Localization/Server/da.json index 8ac1d44a83..1e4ae9af39 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/da.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/da.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Gruppering", "HeaderExport": "Eksporter", "HeaderColumns": "S\u00f8jler", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/de.json b/MediaBrowser.Server.Implementations/Localization/Server/de.json index babfbb028e..9f7db7e104 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/de.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/de.json @@ -78,7 +78,7 @@ "HeaderSyncRequiresSupporterMembership": "Synchronisation ben\u00f6tigt eine Supporter-Mitgliedschaft", "HeaderEnjoyDayTrial": "Genie\u00dfen Sie eine 14 Tage Testversion", "LabelSyncTempPath": "Verzeichnis f\u00fcr tempor\u00e4re Dateien", - "LabelSyncTempPathHelp": "Legen Sie einen eigenen Synchronisations-Arbeits Verzeichnis fest. Konvertierte Medien werden w\u00e4hrend der Synchronisation hier gespeichert.", + "LabelSyncTempPathHelp": "Legen Sie ein eigenes Synchronisations-Arbeits Verzeichnis fest. Konvertierte Medien werden w\u00e4hrend der Synchronisation hier gespeichert.", "LabelCustomCertificatePath": "Eigener Zertifikats Ordner:", "LabelCustomCertificatePathHelp": "F\u00fcgen Sie ihr eigenes SSL Zertifikat als .pfx Datei hinzu. Wenn ausgelassen, wird der Server ein selbst signiertes Zertifikat f\u00fcr Sie erstellen.", "TitleNotifications": "Benachrichtigungen", @@ -1228,7 +1228,7 @@ "OptionNoThemeVideo": "Kein Theme Video", "LabelOneTimeDonationAmount": "Spendenbetrag:", "ButtonDonate": "Spenden", - "ButtonPurchase": "Purchase", + "ButtonPurchase": "Kaufen", "OptionActor": "Schauspieler", "OptionComposer": "Komponist", "OptionDirector": "Regisseur", @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Gruppierung", "HeaderExport": "Export", "HeaderColumns": "Spalten", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Aktiviere externe Videoplayer" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/el.json b/MediaBrowser.Server.Implementations/Localization/Server/el.json index d59c78c6c4..7f030a29d2 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/el.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/el.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Grouping", "HeaderExport": "Export", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/en-GB.json b/MediaBrowser.Server.Implementations/Localization/Server/en-GB.json index e0bdecbb13..d708f5a082 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/en-GB.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/en-GB.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Grouping", "HeaderExport": "Export", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ 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 83f5dd0723..94061b9d02 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/en-US.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/en-US.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Grouping", "HeaderExport": "Export", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/es-MX.json b/MediaBrowser.Server.Implementations/Localization/Server/es-MX.json index 5f1b6397d3..9548f694b8 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/es-MX.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/es-MX.json @@ -1228,7 +1228,7 @@ "OptionNoThemeVideo": "Sin Video del Tema", "LabelOneTimeDonationAmount": "Cantidad a donar:", "ButtonDonate": "Donar", - "ButtonPurchase": "Purchase", + "ButtonPurchase": "Comprar", "OptionActor": "Actor", "OptionComposer": "Compositor", "OptionDirector": "Director", @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Agrupado", "HeaderExport": "Exportar", "HeaderColumns": "Columnas", - "ButtonReset": "Resetear" + "ButtonReset": "Resetear", + "OptionEnableExternalVideoPlayers": "Habilitar reproductores externos de video" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/es.json b/MediaBrowser.Server.Implementations/Localization/Server/es.json index 38111b0ce2..7499de193f 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/es.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/es.json @@ -368,7 +368,7 @@ "LabelFanartApiKey": "Personal api key:", "LabelFanartApiKeyHelp": "Requests to fanart without a personal API key return results that were approved over 7 days ago. With a personal API key that drops to 48 hours and if you are also a fanart VIP member that will further drop to around 10 minutes.", "ExtractChapterImagesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs when videos are discovered, and also as a nightly scheduled task. The schedule is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.", - "LabelMetadataDownloadLanguage": "Preferred download language:", + "LabelMetadataDownloadLanguage": "Idioma preferido visualizado", "ButtonAutoScroll": "Auto-desplazamiento", "LabelImageSavingConvention": "Sistema de guardado de im\u00e1genes:", "LabelImageSavingConventionHelp": "Emby recognizes images from most major media applications. Choosing your downloading convention is useful if you also use other products.", @@ -524,7 +524,7 @@ "HeaderCustomDlnaProfiles": "Perfiles personalizados", "HeaderSystemDlnaProfiles": "Perfiles del sistema", "CustomDlnaProfilesHelp": "Crear un perfil personalizado para un nuevo dispositivo o reemplazar un perfil del sistema.", - "SystemDlnaProfilesHelp": "System profiles are read-only. Changes to a system profile will be saved to a new custom profile.", + "SystemDlnaProfilesHelp": "El perfil del Sistema es solo lectura. Cambios al perfil del sistema seran guardados en un perfil nuevo modificado.", "TitleDashboard": "Panel de control", "TabHome": "Inicio", "TabInfo": "Info", @@ -551,12 +551,12 @@ "LabelPublicHttpsPort": "N\u00famero de puerto p\u00fablico de https:", "LabelPublicHttpsPortHelp": "El n\u00famero de puerto p\u00fablico que debe ser enlazado al puerto local https:", "LabelEnableHttps": "Reportar el https como una direccion externa", - "LabelEnableHttpsHelp": "If enabled, the server will report an https url to clients as it's external address.", + "LabelEnableHttpsHelp": "Si es habilitado, el servidor reportara un enlaze https a los clientes como una direccion externa.", "LabelHttpsPort": "N\u00famero de puerto local de https:", "LabelHttpsPortHelp": "N\u00famero de puerto al que el servidor de tcp de Emby debe de ser enlazado.", "LabelWebSocketPortNumber": "N\u00famero de puerto WebSocket:", "LabelEnableAutomaticPortMap": "Habilitar asignaci\u00f3n de puertos autom\u00e1tico", - "LabelEnableAutomaticPortMapHelp": "Attempt to automatically map the public port to the local port via UPnP. This may not work with some router models.", + "LabelEnableAutomaticPortMapHelp": "UPnP permite la configuraci\u00f3n del router para acceso externo de forma f\u00e1cil y autom\u00e1tica. Esto puede no funcionar en algunos modelos de routers.", "LabelExternalDDNS": "Direccion externa del WAN:", "LabelExternalDDNSHelp": "Ponga aqui su DNS dinamico si tiene uno. las aplicaciones de Emby lo usar\u00e1n para conectarse remotamente. Deje en blanco para detecci\u00f3n autom\u00e1tica.", "TabResume": "Continuar", @@ -634,11 +634,11 @@ "MessagePleaseRestartServerToFinishUpdating": "Reinicie el servidor para acabar de aplicar las actualizaciones.", "LabelDownMixAudioScale": "Audio boost when downmixing:", "LabelDownMixAudioScaleHelp": "Potenciador de audio. Establecer a 1 para preservar el volumen original.", - "ButtonLinkKeys": "Transfer Key", + "ButtonLinkKeys": "Transferir Clave", "LabelOldSupporterKey": "Antigua clave de seguidor", "LabelNewSupporterKey": "Nueva clave de seguidor", - "HeaderMultipleKeyLinking": "Transfer to New Key", - "MultipleKeyLinkingHelp": "If you received a new supporter key, use this form to transfer the old key's registrations to your new one.", + "HeaderMultipleKeyLinking": "Trasferir a una Clave Nueva", + "MultipleKeyLinkingHelp": "Si usted recivio una nueva clave de partidiario, use este formulario para trasferir la registracion de la clave vieja a la nueva.", "LabelCurrentEmailAddress": "Cuenta de correo actual", "LabelCurrentEmailAddressHelp": "La direcci\u00f3n de correo electr\u00f3nico actual a la que se envi\u00f3 la nueva clave.", "HeaderForgotKey": "Perd\u00ed mi clave", @@ -646,13 +646,13 @@ "LabelSupporterEmailAddress": "La direcci\u00f3n de correo que utliz\u00f3 para comprar la clave.", "ButtonRetrieveKey": "Recuperar clave", "LabelSupporterKey": "Clave de seguidor (pegar desde el correo)", - "LabelSupporterKeyHelp": "Enter your supporter key to start enjoying additional benefits the community has developed for Emby.", - "MessageInvalidKey": "Supporter key is missing or invalid.", - "ErrorMessageInvalidKey": "In order for any premium content to be registered, you must also be an Emby Supporter. Please donate and support the continued development of the core product. Thank you.", + "LabelSupporterKeyHelp": "Agregue su clave de partidiario para empezar a disfrutar beneficios adicionales que la comunidad a creado para Emby.", + "MessageInvalidKey": "Clave de partidiario no se encuentra o es invalido.", + "ErrorMessageInvalidKey": "Para que cualquier contenido premium sea registrado, usted debe ser un pardidiario de Emby. Porfavor done y ayude a continuar con el desarrollo del producto principal. Gracias.", "HeaderDisplaySettings": "Opciones de pantalla", "TabPlayTo": "Reproducir en", "LabelEnableDlnaServer": "Habilitar servidor Dlna", - "LabelEnableDlnaServerHelp": "Allows UPnP devices on your network to browse and play Emby content.", + "LabelEnableDlnaServerHelp": "Permite que los aparatos con tecnologia UPnP en su red local pudan acceder los contenidos en Emby.", "LabelEnableBlastAliveMessages": "Explotar mensajes en vivo", "LabelEnableBlastAliveMessagesHelp": "Active aqu\u00ed si el servidor no es detectado correctamente por otros dispositivos UPnP en su red.", "LabelBlastMessageInterval": "Intervalo para mensajes en vivo (segundos)", @@ -677,9 +677,9 @@ "NotificationOptionPluginUpdateInstalled": "Se ha instalado la actualizaci\u00f3n del plugin", "NotificationOptionPluginInstalled": "Plugin instalado", "NotificationOptionPluginUninstalled": "Plugin desinstalado", - "NotificationOptionVideoPlayback": "Video playback started", - "NotificationOptionAudioPlayback": "Audio playback started", - "NotificationOptionGamePlayback": "Game playback started", + "NotificationOptionVideoPlayback": "Reproduccion de video a iniciado", + "NotificationOptionAudioPlayback": "Reproduccion de audio a iniciado", + "NotificationOptionGamePlayback": "Reproduccion de video juego a iniciado", "NotificationOptionVideoPlaybackStopped": "Reproducci\u00f3n de video detenida", "NotificationOptionAudioPlaybackStopped": "Reproducci\u00f3n de audio detenida", "NotificationOptionGamePlaybackStopped": "Reproducci\u00f3n de juego detenida", @@ -687,7 +687,7 @@ "NotificationOptionInstallationFailed": "Fallo en la instalaci\u00f3n", "NotificationOptionNewLibraryContent": "Nuevo contenido a\u00f1adido", "NotificationOptionNewLibraryContentMultiple": "Nuevo contenido a\u00f1adido (multiple)", - "NotificationOptionCameraImageUploaded": "Camera image uploaded", + "NotificationOptionCameraImageUploaded": "Imagen de camara se a carcado", "NotificationOptionUserLockedOut": "User locked out", "HeaderSendNotificationHelp": "By default, notifications are delivered to your dashboard inbox. Browse the plugin catalog to install additional notification options.", "NotificationOptionServerRestartRequired": "Se requiere el reinicio del servidor", @@ -729,13 +729,13 @@ "ButtonFullscreen": "Toggle fullscreen", "ButtonScenes": "Escenas", "ButtonSubtitles": "Subt\u00edtulos", - "ButtonAudioTracks": "Audio tracks", + "ButtonAudioTracks": "Pistas de Audio", "ButtonPreviousTrack": "Pista anterior", "ButtonNextTrack": "Pista siguiente", "ButtonStop": "Detener", "ButtonPause": "Pausa", - "ButtonNext": "Next", - "ButtonPrevious": "Previous", + "ButtonNext": "Siguiente", + "ButtonPrevious": "Anterior", "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": "Error en plugin", @@ -773,7 +773,7 @@ "OptionPlainVideoItemsHelp": "Si est\u00e1 habilitado, todos los v\u00eddeos est\u00e1n representados en DIDL como \"object.item.videoItem\" en lugar de un tipo m\u00e1s espec\u00edfico, como por ejemplo \"object.item.videoItem.movie\".", "LabelSupportedMediaTypes": "Tipos de medio soportados:", "TabIdentification": "Identificaci\u00f3n", - "HeaderIdentification": "Identification", + "HeaderIdentification": "Identificaci\u00f3n", "TabDirectPlay": "Reproducci\u00f3n directa", "TabContainers": "Contenedores", "TabCodecs": "Codecs", @@ -795,9 +795,9 @@ "HeaderProfileServerSettingsHelp": "These values control how Emby Server will present itself to the device.", "LabelMaxBitrate": "Bitrate m\u00e1ximo:", "LabelMaxBitrateHelp": "Especificar una tasa de bits m\u00e1xima en entornos de ancho de banda limitado, o si el dispositivo impone su propio l\u00edmite.", - "LabelMaxStreamingBitrate": "Max streaming bitrate:", + "LabelMaxStreamingBitrate": "Bitrate m\u00e1ximo:", "LabelMaxStreamingBitrateHelp": "Specify a max bitrate when streaming.", - "LabelMaxChromecastBitrate": "Max Chromecast bitrate:", + "LabelMaxChromecastBitrate": "Bitrate de reproducci\u00f3n Chromecast", "LabelMaxStaticBitrate": "Max sync bitrate:", "LabelMaxStaticBitrateHelp": "Specify a max bitrate when syncing content at high quality.", "LabelMusicStaticBitrate": "Music sync bitrate:", @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Grouping", "HeaderExport": "Export", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/fi.json b/MediaBrowser.Server.Implementations/Localization/Server/fi.json index 93f91b5de4..30b5173a4b 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/fi.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/fi.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Grouping", "HeaderExport": "Export", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/fr.json b/MediaBrowser.Server.Implementations/Localization/Server/fr.json index 38d55bc6f5..6f60d972d0 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/fr.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/fr.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Groupement", "HeaderExport": "Exporter", "HeaderColumns": "Colonnes", - "ButtonReset": "R\u00e9initialiser" + "ButtonReset": "R\u00e9initialiser", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/he.json b/MediaBrowser.Server.Implementations/Localization/Server/he.json index 57093d9071..d834971704 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/he.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/he.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Grouping", "HeaderExport": "Export", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/hr.json b/MediaBrowser.Server.Implementations/Localization/Server/hr.json index b8a1018937..c47ab644fe 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/hr.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/hr.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Grouping", "HeaderExport": "Export", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/it.json b/MediaBrowser.Server.Implementations/Localization/Server/it.json index b2df5a0aad..6f553d2e6b 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/it.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/it.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Grouping", "HeaderExport": "Export", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/kk.json b/MediaBrowser.Server.Implementations/Localization/Server/kk.json index 72a2ab0865..22ee04caff 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/kk.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/kk.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "\u0422\u043e\u043f\u0442\u0430\u0443", "HeaderExport": "\u042d\u043a\u0441\u043f\u043e\u0440\u0442\u0442\u0430\u0443", "HeaderColumns": "\u0411\u0430\u0493\u0430\u043d\u0434\u0430\u0440", - "ButtonReset": "\u042b\u0441\u044b\u0440\u0443" + "ButtonReset": "\u042b\u0441\u044b\u0440\u0443", + "OptionEnableExternalVideoPlayers": "\u0421\u044b\u0440\u0442\u049b\u044b \u043e\u0439\u043d\u0430\u0442\u049b\u044b\u0448\u0442\u0430\u0440\u0434\u044b \u049b\u043e\u0441\u0443" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ko.json b/MediaBrowser.Server.Implementations/Localization/Server/ko.json index cdec2c1b7e..56491d496c 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/ko.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/ko.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Grouping", "HeaderExport": "Export", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ms.json b/MediaBrowser.Server.Implementations/Localization/Server/ms.json index b73871bb02..d37faaf9f2 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/ms.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/ms.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Grouping", "HeaderExport": "Export", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/nb.json b/MediaBrowser.Server.Implementations/Localization/Server/nb.json index 80b2fc3ecf..77dd27b82c 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/nb.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/nb.json @@ -69,7 +69,7 @@ "DividerOr": "-- eller --", "HeaderInstalledServices": "Installerte programtillegg", "HeaderAvailableServices": "Tilgjengelige tjenester", - "MessageNoServicesInstalled": "No services are currently installed.", + "MessageNoServicesInstalled": "Ingen programtillegg er installert.", "HeaderToAccessPleaseEnterEasyPinCode": "To access, please enter your easy pin code", "KidsModeAdultInstruction": "Click the lock icon in the bottom right to configure or leave kids mode. Your pin code will be required.", "ButtonConfigurePinCode": "Configure pin code", @@ -169,7 +169,7 @@ "MessageNothingHere": "Ingeting her.", "MessagePleaseEnsureInternetMetadata": "P\u00e5se at nedlasting av internet-metadata er sl\u00e5tt p\u00e5.", "TabSuggested": "Forslag", - "TabSuggestions": "Suggestions", + "TabSuggestions": "Forslag", "TabLatest": "Siste", "TabUpcoming": "Kommer", "TabShows": "Show", @@ -233,7 +233,7 @@ "ScheduledTasksTitle": "Planlagte Oppgaver", "TabMyPlugins": "Mine programtillegg", "TabCatalog": "Katalog", - "TitlePlugins": "Plugins", + "TitlePlugins": "Programtillegg", "HeaderAutomaticUpdates": "Automatiske oppdateringer", "HeaderNowPlaying": "Spiller n\u00e5", "HeaderLatestAlbums": "Siste album", @@ -423,7 +423,7 @@ "LabelNumberOfGuideDays": "Antall dager av guide data som skal lastes ned", "LabelNumberOfGuideDaysHelp": "Nedlasting av guide data for flere dager gir muligheten for \u00e5 planlegge i forveien og for \u00e5 se flere listinger. Dette vil ogs\u00e5 ta lengre tid for nedlasting. Auto vil velge basert p\u00e5 antall kanaler.", "OptionAutomatic": "Auto", - "HeaderServices": "Services", + "HeaderServices": "Tjenester", "LiveTvPluginRequired": "En Live TV tilbyder trengs for \u00e5 kunne fortsette.", "LiveTvPluginRequiredHelp": "Vennligst installer en av v\u00e5re tilgjengelige programtillegg, f.eks Next Pvr eller ServerWmc.", "LabelCustomizeOptionsPerMediaType": "Tilpass for media type:", @@ -628,7 +628,7 @@ "ButtonUpdateNow": "Oppdater N\u00e5", "TabHosting": "Hosting", "PleaseUpdateManually": "Vennligst sl\u00e5 av serveren og oppdater manuelt.", - "NewServerVersionAvailable": "A new version of Emby Server is available!", + "NewServerVersionAvailable": "En ny versjon av Emby Server er tilgjengelig!", "ServerUpToDate": "Emby Server is up to date", "LabelComponentsUpdated": "F\u00f8lgende komponenter har blitt installert eller oppdatert:", "MessagePleaseRestartServerToFinishUpdating": "Vennligst restart serveren for \u00e5 fullf\u00f8re installasjon av oppdateringer.", @@ -926,13 +926,13 @@ "LabelChannelDownloadAgeHelp": "Nedlastet innhold eldre enn dette vil bli slettet. Det vil v\u00e6re avspillbart via internett streaming.", "ChannelSettingsFormHelp": "Installer kanaler som eksempel Trailers og Vimeo i programtillegg katalogen.", "ButtonOptions": "Alternativer", - "ViewTypePlaylists": "Playlists", + "ViewTypePlaylists": "Spillelister", "ViewTypeMovies": "Filmer", "ViewTypeTvShows": "TV", "ViewTypeGames": "Spill", "ViewTypeMusic": "Musikk", - "ViewTypeMusicGenres": "Genres", - "ViewTypeMusicArtists": "Artists", + "ViewTypeMusicGenres": "Sjangere", + "ViewTypeMusicArtists": "Artist", "ViewTypeBoxSets": "Samlinger", "ViewTypeChannels": "Kanaler", "ViewTypeLiveTV": "Live TV", @@ -956,7 +956,7 @@ "ViewTypeMovieFavorites": "Favoritter", "ViewTypeMovieGenres": "Sjangere", "ViewTypeMusicLatest": "Siste", - "ViewTypeMusicPlaylists": "Playlists", + "ViewTypeMusicPlaylists": "Spillelister", "ViewTypeMusicAlbums": "Albumer", "ViewTypeMusicAlbumArtists": "Album artister", "HeaderOtherDisplaySettings": "Visnings Innstillinger", @@ -1073,7 +1073,7 @@ "OptionBox": "Boks", "OptionBoxRear": "Boks bak", "OptionDisc": "Disk", - "OptionIcon": "Icon", + "OptionIcon": "Ikon", "OptionLogo": "Logo", "OptionMenu": "Meny", "OptionScreenshot": "Screenshot", @@ -1125,7 +1125,7 @@ "UserDeletedWithName": "Bruker {0} har blitt slettet", "MessageServerConfigurationUpdated": "Server konfigurasjon har blitt oppdatert", "MessageNamedServerConfigurationUpdatedWithValue": "Server konfigurasjon seksjon {0} har blitt oppdatert", - "MessageApplicationUpdated": "Emby Server has been updated", + "MessageApplicationUpdated": "Emby server har blitt oppdatert", "AuthenticationSucceededWithUserName": "{0} autentisert med suksess", "FailedLoginAttemptWithUserName": "P\u00e5loggingsfors\u00f8k feilet fra {0}", "UserDownloadingItemWithValues": "{0} laster ned {1}", @@ -1256,9 +1256,9 @@ "LabelExtractChaptersDuringLibraryScan": "Hent ut kapittel bilder under bibliotek skann", "LabelExtractChaptersDuringLibraryScanHelp": "Hvis aktivert, vil kapittel bilder bli hentet ut mens videoer importeres under bibliotek skanning.\nHvis deaktivert, vil de bli hentet ut under planlagte oppgaver for kapittel bilder, som medf\u00f8rer at vanlig bibliotek skanning blir fortere ferdig.", "LabelConnectGuestUserName": "Their Emby username or email address:", - "LabelConnectUserName": "Emby username\/email:", + "LabelConnectUserName": "Emby brukernavn\/epost", "LabelConnectUserNameHelp": "Connect this user to an Emby account to enable easy sign-in access from any Emby app without having to know the server ip address.", - "ButtonLearnMoreAboutEmbyConnect": "Learn more about Emby Connect", + "ButtonLearnMoreAboutEmbyConnect": "L\u00e6r mer om Emby Connect", "LabelExternalPlayers": "Eksterne avspillere:", "LabelExternalPlayersHelp": "Vis knapper for \u00e5 spille av innhold i eksterne avspillere. Dette er bare tilgjengelig p\u00e5 enheter som st\u00f8tter url oppsett, i hovedsak Android og iOS. Med eksterne spillere er det vanligvis ingen st\u00f8tte for fjernkontroll eller gjenopptaking.", "HeaderSubtitleProfile": "Undertekst Profil", @@ -1318,7 +1318,7 @@ "LabelConnectGuestUserNameHelp": "This is the username that your friend uses to sign in to the Emby website, or their email address.", "HeaderInviteUserHelp": "Sharing your media with friends is easier than ever before with Emby Connect.", "ButtonSendInvitation": "Send Invitasjon", - "HeaderSignInWithConnect": "Sign in with Emby Connect", + "HeaderSignInWithConnect": "Logg inn med Emby Connect", "HeaderGuests": "Gjester", "HeaderLocalUsers": "Lokale Brukere", "HeaderPendingInvitations": "Ventende invitasjoner", @@ -1337,7 +1337,7 @@ "HeaderOptionalLinkEmbyAccount": "Optional: Link your Emby account", "ButtonTrailerReel": "Trailer reel", "HeaderTrailerReel": "Trailer Reel", - "OptionPlayUnwatchedTrailersOnly": "Play only unwatched trailers", + "OptionPlayUnwatchedTrailersOnly": "Bare spill usette trailere", "HeaderTrailerReelHelp": "Start a trailer reel to play a long running playlist of trailers.", "MessageNoTrailersFound": "No trailers found. Install the Trailer channel to enhance your movie experience by adding a library of internet trailers.", "HeaderNewUsers": "Nye Brukere", @@ -1385,10 +1385,10 @@ "HeaderThisUserIsCurrentlyDisabled": "This user is currently disabled", "MessageReenableUser": "See below to reenable", "LabelEnableInternetMetadataForTvPrograms": "Download internet metadata for:", - "OptionTVMovies": "TV Movies", - "HeaderUpcomingMovies": "Upcoming Movies", - "HeaderUpcomingSports": "Upcoming Sports", - "HeaderUpcomingPrograms": "Upcoming Programs", + "OptionTVMovies": "TV serier", + "HeaderUpcomingMovies": "Kommende filmer", + "HeaderUpcomingSports": "Kommende sport", + "HeaderUpcomingPrograms": "Kommende programmer", "ButtonMoreItems": "Mer...", "LabelShowLibraryTileNames": "Show library tile names", "LabelShowLibraryTileNamesHelp": "Determines if labels will be displayed underneath library tiles on the home page", @@ -1407,29 +1407,30 @@ "LabelConversionCpuCoreLimitHelp": "Limit the number of CPU cores that will be used during sync conversion.", "OptionEnableFullSpeedConversion": "Enable full speed conversion", "OptionEnableFullSpeedConversionHelp": "By default, sync conversion is performed at a low speed to minimize resource consumption.", - "HeaderPlaylists": "Playlists", - "HeaderSelectDate": "Select Date", - "HeaderViewStyles": "View Styles", + "HeaderPlaylists": "Spillelister", + "HeaderSelectDate": "Velg dato", + "HeaderViewStyles": "Se stiler", "LabelSelectViewStyles": "Enable enhanced presentations for:", "LabelSelectViewStylesHelp": "If enabled, views will be built with metadata to offer categories such as Suggestions, Latest, Genres, and more. If disabled, they'll be displayed with simple folders.", - "TabPhotos": "Photos", - "TabVideos": "Videos", - "HeaderWelcomeToEmby": "Welcome to Emby", + "TabPhotos": "Bilder", + "TabVideos": "Filmer", + "HeaderWelcomeToEmby": "Velkommen til Emby", "EmbyIntroMessage": "With Emby you can easily stream videos, music and photos to smart phones, tablets and other devices from your Emby Server.", - "ButtonSkip": "Skip", - "TextConnectToServerManually": "Connect to server manually", - "ButtonSignInWithConnect": "Sign in with Emby Connect", - "ButtonConnect": "Connect", - "LabelServerHost": "Host:", - "LabelServerHostHelp": "192.168.1.100 or https:\/\/myserver.com", + "ButtonSkip": "Hopp over", + "TextConnectToServerManually": "Koble til server manuelt", + "ButtonSignInWithConnect": "Logg inn med Emby Connect", + "ButtonConnect": "Koble til", + "LabelServerHost": "Vert", + "LabelServerHostHelp": "192.168.1.100 eller \"https:\/\/dinserver.no\"", "LabelServerPort": "Port:", - "HeaderNewServer": "New Server", - "ButtonChangeServer": "Change Server", - "HeaderConnectToServer": "Connect to Server", + "HeaderNewServer": "Ny server", + "ButtonChangeServer": "Endre server", + "HeaderConnectToServer": "Koble til server", "OptionReportList": "List View", "OptionReportStatistics": "Statistics", "OptionReportGrouping": "Grouping", - "HeaderExport": "Export", + "HeaderExport": "Eksporter", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Resett", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/nl.json b/MediaBrowser.Server.Implementations/Localization/Server/nl.json index d941b5b17c..987eacc3d2 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/nl.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/nl.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Groupering", "HeaderExport": "Export", "HeaderColumns": "Kolommen", - "ButtonReset": "Rest" + "ButtonReset": "Rest", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pl.json b/MediaBrowser.Server.Implementations/Localization/Server/pl.json index 50cea6f701..449dc2fb57 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/pl.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/pl.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Grouping", "HeaderExport": "Export", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pt-BR.json b/MediaBrowser.Server.Implementations/Localization/Server/pt-BR.json index 54d523825c..cc33babbc6 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/pt-BR.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/pt-BR.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Agrupamento", "HeaderExport": "Exportar", "HeaderColumns": "Colunas", - "ButtonReset": "Redefinir" + "ButtonReset": "Redefinir", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ 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 06df61fd9b..996a250978 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/pt-PT.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/pt-PT.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Grouping", "HeaderExport": "Export", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ 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 f09cb3594f..221ee8f163 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/ru.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/ru.json @@ -27,7 +27,7 @@ "WindowsServiceIntro1": "Emby Server \u043e\u0431\u044b\u0447\u043d\u043e \u0440\u0430\u0431\u043e\u0442\u0430\u0435\u0442 \u043a\u0430\u043a \u043d\u0430\u0441\u0442\u043e\u043b\u044c\u043d\u043e\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0441\u043e \u0437\u043d\u0430\u0447\u043a\u043e\u043c \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u043e\u043c \u043b\u043e\u0442\u043a\u0435, \u043d\u043e \u0435\u0441\u043b\u0438 \u043f\u0440\u0435\u0434\u043f\u043e\u0447\u0442\u0438\u0442\u0435\u043b\u044c\u043d\u0430 \u0440\u0430\u0431\u043e\u0442\u0430 \u043a\u0430\u043a \u0444\u043e\u043d\u043e\u0432\u043e\u0439 \u0441\u043b\u0443\u0436\u0431\u044b, \u0432\u043c\u0435\u0441\u0442\u043e \u044d\u0442\u043e\u0433\u043e \u0435\u0433\u043e \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0447\u0435\u0440\u0435\u0437 \u0434\u0438\u0441\u043f\u0435\u0442\u0447\u0435\u0440 \u0441\u043b\u0443\u0436\u0431 Windows.", "WindowsServiceIntro2": "\u041f\u0440\u0438 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0438 \u0441\u043b\u0443\u0436\u0431\u044b Windows, \u043f\u043e\u043c\u043d\u0438\u0442\u0435, \u0447\u0442\u043e \u043d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u0430 \u043e\u0434\u043d\u043e\u0432\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f \u0440\u0430\u0431\u043e\u0442\u0430 \u0441\u043e \u0437\u043d\u0430\u0447\u043a\u043e\u043c \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u043e\u043c \u043b\u043e\u0442\u043a\u0435, \u043f\u043e\u044d\u0442\u043e\u043c\u0443 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u0437\u0430\u043a\u0440\u044b\u0442\u044c \u0437\u043d\u0430\u0447\u043e\u043a \u0432 \u043b\u043e\u0442\u043a\u0435, \u0447\u0442\u043e\u0431\u044b \u0441\u043b\u0443\u0436\u0431\u0430 \u0437\u0430\u0440\u0430\u0431\u043e\u0442\u0430\u043b\u0430. \u0421\u043b\u0443\u0436\u0431\u0443 \u0442\u0430\u043a\u0436\u0435 \u0431\u0443\u0434\u0435\u0442 \u043d\u0443\u0436\u043d\u043e \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u0447\u0435\u0440\u0435\u0437 \u043a\u043e\u043d\u0441\u043e\u043b\u044c \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0441 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u0438\u0432\u043d\u044b\u043c\u0438 \u043f\u0440\u0430\u0432\u0430\u043c\u0438. \u041f\u043e\u043c\u043d\u0438\u0442\u0435, \u0447\u0442\u043e \u0432 \u0434\u0430\u043d\u043d\u043e\u0435 \u0432\u0440\u0435\u043c\u044f \u043d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0435 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u0441\u043b\u0443\u0436\u0431\u044b, \u0442\u0430\u043a \u0447\u0442\u043e \u0434\u043b\u044f \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f \u0432\u0435\u0440\u0441\u0438\u0439 \u043f\u043e\u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0432\u0430\u0448\u0435 \u0432\u043c\u0435\u0448\u0430\u0442\u0435\u043b\u044c\u0441\u0442\u0432\u043e.", "WizardCompleted": "\u042d\u0442\u043e \u043f\u043e\u043a\u0430 \u0432\u0441\u0451 \u0447\u0442\u043e \u043d\u0430\u043c \u043d\u0443\u0436\u043d\u043e. Emby \u043d\u0430\u0447\u0438\u043d\u0430\u0435\u0442 \u0441\u043e\u0431\u0438\u0440\u0430\u0442\u044c \u0441\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043e \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0435. \u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 \u043d\u0435\u043a\u043e\u0442\u043e\u0440\u044b\u043c\u0438 \u043d\u0430\u0448\u0438\u043c\u0438 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f\u043c\u0438, \u0430 \u043f\u043e\u0442\u043e\u043c \u043d\u0430\u0436\u043c\u0438\u0442\u0435 \u0413\u043e\u0442\u043e\u0432\u043e<\/b>, \u0447\u0442\u043e\u0431\u044b \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0418\u043d\u0444\u043e\u043f\u0430\u043d\u0435\u043b\u044c \u0441\u0435\u0440\u0432\u0435\u0440\u0430<\/b>.", - "LabelConfigureSettings": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432", + "LabelConfigureSettings": "\u041d\u0430\u0437\u043d\u0430\u0447\u0438\u0442\u044c \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b", "LabelEnableVideoImageExtraction": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0438\u0437\u0432\u043b\u0435\u0447\u0435\u043d\u0438\u0435 \u0440\u0438\u0441\u0443\u043d\u043a\u043e\u0432 \u0438\u0437 \u0432\u0438\u0434\u0435\u043e", "VideoImageExtractionHelp": "\u0414\u043b\u044f \u0432\u0438\u0434\u0435\u043e, \u0433\u0434\u0435 \u043d\u0435\u0442 \u0440\u0438\u0441\u0443\u043d\u043a\u043e\u0432, \u0438 \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u043d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043d\u0430\u0439\u0442\u0438 \u0432 \u0418\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u0435. \u041f\u0440\u0438 \u044d\u0442\u043e\u043c \u0431\u0443\u0434\u0435\u0442 \u043f\u0440\u0438\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0435\u0449\u0451 \u0432\u0440\u0435\u043c\u0435\u043d\u0438 \u043a \u043d\u0430\u0447\u0430\u043b\u044c\u043d\u043e\u043c\u0443 \u0441\u043a\u0430\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044e \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438, \u043d\u043e \u044d\u0442\u043e \u043f\u0440\u0438\u0432\u0435\u0434\u0451\u0442 \u043a \u0431\u043e\u043b\u0435\u0435 \u043f\u0440\u0438\u0432\u043b\u0435\u043a\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u043c\u0443 \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044e.", "LabelEnableChapterImageExtractionForMovies": "\u0418\u0437\u0432\u043b\u0435\u043a\u0430\u0442\u044c \u0440\u0438\u0441\u0443\u043d\u043a\u0438 \u0441\u0446\u0435\u043d \u0434\u043b\u044f \u0444\u0438\u043b\u044c\u043c\u043e\u0432", @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "\u0413\u0440\u0443\u043f\u043f\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435", "HeaderExport": "\u042d\u043a\u0441\u043f\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435", "HeaderColumns": "\u041a\u043e\u043b\u043e\u043d\u043a\u0438", - "ButtonReset": "\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c" + "ButtonReset": "\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c", + "OptionEnableExternalVideoPlayers": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0432\u043d\u0435\u0448\u043d\u0438\u0435 \u043f\u0440\u043e\u0438\u0433\u0440\u044b\u0432\u0430\u0442\u0435\u043b\u0438 \u0432\u0438\u0434\u0435\u043e" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/sl-SI.json b/MediaBrowser.Server.Implementations/Localization/Server/sl-SI.json index 83f5dd0723..94061b9d02 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/sl-SI.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/sl-SI.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Grouping", "HeaderExport": "Export", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/sv.json b/MediaBrowser.Server.Implementations/Localization/Server/sv.json index 204d29fdb1..9480b6dc17 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/sv.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/sv.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Grouping", "HeaderExport": "Export", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/tr.json b/MediaBrowser.Server.Implementations/Localization/Server/tr.json index 1fe855c75b..3243d385ae 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/tr.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/tr.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Grouping", "HeaderExport": "Export", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/uk.json b/MediaBrowser.Server.Implementations/Localization/Server/uk.json index e2f56eef17..f6f05206e3 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/uk.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/uk.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Grouping", "HeaderExport": "Export", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/vi.json b/MediaBrowser.Server.Implementations/Localization/Server/vi.json index 6ade2beb10..487f133b91 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/vi.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/vi.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Grouping", "HeaderExport": "Export", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/zh-CN.json b/MediaBrowser.Server.Implementations/Localization/Server/zh-CN.json index 1f19abe5ee..9cef04b9f3 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/zh-CN.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/zh-CN.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Grouping", "HeaderExport": "Export", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Localization/Server/zh-TW.json b/MediaBrowser.Server.Implementations/Localization/Server/zh-TW.json index d311249a20..054505c38c 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/zh-TW.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/zh-TW.json @@ -1431,5 +1431,6 @@ "OptionReportGrouping": "Grouping", "HeaderExport": "Export", "HeaderColumns": "Columns", - "ButtonReset": "Reset" + "ButtonReset": "Reset", + "OptionEnableExternalVideoPlayers": "Enable external video players" } \ No newline at end of file diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs index 4c25c968cf..0c14520270 100644 --- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs +++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs @@ -458,7 +458,7 @@ namespace MediaBrowser.Server.Startup.Common ConnectManager = new ConnectManager(LogManager.GetLogger("Connect"), ApplicationPaths, JsonSerializer, encryptionManager, HttpClient, this, ServerConfigurationManager, UserManager, ProviderManager, SecurityManager); RegisterSingleInstance(ConnectManager); - DeviceManager = new DeviceManager(new DeviceRepository(ApplicationPaths, JsonSerializer, LogManager.GetLogger("DeviceManager"), FileSystemManager), UserManager, FileSystemManager, LibraryMonitor, ConfigurationManager, LogManager.GetLogger("DeviceManager")); + DeviceManager = new DeviceManager(new DeviceRepository(ApplicationPaths, JsonSerializer, LogManager.GetLogger("DeviceManager"), FileSystemManager), UserManager, FileSystemManager, LibraryMonitor, ConfigurationManager, LogManager.GetLogger("DeviceManager"), NetworkManager); RegisterSingleInstance(DeviceManager); var newsService = new Implementations.News.NewsService(ApplicationPaths, JsonSerializer); diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 4315c20231..3871cb9d66 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -225,6 +225,7 @@ PreserveNewest + PreserveNewest diff --git a/SharedVersion.cs b/SharedVersion.cs index 1f434195a2..95f572b03c 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -//[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5621.2")] +[assembly: AssemblyVersion("3.0.*")] +//[assembly: AssemblyVersion("3.0.5621.2")]