Update translations

13 files changed, 19 insertions, 57 deletions

diff --git a/modules-available/baseconfig/lang/de/template-tags.json b/modules-available/baseconfig/lang/de/template-tags.json
index 34163ca9..cdd54f6a 100644
--- a/modules-available/baseconfig/lang/de/template-tags.json
+++ b/modules-available/baseconfig/lang/de/template-tags.json
@@ -1,5 +1,7 @@
 {
     "lang_basicConfiguration": "Basiskonfiguration",
     "lang_clientRelatedConfig": "Die Optionen auf dieser Seite beziehen sich auf das Verhalten der bwLehrpool-Clients.",
-    "lang_enableOverride": "\u00dcberschreiben"
+    "lang_editOverrideNotice": "Sie bearbeiten die Einstellungen f\u00fcr einen Unterbereich",
+    "lang_enableOverride": "\u00dcberschreiben",
+    "lang_settingActive": "Einstellung aktiv"
 }
\ No newline at end of file
diff --git a/modules-available/baseconfig/lang/en/template-tags.json b/modules-available/baseconfig/lang/en/template-tags.json
index 6adfd682..8e75e5ac 100644
--- a/modules-available/baseconfig/lang/en/template-tags.json
+++ b/modules-available/baseconfig/lang/en/template-tags.json
@@ -1,22 +1,7 @@
 {
     "lang_basicConfiguration": "Basic Configuration",
-    "lang_catPartition": "Partition Managment",
-    "lang_catUser": "User Managment",
     "lang_clientRelatedConfig": "The options on this page are related to the bwLehrpool client machines.",
-    "lang_confirm": "Would you like to save the settings on [ \/srv\/openslx\/www\/boot\/config ] ?",
+    "lang_editOverrideNotice": "You're editing the settings of a sub-section",
     "lang_enableOverride": "Override",
-    "lang_helpId": "Partition Id",
-    "lang_helpMountPoint": "Must be a directory: \/example\/directory\/",
-    "lang_helpOptions": "Currently, only option 'bootable' is available",
-    "lang_helpSize": "Must be in Gigabytes e.g. 15G",
-    "lang_newPartition": "New Partition",
-    "lang_newUser": "New User",
-    "lang_partitionId": "Id",
-    "lang_partitionMountPoint": "Mount Point",
-    "lang_partitionOptions": "Options",
-    "lang_partitionSize": "Size",
-    "lang_resetConfirm": "Do you really wish to reset the variable to their default values?",
-    "lang_resetDefault": "Reset Default",
-    "lang_userName": "Username",
-    "lang_userPasswd": "Password"
+    "lang_settingActive": "Setting active"
 }
\ No newline at end of file
diff --git a/modules-available/baseconfig/lang/pt/template-tags.json b/modules-available/baseconfig/lang/pt/template-tags.json
index 28b9cb76..14367665 100644
--- a/modules-available/baseconfig/lang/pt/template-tags.json
+++ b/modules-available/baseconfig/lang/pt/template-tags.json
@@ -1,21 +1,3 @@
 {
-    "lang_basicConfiguration": "Configura\u00e7\u00e3o B\u00e1sica",
-    "lang_catPartition": "Gerenciamento de Parti\u00e7\u00f5es",
-    "lang_catUser": "Gerenciamente de Usu\u00e1rios",
-    "lang_confirm": "Voc\u00ea deseja salvar configura\u00e7\u00f5es em [ \/srv\/openslx\/www\/boot\/default\/config ] ?",
-    "lang_create": "Criar",
-    "lang_helpId": "Id da parti\u00e7\u00e3o",
-    "lang_helpMountPoint": "Precisa ser um diret\u00f3rio: \/exemplo\/diret\u00f3rio\/",
-    "lang_helpOptions": "Atualmente, apenas a op\u00e7\u00e3o 'bootable' est\u00e1 dispon\u00edvel",
-    "lang_helpSize": "Precisa estar em Gigabytes, por exemplo 15G",
-    "lang_newPartition": "Nova Parti\u00e7\u00e3o",
-    "lang_newUser": "Novo Usu\u00e1rio",
-    "lang_partitionId": "Id",
-    "lang_partitionMountPoint": "Mount Point",
-    "lang_partitionOptions": "Op\u00e7\u00f5es",
-    "lang_partitionSize": "Tamanho",
-    "lang_resetConfirm": "Voc\u00ea realmente deseja restaurar as vari\u00e1veis para seus valores padr\u00f5es?",
-    "lang_resetDefault": "Restaurar Padr\u00e3o",
-    "lang_userName": "Nome",
-    "lang_userPasswd": "Senha"
+    "lang_basicConfiguration": "Configura\u00e7\u00e3o B\u00e1sica"
 }
