From 28e754767ad15b028565858d70d24b188a1d120c Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 21 May 2014 23:35:18 -0400
Subject: [PATCH] show context when navigating

---
 .../LiveTv/LiveTvManager.cs                                | 2 +-
 .../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 d989c08668..daed33436f 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 5a3294a122..7658b07f16 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