summaryrefslogtreecommitdiffstats
path: root/lang/en/settings/setting.json
diff options
context:
space:
mode:
authorSimon Rettberg2016-02-19 15:01:56 +0100
committerSimon Rettberg2016-02-19 15:01:56 +0100
commit317db874e7964231ac33b5646cc33b1b400a4f29 (patch)
tree6a1be1c286070ec9f3fd181ccb8fe4fecf47b2fb /lang/en/settings/setting.json
parent[clientlog] Sanity checks for timestamps (diff)
downloadslx-admin-317db874e7964231ac33b5646cc33b1b400a4f29.tar.gz
slx-admin-317db874e7964231ac33b5646cc33b1b400a4f29.tar.xz
slx-admin-317db874e7964231ac33b5646cc33b1b400a4f29.zip
[locations] New module for managing locations
Diffstat (limited to 'lang/en/settings/setting.json')
-rw-r--r--lang/en/settings/setting.json5
1 files changed, 4 insertions, 1 deletions
diff --git a/lang/en/settings/setting.json b/lang/en/settings/setting.json
index 11a34f17..36ac6e8c 100644
--- a/lang/en/settings/setting.json
+++ b/lang/en/settings/setting.json
@@ -16,5 +16,8 @@
"SLX_REMOTE_LOG_SESSIONS": "Determines whether logins and logouts of the users should be reported to the satellite.\r\n*yes* = log with user ID\r\n*anonymous* = anonymous logging\r\n*no* = no logging",
"SLX_ROOT_PASS": "The root password of the client system. Only required for diagnostic purposes on the client.Leave field blank to disallow root logins.\r\n\/Hint\/: The password SHA-512-with-salt hashed before it's being sent to the client. It's only stored in clear text on the Satellite Server. If you want to have it hashed on the server too, you can supply a pre-hashed passoword in \/$6$...$...\/-format.",
"SLX_SHUTDOWN_SCHEDULE": "Fixed time to turn off the computer, even if there is a user active.Several times can be specified, separated by spaces.",
- "SLX_SHUTDOWN_TIMEOUT": "Time in seconds after which a computer is switched off, if no user is logged on.Leave blank to disable the function."
+ "SLX_SHUTDOWN_TIMEOUT": "Time in seconds after which a computer is switched off, if no user is logged on.Leave blank to disable the function.",
+ "SLX_VMCHOOSER_FORLOCATION": "Defines how lectures special to the user's location are handled in the vmchooser.\r\n*IGNORE*: Sort them alphabetically among the global lectures.\r\n*BUMP*: Put them atop the global lectures.\r\n*EXCLUSIVE*: Put them atop the global lectures and aditionally collapse the node which contains the global lectures.",
+ "SLX_VMCHOOSER_TAB": "Defines which tab is show by default, if the user doesn't have stored a last used session on his persistent home directory.\r\n*0*: Native Linux sessions\r\n*1*: User specific lectures\r\n*2*: All lectures\r\n*AUTO*: If the computer has low system specs, show the Linux sessions, otherwise, show all lectures",
+ "SLX_VMCHOOSER_TEMPLATES": "Defines how lectures that link to template VMs are treated wrt sorting.\r\n*IGNORE*: Sort among regular lectures\r\n*BUMP*: Move to top of list"
} \ No newline at end of file