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

12 files changed, 14 insertions, 10 deletions

diff --git a/lang/de/messages-hardcoded.json b/lang/de/messages-hardcoded.json
index 1a332e03..76d13e30 100644
--- a/lang/de/messages-hardcoded.json
+++ b/lang/de/messages-hardcoded.json
@@ -8,6 +8,7 @@
     "lang_location": "Lokalisierung",
     "lang_login": "Anmelden",
     "lang_moduleAdd": "Modul hinzuf\u00fcgen",
+    "lang_noModuleFromThisGroup": "(Kein Modul dieser Gruppe)",
     "lang_serverConfiguration": "Serverseitige Konfiguration",
     "lang_titleBackup": "Sichern und Wiederherstellen",
     "lang_titleEventLog": "Ereignisprotokoll",
diff --git a/lang/de/settings/setting.json b/lang/de/settings/setting.json
index 63a4d881..905f6d2b 100644
--- a/lang/de/settings/setting.json
+++ b/lang/de/settings/setting.json
@@ -1,5 +1,5 @@
 {
-    "SLX_ADDONS": "Zu ladende Addons. Zur Zeit steht nur vmware zur Verf\u00fcgung.",
+    "SLX_ADDONS": "Zu ladende Addons. Zur Zeit steht nur *vmware* zur Verf\u00fcgung.",
     "SLX_BENCHMARK_VM": "Tragen Sie hier den exakten Namen einer Veranstaltung, wie sie im *vmchooser* auftaucht ein, um diese VM nach dem Booten automatisch zu starten. Dies ist n\u00fctzlich f\u00fcr Bootzeitmessungen. Feld leer lassen, um Funktion zu deaktivieren.",
     "SLX_BIOS_CLOCK": "Legt fest, ob und wie die interne Uhr des Rechners im Bezug auf die Systemzeit des \/MiniLinux\/ gesetzt werden soll.\r\n*off* = Die interne Uhr des Rechners wird nicht ver\u00e4ndert.\r\n*local* = Die interne Uhr wird auf die Lokalzeit gesetzt. Bevorzugt wenn z.B. noch eine native Windows-Installation auf dem PC vorhanden ist.\r\n*utc* = Die interne Uhr wird auf die \/Koordinierte Weltzeit\/ gesetzt. Dies ist die g\u00e4ngige Einstellung in einem reinen Linux-Umfeld.",
     "SLX_COMMON_SHARE_AUTH": "Authentifizierungsmethode f\u00fcr das gemeinsame Netzlaufwerk. *guest* bedeutet, dass keine Authentifizierung notwendig ist, *user* bedeutet, dass die Credentials des angemeldeten Benutzers verwendet werden.",
diff --git a/lang/de/templates/baseconfig/_page.json b/lang/de/templates/baseconfig/_page.json
index ec3e4c33..5a4e5a6d 100644
--- a/lang/de/templates/baseconfig/_page.json
+++ b/lang/de/templates/baseconfig/_page.json
@@ -1,5 +1,6 @@
 {
     "lang_basicConfiguration": "Basiskonfiguration",
+    "lang_clientRelatedConfig": "Die Optionen auf dieser Seite beziehen sich auf das Verhalten der bwLehrpool-Clients.",
     "lang_close": "Schlie\u00dfen",
     "lang_reset": "Zur\u00fccksetzen",
     "lang_save": "Speichern"
diff --git a/lang/de/templates/page-vmstore.json b/lang/de/templates/page-vmstore.json
index 51b4dd69..ee462dc1 100644
--- a/lang/de/templates/page-vmstore.json
+++ b/lang/de/templates/page-vmstore.json
@@ -1,7 +1,7 @@
 {
     "lang_close": "Schlie\u00dfen",
     "lang_intern": "Intern",
-    "lang_nfsHelp1": "Ben\u00f6tigt wird ein NFSv3-Share, der f\u00fcr den Satelliten-Server schreibbar, und f\u00fcr die Arbeitsstationen lesbar ist. Beispielkonfiguration auf dem NFS-Server, wenn der Satelliten-Server die Adresse 1.2.3.4 hat:",
+    "lang_nfsHelp1": "Ben\u00f6tigt wird ein NFSv4\/3-Share, der f\u00fcr den Satelliten-Server schreibbar, und f\u00fcr die Arbeitsstationen lesbar ist. Beispielkonfiguration auf dem NFS-Server, wenn der Satelliten-Server die Adresse 1.2.3.4 hat:",
     "lang_nfsHelp2": "Alternative Konfiguration mittels all_sqash. In diesem Fall muss das Verzeichnis auf dem Server dem Benutzer mit der uid 1234 geh\u00f6ren:",
     "lang_noAdditionalInformation": "Keine Weitere Konfiguration notwendig",
     "lang_password": "Passwort",
diff --git a/lang/de/templates/sysconfig/ldap-start.json b/lang/de/templates/sysconfig/ldap-start.json
index 3ad85b86..390eabd1 100644
--- a/lang/de/templates/sysconfig/ldap-start.json
+++ b/lang/de/templates/sysconfig/ldap-start.json
@@ -8,7 +8,7 @@
     "lang_password": "Passwort",
     "lang_searchBase": "Suchbasis (Search base)",
     "lang_ssl": "SSL",
-    "lang_sslDescription": "Zum Verbinden mit dem LDAP-Server SSL verwenden. (Die Verbindung zwischen Client und Proxy wird in jedem Fall mit SSL abgewickelt.)",
+    "lang_sslDescription": "Zum Verbinden mit dem LDAP-Server SSL verwenden. (Die Verbindung zwischen Client und Proxy wird in jedem Fall mit SSL abgewickelt.) Einige LDAP-Server verweigern die Authentifizierung, wenn SSL nicht genutzt wird.",
     "lang_userDirectory": "Home-Verzeichnis",
     "lang_userDirectoryInfo1": "UNC-Pfad zum Home-Verzeichnis der Nutzer, mit Platzhalter '%s' f\u00fcr den Benutzernamen.",
     "lang_userDirectoryInfo2": "Zur Zeit wird nur SMB\/CIFS unterst\u00fctzt."
diff --git a/lang/de/templates/webinterface/https.json b/lang/de/templates/webinterface/https.json
index 7e8c6020..02cb76cd 100644
--- a/lang/de/templates/webinterface/https.json
+++ b/lang/de/templates/webinterface/https.json
@@ -5,7 +5,7 @@
     "lang_description": "Hier k\u00f6nnen Sie festlegen, ob das Web-Interface auch per HTTPS erreichbar sein soll, und welches Zertifikat daf\u00fcr verwendet werden soll.",
     "lang_httpsSettings": "HTTPS-Konfiguration",
     "lang_noHttps": "HTTPS deaktivieren",
-    "lang_privateKey": "Bitte f\u00fcgen Sie hier den privaten Schl\u00fcssel ein, der zum obigen Zertifikat geh\u00f6rt. Er muss ebenfalls im \u0022pem\u0022-Format vorliegen, und sieht wie folgt aus:",
+    "lang_privateKey": "Bitte f\u00fcgen Sie hier den privaten Schl\u00fcssel ein, der zum obigen Zertifikat geh\u00f6rt. Er muss ebenfalls im \"pem\"-Format vorliegen, und sieht wie folgt aus:",
     "lang_randomCert": "Neues selbstsigniertes Zertifikat generieren",
     "lang_save": "Speichern"
 }
\ No newline at end of file
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