18 files changed, 109 insertions, 5 deletions
diff --git a/lang/de/messages.json b/lang/de/messages.json
index 4d2859b2..1d3a40bd 100644
--- a/lang/de/messages.json
+++ b/lang/de/messages.json
@@ -1,5 +1,6 @@
 {
     "ad-config-failed": "Wiederherstellen der Active Directory Konfiguration fehlgeschlagen",
+    "added-x-entries": "Eintr\u00e4ge hinzugef\u00fcgt: {{0}}",
     "adduser-disabled": "Keine ausreichenden Rechte, um weitere Benutzer hinzuzuf\u00fcgen",
     "adduser-success": "Benutzer erfolgreich hinzugef\u00fcgt",
     "backup-failed": "Sicherung fehlgeschlagen!",
@@ -25,6 +26,8 @@
     "invalid-ip": "Kein Interface ist auf die Adresse {{0}} konfiguriert",
     "invalid-path": "Ung\u00fcltiger Pfad.",
     "invalid-template": "Ausgew\u00e4hlte Template ist nicht g\u00fcltig",
+    "location-deleted": "Location wurde gel\u00f6scht (Locations: {{0}}, Subnets: {{1}})",
+    "location-updated": "Location {{0}} wurde aktualisiert",
     "loginfail": "Benutzername oder Kennwort falsch",
     "mail-config-saved": "Mail-Konfiguration gespeichert",
     "missing-file": "Es wurde keine Datei ausgew\u00e4hlt!",
@@ -42,6 +45,7 @@
     "no-image": "Unter der angegebenen URL konnte kein SVG-Bild gefunden werden",
     "no-permission": "Keine ausreichenden Rechte, um auf diese Seite zuzugreifen",
     "notes-saved": "Anmerkungen gespeichert",
+    "parameter-missing": "Fehlender Parameter: {{0}}",
     "password-mismatch": "Passwort und Passwortbest\u00e4tigung stimmen nicht \u00fcberein",
     "reboot-unconfirmed": "Sicherheitsabfrage zum Reboot nicht best\u00e4tigt",
     "remote-parse-failed": "Parsen der empfangenen Daten fehlgeschlagen ({{0}})",
@@ -50,6 +54,9 @@
     "replacing-module": "Ersetzen von Modul {{0}}",
     "restore-done": "Wiederherstellung abgeschlossen",
     "settings-updated": "Einstellungen wurden aktualisiert",
+    "subnets-created": "Subnetze angelegt: {{0}}",
+    "subnets-deleted": "Subnetze gel\u00f6scht: {{0}}",
+    "subnets-updated": "Subnetze aktualisiert: {{0}}",
     "task-error": "Ausf\u00fchrung fehlgeschlagen: {{0}}",
     "taskmanager-error": "Verbindung zum Taskmanager fehlgeschlagen",
     "taskmanager-format": "Taskmanager hat ung\u00fcltige Daten zur\u00fcckgeliefert",
diff --git a/lang/de/settings/cat_setting.json b/lang/de/settings/cat_setting.json
index 0a8050b5..b8cb6935 100644
--- a/lang/de/settings/cat_setting.json
+++ b/lang/de/settings/cat_setting.json
@@ -4,5 +4,6 @@
     "cat_3": "Zeitsynchronisation",
     "cat_4": "Grundsystem",
     "cat_5": "Gemeinsames Netzlaufwerk",
-    "cat_6": "Unkategorisiert"
+    "cat_6": "Unkategorisiert",
+    "cat_7": "vmchooser"
 }
 \ No newline at end of file
diff --git a/lang/de/settings/setting.json b/lang/de/settings/setting.json
index 46ead11b..af1007be 100644
--- a/lang/de/settings/setting.json
+++ b/lang/de/settings/setting.json
@@ -16,5 +16,8 @@
     "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.",
