[merge] merging c3sl / fr - initial commit

90 files changed, 153 insertions, 31 deletions

diff --git a/lang/de/messages-hardcoded.json b/lang/de/messages-hardcoded.json
index f785f042..692bc9bc 100644
--- a/lang/de/messages-hardcoded.json
+++ b/lang/de/messages-hardcoded.json
@@ -4,12 +4,15 @@
     "lang_contentOf": "Inhalt von",
     "lang_createUser": "Benutzer anlegen",
     "lang_days": "Tag(e)",
+    "lang_eventLog": "Server Log",
     "lang_hours": "Stunde(n)",
     "lang_location": "Lokalisierung",
     "lang_login": "Anmelden",
     "lang_moduleAdd": "Modul hinzuf\u00fcgen",
     "lang_noModuleFromThisGroup": "(Kein Modul dieser Gruppe)",
     "lang_serverConfiguration": "Serverseitige Konfiguration",
+    "lang_serverStatus": "Server Status",
+    "lang_status": "Status",
     "lang_titleBackup": "Sichern und Wiederherstellen",
     "lang_titleClientStatistics": "Client-Statistiken",
     "lang_titleEventLog": "Ereignisprotokoll",
diff --git a/lang/de/modules/adduser.json b/lang/de/modules/adduser.json
new file mode 100644
index 00000000..0f446025
--- /dev/null
+++ b/lang/de/modules/adduser.json
@@ -0,0 +1,8 @@
+{
+    "lang_confirmation": "Wiederholen",
+    "lang_createUser": "Benutzer anlegen",
+    "lang_fullName": "Vollst\u00e4ndiger Name",
+    "lang_password": "Passwort",
+    "lang_telephone": "Telefon",
+    "lang_username": "Benutzerkennung"
+}
\ No newline at end of file
diff --git a/lang/de/modules/backup.json b/lang/de/modules/backup.json
new file mode 100644
index 00000000..5e3efea2
--- /dev/null
+++ b/lang/de/modules/backup.json
@@ -0,0 +1,14 @@
+{
+    "lang_backup": "Sichern",
+    "lang_backupDescription": "Hier k\u00f6nnen Sie die Konfiguration des Satellitenservers sichern. Dies beinhaltet die Datenbank \u00fcber alle Virtuellen Maschinen, Veranstaltungen, Authentifizerungsmodule, Passw\u00f6rter, Proxies, den konfigurierten VM-Store sowie weitere Konfiguration des MiniLinux.\r\nDie Festplattenabbilder der Virtuellen Maschinen auf dem VM-Store werden hierbei nicht gesichert. Eventuelle Backups des Stores m\u00fcssen separat durchgef\u00fchrt werden.",
+    "lang_backupRestore": "Sichern und Wiederherstellen",
+    "lang_browseForFile": "Durchsuchen",
+    "lang_download": "Herunterladen",
+    "lang_dozmodExplanation": "Die Datenbank des Dozentenmoduls wiederherstellen. Dazu geh\u00f6ren die Metadaten der Virtuellen Maschinen, die Veranstaltungen, etc. Bitte beachten Sie, dass hierzu auf dem konfigurierten VM-Store die passenden VM-Abbilder vorliegen m\u00fcssen, da diese extern gespeichert werden. Wenn sich der Servername oder die -adresse ge\u00e4ndert haben stellen Sie bitte sicher, dass die relativen Pfade innerhalb des Netzlaufwerks gleich geblieben sind. Ansonsten werden die wiederhergestellten VMs nicht verwendbar sein.",
+    "lang_restore": "Hochladen",
+    "lang_restoreDescription": "Hier k\u00f6nnen Sie ein Backup der Konfiguration wieder einspielen. Bitte beachten Sie, dass der Server dabei neu gestartet wird, daher sollten Sie dies m\u00f6glichst durchf\u00fchren, wenn das System nicht genutzt wird, und keine Dozenten Veranstaltungen oder Virtuelle Labore erstellen oder hoch-\/herunterladen. Bitte beachten Sie, dass dabei auch das urspr\u00fcngliche Passwort der Weboberfl\u00e4che wiederhergestellt wird.",
+    "lang_restoreDozmodConfig": "Dozentenmodul-Konfiguration wiederherstellen",
+    "lang_restoreSystemConfig": "Systemkonfiguration wiederherstellen",
+    "lang_selectFile": "Bitte w\u00e4hlen Sie ein Backup-Archiv",
+    "lang_systemExplanation": "Die Grundkonfiguration des Satelliten wiederherstellen: Authentifizierungmethode, Passw\u00f6rter, Proxies, VM-Storage, etc.\r\nACHTUNG: Wenn Sie ein Backup von vor WS15\/16 einspielen (Backup-Format vor Version 10), wird die Systemkonfiguration in jedem Fall wiederhergestellt, auch wenn Sie diesen Haken nicht setzen."
+}
\ No newline at end of file
diff --git a/lang/de/templates/baseconfig/_page.json b/lang/de/templates/baseconfig/_page.json
index 5a4e5a6d..0f4819b4 100644
--- a/lang/de/templates/baseconfig/_page.json
+++ b/lang/de/templates/baseconfig/_page.json
@@ -1,7 +1,15 @@
 {
     "lang_basicConfiguration": "Basiskonfiguration",
+    "lang_catUser": "Benutzerverwaltung",
     "lang_clientRelatedConfig": "Die Optionen auf dieser Seite beziehen sich auf das Verhalten der bwLehrpool-Clients.",
     "lang_close": "Schlie\u00dfen",
+    "lang_create": "Schaffen",
+    "lang_delete": "L\u00f6schen",
+    "lang_help": "Hilfe",
+    "lang_newUser": "Neuer Benutzer",
+    "lang_partitionMountPoint": "Mount Point",
     "lang_reset": "Zur\u00fccksetzen",
-    "lang_save": "Speichern"
+    "lang_save": "Speichern",
+    "lang_userName": "Benutzername",
+    "lang_userPasswd": "Passwort"
 }
