Merge pull request #3 from MediaBrowser/master

Sync with Master

1 files changed, 129 insertions, 8 deletions

diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 8e2fa18b9..258d7bff2 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -147,10 +147,8 @@
 	"ScheduledTasksTitle": "Scheduled Tasks",
 	"TabMyPlugins": "My Plugins",
 	"TabCatalog": "Catalog",
-	"TabUpdates": "Updates",
 	"PluginsTitle": "Plugins",
 	"HeaderAutomaticUpdates": "Automatic Updates",
-	"HeaderUpdateLevel": "Update Level",
 	"HeaderNowPlaying": "Now Playing",
 	"HeaderLatestAlbums": "Latest Albums",
 	"HeaderLatestSongs": "Latest Songs",
@@ -163,6 +161,10 @@
 	"OptionIso": "Iso",
 	"Option3D": "3D",
 	"LabelFeatures": "Features:",
+	"LabelService": "Service:",
+	"LabelStatus": "Status:",
+	"LabelVersion": "Version:",
+	"LabelLastResult": "Last result:",
 	"OptionHasSubtitles": "Subtitles",
 	"OptionHasTrailer": "Trailer",
 	"OptionHasThemeSong": "Theme Song",
@@ -272,8 +274,8 @@
 	"ButtonAutoScroll": "Auto-scroll",
 	"LabelImageSavingConvention": "Image saving convention:",
 	"LabelImageSavingConventionHelp": "Media Browser recognizes images from most major media applications. Choosing your downloading convention is useful if you also use other products.",
-	"OptionImageSavingCompatible": "Compatible - MB3/Plex/Xbmc",
-	"OptionImageSavingStandard": "Standard - MB3/MB2",
+	"OptionImageSavingCompatible": "Compatible - Media Browser/Plex/Xbmc",
+	"OptionImageSavingStandard": "Standard - MB2",
 	"ButtonSignIn": "Sign In",
 	"TitleSignIn": "Sign In",
 	"HeaderPleaseSignIn": "Please sign in",
@@ -283,10 +285,13 @@
 	"PasswordLocalhostMessage": "Passwords are not required when logging in from localhost.",
 	"TabGuide": "Guide",
 	"TabChannels": "Channels",
+	"TabCollections": "Collections",
 	"HeaderChannels": "Channels",
 	"TabRecordings": "Recordings",
 	"TabScheduled": "Scheduled",
 	"TabSeries": "Series",
+	"TabFavorites": "Favorites",
+	"TabMyLibrary": "My Library",
 	"ButtonCancelRecording": "Cancel Recording",
 	"HeaderPrePostPadding": "Pre/Post Padding",
 	"LabelPrePaddingMinutes": "Pre-padding minutes:",
@@ -520,7 +525,7 @@
 	"ErrorConnectingToMediaBrowserRepository": "There was an error connecting to the remote Media Browser repository.",
 	"LabelComponentsUpdated": "The following components have been installed or updated:",
 	"MessagePleaseRestartServerToFinishUpdating": "Please restart the server to finish applying updates.",
-	"LabelDownMixAudioScale": "Down mix audio boost scale:",
+	"LabelDownMixAudioScale": "Audio boost when downmixing:",
 	"LabelDownMixAudioScaleHelp": "Boost audio when downmixing. Set to 1 to preserve original volume value.",
 	"ButtonLinkKeys": "Link Keys",
 	"LabelOldSupporterKey": "Old supporter key",
@@ -535,8 +540,8 @@
 	"ButtonRetrieveKey": "Retrieve Key",
 	"LabelSupporterKey": "Supporter Key (paste from email)",
 	"LabelSupporterKeyHelp": "Enter your supporter key to start enjoying additional benefits the community has developed for Media Browser.",
-	"MessageInvalidKey": "MB3 Key Missing or Invalid",
-	"ErrorMessageInvalidKey": "In order for any premium content to be registered, you must also be an MB3 Supporter. Please donate and support the continued development of the core product. Thank you.",
+	"MessageInvalidKey": "Supporter key is missing or invalid.",
+	"ErrorMessageInvalidKey": "In order for any premium content to be registered, you must also be a Media Browser Supporter. Please donate and support the continued development of the core product. Thank you.",
 	"HeaderDisplaySettings": "Display Settings",
 	"TabPlayTo": "Play To",
 	"LabelEnableDlnaServer": "Enable Dlna server",
@@ -570,6 +575,7 @@
 	"NotificationOptionTaskFailed": "Scheduled task failure",
 	"NotificationOptionInstallationFailed": "Installation failure",
 	"NotificationOptionNewLibraryContent": "New content added",
+	"NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
 	"SendNotificationHelp": "By default, notifications are delivered to the dashboard inbox. Browse the plugin catalog to install additional notification options.",
 	"NotificationOptionServerRestartRequired": "Server restart required",
 	"LabelNotificationEnabled": "Enable this notification",
