michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

show context when navigating

Browse Source
This commit is contained in:
Luke Pulverenti 2014-05-21 23:35:18 -04:00
parent f9abff883e
commit 28e754767a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@ -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;

7
MediaBrowser.Server.Implementations/Localization/Server/server.json
View File

@ -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"
}