Merge pull request #3 from MediaBrowser/master

Sync with Master

1 files changed, 102 insertions, 5 deletions

diff --git a/MediaBrowser.Server.Implementations/Localization/Server/nb.json b/MediaBrowser.Server.Implementations/Localization/Server/nb.json
index 30ddaf6ac..f1e208a95 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/nb.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/nb.json
@@ -76,6 +76,7 @@
     "LabelMaxParentalRating": "Maximum allowed parental rating:",
     "MaxParentalRatingHelp": "Innhold med h\u00f8yere aldersgrense vil bli skjult for brukeren",
     "LibraryAccessHelp": "Select the media folders to share with this user. Administrators will be able to edit all folders using the metadata manager.",
+    "ChannelAccessHelp": "Select the channels to share with this user. Administrators will be able to edit all channels using the metadata manager.",
     "ButtonDeleteImage": "Slett bilde",
     "LabelSelectUsers": "Select users:",
     "ButtonUpload": "Last opp",
@@ -146,10 +147,8 @@
     "ScheduledTasksTitle": "Scheduled Tasks",
     "TabMyPlugins": "My Plugins",
     "TabCatalog": "Katalog",
-    "TabUpdates": "Oppdateringer",
     "PluginsTitle": "Plugins",
     "HeaderAutomaticUpdates": "Automatiske oppdateringer",
-    "HeaderUpdateLevel": "Oppdaterings-niv\u00e5",
     "HeaderNowPlaying": "Spiller n\u00e5",
     "HeaderLatestAlbums": "Siste album",
     "HeaderLatestSongs": "siste l\u00e5ter",
@@ -267,7 +266,7 @@
     "LabelAutomaticUpdatesTmdbHelp": "If enabled, new images will be downloaded automatically as they're added to TheMovieDB.org. Existing images will not be replaced.",
     "LabelAutomaticUpdatesTvdbHelp": "If enabled, new images will be downloaded automatically as they're added to TheTVDB.com. Existing images will not be replaced.",
     "ExtractChapterImagesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
-    "LabelMetadataDownloadLanguage": "Preferred language:",
+    "LabelMetadataDownloadLanguage": "Preferred download language:",
     "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.",
@@ -515,7 +514,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",
@@ -565,6 +564,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",
@@ -614,5 +614,102 @@
     "NotificationOptionPluginError": "Plugin failure",
     "ButtonVolumeUp": "Volume up",
     "ButtonVolumeDown": "Volume down",
-    "ButtonMute": "Mute"
+    "ButtonMute": "Mute",
+    "HeaderLatestMedia": "Latest Media",
+    "OptionNoSubtitles": "No Subtitles",
+    "OptionSpecialFeatures": "Special Features",
+    "HeaderCollections": "Collections",
+    "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": "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.",
+    "HeaderContainerProfile": "Container Profile",
+    "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.",
+    "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.",
+    "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:"
 }
\ No newline at end of file