-    "SLX_SHUTDOWN_TIMEOUT": "Zeit in Sekunden, nach dem ein Rechner abgeschaltet wird, sofern kein Benutzer angemeldet ist.Feld leer lassen, um die Funktion zu deaktivieren."
+    "SLX_SHUTDOWN_TIMEOUT": "Zeit in Sekunden, nach dem ein Rechner abgeschaltet wird, sofern kein Benutzer angemeldet ist.Feld leer lassen, um die Funktion zu deaktivieren.",
+    "SLX_VMCHOOSER_FORLOCATION": "Legt das Verhalten fest, wenn es Veranstaltungen gibt, die an einen bestimmten Ort\/Raum gebunden sind.\r\n*IGNORE*: Mit den restlichen, globalen Veranstaltungen alphabetisch sortiert auflisten.\r\n*BUMP*: Die spezifischen Veranstaltungen oben auflisten, die globalen darunter.\r\n*EXCLUSIVE*: Spezifische Veranstaltungen oben auflisten, globale Veranstaltungen zun\u00e4chst ausblenden. Die globalen Veranstaltungen befinden sich unter einem eingeklappten Listenknoten.",
+    "SLX_VMCHOOSER_TAB": "Bestimmt, welcher Karteireiter im vmchooser standardm\u00e4\u00dfig ausgew\u00e4hlt wird.\r\n*0*: Native Linux-Sessions\r\n*1*: Nutzerspezifische Kurse\r\n*2*: Alle Kurse\r\n*AUTO*: Hat der Rechner beschr\u00e4nkte Ressourcen, werden die Linux-Sitzungen angezeigt, sonst alle Kurse\r\n\r\nHat der Benutzer ein persistentes Home-Verzeichnis, wirkt sich diese Einstellung nur beim ersten Anmelden aus. Bei sp\u00e4teren Sitzungen markiert der vmchooser die zuletzt gestartete Sitzung und wechselt zum entsprechenden Karteireiter.",
+    "SLX_VMCHOOSER_TEMPLATES": "Legt fest, wie Veranstaltungen in der Sortierung behandelt werden, welche auf eine VM linken, die eine Vorlage ist.\r\n*IGNORE*: Wie regul\u00e4re Veranstaltungen behandeln\r\n*BUMP*: Weiter oben in der Liste einsortieren"
 }
 \ No newline at end of file
