Lots of small bugfixes, proxy config WIP, https config WIP, translation updates, added masterpassword to pxe menu, ...

14 files changed, 35 insertions, 13 deletions

diff --git a/lang/de/templates/main-menu.json b/lang/de/templates/main-menu.json
index 36ecf597..f988f69a 100644
--- a/lang/de/templates/main-menu.json
+++ b/lang/de/templates/main-menu.json
@@ -1,9 +1,8 @@
 {
-    "lang_administration": "\u00dcbersetzungen",
     "lang_backup": "Backup\/Restore",
     "lang_client": "Client",
     "lang_clientLog": "Client Log",
-    "lang_configurationBasic": "Grundkonfiguration",
+    "lang_configurationBasic": "PXE\/Boot",
     "lang_configurationVariables": "KonfigurationsVariablen",
     "lang_eventLog": "Server Log",
     "lang_internetAccess": "Internetzugriff",
@@ -12,11 +11,12 @@
     "lang_login": "Anmelden",
     "lang_logout": "Abmelden",
     "lang_needsSetup": "Einrichtung unvollst\u00e4ndig",
-    "lang_news": "News",
+    "lang_news": "vmChooser News",
     "lang_server": "Server",
     "lang_serverStatus": "Server Status",
     "lang_settings": "Einstellungen",
     "lang_status": "Status",
+    "lang_translations": "\u00dcbersetzungen",
     "lang_vmLocation": "VM Speicherort",
     "lang_warning": "Warnung"
 }
\ No newline at end of file
diff --git a/lang/de/templates/page-news.json b/lang/de/templates/page-news.json
index b25a6b46..d1cf877e 100644
--- a/lang/de/templates/page-news.json
+++ b/lang/de/templates/page-news.json
@@ -1,8 +1,8 @@
 {
-    "lang_activeNews": "Aktive News",
     "lang_content": "Inhalt",
     "lang_date": "Datum",
     "lang_delete": "L\u00f6schen",
+    "lang_editNews": "News bearbeiten",
     "lang_latestUpdate": "Letzte Aktualisierung",
     "lang_newsIntro": "Hier haben Sie die M\u00f6glichkeit, die von bwLehrpool-Clients angezeigten News zu editieren.",
     "lang_newsOld": "Alte News",
diff --git a/lang/de/templates/serversetup/ipxe.json b/lang/de/templates/serversetup/ipxe.json
index 36e49d31..54a3408b 100644
--- a/lang/de/templates/serversetup/ipxe.json
+++ b/lang/de/templates/serversetup/ipxe.json
@@ -4,12 +4,15 @@
     "lang_bootMenu": "Bootmen\u00fc",
     "lang_bootMenuCreate": "Bootmen\u00fc erzeugen",
     "lang_close": "Schlie\u00dfen",
+    "lang_customEntry": "Eigener Eintrag",
     "lang_example": "Beispiel",
     "lang_localHDD": "Lokale HDD",
+    "lang_masterPassword": "Master-Passwort",
+    "lang_masterPasswordHelp": "Das Master-Passwort wird ben\u00f6tigt, um einen Booteintrag direkt am Client tempor\u00e4r durch Dr\u00fccken der Tab-Taste zu editieren. Da dies f\u00fcr Manipulation am Client genutzt werden kann, sollte diese Funktion unbedingt mit einem Passwort gesch\u00fctzt werden.",
     "lang_menuCustom": "Benutzerdefinierter Men\u00fczusatz",
     "lang_menuCustomHint1": "Hier haben Sie die M\u00f6glichkeit, eigenen Men\u00fc-Code zum angezeigten PXE-Men\u00fc hinzuzuf\u00fcgen, um z.B. auf weitere PXE-Server zu verweisen. Das Format entspricht dem syslinux Men\u00fcformat.",
     "lang_menuCustomHint2": "Sie k\u00f6nnen ein oder mehrere Eintr\u00e4ge erzeugen. Wenn Sie einen Eintrag erzeugen m\u00f6chten, der automatisch gestartet wird, wenn der Benutzer keine Auswahl t\u00e4tigt, vergeben Sie als",
-    "lang_menuCustomHint3": "und w\u00e4hlen Sie als Standard-Bootverhalten ebenfalls my-entry.",
+    "lang_menuCustomHint3": "und w\u00e4hlen Sie als Standard-Bootverhalten ebenfalls custom.",
     "lang_menuDisplayTime": "Anzeigedauer des Men\u00fcs",
     "lang_seconds": "Sekunden"
 }
