Merge pull request #1005 from MediaBrowser/dev

3.0.5518.0

1 files changed, 68 insertions, 31 deletions

diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 1935fba93..e5d7b1d58 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -32,7 +32,7 @@
     "LabelEnableVideoImageExtraction": "Enable video image extraction",
     "VideoImageExtractionHelp": "For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.",
     "LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
-    "LabelChapterImageExtractionForMoviesHelp": "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.",
+    "LabelChapterImageExtractionForMoviesHelp": "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, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
     "LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
     "LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
     "HeaderTermsOfService": "Media Browser Terms of Service",
@@ -40,12 +40,32 @@
     "OptionIAcceptTermsOfService": "I accept the terms of service",
     "ButtonPrivacyPolicy": "Privacy policy",
     "ButtonTermsOfService": "Terms of Service",
+    "HeaderDeveloperOptions": "Developer Options",
+    "OptionEnableWebClientResponseCache": "Enable web client response caching",
+    "OptionDisableForDevelopmentHelp": "Configure these as needed for web client development purposes.",
+    "OptionEnableWebClientResourceMinification": "Enable web client resource minification",
+    "LabelDashboardSourcePath": "Web client source path:",
+    "LabelDashboardSourcePathHelp": "If running the server from source, specify the path to the dashboard-ui folder. All web client files will be served from this location.",
+    "ButtonConvertMedia": "Convert media",
+    "ButtonOrganize": "Organize",
     "ButtonOk": "Ok",
     "ButtonCancel": "Cancel",
     "ButtonNew": "New",
     "HeaderTV": "TV",
     "HeaderAudio": "Audio",
     "HeaderVideo": "Video",
+    "HeaderPaths": "Paths",
+    "CategorySync": "Sync",
+    "HeaderEasyPinCode": "Easy Pin Code",
+    "RegisterWithPayPal": "Register with PayPal",
+    "HeaderSyncRequiresSupporterMembership": "Sync Requires a Supporter Membership",
+    "HeaderEnjoyDayTrial": "Enjoy a 14 Day Free Trial",
+    "LabelSyncTempPath": "Temporary file path:",
+    "LabelSyncTempPathHelp": "Specify a custom sync working folder. Converted media created during the sync process will be stored here.",
+    "LabelCustomCertificatePath": "Custom certificate path:",
+    "LabelCustomCertificatePathHelp": "Supply your own ssl certificate .pfx file. If omitted, the server will create a self-signed certificate.",
+    "TitleNotifications": "Notifications",
+    "ButtonDonateWithPayPal": "Donate with PayPal",
     "OptionDetectArchiveFilesAsMedia": "Detect archive files as media",
     "OptionDetectArchiveFilesAsMediaHelp": "If enabled, files with .rar and .zip extensions will be detected as media files.",
     "LabelEnterConnectUserName": "User name or email:",
@@ -63,12 +83,14 @@
     "FolderTypeTvShows": "TV",
     "FolderTypeInherit": "Inherit",
     "LabelContentType": "Content type:",
+    "TitleScheduledTasks": "Scheduled Tasks",
     "HeaderSetupLibrary": "Setup your media library",
     "ButtonAddMediaFolder": "Add media folder",
     "LabelFolderType": "Folder type:",
     "ReferToMediaLibraryWiki": "Refer to the media library wiki.",
     "LabelCountry": "Country:",
     "LabelLanguage": "Language:",
+    "ButtonJoinTheDevelopmentTeam": "Join the Development Team",
     "HeaderPreferredMetadataLanguage": "Preferred metadata language:",
     "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.",
@@ -86,6 +108,8 @@
     "TabCollectionTitles": "Titles",
     "HeaderDeviceAccess": "Device Access",
     "OptionEnableAccessFromAllDevices": "Enable access from all devices",
