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

4 files changed, 12 insertions, 5 deletions

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