diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
index 8b8d7d30c..8bc244891 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -38,6 +38,7 @@
"HeaderSupportTheTeam": "Support the Emby Team",
"TextEnjoyBonusFeatures": "Enjoy Bonus Features",
"TitleLiveTV": "Live TV",
+ "ButtonCancelSyncJob": "Cancel sync job",
"TitleSync": "Sync",
"HeaderSelectDate": "Select Date",
"ButtonDonate": "Donate",
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index 9b20ac717..c0830c8c9 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -99,7 +99,6 @@
Component
-
Form
diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index 06fbd1a7d..fd353962a 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -262,7 +262,7 @@ namespace MediaBrowser.WebDashboard.Api
html = html.Replace("", "")
.Replace("", "");
+ .Replace("", "");
}
if (enableMinification)
@@ -666,7 +666,6 @@ namespace MediaBrowser.WebDashboard.Api
"pluginupdates.css",
"remotecontrol.css",
"userimage.css",
- "livetv.css",
"nowplaying.css",
"materialize.css"
};
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 39481e9a4..074628a8d 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -178,6 +178,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -421,6 +433,13 @@
+
+
+
+
+
+
+
@@ -541,6 +560,9 @@
PreserveNewest
+
+ PreserveNewest
+
PreserveNewest
@@ -634,18 +656,6 @@
PreserveNewest
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
PreserveNewest
@@ -2750,6 +2760,9 @@
+
+
+
@@ -2793,6 +2806,9 @@
+
+
+
@@ -2933,9 +2949,6 @@
PreserveNewest
-
- PreserveNewest
-