\ No newline at end of file
diff --git a/modules-available/baseconfig_partitions_cdn/lang/de/template-tags.json b/modules-available/baseconfig_partitions_cdn/lang/de/template-tags.json
index 91cca0db..ea4f9f5c 100644
--- a/modules-available/baseconfig_partitions_cdn/lang/de/template-tags.json
+++ b/modules-available/baseconfig_partitions_cdn/lang/de/template-tags.json
@@ -1,5 +1,4 @@
 {
-    "lang_addPartition": "Partition anlegen",
     "lang_confirm": "Wollen Sie die Einstellungen unter \/srv\/openslx\/www\/boot\/config speichern?",
     "lang_create": "Anlegen",
     "lang_explanationText": "Hier k\u00f6nnen Sie bestimmen, welche Partitionen auf dem Client angelegt werden.",
diff --git a/modules-available/locations/lang/de/template-tags.json b/modules-available/locations/lang/de/template-tags.json
index 13e21217..09ee8a35 100644
--- a/modules-available/locations/lang/de/template-tags.json
+++ b/modules-available/locations/lang/de/template-tags.json
@@ -6,11 +6,14 @@
     "lang_deleteChildLocations": "Untergeordnete Orte ebenfalls l\u00f6schen",
     "lang_deleteLocation": "Ort l\u00f6schen",
     "lang_deleteSubnet": "Bereich l\u00f6schen",
+    "lang_editConfigVariables": "Konfiguration anpassen",
     "lang_endAddress": "Endadresse",
     "lang_listOfSubnets": "Liste der Subnetze",
     "lang_location": "Ort",
     "lang_locationInfo": "Details zu diesem Ort",
     "lang_locationName": "Name",
+    "lang_locationOtherOverlap": "Achtung! Folgende Orte haben sich \u00fcberlappende Netzbereiche",
+    "lang_locationSelfOverlap": "Folgender Ort hat mehrere sich \u00fcberschneidende Netzbereiche",
     "lang_locationSettings": "Raum\/Ort bearbeiten",
     "lang_locationsMainHeading": "Verwaltung von R\u00e4umen\/Orten",
     "lang_matchingMachines": "Enthaltene Rechner",
@@ -21,5 +24,6 @@
     "lang_startAddress": "Startadresse",
     "lang_subnet": "IP-Bereich",
     "lang_thisListByLocation": "Zur Ortsansicht",
-    "lang_thisListBySubnet": "Nach Subnetzen auflisten"
+    "lang_thisListBySubnet": "Nach Subnetzen auflisten",
+    "lang_unassignedMachines": "Rechner, die in keinen definierten Ort fallen"
 }
\ 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 1ea0f56e..bd64554f 100644
--- a/modules-available/locations/lang/en/template-tags.json
+++ b/modules-available/locations/lang/en/template-tags.json
@@ -6,11 +6,14 @@
     "lang_deleteChildLocations": "Delete child locations aswell",
     "lang_deleteLocation": "Delete location",
     "lang_deleteSubnet": "Delete range",
+    "lang_editConfigVariables": "Edit config variables",
     "lang_endAddress": "End address",
     "lang_listOfSubnets": "List of subnets",
     "lang_location": "Ort",
     "lang_locationInfo": "Location details",
     "lang_locationName": "Name",
+    "lang_locationOtherOverlap": "Warning! These locations have overlapping address ranges",
+    "lang_locationSelfOverlap": "The following location has multiple address ranges that are overlapping",
     "lang_locationSettings": "Edit this room or location",
     "lang_locationsMainHeading": "Manage rooms and locations",
     "lang_matchingMachines": "Matching clients",
@@ -21,5 +24,6 @@
     "lang_startAddress": "Start address",
     "lang_subnet": "IP range",
     "lang_thisListByLocation": "List by location",
-    "lang_thisListBySubnet": "List by subnet"
+    "lang_thisListBySubnet": "List by subnet",
+    "lang_unassignedMachines": "Machines not matching any location"
 }
