diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-06-07 17:21:30 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-06-07 17:21:30 -0400 |
| commit | e8322b4a12652004a19835d0f27390ff1335da16 (patch) | |
| tree | 75139e9ab384a7a9ea5150954e7e69b550638c14 /MediaBrowser.Server.Implementations | |
| parent | c0125c03fd425e38eb7ecf7752aa585267a1fbbf (diff) | |
add mono CreateWebRequest workaround
Diffstat (limited to 'MediaBrowser.Server.Implementations')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Localization/Server/server.json | 4 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json index f801057ab..7e70cd942 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/server.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json @@ -85,8 +85,8 @@ "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:", - "LabelEnterConnectUserNameHelp": "This is your Emby online account user name or password.", + "LabelEnterConnectUserName": "Username or email:", + "LabelEnterConnectUserNameHelp": "This is your Emby online account username or password.", "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", diff --git a/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs b/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs index 44d8cc437..2adf3e86a 100644 --- a/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs +++ b/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs @@ -179,7 +179,8 @@ namespace MediaBrowser.Server.Implementations.ServerManager if (!message.StartsWith("{", StringComparison.OrdinalIgnoreCase)) { - _logger.Error("Received web socket message that is not a json structure: " + message); + // This info is useful sometimes but also clogs up the log + //_logger.Error("Received web socket message that is not a json structure: " + message); return; } |