\ No newline at end of file
diff --git a/lang/de/templates/serversetup/ipxe_update.json b/lang/de/templates/serversetup/ipxe_update.json
new file mode 100644
index 00000000..b984de19
--- /dev/null
+++ b/lang/de/templates/serversetup/ipxe_update.json
@@ -0,0 +1,4 @@
+{
+    "lang_generationFailed": "Erzeugen des Bootmen\u00fcs fehlgeschlagen. Der Netzwerkboot von bwLehrpool wird wahrscheinlich nicht funktionieren. Wenn Sie den Fehler nicht selbst beheben k\u00f6nnen, melden Sie bitte obenstehende Fehlermeldung an das bwLehrpool-Projekt.",
+    "lang_menuGeneration": "Erzeugen des Bootmen\u00fcs"
+}
\ No newline at end of file
diff --git a/lang/en/templates/main-menu.json b/lang/en/templates/main-menu.json
index 50ffabb5..f91e0784 100644
--- a/lang/en/templates/main-menu.json
+++ b/lang/en/templates/main-menu.json
@@ -1,9 +1,8 @@
 {
-    "lang_administration": "Translations",
     "lang_backup": "Backup\/Restore",
     "lang_client": "Client",
     "lang_clientLog": "Client Log",
-    "lang_configurationBasic": "Basic Configuration",
+    "lang_configurationBasic": "PXE\/Boot",
     "lang_configurationVariables": "Configuration Variables",
     "lang_eventLog": "Server Log",
     "lang_internetAccess": "Internet access",
@@ -12,11 +11,12 @@
     "lang_login": "Login",
     "lang_logout": "Logout",
     "lang_needsSetup": "Setup incomplete",
-    "lang_news": "News",
+    "lang_news": "vmChooser news",
     "lang_server": "Server",
     "lang_serverStatus": "Server status",
     "lang_settings": "Settings",
     "lang_status": "Status",
+    "lang_translations": "Translations",
     "lang_vmLocation": "VM Location",
     "lang_warning": "Warning"
 }
