diff options
| author | Tavares André <tavares_and@hotmail.com> | 2015-07-16 20:19:12 +0200 |
|---|---|---|
| committer | Tavares André <tavares_and@hotmail.com> | 2015-07-16 20:19:12 +0200 |
| commit | 8fd5a8af8d8b6d371a0a2c44d0c7c6809410125c (patch) | |
| tree | c23e4a4afc33c35318eb2a26f51b28d3a6bb35da /MediaBrowser.Server.Implementations/Localization/Server/server.json | |
| parent | 0fa55fd6de42b683bcdcc0c632f4db1436bca36d (diff) | |
| parent | f1ad56a7deaef79f6dcb2b871de727b8e4af3371 (diff) | |
Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/Localization/Server/server.json')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Localization/Server/server.json | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json index c361e42f6..138c87712 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/server.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json @@ -86,7 +86,7 @@ "OptionDetectArchiveFilesAsMedia": "Detect archive files as media", "OptionDetectArchiveFilesAsMediaHelp": "If enabled, files with .rar and .zip extensions will be detected as media files.", "LabelEnterConnectUserName": "Username or email:", - "LabelEnterConnectUserNameHelp": "This is your Emby online account username or password.", + "LabelEnterConnectUserNameHelp": "This is your Emby online account username or email.", "LabelEnableEnhancedMovies": "Enable enhanced movie displays", "LabelEnableEnhancedMoviesHelp": "When enabled, movies will be displayed as folders to include trailers, extras, cast & crew, and other related content.", "HeaderSyncJobInfo": "Sync Job", @@ -313,6 +313,9 @@ "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.", + "OptionAllowLinkSharing": "Allow social media sharing", + "OptionAllowLinkSharingHelp": "Only web pages containing media information are shared. Media files are never shared publicly. Shares are time-limited and will expire based on your server sharing settings.", + "HeaderSharing": "Sharing", "HeaderRemoteControl": "Remote Control", "OptionMissingTmdbId": "Missing Tmdb Id", "OptionIsHD": "HD", @@ -1460,9 +1463,10 @@ "HeaderSignUp": "Sign Up", "LabelPasswordConfirm": "Password (confirm):", "ButtonAddServer": "Add Server", - "HeaderOverview": "Overview", - "HeaderShortOverview": "Short Overview", - "HeaderType": "Type", - "HeaderSeverity": "Severity", - "OptionReportActivities": "Activities Log" + "TabHomeScreen": "Home Screen", + "HeaderDisplay": "Display", + "HeaderNavigation": "Navigation", + "LegendTheseSettingsShared": "These settings are shared on all devices", + "OptionEnableAutomaticServerUpdates": "Enable automatic server updates", + "OptionOtherTrailers": "Include trailers from older movies" } |