+    "OptionEnableAccessToAllChannels": "Enable access to all channels",
+    "OptionEnableAccessToAllLibraries": "Enable access to all libraries",
     "DeviceAccessHelp": "This only applies to devices that can be uniquely identified and will not prevent browser access. Filtering user device access will prevent them from using new devices until they've been approved here.",
     "LabelDisplayMissingEpisodesWithinSeasons": "Display missing episodes within seasons",
     "LabelUnairedMissingEpisodesWithinSeasons": "Display unaired episodes within seasons",
@@ -262,9 +286,9 @@
     "OptionAllowUserToManageServer": "Allow this user to manage the server",
     "HeaderFeatureAccess": "Feature Access",
     "OptionAllowMediaPlayback": "Allow media playback",
-    "OptionAllowBrowsingLiveTv": "Allow browsing of live tv",
-    "OptionAllowDeleteLibraryContent": "Allow deletion of library content",
-    "OptionAllowManageLiveTv": "Allow management of live tv recordings",
+    "OptionAllowBrowsingLiveTv": "Allow Live TV access",
+    "OptionAllowDeleteLibraryContent": "Allow media deletion",
+    "OptionAllowManageLiveTv": "Allow Live TV recording management",
     "OptionAllowRemoteControlOthers": "Allow remote control of other users",
     "OptionAllowRemoteSharedDevices": "Allow remote control of shared devices",
     "OptionAllowRemoteSharedDevicesHelp": "Dlna devices are considered shared until a user begins controlling it.",
@@ -299,7 +323,7 @@
     "LabelCachePath": "Cache path:",
     "LabelCachePathHelp": "Specify a custom location for server cache files, such as images.",
     "LabelImagesByNamePath": "Images by name path:",
-    "LabelImagesByNamePathHelp": "Specify a custom location for downloaded actor, artist, genre and studio images.",
+    "LabelImagesByNamePathHelp": "Specify a custom location for downloaded actor, genre and studio images.",
     "LabelMetadataPath": "Metadata path:",
     "LabelMetadataPathHelp": "Specify a custom location for downloaded artwork and metadata, if not saving within media folders.",
     "LabelTranscodingTempPath": "Transcoding temporary path:",
@@ -314,13 +338,15 @@
     "OptionEpisodes": "Episodes",
     "OptionOtherVideos": "Other Videos",
     "TitleMetadata": "Metadata",
-    "LabelAutomaticUpdatesFanart": "Enable automatic updates from FanArt.tv",
+    "LabelAutomaticUpdates": "Enable automatic updates",
     "LabelAutomaticUpdatesTmdb": "Enable automatic updates from TheMovieDB.org",
     "LabelAutomaticUpdatesTvdb": "Enable automatic updates from TheTVDB.com",
     "LabelAutomaticUpdatesFanartHelp": "If enabled, new images will be downloaded automatically as they're added to fanart.tv. Existing images will not be replaced.",
     "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 when videos are discovered, and also as a nightly scheduled task at 4am. The schedule is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+    "LabelFanartApiKey": "Personal api key:",
+    "LabelFanartApiKeyHelp": "Requests to fanart without a personal API key return results that were approved over 7 days ago. With a personal API key that drops to 48 hours and if you are also a fanart VIP member that will further drop to around 10 minutes.",
+    "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 when videos are discovered, and also as a nightly scheduled task. The schedule is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
     "LabelMetadataDownloadLanguage": "Preferred download language:",
     "ButtonAutoScroll": "Auto-scroll",
     "LabelImageSavingConvention": "Image saving convention:",
@@ -468,8 +494,6 @@
     "OptionEnableDebugTranscodingLogging": "Enable debug transcoding logging",
     "OptionEnableDebugTranscodingLoggingHelp": "This will create very large log files and is only recommended as needed for troubleshooting purposes.",
     "OptionEnableDebugTranscodingLogging": "Enable debug transcoding logging",
