Merge remote-tracking branch 'official/master'

1 files changed, 50 insertions, 1 deletions

diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index caf8860fc..a88ba8592 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -808,6 +808,8 @@
     "TabNextUp": "Next Up",
     "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
     "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the New button to start creating Collections.",
+    "MessageNoPlaylistsAvailable":  "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
+    "MessageNoPlaylistItemsAvailable":  "This playlist is currently empty.",
     "HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",
     "ButtonDismiss": "Dismiss",
     "MessageLearnHowToCustomize": "Learn how to customize this page to your own personal tastes. Click your user icon in the top right corner of the screen to view and update your preferences.",
@@ -915,5 +917,52 @@
     "OptionProtocolHls": "Http Live Streaming",
     "LabelContext": "Context:",
     "OptionContextStreaming": "Streaming",
-    "OptionContextStatic": "Sync"
+    "OptionContextStatic": "Sync",
+    "ButtonAddToPlaylist":  "Add to playlist",
+    "TabPlaylists":  "Playlists",
+	"ButtonClose": "Close",
+	"LabelAllLanguages": "All languages",
+	"HeaderBrowseOnlineImages": "Browse Online Images",
+	"LabelSource": "Source:",
+	"OptionAll": "All",
+	"LabelImage": "Image:",
+	"ButtonUpload": "Upload",
+	"ButtonBrowseImages": "Browse Images",
+	"HeaderImages": "Images",
+	"HeaderBackdrops": "Backdrops",
+	"HeaderScreenshots": "Screenshots",
+	"HeaderAddUpdateImage": "Add/Update Image",
+	"LabelDropImageHere": "Drop image here",
+	"LabelJpgPngOnly": "JPG/PNG only",
+	"LabelImageType": "Image type:",
+	"OptionPrimary": "Primary",
+	"OptionArt": "Art",
+	"OptionBackdrop": "Backdrop",
+	"OptionBox": "Box",
+	"OptionBoxRear": "Box rear",
+	"OptionDisc": "Disc",
+	"OptionLogo": "Logo",
+	"OptionMenu": "Menu",
+	"OptionScreenshot": "Screenshot",
+	"OptionLocked": "Locked",
+	"OptionUnidentified": "Unidentified",
+	"OptionMissingParentalRating": "Missing parental rating",
+	"OptionStub": "Stub",
+	"HeaderEpisodes": "Episodes:",
+	"OptionSeason0": "Season 0",
+	"LabelReport": "Report:",
+	"OptionReportSongs": "Songs",
+	"OptionReportSeries": "Series",
+	"OptionReportSeasons": "Seasons",
+	"OptionReportTrailers": "Trailers",
+	"OptionReportMusicVideos": "Music videos",
+	"OptionReportMovies": "Movies",
+	"OptionReportHomeVideos": "Home videos",
+	"OptionReportGames": "Games",
+	"OptionReportEpisodes": "Episodes",
+	"OptionReportCollections": "Collections",
+	"OptionReportBooks": "Books",
+	"OptionReportArtists": "Artists",
+	"OptionReportAlbums": "Albums",
+	"OptionReportAdultVideos": "Adult videos"
 }