\ No newline at end of file
diff --git a/modules-available/news/lang/de/template-tags.json b/modules-available/news/lang/de/template-tags.json
index 94aee385..7bd4c0e0 100644
--- a/modules-available/news/lang/de/template-tags.json
+++ b/modules-available/news/lang/de/template-tags.json
@@ -1,5 +1,4 @@
 {
-    "lang_activeNews": "Aktive News",
     "lang_content": "Inhalt",
     "lang_date": "Datum",
     "lang_editNews": "News bearbeiten",
diff --git a/modules-available/news/lang/en/template-tags.json b/modules-available/news/lang/en/template-tags.json
index 8630e8e8..e33f6945 100644
--- a/modules-available/news/lang/en/template-tags.json
+++ b/modules-available/news/lang/en/template-tags.json
@@ -1,5 +1,4 @@
 {
-    "lang_activeNews": "News",
     "lang_content": "Content",
     "lang_date": "Date",
     "lang_editNews": "Edit news",
diff --git a/modules-available/news/lang/pt/template-tags.json b/modules-available/news/lang/pt/template-tags.json
index 127aeec9..f1d71682 100644
--- a/modules-available/news/lang/pt/template-tags.json
+++ b/modules-available/news/lang/pt/template-tags.json
@@ -1,5 +1,4 @@
 {
-    "lang_activeNews": "Novidades",
     "lang_content": "Conte\u00fado",
     "lang_date": "Data",
     "lang_latestUpdate": "\u00daltima Atualiza\u00e7\u00e3o",
diff --git a/modules-available/serversetup-bwlp/lang/de/template-tags.json b/modules-available/serversetup-bwlp/lang/de/template-tags.json
index 12881540..593eb9e8 100644
--- a/modules-available/serversetup-bwlp/lang/de/template-tags.json
+++ b/modules-available/serversetup-bwlp/lang/de/template-tags.json
@@ -7,7 +7,6 @@
     "lang_bootMenu": "Bootmen\u00fc",
     "lang_bootMenuCreate": "Bootmen\u00fc erzeugen",
     "lang_chooseIP": "Bitte w\u00e4hlen Sie die IP-Adresse, \u00fcber die der Server von den Clients zum Booten angesprochen werden soll.",
-    "lang_compile": "Kompilieren",
     "lang_customEntry": "Eigener Eintrag",
     "lang_downloadImage": "USB-Image herunterladen",
     "lang_example": "Beispiel",
diff --git a/modules-available/serversetup-bwlp/lang/en/template-tags.json b/modules-available/serversetup-bwlp/lang/en/template-tags.json
index 61ac6ade..f2c8aa41 100644
--- a/modules-available/serversetup-bwlp/lang/en/template-tags.json
+++ b/modules-available/serversetup-bwlp/lang/en/template-tags.json
@@ -7,18 +7,10 @@
     "lang_bootMenu": "Boot Menu",
     "lang_bootMenuCreate": "Create Boot Menu",
     "lang_chooseIP": "Please select the IP address that the client server will use to boot.",
-    "lang_compile": "Compile",
-    "lang_compilingIpxe": "Compiling iPXE",
     "lang_customEntry": "Custom entry",
-    "lang_customScript": "Custom script",
-    "lang_download": "Download",
     "lang_downloadImage": "Download USB image",
     "lang_example": "Example",
-    "lang_extension": "Extension",
     "lang_generationFailed": "Could not generate boot menu. The bwLehrpool-System might not work properly. If you can't fix the problem, please report the error message above to the bwLehrpool project.",
-    "lang_ipxeInfo": "Here it is possible to compile iPXE using a custom script.",
-    "lang_ipxeWarning": "If this is your first time compiling, it may take 1 to 4 minutes to finish.",
-    "lang_loading": "Loading",
     "lang_localHDD": "Local HDD",
     "lang_masterPassword": "Master password",
     "lang_masterPasswordHelp": "The master password is required to edit a boot menu entry. This should be set for security reasons.",
@@ -28,10 +20,6 @@
     "lang_menuCustomHint3": "and select as the default boot behavior custom as well.",
     "lang_menuDisplayTime": "Menu Display Time",
     "lang_menuGeneration": "Generating boot menu...",
-    "lang_mountIpxe": "Mount iPXE",
-    "lang_restoreDefault": "Restore Default",
-    "lang_saveScript": "Save Script",
     "lang_seconds": "Seconds",
-    "lang_set": "Set",
-    "lang_success": "Successfully create file:"
+    "lang_set": "Set"
 }
\ No newline at end of file
diff --git a/modules-available/statistics/lang/de/template-tags.json b/modules-available/statistics/lang/de/template-tags.json
index bd4785c0..40f3dbc4 100644
--- a/modules-available/statistics/lang/de/template-tags.json
+++ b/modules-available/statistics/lang/de/template-tags.json
@@ -6,6 +6,7 @@
     "lang_cpuCores": "CPU-Kerne",
     "lang_cpuModel": "CPU",
     "lang_details": "Details",
+    "lang_devices": "Ger\u00e4te",
     "lang_event": "Ereignis",
     "lang_firstSeen": "Erste Aktivit\u00e4t",
     "lang_gbRam": "RAM",
diff --git a/modules-available/statistics/lang/en/template-tags.json b/modules-available/statistics/lang/en/template-tags.json
index aae26ae6..beb9f4f6 100644
--- a/modules-available/statistics/lang/en/template-tags.json
+++ b/modules-available/statistics/lang/en/template-tags.json
@@ -6,6 +6,7 @@
     "lang_cpuCores": "CPU cores",
     "lang_cpuModel": "CPU",
     "lang_details": "Details",
+    "lang_devices": "Devices",
     "lang_event": "Event",
     "lang_firstSeen": "First seen",
     "lang_gbRam": "RAM",