-    "OptionUpscaling": "Allow clients to request upscaled video",
-    "OptionUpscalingHelp": "In some cases this will result in improved video quality but will increase CPU usage.",
     "EditCollectionItemsHelp": "Add or remove any movies, series, albums, books or games you wish to group within this collection.",
     "HeaderAddTitles": "Add Titles",
     "LabelEnableDlnaPlayTo": "Enable DLNA Play To",
@@ -489,6 +513,7 @@
     "HeaderSystemPaths": "System Paths",
     "LinkCommunity": "Community",
     "LinkGithub": "Github",
+    "LinkApi": "Api",
     "LinkApiDocumentation": "Api Documentation",
     "LabelFriendlyServerName": "Friendly server name:",
     "LabelFriendlyServerNameHelp": "This name will be used to identify this server. If left blank, the computer name will be used.",
@@ -496,20 +521,25 @@
     "LabelPreferredDisplayLanguageHelp": "Translating Media Browser is an ongoing project and is not yet complete.",
     "LabelReadHowYouCanContribute": "Read about how you can contribute.",
     "HeaderNewCollection": "New Collection",
-    "HeaderAddToCollection": "Add to Collection",
     "ButtonSubmit": "Submit",
-    "NewCollectionNameExample": "Example: Star Wars Collection",
-    "OptionSearchForInternetMetadata": "Search the internet for artwork and metadata",
     "ButtonCreate": "Create",
-    "LabelLocalHttpServerPortNumber": "Local port number:",
+    "LabelCustomCss": "Custom css:",
+    "LabelCustomCssHelp": "Apply your own custom css to the web interface.",
+    "LabelLocalHttpServerPortNumber": "Local http port number:",
     "LabelLocalHttpServerPortNumberHelp": "The tcp port number that Media Browser's http server should bind to.",
-    "LabelPublicPort": "Public port number:",
-    "LabelPublicPortHelp": "The public port number that should be mapped to the local port.",
+    "LabelPublicHttpPort": "Public http port number:",
+    "LabelPublicHttpPortHelp": "The public port number that should be mapped to the local http port.",
+    "LabelPublicHttpsPort": "Public https port number:",
+    "LabelPublicHttpsPortHelp": "The public port number that should be mapped to the local https port.",
+    "LabelEnableHttps": "Report https as external address",
+    "LabelEnableHttpsHelp": "If enabled, the server will report an https url to clients as it's external address. This may break clients that do not yet support https.",
+    "LabelHttpsPort": "Local https port number:",
+    "LabelHttpsPortHelp": "The tcp port number that Media Browser's https server should bind to.",
     "LabelWebSocketPortNumber": "Web socket port number:",
     "LabelEnableAutomaticPortMap": "Enable automatic port mapping",
     "LabelEnableAutomaticPortMapHelp": "Attempt to automatically map the public port to the local port via UPnP. This may not work with some router models.",
-    "LabelExternalDDNS": "External DDNS:",
-    "LabelExternalDDNSHelp": "If you have a dynamic DNS enter it here. Media Browser apps will use it when connecting remotely.",
+    "LabelExternalDDNS": "External WAN Address:",
+    "LabelExternalDDNSHelp": "If you have a dynamic DNS enter it here. Media Browser apps will use it when connecting remotely. Leave empty for automatic detection.",
     "TabResume": "Resume",
     "TabWeather": "Weather",
     "TitleAppSettings": "App Settings",
@@ -578,10 +608,10 @@
     "ButtonRestart": "Restart",
     "ButtonShutdown": "Shutdown",
     "ButtonUpdateNow": "Update Now",
+    "TabHosting": "Hosting",
     "PleaseUpdateManually": "Please shutdown the server and update manually.",
     "NewServerVersionAvailable": "A new version of Media Browser Server is available!",
     "ServerUpToDate": "Media Browser Server is up to date",
-    "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": "Audio boost when downmixing:",
@@ -639,6 +669,7 @@
     "NotificationOptionInstallationFailed": "Installation failure",
     "NotificationOptionNewLibraryContent": "New content added",
     "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
     "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",
