diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index c0917b8df7..99aa12467e 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -690,7 +690,7 @@ namespace MediaBrowser.Api.Playback
// TODO: Perhaps also use original_size=1920x800 ??
return string.Format("subtitles=filename='{0}'{1},setpts=PTS -{2}/TB",
- subtitlePath.Replace("'", "\\'").Replace('\\', '/').Replace(":/", "\\:/"),
+ subtitlePath.Replace('\\', '/').Replace("'", "\\'").Replace(":/", "\\:/"),
charsetParam,
seconds.ToString(UsCulture));
}
@@ -698,7 +698,7 @@ namespace MediaBrowser.Api.Playback
var mediaPath = state.MediaPath ?? string.Empty;
return string.Format("subtitles='{0}:si={1}',setpts=PTS -{2}/TB",
- mediaPath.Replace("'", "\\'").Replace('\\', '/').Replace(":/", "\\:/"),
+ mediaPath.Replace('\\', '/').Replace("'", "\\'").Replace(":/", "\\:/"),
state.InternalSubtitleStreamOffset.ToString(UsCulture),
seconds.ToString(UsCulture));
}
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 7e70cd9422..2d9b0e02d3 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -1453,5 +1453,6 @@
"ButtonReset": "Reset",
"OptionEnableExternalVideoPlayers": "Enable external video players",
"ButtonUnlockGuide": "Unlock Guide",
- "LabelEnableFullScreen": "Enable fullscreen mode"
+ "LabelEnableFullScreen": "Enable fullscreen mode",
+ "LabelEnableChromecastAc3Passthrough": "Enable Chromecast AC3 Passthrough"
}
diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index 0534ffe5f9..226dd462a6 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -597,11 +597,7 @@ namespace MediaBrowser.WebDashboard.Api
"syncactivity.js",
"thememediaplayer.js",
"useredit.js",
- "userpassword.js",
- "userprofilespage.js",
- "userparentalcontrol.js",
- "userlibraryaccess.js",
- "wizardstartpage.js"
+ "userprofilespage.js"
};
}
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 92a3f5c16a..749341ebad 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -120,6 +120,9 @@
PreserveNewest
+
+ PreserveNewest
+
PreserveNewest