lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	MediaBrowser.Server.Startup.Common/ApplicationHost.cs
This commit is contained in:
Luke Pulverenti 2015-01-17 15:17:01 -05:00
commit 7903037524
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
View File

@ -194,6 +194,7 @@
"LabelVideoCodec": "Video: {0}", "LabelVideoCodec": "Video: {0}",
"LabelRemoteAccessUrl": "Remote access: {0}", "LabelRemoteAccessUrl": "Remote access: {0}",
"LabelRunningOnPort": "Running on port {0}.", "LabelRunningOnPort": "Running on port {0}.",
"LabelRunningOnHttpsPort": "Running on SSL port {0}.",
"HeaderLatestFromChannel": "Latest from {0}", "HeaderLatestFromChannel": "Latest from {0}",
"ButtonDownload": "Download", "ButtonDownload": "Download",
"LabelUnknownLanaguage": "Unknown language", "LabelUnknownLanaguage": "Unknown language",

1
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
View File

@ -977,6 +977,7 @@ namespace MediaBrowser.Server.Startup.Common
CachePath = ApplicationPaths.CachePath, CachePath = ApplicationPaths.CachePath,
MacAddress = GetMacAddress(), MacAddress = GetMacAddress(),
HttpServerPortNumber = HttpServerPort, HttpServerPortNumber = HttpServerPort,
HttpsPortNumber = HttpsServerPort,
OperatingSystem = OperatingSystemDisplayName, OperatingSystem = OperatingSystemDisplayName,
CanSelfRestart = CanSelfRestart, CanSelfRestart = CanSelfRestart,
CanSelfUpdate = CanSelfUpdate, CanSelfUpdate = CanSelfUpdate,