Improved several translations, added help texts, fixed module grouping, layout

6 files changed, 8 insertions, 6 deletions

diff --git a/lang/en/messages-hardcoded.json b/lang/en/messages-hardcoded.json
index 62725274..325f04ef 100644
--- a/lang/en/messages-hardcoded.json
+++ b/lang/en/messages-hardcoded.json
@@ -8,6 +8,7 @@
     "lang_location": "Location",
     "lang_login": "Login",
     "lang_moduleAdd": "Add Module",
+    "lang_noModuleFromThisGroup": "(No module from this group)",
     "lang_serverConfiguration": "Server-side Configuration",
     "lang_titleBackup": "Save and Restore",
     "lang_titleEventLog": "Event log",
diff --git a/lang/en/settings/setting.json b/lang/en/settings/setting.json
index a17edfa6..4fd59186 100644
--- a/lang/en/settings/setting.json
+++ b/lang/en/settings/setting.json
@@ -1,5 +1,5 @@
 {
-    "SLX_ADDONS": "To load addons. There currently only vmware is available.",
+    "SLX_ADDONS": "Addons to load. Currently, only *vmware* is available.",
     "SLX_BENCHMARK_VM": "If non-empty, this should be the exact display name of an entry in *vmchooser*, so it will be automatically started after bootup. Useful for benchmarking.",
     "SLX_BIOS_CLOCK": "Specifies whether and how the internal clock of the computer should be set in relation to the system time of the \/MiniLinux\/.\r\n*off* = The internal clock of the computer is not changed.\r\n*local* = The internal clock is set to local time. Preferably if, for example, there is still a native Windows installation available on the PC.\r\n*utc* = The internal clock is set to the \/Coordinated Universal Time\/. This is the most common setup in a pure Linux environment.",
     "SLX_COMMON_SHARE_AUTH": "Athentication method for the common network share. *guest* means no authentication (public share), *user* means the user's credentials will be used.",
@@ -13,7 +13,7 @@
     "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_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_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."
 }
\ No newline at end of file
diff --git a/lang/en/templates/baseconfig/_page.json b/lang/en/templates/baseconfig/_page.json
index 31a2fd3a..6429a835 100644
--- a/lang/en/templates/baseconfig/_page.json
+++ b/lang/en/templates/baseconfig/_page.json
@@ -1,5 +1,6 @@
 {
     "lang_basicConfiguration": "Basic Configuration",
+    "lang_clientRelatedConfig": "The options on this page are related to the bwLehrpool client machines.",
     "lang_close": "Close",
     "lang_reset": "Reset",
     "lang_save": "Save"
diff --git a/lang/en/templates/page-vmstore.json b/lang/en/templates/page-vmstore.json
index 29ea8537..23ddbbd3 100644
--- a/lang/en/templates/page-vmstore.json
+++ b/lang/en/templates/page-vmstore.json
@@ -1,7 +1,7 @@
 {
     "lang_close": "Close",
     "lang_intern": "Intern",
-    "lang_nfsHelp1": "An NFSv3-Share is required. It should be readable by all the workstations, and writable for the satellite server. An example, assuming the satellite server has IP address 1.2.3.4:",
+    "lang_nfsHelp1": "An NFSv4\/3-Share is required. It should be readable by all the workstations, and writable for the satellite server. An example, assuming the satellite server has IP address 1.2.3.4:",
     "lang_nfsHelp2": "Alternate configuration using all_squash. The exported directory should be owned (and be writable) by the user with uid 1234.",
     "lang_noAdditionalInformation": "No additional cofiguration required",
     "lang_password": "Password",
diff --git a/lang/en/templates/sysconfig/ldap-start.json b/lang/en/templates/sysconfig/ldap-start.json
index d2953f45..74f1c730 100644
--- a/lang/en/templates/sysconfig/ldap-start.json
+++ b/lang/en/templates/sysconfig/ldap-start.json
@@ -8,7 +8,7 @@
     "lang_password": "Password",
     "lang_searchBase": "Search base",
     "lang_ssl": "SSL",
-    "lang_sslDescription": "Use SSL to connect to the LDAP-Server. (The connection between clients and proxy uses SSL in either case.)",
+    "lang_sslDescription": "Use SSL to connect to the LDAP-Server. (The connection between clients and proxy uses SSL in either case.) Some LDAP servers require SSL for authenticating connections.",
     "lang_userDirectory": "Home-Directory",
     "lang_userDirectoryInfo1": "UNC-path to home directory of user. '%s' can be used as a placeholder for the account name.",
     "lang_userDirectoryInfo2": "Currently, only CIFS\/SMB is supported."
diff --git a/lang/en/templates/webinterface/https.json b/lang/en/templates/webinterface/https.json
index fc1e8e3e..90bdfdd4 100644
--- a/lang/en/templates/webinterface/https.json
+++ b/lang/en/templates/webinterface/https.json
@@ -5,7 +5,7 @@
     "lang_description": "Here you can set whether the web interface should be accessible via https. You can chose if you want to use a random self signed certificate, or supply your own.",
     "lang_httpsSettings": "HTTPS settings",
     "lang_noHttps": "Disable HTTPS",
-    "lang_privateKey": "Please paste the private key belonging to the certificate here. It has to be in \u0022pem\u0022 format too, which should look like this:",
-    "lang_randomCert": "Geenrate new self-signed certificate",
+    "lang_privateKey": "Please paste the private key belonging to the certificate here. It has to be in \"pem\" format too, which should look like this:",
+    "lang_randomCert": "Genenrate new self-signed certificate",
     "lang_save": "Save"
 }
\ No newline at end of file