summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Ritter2017-11-30 18:28:33 +0100
committerSimon Rettberg2017-11-30 18:28:33 +0100
commit1a6f7561c191d34edbf152d516b70ceacbd44a0c (patch)
tree7a0f767ef3781060c6ff724d91c13440450769ef
parent[locationinfo] removed seconds from the time. More than 4 locations are allow... (diff)
downloadslx-admin-1a6f7561c191d34edbf152d516b70ceacbd44a0c.tar.gz
slx-admin-1a6f7561c191d34edbf152d516b70ceacbd44a0c.tar.xz
slx-admin-1a6f7561c191d34edbf152d516b70ceacbd44a0c.zip
Update translations
-rw-r--r--modules-available/dnbd3/lang/de/template-tags.json6
-rw-r--r--modules-available/dnbd3/lang/en/template-tags.json2
-rw-r--r--modules-available/locationinfo/lang/de/messages.json5
-rw-r--r--modules-available/locationinfo/lang/de/template-tags.json2
-rw-r--r--modules-available/locationinfo/lang/en/messages.json5
-rw-r--r--modules-available/locationinfo/lang/en/template-tags.json6
-rw-r--r--modules-available/roomplanner/baseconfig/getconfig.inc.php15
-rw-r--r--modules-available/roomplanner/config.json2
-rw-r--r--modules-available/roomplanner/hooks/runmode/config.json6
-rw-r--r--modules-available/runmode/lang/de/template-tags.json2
-rw-r--r--modules-available/runmode/lang/en/template-tags.json2
-rw-r--r--modules-available/sysconfig/lang/de/module.json1
-rw-r--r--modules-available/sysconfig/lang/en/module.json3
13 files changed, 33 insertions, 24 deletions
diff --git a/modules-available/dnbd3/lang/de/template-tags.json b/modules-available/dnbd3/lang/de/template-tags.json
index a9321e75..a178df6d 100644
--- a/modules-available/dnbd3/lang/de/template-tags.json
+++ b/modules-available/dnbd3/lang/de/template-tags.json
@@ -15,7 +15,7 @@
"lang_count": "Anzahl",
"lang_disabled": "Deaktiviert",
"lang_diskFree": "Freier Speicher",
- "lang_dnbd3IntroText": "DNBD3 ist ganz toll. Einfach einschalten und los gehts, zu beachten gibt es rein gar nichts!",
+ "lang_dnbd3IntroText": "DNBD3 ist ein verteiltes Speichersystem speziell f\u00fcr die Anforderungen von bwLehrpool. Erst in Verbindung mit mindestens einem Proxy (zus\u00e4tzlich zum Satellitenserver) kann das System seine Geschwindigkeitsvorteile gegen\u00fcber NFS\/CIFS ausspielen. F\u00fcr schlecht angebundene Poolr\u00e4ume empfiehlt sich jeweils ein eigener Proxy-Server.\r\nBitte beachten Sie die Hinweise im Wiki.",
"lang_dnbd3Management": "DNBD3 Verwaltung",
"lang_dnbd3Status": "DNBD3 Status",
"lang_editProxyHeading": "Proxy-Einstellungen bearbeiten",
@@ -39,7 +39,7 @@
"lang_managedServerHelp": "Automatisch konfigurierte DNBD3-Proxies booten wie gew\u00f6hnliche bwLehrpool-Clients via PXE \u00fcber den Satelliten-Server. Sobald ein bwLehrpool-Client als DNBD3-Proxy konfiguriert wird, erh\u00e4lt er beim Booten eine gesonderte Konfiguration, sodass er fortan exklusiv als DNBD3-Proxy arbeitet, und nicht mehr als Arbeitsstation zur Verf\u00fcgung steht.\r\nDer Vorteil ist, dass die Konfiguration automatisiert erfolgt, und durch w\u00f6chentliche Reboots sichergestellt wird, dass eventuelle Updates des MiniLinux angewendet werden.\r\nIn diesem Fall legen Sie bitte eine Partition mit der ID 45 auf der Festplatte des Proxy-Servers an; diese wird persistent Behandelt und im Gegensatz zur ID44-Partition nicht beim Booten formatiert. Generell sollte diese Partition so gro\u00df wie m\u00f6glich sein, abh\u00e4ngig von der Anzahl der genutzten VMs. Bei Platzmangel l\u00f6scht der Proxy automatisch die VM, die am l\u00e4ngsten nicht verwendet wurde, um neuen VMs Platz zu machen.\r\nWeitere Informationen dazu finden Sie im Wiki.",
"lang_numFails": "Fehler",
"lang_proxyConfig": "Konfiguration",
- "lang_proxyLocationText": "Bla bla bla BLA!!!!",
+ "lang_proxyLocationText": "Hier k\u00f6nnen Sie festlegen, dass nur Clients aus bestimmten R\u00e4umen\/Orten diesen Proxy verwenden. Damit vermeiden Sie die Metrikmessung zwischen Client und Proxy, wenn aufgrund der Infrastruktur bereits bekannt ist, dass dieser Proxy nur f\u00fcr bestimmte R\u00e4ume sinnvoll ist. ",
"lang_proxyServerTHead": "Server\/Proxy",
"lang_reboot": "Reboot",
"lang_rebootProxyHeading": "Proxy neustarten",
@@ -55,4 +55,4 @@
"lang_txTotal": "Gesamt gesendet",
"lang_uptime": "Aktuelle Laufzeit",
"lang_wantToDelete": "Wollen Sie diesen Server wirklich entfernen? (Rebooten\/Ausschalten muss in diesem Fall manuell vorgenommen werden)"
-}
+} \ No newline at end of file
diff --git a/modules-available/dnbd3/lang/en/template-tags.json b/modules-available/dnbd3/lang/en/template-tags.json
index 6c539db6..0441521f 100644
--- a/modules-available/dnbd3/lang/en/template-tags.json
+++ b/modules-available/dnbd3/lang/en/template-tags.json
@@ -15,6 +15,7 @@
"lang_count": "Count",
"lang_disabled": "Disabled",
"lang_diskFree": "Free space",
+ "lang_dnbd3IntroText": "DNBD3 is a distributed storage system for the special requirements of bwLehrpool. To see speed improvements over NFS\/CIFS you need at least one proxy (besides the satellite server). If you have locations with slow network connection it's advisable to have one proxy per location. Please mind the information in the wiki.",
"lang_dnbd3Management": "DNBD3 management",
"lang_dnbd3Status": "DNBD3 status",
"lang_editProxyHeading": "Edit proxy settings",
@@ -38,6 +39,7 @@
"lang_managedServerHelp": "Automatically configured DNBD3-Proxies will boot like normal bwLehrpool-Clients over PXE and the satellite server. If a client is configured as proxy it will boot with a different configuration and acts exclusively as proxy. The client can therefore not be used as a normal working station.\r\nThe advantage is that you don't need to install or configure anything else. The client will reboot every week to get possible updates ot the minilinux.\r\nIf you want to use this feature, please create a partition with ID 45 on the local hard disk of the proxy server. In contrast to the ID 44 partition which is formated after every reboot, this partition is persistent. As a rule of thumb the partition should be as big as possible. If there is no space left the proxy will delete the VM which hasn't be used for the longest time. More information in the wiki.",
"lang_numFails": "Errors",
"lang_proxyConfig": "Configuration",
+ "lang_proxyLocationText": "Here you can restrict the usage of this proxy to certain locations. This can be useful if the usage is only reasonable from some locations. That may be because of the network infrastructure.",
"lang_proxyServerTHead": "Server\/Proxy",
"lang_reboot": "Reboot",
"lang_rebootProxyHeading": "Reboot proxy",
diff --git a/modules-available/locationinfo/lang/de/messages.json b/modules-available/locationinfo/lang/de/messages.json
index 8da5bd33..622b94ac 100644
--- a/modules-available/locationinfo/lang/de/messages.json
+++ b/modules-available/locationinfo/lang/de/messages.json
@@ -5,6 +5,9 @@
"ignored-invalid-range": "Eintrag mit ung\u00fcltiger Range ignoriert",
"ignored-invalid-start": "Eintrag mit ung\u00fcltiger Startzeit ignoriert",
"ignored-line-no-days": "Eintrag ohne ausgew\u00e4hlte Tage ignoriert",
+ "invalid-backend-type": "Ung\u00fcltiger Backend-Typ '{{0}}'",
"invalid-panel-id": "Ung\u00fcltige Panel-ID '{{0}}'",
- "invalid-server-id": "Ung\u00fcltige Server-ID '{{0}}'"
+ "invalid-panel-type": "Ung\u00fcltiger Panel-Typ '{{0}}'",
+ "invalid-server-id": "Ung\u00fcltige Server-ID '{{0}}'",
+ "server-id-missing": "Server-ID fehlt"
} \ No newline at end of file
diff --git a/modules-available/locationinfo/lang/de/template-tags.json b/modules-available/locationinfo/lang/de/template-tags.json
index e647ceac..be2814d6 100644
--- a/modules-available/locationinfo/lang/de/template-tags.json
+++ b/modules-available/locationinfo/lang/de/template-tags.json
@@ -68,6 +68,8 @@
"lang_panelsTable": "Panels verwalten",
"lang_panelsTableHints": "Hier sehen Sie alle erstellen Anzeigetafeln, die per Browser an beliebiger Stelle angezeigt werden k\u00f6nnen, z.B. als digitales T\u00fcrschild.",
"lang_pleaseSelect": "Bitte w\u00e4hlen\u2026",
+ "lang_prettytime": "PrettyTime",
+ "lang_prettytimeTooltip": "Verwende ein anderes Anzeigeformat f\u00fcr die Uhrzeit",
"lang_recursiveServerSet": "Auch f\u00fcr alle untergeordneten R\u00e4ume setzen",
"lang_recursiveSetTooltip": "Wenn aktiviert, wird der Backend-Server auch f\u00fcr alle untergeordneten R\u00e4ume auf den hier gew\u00e4hlten Wert gesetzt",
"lang_remoteSchedule": "Abruf Belegungsplan",
diff --git a/modules-available/locationinfo/lang/en/messages.json b/modules-available/locationinfo/lang/en/messages.json
index 6767bfcf..348390dd 100644
--- a/modules-available/locationinfo/lang/en/messages.json
+++ b/modules-available/locationinfo/lang/en/messages.json
@@ -5,6 +5,9 @@
"ignored-invalid-range": "Ignored entry with invalid range",
"ignored-invalid-start": "Ignored entry with invalid start time",
"ignored-line-no-days": "Ignored entry with no days selected",
+ "invalid-backend-type": "Invalid backend type '{{0}}'",
"invalid-panel-id": "Invalid panel id '{{0}}'",
- "invalid-server-id": "Invalid server id '{{0}}'"
+ "invalid-panel-type": "Invalid panel type '{{0}}'",
+ "invalid-server-id": "Invalid server id '{{0}}'",
+ "server-id-missing": "Server id is missing"
} \ No newline at end of file
diff --git a/modules-available/locationinfo/lang/en/template-tags.json b/modules-available/locationinfo/lang/en/template-tags.json
index 0325d165..0d2b42a3 100644
--- a/modules-available/locationinfo/lang/en/template-tags.json
+++ b/modules-available/locationinfo/lang/en/template-tags.json
@@ -26,6 +26,7 @@
"lang_ecoTooltip": "Symbolic based pc state pictures are used instead of the colour based ones",
"lang_editDefaultPanelHints": "Here you can define panel properties for e.g. a digital door sign. To show opening times for a room you need to define corresponding times in the settings.\r\nIf you want to show calendar events you have to define a functioning backend first and link it to corresponding rooms.",
"lang_editPanel": "Edit panel",
+ "lang_editSummaryPanelHints": "Here you can define a summary panel which shows a overview of clients in your locations.",
"lang_editUrlPanelHints": "Here you can define which URL is opened by the panel. This enables you to show news about your university or any other website.",
"lang_entryName": "Name",
"lang_error": "Error",
@@ -41,6 +42,7 @@
"lang_locationSettings": "Settings",
"lang_locations": "Locations",
"lang_locationsTable": "Rooms \/ Locations",
+ "lang_locationsTableHints": "Here you can define opening times for your locations and link the location ID to a configured backend (e.g. HISinOne) to show calendar events.",
"lang_longFri": "Friday",
"lang_longMon": "Monday",
"lang_longSat": "Saturday",
@@ -64,7 +66,10 @@
"lang_panelType": "Type",
"lang_panels": "Panels",
"lang_panelsTable": "Manage panels",
+ "lang_panelsTableHints": "This shows you all panels which can be shown anywhere by a browser of your choice, e.g. for a digital door sign.",
"lang_pleaseSelect": "Please select...",
+ "lang_prettytime": "PrettyTime",
+ "lang_prettytimeTooltip": "Use a different display format for the time",
"lang_recursiveServerSet": "Also set for all child locations",
"lang_recursiveSetTooltip": "If checked, all direct and indirect child locations will be configured to use the backend server selected above",
"lang_remoteSchedule": "Time table retrieval",
@@ -85,6 +90,7 @@
"lang_sec": "sec",
"lang_server": "Server",
"lang_serverTable": "Manage backend servers",
+ "lang_serverTableHints": "List of all configured server backends. Those are required if you want to show calendar events for your locations.",
"lang_serverTooltip": "Defines from which server the room queries the calendar data",
"lang_serverType": "Type",
"lang_shortFri": "Fri",
diff --git a/modules-available/roomplanner/baseconfig/getconfig.inc.php b/modules-available/roomplanner/baseconfig/getconfig.inc.php
deleted file mode 100644
index aa8721ef..00000000
--- a/modules-available/roomplanner/baseconfig/getconfig.inc.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-ConfigHolder::add("SLX_PVS_CONFIG_URL", 'http://' . $_SERVER['SERVER_ADDR'] . $_SERVER['SCRIPT_NAME'] . '?do=roomplanner');
-
-$res = Database::queryFirst('SELECT dedicatedmgr FROM location_roomplan WHERE managerip = :ip LIMIT 1', ['ip' => $ip]);
-if ($res !== false) {
- if ((int)$res['dedicatedmgr'] !== 0) {
- // TODO: Runmode
- ConfigHolder::add("SLX_PVS_DEDICATED", 'yes');
- ConfigHolder::add("SLX_EXAM", false, 100000);
- ConfigHolder::add("SLX_SYSTEMD_TARGET", false, 100000);
- } else {
- ConfigHolder::add("SLX_PVS_HYBRID", 'yes');
- }
-} \ No newline at end of file
diff --git a/modules-available/roomplanner/config.json b/modules-available/roomplanner/config.json
index f620405a..537714c3 100644
--- a/modules-available/roomplanner/config.json
+++ b/modules-available/roomplanner/config.json
@@ -1,3 +1,3 @@
{
- "dependencies": ["js_jqueryui", "js_selectize", "bootstrap_dialog", "statistics", "locations"]
+ "dependencies": ["js_jqueryui", "js_selectize", "bootstrap_dialog", "statistics", "locations", "runmode"]
}
diff --git a/modules-available/roomplanner/hooks/runmode/config.json b/modules-available/roomplanner/hooks/runmode/config.json
new file mode 100644
index 00000000..0f2ce493
--- /dev/null
+++ b/modules-available/roomplanner/hooks/runmode/config.json
@@ -0,0 +1,6 @@
+{
+ "getModeName": "PvsGenerator::getManagerName",
+ "isClient": false,
+ "configHook": "PvsGenerator::runmodeConfigHook",
+ "allowGenericEditor": false
+} \ No newline at end of file
diff --git a/modules-available/runmode/lang/de/template-tags.json b/modules-available/runmode/lang/de/template-tags.json
index 63eaa5ec..6b45b82c 100644
--- a/modules-available/runmode/lang/de/template-tags.json
+++ b/modules-available/runmode/lang/de/template-tags.json
@@ -1,6 +1,6 @@
{
"lang_addNewMachines": "Clients",
- "lang_assignMachineIntroText": "Definieren Sie hier Clients, die in einem speziellen Betriebsmodus gestartet werden sollen",
+ "lang_assignMachineIntroText": "Definieren Sie hier Clients, die in einem speziellen Betriebsmodus gestartet werden sollen. Sie k\u00f6nnen Rechner anhand der UUID, IP, Hostname oder MAC-Adresse suchen.",
"lang_assignRunmodeToMachine": "Betriebsmodus",
"lang_confirmDelete": "Wollen Sie den Betriebsmodus f\u00fcr diesen Client entfernen?",
"lang_isclient": "Pool-Client",
diff --git a/modules-available/runmode/lang/en/template-tags.json b/modules-available/runmode/lang/en/template-tags.json
index 7b8040dd..43fd3da5 100644
--- a/modules-available/runmode/lang/en/template-tags.json
+++ b/modules-available/runmode/lang/en/template-tags.json
@@ -1,6 +1,6 @@
{
"lang_addNewMachines": "Clients",
- "lang_assignMachineIntroText": "Define the clients which should start a special runmode configuration",
+ "lang_assignMachineIntroText": "Define the clients which should start a special runmode configuration. You can search for clients by UUID, IP address, host name or MAC address.",
"lang_assignRunmodeToMachine": "Runmode",
"lang_confirmDelete": "Do you want to delete the runmode for this client?",
"lang_isclient": "Pool-Client",
diff --git a/modules-available/sysconfig/lang/de/module.json b/modules-available/sysconfig/lang/de/module.json
index 056cd158..4b401437 100644
--- a/modules-available/sysconfig/lang/de/module.json
+++ b/modules-available/sysconfig/lang/de/module.json
@@ -1,4 +1,5 @@
{
+ "config-module": "Konfigurationsmodul",
"lang_clientSshConfig": "SSH-Konfiguration",
"lang_configurationCompilation": "Konfiguration zusammenstellen",
"lang_contentOf": "Inhalt von",
diff --git a/modules-available/sysconfig/lang/en/module.json b/modules-available/sysconfig/lang/en/module.json
index 526f6562..ba2d0591 100644
--- a/modules-available/sysconfig/lang/en/module.json
+++ b/modules-available/sysconfig/lang/en/module.json
@@ -1,4 +1,5 @@
{
+ "config-module": "Config module",
"lang_clientSshConfig": "SSH configuration",
"lang_configurationCompilation": "Compile configuration",
"lang_contentOf": "Content of",
@@ -7,4 +8,4 @@
"lang_unknwonTaskManager": "Unknown Task Manager error",
"module_name": "Localization",
"page_title": "Localize and integrate"
-}
+} \ No newline at end of file