From 8f3256a12ca8bcc1dfcca7f4440d27bf6f585a4b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 18 Mar 2015 12:56:14 -0400
Subject: [PATCH] combine playlist with remote control

---
 .../Localization/Server/server.json                         | 1 +
 MediaBrowser.WebDashboard/Api/PackageCreator.cs             | 1 -
 MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj  | 6 ------
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 2ea4b3a5e5..c2a115df45 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -62,6 +62,7 @@
     "HeaderVideo": "Video",
     "HeaderPaths": "Paths",
     "CategorySync": "Sync",
+    "TabPlaylist": "Playlist",
     "HeaderEasyPinCode": "Easy Pin Code",
     "HeaderGrownupsOnly": "Grown-ups Only!",
     "DividerOr": "-- or --",
diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index ac94f680b2..a93cccfbcf 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -473,7 +473,6 @@ namespace MediaBrowser.WebDashboard.Api
                                 "notificationlist.js",
                                 "notificationsetting.js",
                                 "notificationsettings.js",
-                                "playlist.js",
                                 "playlists.js",
                                 "playlistedit.js",
 
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 6f34f6d15d..f945ce0821 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -1774,9 +1774,6 @@
     <Content Include="dashboard-ui\songs.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\playlist.html">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\scripts\moviecollections.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -1822,9 +1819,6 @@
     <Content Include="dashboard-ui\scripts\songs.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\scripts\playlist.js">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="dashboard-ui\scripts\librarybrowser.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>