diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-05-21 23:35:18 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-05-21 23:35:18 -0400 |
| commit | 28e754767ad15b028565858d70d24b188a1d120c (patch) | |
| tree | 552f6d972fd2380b86a67e2380bc10213ccb366d | |
| parent | f9abff883e4dcc9e974705ee90f0b8d4704e7f14 (diff) | |
show context when navigating
| -rw-r--r-- | MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Localization/Server/server.json | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs index d989c0866..daed33436 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs @@ -1599,7 +1599,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv } catch (Exception ex) { - _logger.ErrorException("Error getting service status info from {0}", ex, service.Name); + _logger.ErrorException("Error getting service status info from {0}", ex, service.Name ?? string.Empty); info.Status = LiveTvServiceStatus.Unavailable; info.StatusMessage = ex.Message; diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json index 5a3294a12..7658b07f1 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/server.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json @@ -780,5 +780,10 @@ "OptionLibraryButtons": "Library buttons", "OptionLibraryTiles": "Library tiles", "OptionResumablemedia": "Resume", - "OptionLatestMedia": "Latest media" + "OptionLatestMedia": "Latest media", + "OptionNone": "None", + "HeaderLiveTv": "Live TV", + "HeaderReports": "Reports", + "HeaderMetadataManager": "Metadata Manager", + "HeaderPreferences": "Preferences" }
\ No newline at end of file |