\ No newline at end of file
diff --git a/lang/en/templates/page-news.json b/lang/en/templates/page-news.json
index ab925ccc..df63658c 100644
--- a/lang/en/templates/page-news.json
+++ b/lang/en/templates/page-news.json
@@ -1,8 +1,8 @@
 {
-    "lang_activeNews": "Active News",
     "lang_content": "Content",
     "lang_date": "Date",
     "lang_delete": "Delete",
+    "lang_editNews": "Edit news",
     "lang_latestUpdate": "Latest update",
     "lang_newsIntro": "Here you have the possibility to edit the news displayed to the bwLehrpool clients.",
     "lang_newsOld": "Old News",
diff --git a/lang/en/templates/serversetup/ipxe.json b/lang/en/templates/serversetup/ipxe.json
index 1ab18e14..39bb0d54 100644
--- a/lang/en/templates/serversetup/ipxe.json
+++ b/lang/en/templates/serversetup/ipxe.json
@@ -4,12 +4,15 @@
     "lang_bootMenu": "Boot Menu",
     "lang_bootMenuCreate": "Create Boot Menu",
     "lang_close": "Close",
+    "lang_customEntry": "Custom entry",
     "lang_example": "Example",
     "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.",
     "lang_menuCustom": "Custom Extra Menu",
     "lang_menuCustomHint1": "Here you have the opportunity to add your own menu code to the displayed PXE menu, eg to refer to other PXE server. The format corresponds to the syslinux menu format.",
     "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 my-entry as well.",
+    "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
diff --git a/lang/en/templates/serversetup/ipxe_update.json b/lang/en/templates/serversetup/ipxe_update.json
new file mode 100644
index 00000000..b33b12dd
--- /dev/null
+++ b/lang/en/templates/serversetup/ipxe_update.json
@@ -0,0 +1,4 @@
+{
+    "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_menuGeneration": "Generating boot menu..."
+}
\ No newline at end of file
diff --git a/lang/pt/templates/internetaccess/_page.json b/lang/pt/templates/internetaccess/_page.json
new file mode 100644
index 00000000..c44dc44f
--- /dev/null
+++ b/lang/pt/templates/internetaccess/_page.json
@@ -0,0 +1,3 @@
+[
+
+]
\ No newline at end of file
diff --git a/lang/pt/templates/internetaccess/restart.json b/lang/pt/templates/internetaccess/restart.json
new file mode 100644
index 00000000..c44dc44f
--- /dev/null
+++ b/lang/pt/templates/internetaccess/restart.json
@@ -0,0 +1,3 @@
+[
+
+]
\ No newline at end of file
diff --git a/lang/pt/templates/main-menu.json b/lang/pt/templates/main-menu.json
index 32cc418d..7b0d868a 100644
--- a/lang/pt/templates/main-menu.json
+++ b/lang/pt/templates/main-menu.json
@@ -1,5 +1,4 @@
 {
-    "lang_administration": "Tradu\u00e7\u00f5es",
     "lang_client": "Cliente",
     "lang_clientLog": "Log dos Clientes",
     "lang_configurationBasic": "Comfigura\u00e7\u00e3o B\u00e1sica",
@@ -14,5 +13,6 @@
     "lang_serverStatus": "Server status",
     "lang_settings": "Op\u00e7\u00f5es",
     "lang_status": "Status",
+    "lang_translations": "Tradu\u00e7\u00f5es",
     "lang_vmLocation": "Localiza\u00e7\u00e3o da VM"
 }
\ No newline at end of file
diff --git a/lang/pt/templates/page-news.json b/lang/pt/templates/page-news.json
index 3c03cb34..5a994d35 100644
--- a/lang/pt/templates/page-news.json
+++ b/lang/pt/templates/page-news.json
@@ -1,5 +1,4 @@
 {
-    "lang_activeNews": "Novidades",
     "lang_content": "Conte\u00fado",
     "lang_date": "Data",
     "lang_delete": "Excluir",
diff --git a/lang/pt/templates/serversetup/ipxe.json b/lang/pt/templates/serversetup/ipxe.json
index 4c0c8fa5..c38dd60c 100644
--- a/lang/pt/templates/serversetup/ipxe.json
+++ b/lang/pt/templates/serversetup/ipxe.json
@@ -9,7 +9,7 @@
     "lang_menuCustom": "Menu Adicional Customizado",
     "lang_menuCustomHint1": "Aqui voc\u00ea tem a oportunidade de adicionar seu pr\u00f3prio c\u00f3digo de menu para o menu PXE exibido, por exemplo, para se referir a outro servidor PXE. O formato corresponde ao formato de menu syslinux.",
     "lang_menuCustomHint2": "Voc\u00ea pode criar uma ou mais entradas. Se voc\u00ea quiser criar uma entrada que \u00e9 iniciada automaticamente quando o usu\u00e1rio faz uma sele\u00e7\u00e3o, atribua como",
-    "lang_menuCustomHint3": "e selecione como o comportamento de boot padr\u00e3o tamb\u00e9m my-entry.",
+    "lang_menuCustomHint3": "e selecione como o comportamento de boot padr\u00e3o tamb\u00e9m custom.",
     "lang_menuDisplayTime": "Tempo de Exibi\u00e7\u00e3o do Menu",
     "lang_seconds": "Segundos"
 }
\ No newline at end of file
diff --git a/lang/pt/templates/serversetup/ipxe_update.json b/lang/pt/templates/serversetup/ipxe_update.json
new file mode 100644
index 00000000..c44dc44f
--- /dev/null
+++ b/lang/pt/templates/serversetup/ipxe_update.json
@@ -0,0 +1,3 @@
+[
+
+]
\ No newline at end of file