Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

1 files changed, 41 insertions, 2 deletions

diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 9630509d3..134716dc1 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -15,7 +15,7 @@
 	"LabelNext": "Next",
 	"LabelYoureDone": "You're Done!",
 	"WelcomeToMediaBrowser": "Welcome to Media Browser!",
-	"LabelMediaBrowser": "Media Browser",
+	"TitleMediaBrowser": "Media Browser",
 	"ThisWizardWillGuideYou": "This wizard will help guide you through the setup process.",
 	"TellUsAboutYourself": "Tell us about yourself",
 	"LabelYourFirstName": "Your first name:",
@@ -46,5 +46,44 @@
 	"LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
 	"LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
 	"LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
-	"LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations."
+	"LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations.",
+	"TabPreferences": "Preferences",
+	"TabPassword": "Password",
+	"TabLibraryAccess": "Library Access",
+	"TabImage": "Image",
+	"TabProfile": "Profile",
+	"LabelDisplayMissingEpisodesWithinSeasons": "Display missing episodes within seasons",
+	"LabelUnairedMissingEpisodesWithinSeasons": "Display unaired episodes within seasons",
+	"HeaderVideoPlaybackSettings": "Video Playback Settings",
+	"LabelAudioLanguagePreference": "Audio language preference:",
+	"LabelSubtitleLanguagePreference": "Subtitle language preference:",
+	"LabelDisplayForcedSubtitlesOnly": "Display only forced subtitles",
+	"TabProfiles": "Profiles",
+	"TabSecurity": "Security",
+	"ButtonAddUser": "Add User",
+	"ButtonSave": "Save",
+	"ButtonResetPassword": "Reset Password",
+	"LabelNewPassword": "New password:",
+	"LabelNewPasswordConfirm": "New password confirm:",
+	"HeaderCreatePassword": "Create Password",
+	"LabelCurrentPassword": "Current password:",
+	"LabelMaxParentalRating": "Maximum allowed parental rating:",
+	"MaxParentalRatingHelp": "Content with a higher rating will be hidden from this user.",
+	"LibraryAccessHelp": "Select the media folders to share with this user. Administrators will be able to edit all folders using the metadata manager.",
+	"ButtonDeleteImage": "Delete Image",
+	"ButtonUpload": "Upload",
+	"HeaderUploadNewImage": "Upload New Image",
+	"LabelDropImageHere": "Drop Image Here",
+	"ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG/PNG only.",
+	"MessageNothingHere": "Nothing here.",
+	"MessagePleaseEnsureInternetMetadata": "Please ensure downloading of internet metadata is enabled.",
+	"TabSuggested": "Suggested",
+	"TabLatest": "Latest",
+	"TabUpcoming": "Upcoming",
+	"TabShows": "Shows",
+	"TabEpisodes": "Episodes",
+	"TabGenres": "Genres",
+	"TabPeople": "People",
+	"TabNetworks": "Networks",
+	"HeaderUsers": "Users"
 }
\ No newline at end of file