@@ -593,6 +599,7 @@
 	"ButtonArrowRight": "Right",
 	"ButtonBack": "Back",
 	"ButtonInfo": "Info",
+	"ButtonOsd": "On screen display",
 	"ButtonPageUp": "Page Up",
 	"ButtonPageDown": "Page Down",
 	"PageAbbreviation": "PG",
@@ -624,5 +631,119 @@
 	"ButtonMute": "Mute",
 	"HeaderLatestMedia": "Latest Media",
 	"OptionNoSubtitles": "No Subtitles",
-	"OptionSpecialFeatures": "Special Features"
+	"OptionSpecialFeatures": "Special Features",
+	"HeaderCollections": "Collections",
+	"HeaderChannels": "Channels",
+	"HeaderMyLibrary": "My Library",
+	"LabelProfileCodecsHelp": "Separated by comma. This can be left empty to apply to all codecs.",
+	"LabelProfileContainersHelp": "Separated by comma. This can be left empty to apply to all containers.",
+	"HeaderResponseProfile": "Response Profile",
+	"LabelType": "Type:",
+	"LabelProfileContainer": "Container:",
+	"LabelProfileVideoCodecs": "Video codecs:",
+	"LabelProfileAudioCodecs": "Audio codecs:",
+	"LabelProfileCodecs": "Codecs:",
+	"HeaderDirectPlayProfile": "Direct Play Profile",
+	"HeaderTranscodingProfile": "Transcoding Profile",
+	"HeaderCodecProfile": "Codec Profile",
+	"HeaderCodecProfileHelp": "Define additional conditions that must be met in order for a codec to be direct played.",
+	"HeaderContainerProfile": "Container Profile",
+	"HeaderContainerProfileHelp": "Define additional conditions that must be met in order for a file to be direct played.",
+	"OptionProfileVideo": "Video",
+	"OptionProfileAudio": "Audio",
+	"OptionProfileVideoAudio": "Video Audio",
+	"OptionProfilePhoto": "Photo",
+	"LabelUserLibrary": "User library:",
+	"LabelUserLibraryHelp": "Select which user library to display to the device. Leave empty to inherit the default setting.",
+	"OptionPlainStorageFolders": "Display all folders as plain storage folders",
+	"OptionPlainStorageFoldersHelp": "If enabled, all folders are represented in DIDL as \"object.container.storageFolder\" instead of a more specific type, such as \"object.container.person.musicArtist\".",
+	"OptionPlainVideoItems": "Display all videos as plain video items",
+	"OptionPlainVideoItemsHelp": "If enabled, all videos are represented in DIDL as \"object.item.videoItem\" instead of a more specific type, such as \"object.item.videoItem.movie\".",
+	"LabelSupportedMediaTypes": "Supported Media Types:",
+	"TabIdentification": "Identification",
+	"TabDirectPlay": "Direct Play",
+	"TabContainers": "Containers",
+	"TabCodecs": "Codecs",
+	"TabResponses": "Responses",
+	"HeaderProfileInformation": "Profile Information",
+	"LabelEmbedAlbumArtDidl": "Embed album art in Didl",
+	"LabelEmbedAlbumArtDidlHelp": "Some devices prefer this method for obtaining album art. Others may fail to play with this option enabled.",
+	"LabelAlbumArtPN": "Album art PN:",
+	"LabelAlbumArtHelp": "PN used for album art, within the dlna:profileID attribute on upnp:albumArtURI. Some clients require a specific value, regardless of the size of the image.",
+	"LabelAlbumArtMaxWidth": "Album art max width:",
+	"LabelAlbumArtMaxWidthHelp": "Max resolution of album art exposed via upnp:albumArtURI.",
+	"LabelAlbumArtMaxHeight": "Album art max height:",
+	"LabelAlbumArtMaxHeightHelp": "Max resolution of album art exposed via upnp:albumArtURI.",
+	"LabelIconMaxWidth": "Icon max width:",
+	"LabelIconMaxWidthHelp": "Max resolution of icons exposed via upnp:icon.",
+	"LabelIconMaxHeight": "Icon max height:",
+	"LabelIconMaxHeightHelp": "Max resolution of icons exposed via upnp:icon.",
+	"LabelIdentificationFieldHelp": "A case-insensitive substring or regex expression.",
+	"HeaderProfileServerSettingsHelp": "These values control how Media Browser will present itself to the device.",
+	"LabelMaxBitrate": "Max bitrate:",
+	"LabelMaxBitrateHelp": "Specify a max bitrate in bandwidth constrained environments, or if the device imposes it's own limit.",
+	"OptionIgnoreTranscodeByteRangeRequests": "Ignore transcode byte range requests",
+	"OptionIgnoreTranscodeByteRangeRequestsHelp": "If enabled, these requests will be honored but will ignore the byte range header.",
+	"LabelFriendlyName": "Friendly name",
+	"LabelManufacturer": "Manufacturer",
+	"LabelManufacturerUrl": "Manufacturer url",
+	"LabelModelName": "Model name",
+	"LabelModelNumber": "Model number",
+	"LabelModelDescription": "Model description",
+	"LabelModelUrl": "Model url",
+	"LabelSerialNumber": "Serial number",
+	"LabelDeviceDescription": "Device description",
+	"HeaderIdentificationCriteriaHelp": "Enter at least one identification criteria.",
+	"HeaderDirectPlayProfileHelp": "Add direct play profiles to indicate which formats the device can handle natively.",
+	"HeaderTranscodingProfileHelp": "Add transcoding profiles to indicate which formats should be used when transcoding is required.",
+	"HeaderContainerProfileHelp": "Container profiles indicate the limitations of a device when playing specific formats. If a limitation applies then the media will be transcoded, even if the format is configured for direct play.",
+	"HeaderCodecProfileHelp": "Codec profiles indicate the limitations of a device when playing specific codecs. If a limitation applies then the media will be transcoded, even if the codec is configured for direct play.",
+	"HeaderResponseProfileHelp": "Response profiles provide a way to customize information sent to the device when playing certain kinds of media.",
+	"LabelXDlnaCap": "X-Dlna cap:",
+	"LabelXDlnaCapHelp": "Determines the content of the X_DLNACAP element in the urn:schemas-dlna-org:device-1-0 namespace.",
+	"LabelXDlnaDoc": "X-Dlna doc:",
+	"LabelXDlnaDocHelp": "Determines the content of the X_DLNADOC element in the urn:schemas-dlna-org:device-1-0 namespace.",
+	"LabelSonyAggregationFlags": "Sony aggregation flags:",
+	"LabelSonyAggregationFlagsHelp": "Determines the content of the aggregationFlags element in the urn:schemas-sonycom:av namespace.",
+	"LabelTranscodingContainer": "Container:",
+	"LabelTranscodingVideoCodec": "Video codec:",
+	"LabelTranscodingVideoProfile": "Video profile:",
+	"LabelTranscodingAudioCodec": "Audio codec:",
+	"OptionEnableM2tsMode": "Enable M2ts mode",
+	"OptionEnableM2tsModeHelp": "Enable m2ts mode when encoding to mpegts.",
+	"OptionEstimateContentLength": "Estimate content length when transcoding",
+	"OptionReportByteRangeSeekingWhenTranscoding": "Report that the server supports byte seeking when transcoding",
+	"OptionReportByteRangeSeekingWhenTranscodingHelp": "This is required for some devices that don't time seek very well.",
+	"HeaderSubtitleDownloadingHelp": "When Media Browser scans your video files it can search for missing subtitles, and download them using a subtitle provider such as OpenSubtitles.org.",
+	"HeaderDownloadSubtitlesFor": "Download subtitles for:",
+	"LabelSkipIfGraphicalSubsPresent": "Skip if the video already contains graphical subtitles",
+	"LabelSkipIfGraphicalSubsPresentHelp": "Keeping text versions of subtitles will result in more efficient delivery to mobile clients.",
+	"TabSubtitles": "Subtitles",
+	"LabelOpenSubtitlesUsername": "Open Subtitles username:",
+	"LabelOpenSubtitlesPassword": "Open Subtitles password:",
+	"LabelAudioLanguagePreferenceHelp": "If empty, the default audio track will be selected, regardless of language.",
+	"LabelDownloadLanguages": "Download languages:",
+	"ButtonRegister": "Register",
+	"LabelSkipIfAudioTrackPresent": "Skip if the default audio track matches the download language",
+	"LabelSkipIfAudioTrackPresentHelp": "Uncheck this to ensure all videos have subtitles, regardless of audio language.",
+	"HeaderSendMessage": "Send Message",
+	"ButtonSend": "Send",
+	"LabelMessageText": "Message text:",
+	"LabelMessageTitle": "Message title:",
+	"MessageNoAvailablePlugins": "No available plugins.",
+	"LabelDisplayPluginsFor": "Display plugins for:",
+	"PluginTabMediaBrowserClassic": "MB Classic",
+	"PluginTabMediaBrowserTheater": "MB Theater",
+	"TabOtherPlugins": "Others",
+	"LabelEpisodeName": "Episode name",
+	"LabelSeriesName": "Series name",
+	"ValueSeriesNamePeriod": "Series.name",
+	"ValueSeriesNameUnderscore": "Series_name",
+	"ValueEpisodeNamePeriod": "Episode.name",
+	"ValueEpisodeNameUnderscore": "Episode_name",
+	"LabelSeasonNumber": "Season number",
+	"LabelEpisodeNumber": "Episode number",
+	"LabelEndingEpisodeNumber": "Ending episode number",
+	"HeaderTypeText": "Enter Text",
+	"LabelTypeText": "Text"
 }
\ No newline at end of file