aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Localization/Server
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2015-07-16 09:00:03 -0400
committerLuke <luke.pulverenti@gmail.com>2015-07-16 09:00:03 -0400
commit087b9c6fd2bfbbd10a4fcbfe335550beb9085a04 (patch)
treec474f1d70d4cdbc513034dc3832e4d266719ddea /MediaBrowser.Server.Implementations/Localization/Server
parent2022c5631fe18996b23330a58133cb18d1e9600e (diff)
parentc6a64efab781269f9dc512282f27f2a2d3fdb1f2 (diff)
Merge pull request #1140 from MediaBrowser/dev
3.0.5675.1
Diffstat (limited to 'MediaBrowser.Server.Implementations/Localization/Server')
-rw-r--r--MediaBrowser.Server.Implementations/Localization/Server/server.json6
1 files changed, 4 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 55e754085..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",
@@ -1466,5 +1466,7 @@
"TabHomeScreen": "Home Screen",
"HeaderDisplay": "Display",
"HeaderNavigation": "Navigation",
- "LegendTheseSettingsShared": "These settings are shared on all devices"
+ "LegendTheseSettingsShared": "These settings are shared on all devices",
+ "OptionEnableAutomaticServerUpdates": "Enable automatic server updates",
+ "OptionOtherTrailers": "Include trailers from older movies"
}