summaryrefslogtreecommitdiffstats
path: root/lang
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
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')
-rw-r--r--lang/de/messages.json1
-rw-r--r--lang/de/settings/setting.json2
-rw-r--r--lang/de/templates/sysconfig/cfg-start.json4
-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
-rw-r--r--lang/pt/templates/sysconfig/cfg-start.json1
7 files changed, 8 insertions, 7 deletions
diff --git a/lang/de/messages.json b/lang/de/messages.json
index 51540c15..b344fd41 100644
--- a/lang/de/messages.json
+++ b/lang/de/messages.json
@@ -28,6 +28,7 @@
"missing-title": "Kein Titel eingegeben",
"module-added": "Modul erfolgreich hinzugef\u00fcgt",
"module-deleted": "Modul {{0}} wurde gel\u00f6scht",
+ "module-edited": "Modul wurde aktualisiert",
"module-in-use": "Modul {{0}} wird noch durch Konfiguration {{1}} verwendet",
"module-rebuild-failed": "Neubau des Moduls fehlgeschlagen",
"module-rebuilding": "Modul wird neu generiert",
diff --git a/lang/de/settings/setting.json b/lang/de/settings/setting.json
index e2fbe145..63a4d881 100644
--- a/lang/de/settings/setting.json
+++ b/lang/de/settings/setting.json
@@ -11,7 +11,7 @@
"SLX_PROXY_IP": "Die Adresse des zu verwendenden Proxy Servers.",
"SLX_PROXY_MODE": "Legt fest, ob zum Zugriff aufs Internet ein Proxy-Server ben\u00f6tigt wird.\r\n*off* = keinen Proxy benutzen.\r\n*on* = Proxy immer benutzen.\r\n*auto* = Proxy nur benutzen, wenn sich der Client-PC in einem privaten Adressbereich befindet.",
"SLX_PROXY_PORT": "Der Port des zu verwendenden Proxy Servers.",
- "SLX_PROXY_TYPE": "Art des Proxys: *socks4*, *socks5*, *http-connect* (HTTP Proxy mit Unterst\u00fctzung der CONNECT-Methode),*http-relay* (Klassischer HTTP Proxy)",
+ "SLX_PROXY_TYPE": "Art des Proxys: *socks4*, *socks5*, *http-connect* (HTTP Proxy mit Unterst\u00fctzung der CONNECT-Methode), *http-relay* (Klassischer HTTP Proxy)",
"SLX_REMOTE_LOG_SESSIONS": "Legt fest, ob Logins und Logouts der Benutzer an den Satelliten gemeldet werden sollen.\r\n*yes* = Mit Benutzerkennung loggen\r\n*anonymous* = Anonym loggen\r\n*no* = Nicht loggen",
"SLX_ROOT_PASS": "Das root-Passwort des Grundsystems. Wird nur f\u00fcr Diagnosezwecke am Client ben\u00f6tigt.\r\nFeld leer lassen, um root-Logins zu verbieten.\r\n\/Hinweis\/: Das Passwort wird im Klartext in der lokalen Datenbank hinterlegt, jedoch immer gehasht an die Clients \u00fcbermittelt (SHA-512 mit Salt). Wenn Sie das Passwort auch im Satelliten nicht im Klartext speichern wollen, k\u00f6nnen Sie hier auch ein vorgehashtes Passwort eintragen (im *$6$....*-Format).",
"SLX_SHUTDOWN_SCHEDULE": "Feste Uhrzeit, zu der sich die Rechner ausschalten, auch wenn noch ein Benutzer aktiv ist.Mehrere Zeitpunkte k\u00f6nnen durch Leerzeichen getrennt angegeben werden.",
diff --git a/lang/de/templates/sysconfig/cfg-start.json b/lang/de/templates/sysconfig/cfg-start.json
index c5f4c5fa..c22a96c3 100644
--- a/lang/de/templates/sysconfig/cfg-start.json
+++ b/lang/de/templates/sysconfig/cfg-start.json
@@ -2,6 +2,6 @@
"lang_configuration": "Konfiguration",
"lang_configurationChoose": "Bitte w\u00e4hlen Sie, welche Module f\u00fcr diese Konfiguration verwendet werden sollen.",
"lang_name": "Name",
- "lang_new": "Neu",
- "lang_next": "Weiter"
+ "lang_next": "Weiter",
+ "lang_noModuleOfType": "Kein Modul dieser Art vorhanden."
} \ No newline at end of file
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
diff --git a/lang/pt/templates/sysconfig/cfg-start.json b/lang/pt/templates/sysconfig/cfg-start.json
index 7b980f3c..27260a59 100644
--- a/lang/pt/templates/sysconfig/cfg-start.json
+++ b/lang/pt/templates/sysconfig/cfg-start.json
@@ -2,6 +2,5 @@
"lang_configuration": "Configura\u00e7\u00e3o",
"lang_configurationChoose": "Por favor, selecione qual os m\u00f3dulos ser\u00e3o usados \u200b\u200bpara esta configura\u00e7\u00e3o.",
"lang_name": "Nome",
- "lang_new": "Nova",
"lang_next": "Pr\u00f3ximo"
} \ No newline at end of file