\ No newline at end of file
diff --git a/lang/de/templates/page-news.json b/lang/de/templates/page-news.json
index d1cf877e..7801584d 100644
--- a/lang/de/templates/page-news.json
+++ b/lang/de/templates/page-news.json
@@ -1,4 +1,5 @@
 {
+    "lang_activeNews": "Aktive News",
     "lang_content": "Inhalt",
     "lang_date": "Datum",
     "lang_delete": "L\u00f6schen",
diff --git a/lang/de/templates/serversetup/ipxe.json b/lang/de/templates/serversetup/ipxe.json
index 54a3408b..edce0b5e 100644
--- a/lang/de/templates/serversetup/ipxe.json
+++ b/lang/de/templates/serversetup/ipxe.json
@@ -4,6 +4,7 @@
     "lang_bootMenu": "Bootmen\u00fc",
     "lang_bootMenuCreate": "Bootmen\u00fc erzeugen",
     "lang_close": "Schlie\u00dfen",
+    "lang_compile": "Kompilieren",
     "lang_customEntry": "Eigener Eintrag",
     "lang_example": "Beispiel",
     "lang_localHDD": "Lokale HDD",
diff --git a/lang/de/templates/sysconfig/ad_ldap-homedir.json b/lang/de/templates/sysconfig/ad_ldap-homedir.json
deleted file mode 100644
index 9d199688..00000000
--- a/lang/de/templates/sysconfig/ad_ldap-homedir.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "lang_folderRedirection": "Folder Redirection",
-    "lang_handlingNotes": "Hier k\u00f6nnen Sie festlegen, wie Netzwerk-Shares (inkl. des Home-Verzeichnisses) an Virtuelle Maschinen durchgereicht werden. In \u00e4lteren Versionen von bwLehrpool wurden die VMware Shared Folders genutzt, was mit bestimmten file servern Probleme verursachen konnte. Der neue native Modus funktioniert deutlich besser, ist aber bei Windows-G\u00e4sten darauf angewiesen, dass (1) der file server smb\/cifs spricht (z.B. Windows Server, Samba unter Linux) und (2) die openslx.exe im Autostart eingebunden ist (bei den bwLehrpool Vorlagen bereits der Fall). Der native Modus mit Fallback auf VMware ist experimentell und kann dazu f\u00fchren, dass die VM in regelm\u00e4\u00dfigen Abst\u00e4nden H\u00e4nger hat. WICHTIG: Bitte w\u00e4hlen Sie einen Laufwerksbuchstaben, der in den eingesetzten VMs verf\u00fcgbar ist, da ansonsten auf einen anderen Buchstaben ausgewichen werden muss.",
-    "lang_homedirHandling": "(Home-)Verzeichnis Einbindung",
-    "lang_mapModeNative": "Nativ direkt in der VM einbinden [openslx.exe]",
-    "lang_mapModeNativeFallback": "Nativ in der VM einbinden; Fallback auf VMware Shared Folders",
-    "lang_mapModeNone": "Verzeichnisse nicht durchreichen",
-    "lang_mapModeVmware": "VMware Shared Folders [VMwareTools]",
-    "lang_next": "Weiter",
-    "lang_redirectionWarning": "ACHTUNG: Diese Funktion ist experimentell. Sie biegt nach dem Starten mittels openslx.exe die ausgew\u00e4hlten Verzeichnisse auf das Home-Verzeichnis des angemeldeten Benutzers um (getestet mit Windows 7 und 10). Da hierzu undokumentierte Windows-Einstellungen zur Laufzeit ge\u00e4ndert werden ist nicht garantiert, dass diese Methode in sp\u00e4teren Versionen\/Updates von Windows noch funktioniert. Wir empfehlen, stattdessen die Verzeichnisse - sofern gew\u00fcnscht - bereits in der Vorlage auf den oben konfigurierten Laufwerksbuchstaben des Home-Verzeichnisses umzukonfigurieren.",
-    "lang_shareDesktop": "Desktop (Achtung: Vom Dozent angelegte Verkn\u00fcpfungen nicht sichtbar!)",
-    "lang_shareDocuments": "Eigene Dokumente",
-    "lang_shareDownloads": "Downloads",
-    "lang_shareHomeDrive": "Home-Verzeichnis Buchstabe (Windows)",
-    "lang_shareMapCreate": "Ordner auf dem Netzlaufwerk bei Bedarf anlegen",
-    "lang_shareMedia": "Eigene Musik, Videos, Bilder",
-    "lang_shareOther": "Andere (Saved Games, Kontakte, Favoriten, ...)",
-    "lang_shareRemapMode": "Einbindemodus"
-}
\ No newline at end of file
diff --git a/lang/en/messages-hardcoded.json b/lang/en/messages-hardcoded.json
index b19ef60a..7c781d4e 100644
--- a/lang/en/messages-hardcoded.json
+++ b/lang/en/messages-hardcoded.json
@@ -1,21 +1,55 @@
 {
+    "lang_administration": "Translations",
+    "lang_backup": "Backup",
+    "lang_baseconfig": "Variables",
+    "lang_cities":"Cities",
+    "lang_citymanagement":"Management",
+    "lang_clientLog": "Client Log",
     "lang_clientSshConfig": "SSH configuration",
     "lang_configurationCompilation": "Compile configuration",
+    "lang_content": "Content",
     "lang_contentOf": "Content of \"",
     "lang_createUser": "Create User",
     "lang_days": "Day(s)",
+    "lang_dozmod": "Tutor Module",
+    "lang_eventLog": "Server Log",
+    "lang_eventlog": "Client Log",
     "lang_hours": "Hour(s)",
-    "lang_location": "Location",
+    "lang_internetaccess": "Internet Access",
+    "lang_imgmanagement": "Image Management",
+    "lang_locations": "Room/Locations",
     "lang_login": "Login",
+    "lang_minilinux": "Minilinux",
+    "lang_modules": "Modules",
     "lang_moduleAdd": "Add Module",
+    "lang_news": "News",
     "lang_noModuleFromThisGroup": "(No module from this group)",
+    "lang_server": "iPXE \/ Boot Menu",
     "lang_serverConfiguration": "Server-side Configuration",
+    "lang_serverStatus": "Server",
+    "lang_serversetup": "iPXE \/ Boot Menu",
+    "lang_settings": "Settings",
+    "lang_statistics": "Client Statistics",
+    "lang_status": "Status",
+    "lang_support": "Support",
+    "lang_sysconfig": "Modules",
+    "lang_syslog": "Server Log",
+    "lang_systemstatus": "Server",
     "lang_titleBackup": "Save and Restore",
     "lang_titleClientStatistics": "Client statistics",
     "lang_titleEventLog": "Event log",
+    "lang_translation": "Translation",
+    "lang_user": "Users",
+    "lang_userManagement": "Management",
+    "lang_usermanagement": "Management",
+    "lang_users": "Users",
+    "lang_variables": "Variables",
+    "lang_vmLocation": "Virtual Machine",
+    "lang_vmstore": "Virtual Machine",
     "lang_titleWebinterface": "Web Interface",
     "lang_unknwonTaskManager": "Unknown Task Manager error",
+    "lang_webinterface": "Web Interface",
     "today": "Today",
     "unused": "Unused",
     "yesterday": "Yesterday"
-}
\ No newline at end of file
+}
diff --git a/lang/en/templates/backup/_page.json b/lang/en/modules/backup/_page.json
index 799c6168..799c6168 100644
--- a/lang/en/templates/backup/_page.json
+++ b/lang/en/modules/backup/_page.json
diff --git a/lang/en/templates/backup/restore.json b/lang/en/modules/backup/restore.json
index 5a5f6f64..5a5f6f64 100644
--- a/lang/en/templates/backup/restore.json
+++ b/lang/en/modules/backup/restore.json
diff --git a/lang/en/templates/baseconfig/_page.json b/lang/en/modules/baseconfig/_page.json
index 6429a835..6429a835 100644
--- a/lang/en/templates/baseconfig/_page.json
+++ b/lang/en/modules/baseconfig/_page.json
diff --git a/lang/en/modules/citymanagement.json b/lang/en/modules/citymanagement.json
new file mode 100644
index 00000000..27bb60c0
--- /dev/null
+++ b/lang/en/modules/citymanagement.json
@@ -0,0 +1,13 @@
+{
+    "lang_cancelConfirm": "Do you really want to remove this city?",
+    "lang_cityInfo":"Here you can create new cities for the website, besides editing or removing the existing ones",
+    "lang_cityPage":"Manage cities",
+    "lang_cityname":"City name",
+    "lang_close": "Close",
+    "lang_create": "Create",
+    "lang_edit":"Edit",
+    "lang_editcity":"Edit City",
+    "lang_operations": "Operations",
+    "lang_remove": "Remove",
+    "lang_save": "Save"
+}
diff --git a/lang/en/templates/dozmod/images-delete.json b/lang/en/modules/dozmod/images-delete.json
index fcc8c7e7..fcc8c7e7 100644
--- a/lang/en/templates/dozmod/images-delete.json
+++ b/lang/en/modules/dozmod/images-delete.json
diff --git a/lang/en/templates/dozmod/mailconfig.json b/lang/en/modules/dozmod/mailconfig.json
index 0c0dcd7f..0c0dcd7f 100644
--- a/lang/en/templates/dozmod/mailconfig.json
+++ b/lang/en/modules/dozmod/mailconfig.json
diff --git a/lang/en/templates/dozmod/orglist.json b/lang/en/modules/dozmod/orglist.json
index 37b89e02..37b89e02 100644
--- a/lang/en/templates/dozmod/orglist.json
+++ b/lang/en/modules/dozmod/orglist.json
diff --git a/lang/en/templates/dozmod/userlist.json b/lang/en/modules/dozmod/userlist.json
index 615f1b14..615f1b14 100644
--- a/lang/en/templates/dozmod/userlist.json
+++ b/lang/en/modules/dozmod/userlist.json
diff --git a/lang/en/templates/eventlog/_page.json b/lang/en/modules/eventlog/_page.json
index 21ec64ea..21ec64ea 100644
--- a/lang/en/templates/eventlog/_page.json
+++ b/lang/en/modules/eventlog/_page.json
diff --git a/lang/en/templates/internetaccess/_page.json b/lang/en/modules/internetaccess/_page.json
index c02ca4f5..c02ca4f5 100644
--- a/lang/en/templates/internetaccess/_page.json
+++ b/lang/en/modules/internetaccess/_page.json
diff --git a/lang/en/templates/internetaccess/restart.json b/lang/en/modules/internetaccess/restart.json
index badad460..badad460 100644
--- a/lang/en/templates/internetaccess/restart.json
+++ b/lang/en/modules/internetaccess/restart.json
diff --git a/lang/en/templates/locations/location-subnets.json b/lang/en/modules/locations/location-subnets.json
index 2ba94384..2ba94384 100644
--- a/lang/en/templates/locations/location-subnets.json
+++ b/lang/en/modules/locations/location-subnets.json
diff --git a/lang/en/templates/locations/locations.json b/lang/en/modules/locations/locations.json
index db4fd0a7..db4fd0a7 100644
--- a/lang/en/templates/locations/locations.json
+++ b/lang/en/modules/locations/locations.json
diff --git a/lang/en/templates/locations/subnets.json b/lang/en/modules/locations/subnets.json
index 65da254b..65da254b 100644
--- a/lang/en/templates/locations/subnets.json
+++ b/lang/en/modules/locations/subnets.json
diff --git a/lang/en/modules/main.json b/lang/en/modules/main.json
new file mode 100644
index 00000000..32d9b177
--- /dev/null
+++ b/lang/en/modules/main.json
@@ -0,0 +1,33 @@
+{
+    "lang_backup": "Backup\/Restore",
+    "lang_client": "Client",
+    "lang_clientLog": "Client Log",
+    "lang_clientStats": "Client statistics",
+    "lang_configurationBasic": "PXE\/Boot",
+    "lang_configurationVariables": "Configuration Variables",
+    "lang_dozmod": "Tutor module",
+    "lang_eventLog": "Server Log",
+    "lang_internetAccess": "Internet access",
+    "lang_intro": "Esta \u00e9 a interface de configura\u00e7\u00e3o do OpenSLX.",
+    "lang_introGuest": "This is the administration interface of the local bwLehrpool intallation. Please authenticate yourself to adjust settings.",
+    "lang_language": "Language",
+    "lang_localization": "Localization",
+    "lang_locations": "Rooms\/Locations",
+    "lang_login": "Login",
+    "lang_logout": "Logout",
+    "lang_needsSetup": "Setup incomplete",
+    "lang_next": "Next",
+    "lang_noExistingAccount": "No account has been created yet. Sign up to become the administrator.",
+    "lang_register": "Register",
+    "lang_warning": "Warning",
+    "lang_welcome": "Welcome",
+    "lang_bootMenuWarning": "The boot menu is outdated or has not been generated.",
+    "lang_configure": "Configure",
+    "lang_intro": "This is the bwLehrpool configuration interface.",
+    "lang_minilinuxMissing": "Important files from the mini Linux installation are missing.",
+    "lang_numerOfImagesMarkedForDeletion": "Images marked for deletion",
+    "lang_systemConfiguration": "System Configuration",
+    "lang_systemConfigurationNotChosen": "A system configuration has not been chosen yet.",
+    "lang_vmLocationNotSet": "A location for the virtual machine is not set yet.",
+    "lang_welcome": "Welcome"
+}
diff --git a/lang/en/templates/dialog-generic.json b/lang/en/modules/main/dialog-generic.json
index c7551ed3..c7551ed3 100644
--- a/lang/en/templates/dialog-generic.json
+++ b/lang/en/modules/main/dialog-generic.json
diff --git a/lang/en/templates/main-menu.json b/lang/en/modules/main/main-menu.json
index d22f90d7..d22f90d7 100644
--- a/lang/en/templates/main-menu.json
+++ b/lang/en/modules/main/main-menu.json
diff --git a/lang/en/templates/messagebox-warning.json b/lang/en/modules/main/messagebox-warning.json
index 2c63c085..2c63c085 100644
--- a/lang/en/templates/messagebox-warning.json
+++ b/lang/en/modules/main/messagebox-warning.json
diff --git a/lang/en/templates/page-main-guest.json b/lang/en/modules/main/page-main-guest.json
index 6526f5bd..6526f5bd 100644
--- a/lang/en/templates/page-main-guest.json
+++ b/lang/en/modules/main/page-main-guest.json
diff --git a/lang/en/templates/page-main.json b/lang/en/modules/main/page-main.json
index 8031ac1c..8031ac1c 100644
--- a/lang/en/templates/page-main.json
+++ b/lang/en/modules/main/page-main.json
diff --git a/lang/en/templates/messagebox-error.json b/lang/en/modules/messagebox-error.json
index c44dc44f..c44dc44f 100644
--- a/lang/en/templates/messagebox-error.json
+++ b/lang/en/modules/messagebox-error.json
diff --git a/lang/en/templates/messagebox-info.json b/lang/en/modules/messagebox-info.json
index 2c63c085..2c63c085 100644
--- a/lang/en/templates/messagebox-info.json
+++ b/lang/en/modules/messagebox-info.json
diff --git a/lang/en/templates/messagebox-success.json b/lang/en/modules/messagebox-success.json
index 2c63c085..2c63c085 100644
--- a/lang/en/templates/messagebox-success.json
+++ b/lang/en/modules/messagebox-success.json
diff --git a/lang/en/templates/minilinux/download.json b/lang/en/modules/minilinux/download.json
index 2c63c085..2c63c085 100644
--- a/lang/en/templates/minilinux/download.json
+++ b/lang/en/modules/minilinux/download.json
diff --git a/lang/en/templates/minilinux/filelist.json b/lang/en/modules/minilinux/filelist.json
index 89fed42b..89fed42b 100644
--- a/lang/en/templates/minilinux/filelist.json
+++ b/lang/en/modules/minilinux/filelist.json
diff --git a/lang/en/templates/page-news.json b/lang/en/modules/news/page-news.json
index df63658c..df63658c 100644
--- a/lang/en/templates/page-news.json
+++ b/lang/en/modules/news/page-news.json
diff --git a/lang/en/templates/page-adduser.json b/lang/en/modules/page-adduser.json
index 42bae6dc..42bae6dc 100644
--- a/lang/en/templates/page-adduser.json
+++ b/lang/en/modules/page-adduser.json
diff --git a/lang/en/templates/page-minilinux.json b/lang/en/modules/page-minilinux.json
index 2f59fa57..2f59fa57 100644
--- a/lang/en/templates/page-minilinux.json
+++ b/lang/en/modules/page-minilinux.json
diff --git a/lang/en/templates/pagenav.json b/lang/en/modules/pagenav.json
index 2c63c085..2c63c085 100644
--- a/lang/en/templates/pagenav.json
+++ b/lang/en/modules/pagenav.json
diff --git a/lang/en/templates/serversetup/ipaddress.json b/lang/en/modules/serversetup/ipaddress.json
index 699aeacc..699aeacc 100644
--- a/lang/en/templates/serversetup/ipaddress.json
+++ b/lang/en/modules/serversetup/ipaddress.json
diff --git a/lang/en/templates/serversetup/ipxe.json b/lang/en/modules/serversetup/ipxe.json
index 39bb0d54..70c17f43 100644
--- a/lang/en/templates/serversetup/ipxe.json
+++ b/lang/en/modules/serversetup/ipxe.json
@@ -3,9 +3,18 @@
     "lang_bootInfo": "Here adjustments can be made to the appearance of the boot menu.",
     "lang_bootMenu": "Boot Menu",
     "lang_bootMenuCreate": "Create Boot Menu",