@@ -792,7 +823,7 @@
     "HeaderDownloadSubtitlesFor": "Download subtitles for:",
     "MessageNoChapterProviders": "Install a chapter provider plugin such as ChapterDb to enable additional chapter options.",
     "LabelSkipIfGraphicalSubsPresent": "Skip if the video already contains graphical subtitles",
-    "LabelSkipIfGraphicalSubsPresentHelp": "Keeping text versions of subtitles will result in more efficient delivery to mobile clients.",
+    "LabelSkipIfGraphicalSubsPresentHelp": "Keeping text versions of subtitles will result in more efficient delivery and decrease the likelihood of video transcoding.",
     "TabSubtitles": "Subtitles",
     "TabChapters": "Chapters",
     "HeaderDownloadChaptersFor": "Download chapter names for:",
@@ -862,6 +893,8 @@
     "OptionDefaultSort": "Default",
     "OptionCommunityMostWatchedSort": "Most Watched",
     "TabNextUp": "Next Up",
+    "HeaderBecomeMediaBrowserSupporter": "Become a Media Browser Supporter",
+    "TextEnjoyBonusFeatures": "Enjoy Bonus Features",
     "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 + 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.",
@@ -878,7 +911,6 @@
     "LabelChannelDownloadAge": "Delete content after: (days)",
     "LabelChannelDownloadAgeHelp": "Downloaded content older than this will be deleted. It will remain playable via internet streaming.",
     "ChannelSettingsFormHelp": "Install channels such as Trailers and Vimeo in the plugin catalog.",
-    "LabelSelectCollection": "Select collection:",
     "ButtonOptions": "Options",
     "ViewTypeMovies": "Movies",
     "ViewTypeTvShows": "TV",
@@ -926,10 +958,10 @@
     "OptionLatestTvRecordings": "Latest recordings",
     "LabelProtocolInfo": "Protocol info:",
     "LabelProtocolInfoHelp": "The value that will be used when responding to GetProtocolInfo requests from the device.",
-    "TabKodiMetadata": "Kodi",
-    "HeaderKodiMetadataHelp": "Media Browser includes native support for Kodi Nfo metadata and images. To enable or disable Kodi metadata, use the Advanced tab to configure options for your media types.",
+    "TabNfo": "Nfo",
+    "HeaderKodiMetadataHelp": "Media Browser includes native support for Nfo metadata files. To enable or disable Nfo metadata, use the Advanced tab to configure options for your media types.",
     "LabelKodiMetadataUser": "Sync user watch data to nfo's for:",
-    "LabelKodiMetadataUserHelp": "Enable this to keep watch data in sync between Media Browser and Kodi.",
+    "LabelKodiMetadataUserHelp": "Enable this to keep watch data in sync between Media Browser and Nfo files.",
     "LabelKodiMetadataDateFormat": "Release date format:",
     "LabelKodiMetadataDateFormatHelp": "All dates within nfo's will be read and written to using this format.",
     "LabelKodiMetadataSaveImagePaths": "Save image paths within nfo files",
@@ -940,6 +972,7 @@
     "LabelGroupChannelsIntoViews": "Display the following channels directly within my views:",
     "LabelGroupChannelsIntoViewsHelp": "If enabled, these channels will be displayed directly alongside other views. If disabled, they'll be displayed within a separate Channels view.",
     "LabelDisplayCollectionsView": "Display a collections view to show movie collections",
+    "LabelDisplayCollectionsViewHelp": "This will create a separate view to display collections that you've created or have access to. To create a collection, right-click or tap-hold any movie and select 'Add to Collection'. ",
     "LabelKodiMetadataEnableExtraThumbs": "Copy extrafanart into extrathumbs",
     "LabelKodiMetadataEnableExtraThumbsHelp": "When downloading images they can be saved into both extrafanart and extrathumbs for maximum Kodi skin compatibility.",
     "TabServices": "Services",
