Work on translations: templates and messages work

6 files changed, 20 insertions, 36 deletions

diff --git a/modules-available/locations/lang/de/templates/location-subnets.json b/modules-available/locations/lang/de/template-tags.json
index 6caa1991..839536f1 100644
--- a/modules-available/locations/lang/de/templates/location-subnets.json
+++ b/modules-available/locations/lang/de/template-tags.json
@@ -1,18 +1,27 @@
 {
     "lang_addNewSubnet": "Neues Subnetz hinzuf\u00fcgen",
+    "lang_areYouSureNoUndo": "Sind Sie sicher? Diese Aktion kann nicht r\u00fcckg\u00e4ngig gemacht werden.",
     "lang_assignSubnetExplanation": "Rechner, die in einen der hier aufgef\u00fchrten Adressbereiche fallen, werden diesem Ort zugeschrieben und erhalten damit z.B. f\u00fcr diesen Raum angepasste Veranstaltungslisten.",
     "lang_assignedSubnets": "Zugeordnete Subnetze bzw. IP-Bereiche",
     "lang_deleteChildLocations": "Untergeordnete Orte ebenfalls l\u00f6schen",
     "lang_deleteLocation": "Ort l\u00f6schen",
     "lang_deleteSubnet": "Bereich l\u00f6schen",
+    "lang_edit": "Bearbeiten",
     "lang_endAddress": "Endadresse",
+    "lang_listOfSubnets": "Liste der Subnetze",
+    "lang_location": "Ort",
     "lang_locationInfo": "Details zu diesem Ort",
+    "lang_locationName": "Name",
     "lang_locationSettings": "Raum\/Ort bearbeiten",
+    "lang_locationsMainHeading": "Verwaltung von R\u00e4umen\/Orten",
     "lang_matchingMachines": "Enthaltene Rechner",
     "lang_name": "Name",
+    "lang_noParent": "Kein \u00fcbergeordneter Ort",
     "lang_parentLocation": "\u00dcbergeordneter Ort",
     "lang_referencingLectures": "Veranstaltungen",
     "lang_save": "Speichern",
     "lang_startAddress": "Startadresse",
-    "lang_subnet": "IP-Bereich"
+    "lang_subnet": "IP-Bereich",
+    "lang_thisListByLocation": "Zur Ortsansicht",
+    "lang_thisListBySubnet": "Nach Subnetzen auflisten"
 }
\ No newline at end of file
diff --git a/modules-available/locations/lang/de/templates/locations.json b/modules-available/locations/lang/de/templates/locations.json
deleted file mode 100644
index 3e25ef45..00000000
--- a/modules-available/locations/lang/de/templates/locations.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "lang_areYouSureNoUndo": "Sind Sie sicher? Diese Aktion kann nicht r\u00fcckg\u00e4ngig gemacht werden.",
-    "lang_edit": "Bearbeiten",
-    "lang_location": "Ort",
-    "lang_locationName": "Name",
-    "lang_locationsMainHeading": "Verwaltung von R\u00e4umen\/Orten",
-    "lang_noParent": "Kein \u00fcbergeordneter Ort",
-    "lang_save": "Speichern",
-    "lang_thisListBySubnet": "Nach Subnetzen auflisten"
-}
\ No newline at end of file
diff --git a/modules-available/locations/lang/de/templates/subnets.json b/modules-available/locations/lang/de/templates/subnets.json
deleted file mode 100644
index b57f87ce..00000000
--- a/modules-available/locations/lang/de/templates/subnets.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "lang_endAddress": "Ende",
-    "lang_listOfSubnets": "Liste der Subnetze",
-    "lang_location": "Ort",
-    "lang_startAddress": "Start",
-    "lang_thisListByLocation": "Zur Ortsansicht"
-}
\ No newline at end of file
diff --git a/modules-available/locations/lang/en/templates/location-subnets.json b/modules-available/locations/lang/en/template-tags.json
index 2ba94384..7c217732 100644
--- a/modules-available/locations/lang/en/templates/location-subnets.json
+++ b/modules-available/locations/lang/en/template-tags.json
@@ -1,18 +1,27 @@
 {
     "lang_addNewSubnet": "Add new subnet",
+    "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_deleteChildLocations": "Delete child locations aswell",
     "lang_deleteLocation": "Delete location",
     "lang_deleteSubnet": "Delete range",
+    "lang_edit": "Edit",
     "lang_endAddress": "End address",
+    "lang_listOfSubnets": "List of subnets",
+    "lang_location": "Ort",
     "lang_locationInfo": "Location details",
+    "lang_locationName": "Name",
     "lang_locationSettings": "Edit this room or location",
+    "lang_locationsMainHeading": "Manage rooms and locations",
     "lang_matchingMachines": "Matching clients",
     "lang_name": "Name",
+    "lang_noParent": "No parent",
     "lang_parentLocation": "Parent location",
     "lang_referencingLectures": "Assigned Lectures",
     "lang_save": "Save",
     "lang_startAddress": "Start address",
-    "lang_subnet": "IP range"
+    "lang_subnet": "IP range",
+    "lang_thisListByLocation": "List by location",
+    "lang_thisListBySubnet": "List by subnet"
 }
\ No newline at end of file
diff --git a/modules-available/locations/lang/en/templates/locations.json b/modules-available/locations/lang/en/templates/locations.json
deleted file mode 100644
index db4fd0a7..00000000
--- a/modules-available/locations/lang/en/templates/locations.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "lang_areYouSureNoUndo": "Are you sure? This cannot be undone!",
-    "lang_edit": "Edit",
-    "lang_location": "Ort",
-    "lang_locationName": "Name",
-    "lang_locationsMainHeading": "Manage rooms and locations",
-    "lang_noParent": "No parent",
-    "lang_save": "Save",
-    "lang_thisListBySubnet": "List by subnet"
-}
\ No newline at end of file
diff --git a/modules-available/locations/lang/en/templates/subnets.json b/modules-available/locations/lang/en/templates/subnets.json
deleted file mode 100644
index 65da254b..00000000
--- a/modules-available/locations/lang/en/templates/subnets.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "lang_endAddress": "End",
-    "lang_listOfSubnets": "List of subnets",
-    "lang_location": "Location",
-    "lang_startAddress": "Start",
-    "lang_thisListByLocation": "List by location"
-}
\ No newline at end of file