+    "lang_cancel": "Cancel",
     "lang_close": "Close",
+    "lang_compile": "Compile",
+    "lang_compilingIpxe": "Compiling iPXE",
     "lang_customEntry": "Custom entry",
+    "lang_customScript": "Custom script",
+    "lang_download": "Download",
     "lang_example": "Example",
+    "lang_extension": "Extension",
+    "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.",
@@ -14,5 +23,9 @@
     "lang_menuCustomHint2": "You can create one or more entries. If you want to create an entry that starts automatically when the user makes a selection, assign as",
     "lang_menuCustomHint3": "and select as the default boot behavior custom as well.",
     "lang_menuDisplayTime": "Menu Display Time",
-    "lang_seconds": "Seconds"
-}
\ No newline at end of file
+    "lang_mountIpxe": "Mount iPXE",
+    "lang_restoreDefault": "Restore Default",
+    "lang_saveScript": "Save Script",
+    "lang_seconds": "Seconds",
+    "lang_success": "Successfully create file:"
+}
diff --git a/lang/en/templates/serversetup/ipxe_update.json b/lang/en/modules/serversetup/ipxe_update.json
index b33b12dd..b33b12dd 100644
--- a/lang/en/templates/serversetup/ipxe_update.json
+++ b/lang/en/modules/serversetup/ipxe_update.json
diff --git a/lang/en/templates/page-login.json b/lang/en/modules/session/page-login.json
index 4b192a7a..4b192a7a 100644
--- a/lang/en/templates/page-login.json
+++ b/lang/en/modules/session/page-login.json
diff --git a/lang/en/templates/statistics/clientlist.json b/lang/en/modules/statistics/clientlist.json
index ae692154..ae692154 100644
--- a/lang/en/templates/statistics/clientlist.json
+++ b/lang/en/modules/statistics/clientlist.json
diff --git a/lang/en/templates/statistics/cpumodels.json b/lang/en/modules/statistics/cpumodels.json
index 864933dd..864933dd 100644
--- a/lang/en/templates/statistics/cpumodels.json
+++ b/lang/en/modules/statistics/cpumodels.json
diff --git a/lang/en/templates/statistics/id44.json b/lang/en/modules/statistics/id44.json
index 0d0081a8..0d0081a8 100644
--- a/lang/en/templates/statistics/id44.json
+++ b/lang/en/modules/statistics/id44.json
diff --git a/lang/en/templates/statistics/kvmstate.json b/lang/en/modules/statistics/kvmstate.json
index b4846473..b4846473 100644
--- a/lang/en/templates/statistics/kvmstate.json
+++ b/lang/en/modules/statistics/kvmstate.json
diff --git a/lang/en/templates/statistics/machine-hdds.json b/lang/en/modules/statistics/machine-hdds.json
index 8ce6801d..8ce6801d 100644
--- a/lang/en/templates/statistics/machine-hdds.json
+++ b/lang/en/modules/statistics/machine-hdds.json
diff --git a/lang/en/templates/statistics/machine-main.json b/lang/en/modules/statistics/machine-main.json
index 1addd437..1addd437 100644
--- a/lang/en/templates/statistics/machine-main.json
+++ b/lang/en/modules/statistics/machine-main.json
diff --git a/lang/en/templates/statistics/machine-notes.json b/lang/en/modules/statistics/machine-notes.json
index 7a13f28a..7a13f28a 100644
--- a/lang/en/templates/statistics/machine-notes.json
+++ b/lang/en/modules/statistics/machine-notes.json
diff --git a/lang/en/templates/statistics/machine-usage.json b/lang/en/modules/statistics/machine-usage.json
index 398996f6..398996f6 100644
--- a/lang/en/templates/statistics/machine-usage.json
+++ b/lang/en/modules/statistics/machine-usage.json
diff --git a/lang/en/templates/statistics/memory.json b/lang/en/modules/statistics/memory.json
index decdd021..decdd021 100644
--- a/lang/en/templates/statistics/memory.json
+++ b/lang/en/modules/statistics/memory.json
diff --git a/lang/en/templates/statistics/newclients.json b/lang/en/modules/statistics/newclients.json
index f7e55f3f..f7e55f3f 100644
--- a/lang/en/templates/statistics/newclients.json
+++ b/lang/en/modules/statistics/newclients.json
diff --git a/lang/en/templates/statistics/summary.json b/lang/en/modules/statistics/summary.json
index b57c290f..b57c290f 100644
--- a/lang/en/templates/statistics/summary.json
+++ b/lang/en/modules/statistics/summary.json
diff --git a/lang/en/templates/statistics/syslog.json b/lang/en/modules/statistics/syslog.json
index 6737ca68..6737ca68 100644
--- a/lang/en/templates/statistics/syslog.json
+++ b/lang/en/modules/statistics/syslog.json
diff --git a/lang/en/templates/sysconfig/_page.json b/lang/en/modules/sysconfig/_page.json
index 6f139359..6f139359 100644
--- a/lang/en/templates/sysconfig/_page.json
+++ b/lang/en/modules/sysconfig/_page.json
diff --git a/lang/en/templates/sysconfig/ad-finish.json b/lang/en/modules/sysconfig/ad-finish.json
index 8f89046e..8f89046e 100644
--- a/lang/en/templates/sysconfig/ad-finish.json
+++ b/lang/en/modules/sysconfig/ad-finish.json
diff --git a/lang/en/templates/sysconfig/ad-selfsearch.json b/lang/en/modules/sysconfig/ad-selfsearch.json
index 70db0620..70db0620 100644
--- a/lang/en/templates/sysconfig/ad-selfsearch.json
+++ b/lang/en/modules/sysconfig/ad-selfsearch.json
diff --git a/lang/en/templates/sysconfig/ad-start.json b/lang/en/modules/sysconfig/ad-start.json
index ff35fc03..ff35fc03 100644
--- a/lang/en/templates/sysconfig/ad-start.json
+++ b/lang/en/modules/sysconfig/ad-start.json
diff --git a/lang/en/templates/sysconfig/ad_ldap-checkconnection.json b/lang/en/modules/sysconfig/ad_ldap-checkconnection.json
index 6a924f8b..6a924f8b 100644
--- a/lang/en/templates/sysconfig/ad_ldap-checkconnection.json
+++ b/lang/en/modules/sysconfig/ad_ldap-checkconnection.json
diff --git a/lang/en/templates/sysconfig/ad_ldap-checkcredentials.json b/lang/en/modules/sysconfig/ad_ldap-checkcredentials.json
index 2b83a231..2b83a231 100644
--- a/lang/en/templates/sysconfig/ad_ldap-checkcredentials.json
+++ b/lang/en/modules/sysconfig/ad_ldap-checkcredentials.json
diff --git a/lang/en/templates/sysconfig/ad_ldap-homedir.json b/lang/en/modules/sysconfig/ad_ldap-homedir.json
index 82550b8a..90d4a211 100644
--- a/lang/en/templates/sysconfig/ad_ldap-homedir.json
+++ b/lang/en/modules/sysconfig/ad_ldap-homedir.json
@@ -6,8 +6,7 @@
     "lang_mapModeNativeFallback": "Natively map inside VM; fallback to VMware Shared Folders",
     "lang_mapModeNone": "Don't map shares at all",
     "lang_mapModeVmware": "VMware Shared Folders [VMwareTools]",