@@ -1097,11 +1130,14 @@
     "LabelDisplayFoldersView": "Display a folders view to show plain media folders",
     "ViewTypeLiveTvRecordingGroups": "Recordings",
     "ViewTypeLiveTvChannels": "Channels",
-    "LabelAllowLocalAccessWithoutPassword": "Allow local access without a password",
-    "LabelAllowLocalAccessWithoutPasswordHelp": "When enabled, a password will not be required when signing in from within your home network.",
+    "LabelEasyPinCode": "Easy pin code:",
+    "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Media Browser apps, and can also be used for easy in-network sign in.",
+    "LabelInNetworkSignInWithEasyPassword": "Enable in-network sign in with my easy pin code",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "If enabled, you'll be able to use your easy pin code to sign in to Media Browser apps from inside your home network. Your regular password will only be needed away from home. If the pin code is left blank, you won't need a password within your home network.",
     "HeaderPassword": "Password",
     "HeaderLocalAccess": "Local Access",
     "HeaderViewOrder": "View Order",
+    "ButtonResetEasyPassword": "Reset easy pin code",
     "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
     "LabelMetadataRefreshMode": "Metadata refresh mode:",
     "LabelImageRefreshMode": "Image refresh mode:",
@@ -1225,8 +1261,6 @@
     "LabelSubtitleFormatHelp": "Example: srt",
     "ButtonLearnMore": "Learn more",
     "TabPlayback": "Playback",
-    "HeaderTrailersAndExtras": "Trailers & Extras",
-    "OptionFindTrailers": "Find trailers from the internet automatically",
     "HeaderLanguagePreferences": "Language Preferences",
     "TabCinemaMode": "Cinema Mode",
     "TitlePlayback": "Playback",
@@ -1295,7 +1329,7 @@
     "MessageNoTrailersFound": "No trailers found. Install the Trailer channel to enhance your movie experience by adding a library of internet trailers.",
     "HeaderNewUsers": "New Users",
     "ButtonSignUp": "Sign up",
-    "ButtonForgotPassword": "Forgot password?",
+    "ButtonForgotPassword": "Forgot password",
     "OptionDisableUserPreferences": "Disable access to user preferences",
     "OptionDisableUserPreferencesHelp": "If enabled, only administrators will be able to configure user profile images, passwords, and language preferences.",
     "HeaderSelectServer": "Select Server",
@@ -1320,16 +1354,19 @@
     "HeaderVideoTypes": "Video Types",
     "HeaderYears": "Years",
     "HeaderAddTag": "Add Tag",
-    "LabelBlockItemsWithTags": "Block items with tags:",
+    "LabelBlockContentWithTags": "Block content with tags:",
     "LabelTag": "Tag:",
     "LabelEnableSingleImageInDidlLimit": "Limit to single embedded image",
     "LabelEnableSingleImageInDidlLimitHelp": "Some devices will not render properly if multiple images are embedded within Didl.",
     "TabActivity": "Activity",
     "TitleSync": "Sync",
-    "OptionAllowSyncContent": "Allow syncing media to devices",
+    "OptionAllowSyncContent": "Allow Sync",
+    "OptionAllowContentDownloading": "Allow media downloading",
     "NameSeasonUnknown": "Season Unknown",
     "NameSeasonNumber": "Season {0}",
     "LabelNewUserNameHelp": "Usernames can contain letters (a-z), numbers (0-9), dashes (-), underscores (_), apostrophes ('), and periods (.)",
     "TabJobs": "Jobs",
-    "TabSyncJobs": "Sync Jobs"
+    "TabSyncJobs": "Sync Jobs",
+    "LabelTagFilterMode": "Mode:",
+    "LabelTagFilterAllowModeHelp": "If allowed tags are used as part of a deeply nested folder structure, content that is tagged will require parent folders to be tagged as well."
 }