aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Localization/Server/server.json
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-17 13:15:34 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-17 13:15:34 -0500
commitea30f766b6348a0d846d9f72191a8c4959bf2483 (patch)
treeb1706bdb6b859103a4d066160f21a0e9831522a3 /MediaBrowser.Server.Implementations/Localization/Server/server.json
parent628c6cbc28f5a744785731dd4e94ec7a1f881dd2 (diff)
parentbb02d68cebb2379623dda5e7803135d80f15b27f (diff)
Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/Localization/Server/server.json')
-rw-r--r--MediaBrowser.Server.Implementations/Localization/Server/server.json8
1 files changed, 8 insertions, 0 deletions
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 35d58837c..253d9a00d 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -508,6 +508,14 @@
"LabelLocalHttpServerPortNumberHelp": "The tcp port number that Media Browser's http server should bind to.",
"LabelPublicPort": "Public port number:",
"LabelPublicPortHelp": "The public port number that should be mapped to the local port.",
+
+ "LabelUseHttps": "Enable SSL",
+ "LabelUseHttpsHelp": "Check to enable SSL hosting.",
+ "LabelHttpsPort": "Local http port:",
+ "LabelHttpsPortHelp": "The tcp port number that Media Browser's https server should bind to.",
+ "LabelCertificatePath": "SSL Certificate path:",
+ "LabelCertificatePathHelp": "The path on the filesystem to the ssl certificate pfx file.",
+
"LabelWebSocketPortNumber": "Web socket port number:",
"LabelEnableAutomaticPortMap": "Enable automatic port mapping",
"LabelEnableAutomaticPortMapHelp": "Attempt to automatically map the public port to the local port via UPnP. This may not work with some router models.",