-    "lang_next": "Next",
-    "lang_redirectionWarning": "WARNING: This feature is experimental. It remaps the selected folders after the VM booted (via openslx.exe) to the logged in user's home drive. This might cause problems with applications that start before the pathes are patched, as they will see the old unpatched settings. Please note that this is usign undocumented or unsupported techniques to achieve this goal. It is not guaranteed that this method will work in future versions or updates of Windows. If you want to reliably remap these directories, you might want to change their locations in the VM before uploading it.",
+    "lang_redirectionWarning": "WARNING: This feature is experimental. It remaps the selected folders after the VM booted (via openslx.exe) to the logged in user's home drive. This might cause problems with applications that start before the pathes are patched, as they will see the old unpatched settings. This also doesn't work fully on Windows 10. If you want to reliably remap these directories, it's recommended to change their locations in the VM before uploading it.",
     "lang_shareDesktop": "Desktop (Might hide shortcuts created by the tutor)",
     "lang_shareDocuments": "My Documents",
     "lang_shareDownloads": "Downloads",
diff --git a/lang/en/templates/sysconfig/branding-check.json b/lang/en/modules/sysconfig/branding-check.json
index 6a481d8b..6a481d8b 100644
--- a/lang/en/templates/sysconfig/branding-check.json
+++ b/lang/en/modules/sysconfig/branding-check.json
diff --git a/lang/en/templates/sysconfig/branding-start.json b/lang/en/modules/sysconfig/branding-start.json
index 4423784d..4423784d 100644
--- a/lang/en/templates/sysconfig/branding-start.json
+++ b/lang/en/modules/sysconfig/branding-start.json
diff --git a/lang/en/templates/sysconfig/cfg-finish.json b/lang/en/modules/sysconfig/cfg-finish.json
index b8729636..b8729636 100644
--- a/lang/en/templates/sysconfig/cfg-finish.json
+++ b/lang/en/modules/sysconfig/cfg-finish.json
diff --git a/lang/en/templates/sysconfig/cfg-start.json b/lang/en/modules/sysconfig/cfg-start.json
index a00a6720..9afc6ce3 100644
--- a/lang/en/templates/sysconfig/cfg-start.json
+++ b/lang/en/modules/sysconfig/cfg-start.json
@@ -2,6 +2,5 @@
     "lang_configuration": "Configuration",
     "lang_configurationChoose": "Please select which modules will be used for this configuration.",
     "lang_name": "Name",
