summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2018-03-21 11:30:29 +0100
committerSimon Rettberg2018-03-21 11:30:29 +0100
commitd5166e77fbb1dc034a421da868f9539fc455e490 (patch)
treef8be30ac1302051adcf19938bd10fea597626ff2
parent[vmstore] Add fields to specify mount options (diff)
downloadslx-admin-d5166e77fbb1dc034a421da868f9539fc455e490.tar.gz
slx-admin-d5166e77fbb1dc034a421da868f9539fc455e490.tar.xz
slx-admin-d5166e77fbb1dc034a421da868f9539fc455e490.zip
Update translations
-rw-r--r--modules-available/locations/lang/de/template-tags.json4
-rw-r--r--modules-available/locations/lang/en/template-tags.json4
-rw-r--r--modules-available/rebootcontrol/page.inc.php2
-rw-r--r--modules-available/runmode/lang/de/messages.json1
-rw-r--r--modules-available/runmode/lang/de/template-tags.json1
-rw-r--r--modules-available/runmode/lang/en/messages.json1
-rw-r--r--modules-available/runmode/lang/en/template-tags.json1
-rw-r--r--modules-available/statistics/page.inc.php2
8 files changed, 10 insertions, 6 deletions
diff --git a/modules-available/locations/lang/de/template-tags.json b/modules-available/locations/lang/de/template-tags.json
index 04d10d06..43142555 100644
--- a/modules-available/locations/lang/de/template-tags.json
+++ b/modules-available/locations/lang/de/template-tags.json
@@ -6,7 +6,7 @@
"lang_deleteChildLocations": "Untergeordnete Orte ebenfalls l\u00f6schen",
"lang_deleteLocation": "Ort l\u00f6schen",
"lang_deleteSubnet": "Bereich l\u00f6schen",
- "lang_deleteSubnetWarning": "Alle zum L\u00f6schen markierten Subnetze werden gelöscht. Diese Aktion kann nicht r\u00fcckg\u00e4ngig gemacht werden.",
+ "lang_deleteSubnetWarning": "Alle zum L\u00f6schen markierten Subnetze werden gel\u00f6scht. Diese Aktion kann nicht r\u00fcckg\u00e4ngig gemacht werden.",
"lang_editConfigVariables": "Konfig.-Variablen",
"lang_editRoomplan": "Raumplan bearbeiten",
"lang_endAddress": "Endadresse",
@@ -22,10 +22,10 @@
"lang_machineLoad": "Besetzt",
"lang_matchingMachines": "Enthaltene Rechner",
"lang_name": "Name",
- "lang_noParent": "Kein \u00fcbergeordneter Ort",
"lang_overrideCount": "Angepasst",
"lang_parentLocation": "\u00dcbergeordneter Ort",
"lang_referencingLectures": "Veranstaltungen",
+ "lang_showRoomplan": "Raumplan anzeigen",
"lang_startAddress": "Startadresse",
"lang_subnet": "IP-Bereich",
"lang_sysConfig": "Lokalisierung",
diff --git a/modules-available/locations/lang/en/template-tags.json b/modules-available/locations/lang/en/template-tags.json
index ddb90f83..41261726 100644
--- a/modules-available/locations/lang/en/template-tags.json
+++ b/modules-available/locations/lang/en/template-tags.json
@@ -22,14 +22,14 @@
"lang_machineLoad": "In use",
"lang_matchingMachines": "Matching clients",
"lang_name": "Name",
- "lang_noParent": "No parent",
"lang_overrideCount": "Overridden",
"lang_parentLocation": "Parent location",
"lang_referencingLectures": "Assigned Lectures",
+ "lang_showRoomplan": "Show room plan",
"lang_startAddress": "Start address",
"lang_subnet": "IP range",
"lang_sysConfig": "Localization\/Integration",
"lang_thisListByLocation": "Locations",
"lang_thisListBySubnet": "Subnets",
"lang_unassignedMachines": "Machines not matching any location"
-}
+} \ No newline at end of file
diff --git a/modules-available/rebootcontrol/page.inc.php b/modules-available/rebootcontrol/page.inc.php
index fa7688d8..abbdb2c3 100644
--- a/modules-available/rebootcontrol/page.inc.php
+++ b/modules-available/rebootcontrol/page.inc.php
@@ -38,7 +38,7 @@ class Page_RebootControl extends Page
// Filter ones with no permission
foreach (array_keys($actualClients) as $idx) {
if (!User::hasPermission('action.' . $this->action, $actualClients[$idx]['locationid'])) {
- Message::addWarning('main.location-no-permission', $actualClients[$idx]['locationid']);
+ Message::addWarning('locations.no-permission-location', $actualClients[$idx]['locationid']);
unset($actualClients[$idx]);
} else {
$locationId = $actualClients[$idx]['locationid'];
diff --git a/modules-available/runmode/lang/de/messages.json b/modules-available/runmode/lang/de/messages.json
index 911d48d4..bca70019 100644
--- a/modules-available/runmode/lang/de/messages.json
+++ b/modules-available/runmode/lang/de/messages.json
@@ -2,6 +2,7 @@
"cannot-edit-module": "Modul {{0}} kann nicht direkt editiert werden",
"enabled-removed-save": "{{0}} Rechner gespeichert, {{1}} entfernt",
"invalid-modeid": "{{1}} ist kein g\u00fcltiger Betriebsmodus f\u00fcr Modul {{0}}",
+ "machine-no-permission": "Keine Berechtigung f\u00fcr client {{0}}",
"machine-not-found": "Rechner {{0}} nicht gefunden",
"machine-not-runmode": "Rechner {{0}} hatte keinen speziellen Betriebsmodus aktiviert",
"machine-removed": "Rechner {{0}} entfernt",
diff --git a/modules-available/runmode/lang/de/template-tags.json b/modules-available/runmode/lang/de/template-tags.json
index 6b45b82c..989e5b1d 100644
--- a/modules-available/runmode/lang/de/template-tags.json
+++ b/modules-available/runmode/lang/de/template-tags.json
@@ -3,6 +3,7 @@
"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_existingClients": "Vorhandene Clients mit diesem Betriebsmodus",
"lang_isclient": "Pool-Client",
"lang_machine": "Client",
"lang_mode": "Modus",
diff --git a/modules-available/runmode/lang/en/messages.json b/modules-available/runmode/lang/en/messages.json
index 6d890428..1ca1567a 100644
--- a/modules-available/runmode/lang/en/messages.json
+++ b/modules-available/runmode/lang/en/messages.json
@@ -2,6 +2,7 @@
"cannot-edit-module": "Module {{0}} cannot be edited directly",
"enabled-removed-save": "Saved {{0}} clients, deleted {{1}}",
"invalid-modeid": "Module {{0}} doesn't provide mode {{1}}",
+ "machine-no-permission": "No permission for client {{0}}",
"machine-not-found": "Client {{0}} not found",
"machine-not-runmode": "No special mode of operation configured for client {{0}}",
"machine-removed": "Removed client {{0}}",
diff --git a/modules-available/runmode/lang/en/template-tags.json b/modules-available/runmode/lang/en/template-tags.json
index 43fd3da5..89cf6b15 100644
--- a/modules-available/runmode/lang/en/template-tags.json
+++ b/modules-available/runmode/lang/en/template-tags.json
@@ -3,6 +3,7 @@
"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_existingClients": "Existing clients with this run mode",
"lang_isclient": "Pool-Client",
"lang_machine": "Client",
"lang_mode": "Mode",
diff --git a/modules-available/statistics/page.inc.php b/modules-available/statistics/page.inc.php
index 3baac190..60743fb6 100644
--- a/modules-available/statistics/page.inc.php
+++ b/modules-available/statistics/page.inc.php
@@ -227,7 +227,7 @@ class Page_Statistics extends Page
if (in_array($row['locationid'], $allowedLocations)) {
$delete[] = $row['machineuuid'];
} else {
- Message::addError('no-permission-location', $row['locationid']);
+ Message::addError('locations.no-permission-location', $row['locationid']);
}
}
if (!empty($delete)) {