diff --git a/lang/de/templates/locations/location-subnets.json b/lang/de/templates/locations/location-subnets.json
new file mode 100644
index 00000000..6caa1991
--- /dev/null
+++ b/lang/de/templates/locations/location-subnets.json
@@ -0,0 +1,18 @@
+{
+    "lang_addNewSubnet": "Neues Subnetz hinzuf\u00fcgen",
+    "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_endAddress": "Endadresse",
+    "lang_locationInfo": "Details zu diesem Ort",
+    "lang_locationSettings": "Raum\/Ort bearbeiten",
+    "lang_matchingMachines": "Enthaltene Rechner",
+    "lang_name": "Name",
+    "lang_parentLocation": "\u00dcbergeordneter Ort",
+    "lang_referencingLectures": "Veranstaltungen",
+    "lang_save": "Speichern",
+    "lang_startAddress": "Startadresse",
+    "lang_subnet": "IP-Bereich"
+}
+\ No newline at end of file
diff --git a/lang/de/templates/locations/locations.json b/lang/de/templates/locations/locations.json
new file mode 100644
index 00000000..3e25ef45
--- /dev/null
+++ b/lang/de/templates/locations/locations.json
@@ -0,0 +1,10 @@
+{
+    "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/lang/de/templates/locations/subnets.json b/lang/de/templates/locations/subnets.json
new file mode 100644
index 00000000..b57f87ce
--- /dev/null
+++ b/lang/de/templates/locations/subnets.json
@@ -0,0 +1,7 @@
+{
+    "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/lang/de/templates/main-menu.json b/lang/de/templates/main-menu.json
index 3ed43eff..67ae974a 100644
--- a/lang/de/templates/main-menu.json
+++ b/lang/de/templates/main-menu.json
@@ -10,6 +10,7 @@
     "lang_internetAccess": "Internetzugriff",
     "lang_language": "Sprachen",
     "lang_localization": "Lokalisierung + Integration",
+    "lang_locations": "R\u00e4ume\/Orte",
     "lang_login": "Anmelden",
     "lang_logout": "Abmelden",
     "lang_needsSetup": "Einrichtung unvollst\u00e4ndig",
diff --git a/lang/en/messages.json b/lang/en/messages.json
index aed10cce..7d60575d 100644
--- a/lang/en/messages.json
+++ b/lang/en/messages.json
@@ -1,5 +1,6 @@
 {
     "ad-config-failed": "Rebuilding the Active Directory configuration failed",
+    "added-x-entries": "Entries added: {{0}}",
     "adduser-disabled": "Insufficient privileges to add more users",
     "adduser-success": "User successfully added",
     "backup-failed": "Backup failed!",
@@ -25,6 +26,8 @@
     "invalid-ip": "No interface is configured with the address {{0}}",
     "invalid-path": "Invalid path.",
     "invalid-template": "Selected template is not valid",
+    "location-deleted": "Location has been deleted (locations: {{0}}, subnets: {{1}})",
+    "location-updated": "Location {{0}} has been updated",
     "loginfail": "Username or Password incorrect",
     "mail-config-saved": "Mail config saved",
     "missing-file": "There was no file selected!",
@@ -42,6 +45,7 @@
     "no-image": "Could not find an SVG-image at the given URL",
     "no-permission": "No sufficient privileges to access this page",
     "notes-saved": "Notes have been saved",
+    "parameter-missing": "Missing parameter: {{0}}",
     "password-mismatch": "Password and password confirmation do not match",
     "reboot-unconfirmed": "Confirmation prompt to reboot not confirmed",
     "remote-parse-failed": "Parsing the received data failed ({{0}})",
@@ -50,6 +54,9 @@
     "replacing-module": "Replace module {{0}}",
     "restore-done": "Restore done",
     "settings-updated": "Settings have been updated",
+    "subnets-created": "{{0}} subnet(s) created",
+    "subnets-deleted": "{{0}} subnet(s) deleted",
+    "subnets-updated": "{{0}} subnet(s) updated",
     "task-error": "Execution failed: {{0}}",
     "taskmanager-error": "Failed to connect to the Task Manager",
     "taskmanager-format": "Task Manager has returned invalid data",
diff --git a/lang/en/settings/cat_setting.json b/lang/en/settings/cat_setting.json
index 856775a9..7c0ab654 100644
--- a/lang/en/settings/cat_setting.json
+++ b/lang/en/settings/cat_setting.json
@@ -4,5 +4,6 @@
     "cat_3": "Time Synchronization",
     "cat_4": "Basic System",
     "cat_5": "Common network share",
-    "cat_6": "Uncategorized"
+    "cat_6": "Uncategorized",
+    "cat_7": "vmchooser"
 }
 \ No newline at end of file
diff --git a/lang/en/settings/setting.json b/lang/en/settings/setting.json
index 11a34f17..36ac6e8c 100644
--- a/lang/en/settings/setting.json
+++ b/lang/en/settings/setting.json
@@ -16,5 +16,8 @@
     "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 client system. Only required for diagnostic purposes on the client.Leave field blank to disallow root logins.\r\n\/Hint\/: The password SHA-512-with-salt hashed before it's being sent to the client. It's only stored in clear text on the Satellite Server. If you want to have it hashed on the server too, you can supply a pre-hashed passoword in \/$6$...$...\/-format.",
     "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.",
-    "SLX_SHUTDOWN_TIMEOUT": "Time in seconds after which a computer is switched off, if no user is logged on.Leave blank to disable the function."
+    "SLX_SHUTDOWN_TIMEOUT": "Time in seconds after which a computer is switched off, if no user is logged on.Leave blank to disable the function.",
+    "SLX_VMCHOOSER_FORLOCATION": "Defines how lectures special to the user's location are handled in the vmchooser.\r\n*IGNORE*: Sort them alphabetically among the global lectures.\r\n*BUMP*: Put them atop the global lectures.\r\n*EXCLUSIVE*: Put them atop the global lectures and aditionally collapse the node which contains the global lectures.",
+    "SLX_VMCHOOSER_TAB": "Defines which tab is show by default, if the user doesn't have stored a last used session on his persistent home directory.\r\n*0*: Native Linux sessions\r\n*1*: User specific lectures\r\n*2*: All lectures\r\n*AUTO*: If the computer has low system specs, show the Linux sessions, otherwise, show all lectures",
+    "SLX_VMCHOOSER_TEMPLATES": "Defines how lectures that link to template VMs are treated wrt sorting.\r\n*IGNORE*: Sort among regular lectures\r\n*BUMP*: Move to top of list"
 }
 \ No newline at end of file
diff --git a/lang/en/templates/locations/location-subnets.json b/lang/en/templates/locations/location-subnets.json
new file mode 100644
index 00000000..2ba94384
--- /dev/null
+++ b/lang/en/templates/locations/location-subnets.json
@@ -0,0 +1,18 @@
+{
+    "lang_addNewSubnet": "Add new subnet",
+    "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_endAddress": "End address",
+    "lang_locationInfo": "Location details",
+    "lang_locationSettings": "Edit this room or location",
+    "lang_matchingMachines": "Matching clients",
+    "lang_name": "Name",
+    "lang_parentLocation": "Parent location",
+    "lang_referencingLectures": "Assigned Lectures",
+    "lang_save": "Save",
+    "lang_startAddress": "Start address",
+    "lang_subnet": "IP range"
+}
+\ No newline at end of file
diff --git a/lang/en/templates/locations/locations.json b/lang/en/templates/locations/locations.json
new file mode 100644
index 00000000..db4fd0a7
--- /dev/null
+++ b/lang/en/templates/locations/locations.json
@@ -0,0 +1,10 @@
+{
+    "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/lang/en/templates/locations/subnets.json b/lang/en/templates/locations/subnets.json
new file mode 100644
index 00000000..65da254b
--- /dev/null
+++ b/lang/en/templates/locations/subnets.json
@@ -0,0 +1,7 @@
+{
+    "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
diff --git a/lang/en/templates/main-menu.json b/lang/en/templates/main-menu.json
index be9cefed..d22f90d7 100644
--- a/lang/en/templates/main-menu.json
+++ b/lang/en/templates/main-menu.json
@@ -10,6 +10,7 @@
     "lang_internetAccess": "Internet access",
     "lang_language": "Language",
     "lang_localization": "Localization",
+    "lang_locations": "Rooms\/Locations",
     "lang_login": "Login",
     "lang_logout": "Logout",
     "lang_needsSetup": "Setup incomplete",
diff --git a/lang/pt/settings/cat_setting.json b/lang/pt/settings/cat_setting.json
index 772575fc..b04839e8 100644
--- a/lang/pt/settings/cat_setting.json
+++ b/lang/pt/settings/cat_setting.json
@@ -2,5 +2,6 @@
     "cat_1": "Inatividade e Desligamento",
     "cat_2": "Acesso \u00e0 Internet",
     "cat_3": "Sincroniza\u00e7\u00e3o de Tempo",
-    "cat_4": "Sistema B\u00e1sico"
+    "cat_4": "Sistema B\u00e1sico",
+    "cat_7": "vmchooser"
 }
 \ No newline at end of file
diff --git a/lang/pt/templates/locations/location-subnets.json b/lang/pt/templates/locations/location-subnets.json
new file mode 100644
index 00000000..c44dc44f
--- /dev/null
+++ b/lang/pt/templates/locations/location-subnets.json
@@ -0,0 +1,3 @@
+[
+
+]
+\ No newline at end of file
diff --git a/lang/pt/templates/locations/locations.json b/lang/pt/templates/locations/locations.json
new file mode 100644
index 00000000..c44dc44f
--- /dev/null
+++ b/lang/pt/templates/locations/locations.json
@@ -0,0 +1,3 @@
+[
+
+]
+\ No newline at end of file
diff --git a/lang/pt/templates/locations/subnets.json b/lang/pt/templates/locations/subnets.json
new file mode 100644
index 00000000..c44dc44f
--- /dev/null
+++ b/lang/pt/templates/locations/subnets.json
@@ -0,0 +1,3 @@
+[
+
+]
+\ No newline at end of file