-    "lang_next": "Next",
     "lang_noModuleOfType": "No module of this type found."
-}
\ No newline at end of file
+}
diff --git a/lang/en/templates/sysconfig/config-module-list.json b/lang/en/modules/sysconfig/config-module-list.json
index ff30c0b4..ff30c0b4 100644
--- a/lang/en/templates/sysconfig/config-module-list.json
+++ b/lang/en/modules/sysconfig/config-module-list.json
diff --git a/lang/en/templates/sysconfig/custom-filelist.json b/lang/en/modules/sysconfig/custom-filelist.json
index 50bec5b5..50bec5b5 100644
--- a/lang/en/templates/sysconfig/custom-filelist.json
+++ b/lang/en/modules/sysconfig/custom-filelist.json
diff --git a/lang/en/templates/sysconfig/custom-fileselect.json b/lang/en/modules/sysconfig/custom-fileselect.json
index 2ae25e16..2ae25e16 100644
--- a/lang/en/templates/sysconfig/custom-fileselect.json
+++ b/lang/en/modules/sysconfig/custom-fileselect.json
diff --git a/lang/en/templates/sysconfig/custom-upload.json b/lang/en/modules/sysconfig/custom-upload.json
index 26b7c186..26b7c186 100644
--- a/lang/en/templates/sysconfig/custom-upload.json
+++ b/lang/en/modules/sysconfig/custom-upload.json
diff --git a/lang/en/templates/sysconfig/ldap-checkconnection.json b/lang/en/modules/sysconfig/ldap-checkconnection.json
index 52fbae9e..52fbae9e 100644
--- a/lang/en/templates/sysconfig/ldap-checkconnection.json
+++ b/lang/en/modules/sysconfig/ldap-checkconnection.json
diff --git a/lang/en/templates/sysconfig/ldap-checkcredentials.json b/lang/en/modules/sysconfig/ldap-checkcredentials.json
index 2a8723c9..2a8723c9 100644
--- a/lang/en/templates/sysconfig/ldap-checkcredentials.json
+++ b/lang/en/modules/sysconfig/ldap-checkcredentials.json
diff --git a/lang/en/templates/sysconfig/ldap-finish.json b/lang/en/modules/sysconfig/ldap-finish.json
index bd15bafc..bd15bafc 100644
--- a/lang/en/templates/sysconfig/ldap-finish.json
+++ b/lang/en/modules/sysconfig/ldap-finish.json
diff --git a/lang/en/templates/sysconfig/ldap-start.json b/lang/en/modules/sysconfig/ldap-start.json
index 45ba19f1..45ba19f1 100644
--- a/lang/en/templates/sysconfig/ldap-start.json
+++ b/lang/en/modules/sysconfig/ldap-start.json
diff --git a/lang/en/templates/sysconfig/sshconfig-start.json b/lang/en/modules/sysconfig/sshconfig-start.json
index 1ce553cd..1ce553cd 100644
--- a/lang/en/templates/sysconfig/sshconfig-start.json
+++ b/lang/en/modules/sysconfig/sshconfig-start.json
diff --git a/lang/en/templates/sysconfig/start.json b/lang/en/modules/sysconfig/start.json
index 4567d649..4567d649 100644
--- a/lang/en/templates/sysconfig/start.json
+++ b/lang/en/modules/sysconfig/start.json
diff --git a/lang/en/templates/page-syslog.json b/lang/en/modules/syslog/page-syslog.json
index 71f61693..71f61693 100644
--- a/lang/en/templates/page-syslog.json
+++ b/lang/en/modules/syslog/page-syslog.json
diff --git a/lang/en/templates/systemstatus/_page.json b/lang/en/modules/systemstatus/_page.json
index f698521d..f698521d 100644
--- a/lang/en/templates/systemstatus/_page.json
+++ b/lang/en/modules/systemstatus/_page.json
diff --git a/lang/en/templates/systemstatus/addresses.json b/lang/en/modules/systemstatus/addresses.json
index 2c63c085..2c63c085 100644
--- a/lang/en/templates/systemstatus/addresses.json
+++ b/lang/en/modules/systemstatus/addresses.json
diff --git a/lang/en/templates/systemstatus/diskstat.json b/lang/en/modules/systemstatus/diskstat.json
index 6c880ebe..6c880ebe 100644
--- a/lang/en/templates/systemstatus/diskstat.json
+++ b/lang/en/modules/systemstatus/diskstat.json
diff --git a/lang/en/templates/systemstatus/services.json b/lang/en/modules/systemstatus/services.json
index 2c63c085..2c63c085 100644
--- a/lang/en/templates/systemstatus/services.json
+++ b/lang/en/modules/systemstatus/services.json
diff --git a/lang/en/templates/systemstatus/systeminfo.json b/lang/en/modules/systemstatus/systeminfo.json
index 602693f5..602693f5 100644
--- a/lang/en/templates/systemstatus/systeminfo.json
+++ b/lang/en/modules/systemstatus/systeminfo.json
diff --git a/lang/en/templates/translation/_page.json b/lang/en/modules/translation/_page.json
index 5a48b696..5a48b696 100644
--- a/lang/en/templates/translation/_page.json
+++ b/lang/en/modules/translation/_page.json
diff --git a/lang/en/templates/translation/edit.json b/lang/en/modules/translation/edit.json
index 05c6697a..05c6697a 100644
--- a/lang/en/templates/translation/edit.json
+++ b/lang/en/modules/translation/edit.json
diff --git a/lang/en/templates/translation/template-list.json b/lang/en/modules/translation/template-list.json
index e3feb70b..e3feb70b 100644
--- a/lang/en/templates/translation/template-list.json
+++ b/lang/en/modules/translation/template-list.json
diff --git a/lang/en/modules/usermanagement/user-management.json b/lang/en/modules/usermanagement/user-management.json
new file mode 100644
index 00000000..61225f55
--- /dev/null
+++ b/lang/en/modules/usermanagement/user-management.json
@@ -0,0 +1,18 @@
+{
+    "lang_cancelConfirm": "Do you really want to delete this users?",
+    "lang_close": "Close",
+    "lang_create": "Create",
+    "lang_edit": "Edit",
+    "lang_editUser": "Edit User",
+    "lang_email": "Email",
+    "lang_login": "Login",
+    "lang_operations": "Operation",
+    "lang_password": "Password",
+    "lang_remove": "Remove",
+    "lang_save": "Save",
+    "lang_telephone": "Telephone",
+    "lang_userAdmin": "Administrator",
+    "lang_userInfo": "On this section, you will be able to create website users, besides editing or removing existing users.",
+    "lang_userPage": "Users",
+    "lang_username": "Username"
+}
\ No newline at end of file
diff --git a/lang/en/templates/vmstore/mount.json b/lang/en/modules/vmstore/mount.json
index 29814430..29814430 100644
--- a/lang/en/templates/vmstore/mount.json
+++ b/lang/en/modules/vmstore/mount.json
diff --git a/lang/en/templates/page-vmstore.json b/lang/en/modules/vmstore/page-vmstore.json
index 23ddbbd3..23ddbbd3 100644
--- a/lang/en/templates/page-vmstore.json
+++ b/lang/en/modules/vmstore/page-vmstore.json
diff --git a/lang/en/templates/webinterface/httpd-restart.json b/lang/en/modules/webinterface/httpd-restart.json
index 0a7d4aea..0a7d4aea 100644
--- a/lang/en/templates/webinterface/httpd-restart.json
+++ b/lang/en/modules/webinterface/httpd-restart.json
diff --git a/lang/en/templates/webinterface/https.json b/lang/en/modules/webinterface/https.json
index 64631a9a..64631a9a 100644
--- a/lang/en/templates/webinterface/https.json
+++ b/lang/en/modules/webinterface/https.json
diff --git a/lang/en/templates/webinterface/passwords.json b/lang/en/modules/webinterface/passwords.json
index 2db88ae2..2db88ae2 100644
--- a/lang/en/templates/webinterface/passwords.json
+++ b/lang/en/modules/webinterface/passwords.json
diff --git a/lang/pt/templates/sysconfig/ad_ldap-homedir.json b/lang/pt/templates/sysconfig/ad_ldap-homedir.json
deleted file mode 100644
index c44dc44f..00000000
--- a/lang/pt/templates/sysconfig/ad_ldap-homedir.json
+++ /dev/null
@@ -1,3 +0,0 @@
-[
-
-]
\ No newline at end of file