Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

1 files changed, 7 insertions, 8 deletions

diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 3f28e90ea..d8628575a 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -909,7 +909,7 @@
     "HeaderLiveTv": "Live TV",
     "HeaderReports": "Reports",
     "HeaderMetadataManager": "Metadata Manager",
-    "HeaderPreferences": "Preferences",
+    "HeaderSettings": "Settings",
     "MessageLoadingChannels": "Loading channel content...",
     "MessageLoadingContent": "Loading content...",
     "ButtonMarkRead": "Mark Read",
@@ -1408,7 +1408,7 @@
     "HeaderUpcomingMovies": "Upcoming Movies",
     "HeaderUpcomingSports": "Upcoming Sports",
     "HeaderUpcomingPrograms": "Upcoming Programs",
-    "ButtonMoreItems": "More...",
+    "ButtonMoreItems": "More",
     "LabelShowLibraryTileNames": "Show library tile names",
     "LabelShowLibraryTileNamesHelp": "Determines if labels will be displayed underneath library tiles on the home page",
     "OptionEnableTranscodingThrottle": "Enable throttling",
@@ -1427,7 +1427,6 @@
     "OptionEnableFullSpeedConversion": "Enable full speed conversion",
     "OptionEnableFullSpeedConversionHelp": "By default, sync conversion is performed at a low speed to minimize resource consumption.",
     "HeaderPlaylists": "Playlists",
-    "HeaderSelectDate": "Select Date",
     "HeaderViewStyles": "View Styles",
     "LabelSelectViewStyles": "Enable enhanced presentations for:",
     "LabelSelectViewStylesHelp": "If enabled, views will be built with metadata to offer categories such as Suggestions, Latest, Genres, and more. If disabled, they'll be displayed with simple folders.",
@@ -1448,7 +1447,6 @@
     "OptionReportList": "List View",
     "OptionReportStatistics": "Statistics",
     "OptionReportGrouping": "Grouping",
-    "OptionReportActivities": "Activities Log",
     "HeaderExport": "Export",
     "HeaderColumns": "Columns",
     "ButtonReset": "Reset",
@@ -1457,8 +1455,9 @@
     "LabelEnableFullScreen": "Enable fullscreen mode",
     "LabelEnableChromecastAc3Passthrough": "Enable Chromecast AC3 Passthrough",
     "LabelSyncPath": "Synced content path:",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity"
+    "LabelEmail": "Email:",
+    "LabelUsername": "Username:",
+    "HeaderSignUp": "Sign Up",
+    "LabelPasswordConfirm": "Password (confirm):",
+    "ButtonAddServer": "Add Server"
 }