Merge branch 'master' into usb-lock-offusb-lock-off

3 files changed, 11 insertions, 9 deletions

diff --git a/modules-available/locations/lang/en/messages.json b/modules-available/locations/lang/en/messages.json
index fca00c7c..95788c47 100644
--- a/modules-available/locations/lang/en/messages.json
+++ b/modules-available/locations/lang/en/messages.json
@@ -3,6 +3,7 @@
     "invalid-location-id": "Invalid location id: {{0}}",
     "location-deleted": "Location has been deleted (locations: {{0}}, subnets: {{1}})",
     "location-updated": "Location {{0}} has been updated",
+    "no-permission-location": "No permissions for location {{0}}",
     "parameter-missing": "Missing parameter: {{0}}",
     "subnets-created": "{{0}} subnet(s) created",
     "subnets-deleted": "{{0}} subnet(s) deleted",
diff --git a/modules-available/locations/lang/en/permissions.json b/modules-available/locations/lang/en/permissions.json
index db0ac5f6..1d01a9d1 100644
--- a/modules-available/locations/lang/en/permissions.json
+++ b/modules-available/locations/lang/en/permissions.json
@@ -1,9 +1,9 @@
 {
-	"location.view": "View locations.",
-	"location.edit": "Edit locations.",
-	"location.add": "Add locations.",
-	"location.delete": "Delete locations.",
-	"subnet.edit": "Edit subnets.",
-	"subnet.add": "Add subnets.",
-	"subnet.delete": "Delete subnets."
+    "location.add": "Add locations.",
+    "location.delete": "Delete locations.",
+    "location.edit.name": "Rename locations.",
+    "location.edit.parent": "Change the parent location of a location.",
+    "location.edit.subnets": "Edit the IP ranges of a location.",
+    "location.view": "View locations.",
+    "subnets.edit": "Edit subnets via the subnet overview."
 }
\ No newline at end of file
diff --git a/modules-available/locations/lang/en/template-tags.json b/modules-available/locations/lang/en/template-tags.json
index ddb90f83..64211e27 100644
--- a/modules-available/locations/lang/en/template-tags.json
+++ b/modules-available/locations/lang/en/template-tags.json
@@ -3,6 +3,7 @@
     "lang_areYouSureNoUndo": "Are you sure? This cannot be undone!",
     "lang_assignSubnetExplanation": "Client machines which fall into an IP range listed below will be assigned to this location and will see an according lecture list (e.g. they will see lectures that are exclusively assigned to this location).",
     "lang_assignedSubnets": "Assigned subnets \/ IP ranges",
+    "lang_bootMenu": "Boot menu",
     "lang_deleteChildLocations": "Delete child locations aswell",
     "lang_deleteLocation": "Delete location",
     "lang_deleteSubnet": "Delete range",
@@ -22,14 +23,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