summaryrefslogtreecommitdiffstats
path: root/lang/en
diff options
context:
space:
mode:
authorSimon Rettberg2015-01-29 20:41:41 +0100
committerSimon Rettberg2015-01-29 20:41:41 +0100
commit06d9d5f70e8475e768b528b1f46e1005b8c2e1ee (patch)
treea2355836c9128cf4d5aa3939c48bad635ed768b8 /lang/en
parent[sysconfig] Add legend (diff)
downloadslx-admin-06d9d5f70e8475e768b528b1f46e1005b8c2e1ee.tar.gz
slx-admin-06d9d5f70e8475e768b528b1f46e1005b8c2e1ee.tar.xz
slx-admin-06d9d5f70e8475e768b528b1f46e1005b8c2e1ee.zip
Config.tgz improvements, automatic rebuilds etc.
Diffstat (limited to 'lang/en')
-rw-r--r--lang/en/messages.json1
-rw-r--r--lang/en/settings/setting.json2
-rw-r--r--lang/en/templates/sysconfig/cfg-start.json4
3 files changed, 4 insertions, 3 deletions
diff --git a/lang/en/messages.json b/lang/en/messages.json
index 8d3ac4df..889b5406 100644
--- a/lang/en/messages.json
+++ b/lang/en/messages.json
@@ -28,6 +28,7 @@
"missing-title": "No title given",
"module-added": "Module successfully added",
"module-deleted": "Module {{0}} was deleted",
+ "module-edited": "Module has been edited",
"module-in-use": "Module {{0}} is still used by Configuration {{1}}",
"module-rebuild-failed": "Rebuilding module failed",
"module-rebuilding": "Module is rebuilding...",
diff --git a/lang/en/settings/setting.json b/lang/en/settings/setting.json
index 7a9db4a9..a17edfa6 100644
--- a/lang/en/settings/setting.json
+++ b/lang/en/settings/setting.json
@@ -11,7 +11,7 @@
"SLX_PROXY_IP": "The address to use for the proxy server.",
"SLX_PROXY_MODE": "Determines whether a proxy server is required to access the Internet.\r\n*off* = do not use a Proxy.\r\n*on* = Always use proxy.\r\n*auto* = Only use proxy when the client PC is in a private address space.",
"SLX_PROXY_PORT": "The port to use for the proxy server.",
- "SLX_PROXY_TYPE": "Type of the proxy.*socks4*, *socks5*,*http-connect* (HTTP proxy with support from the CONNECT method),*http-relay* (Classic HTTP proxy)",
+ "SLX_PROXY_TYPE": "Type of the proxy.*socks4*, *socks5*, *http-connect* (HTTP proxy with support from the CONNECT method), *http-relay* (Classic HTTP proxy)",
"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 basic system. Only required for diagnostic purposes on the client.Leave field blank to disallow root logins.\/Hint\/: The password is encrypted with $6$ hash, so it is no longer readable after saving!",
"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.",
diff --git a/lang/en/templates/sysconfig/cfg-start.json b/lang/en/templates/sysconfig/cfg-start.json
index 8ab46f37..a00a6720 100644
--- a/lang/en/templates/sysconfig/cfg-start.json
+++ b/lang/en/templates/sysconfig/cfg-start.json
@@ -2,6 +2,6 @@
"lang_configuration": "Configuration",
"lang_configurationChoose": "Please select which modules will be used for this configuration.",
"lang_name": "Name",
- "lang_new": "New",
- "lang_next": "Next"
+ "lang_next": "Next",
+ "lang_noModuleOfType": "No module of this type found."
} \ No newline at end of file