Work on translations: templates and messages work

4 files changed, 8 insertions, 43 deletions

diff --git a/modules-available/serversetup/lang/en/module.json b/modules-available/serversetup/lang/en/module.json
index c7c06098..aeea610c 100644
--- a/modules-available/serversetup/lang/en/module.json
+++ b/modules-available/serversetup/lang/en/module.json
@@ -1,34 +1,3 @@
 {
-    "lang_active": "Active",
-    "lang_bootAddress": "Boot Address of the Server",
-    "lang_bootBehavior": "Default Boot Behavior",
-    "lang_bootHint": "The Boot menu must be recreated after changing the IP address. Usually this is done automatically, but the process can also be triggered manually in the section of the boot menu.",
-    "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_chooseIP": "Please select the IP address that the client server will use to boot.",
-    "lang_close": "Close",
-    "lang_compile": "Compile",
-    "lang_compilingIpxe": "Compiling iPXE",
-    "lang_customScript": "Custom Script",
-    "lang_download": "Download",
-    "lang_example": "Example",
-    "lang_extension": "Extension",
-    "lang_ipxeInfo": "Here it is possible to compile and download iPXE for USB 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_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_menuDisplayTime": "Menu Display Time",
-    "lang_mountIpxe": "Mount iPXE",
-    "lang_restoreDefault": "Restore Default",
-    "lang_saveScript": "Save Script",
-    "lang_seconds": "Seconds",
-    "lang_set": "Set",
-    "lang_success": "Successfully create file:",
     "module_name": "iPXE \/ Boot Menu"
 }
\ No newline at end of file
diff --git a/modules-available/serversetup/lang/en/templates/ipxe.json b/modules-available/serversetup/lang/en/template-tags.json
index 70c17f43..af22081a 100644
--- a/modules-available/serversetup/lang/en/templates/ipxe.json
+++ b/modules-available/serversetup/lang/en/template-tags.json
@@ -1,9 +1,13 @@
 {
+    "lang_active": "Active",
+    "lang_bootAddress": "Boot Address of the Server",
     "lang_bootBehavior": "Default Boot Behavior",
+    "lang_bootHint": "The Boot menu must be recreated after changing the IP address. Usually this is done automatically, but the process can also be triggered manually in the section of the boot menu.",
     "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_chooseIP": "Please select the IP address that the client server will use to boot.",
     "lang_close": "Close",
     "lang_compile": "Compile",
     "lang_compilingIpxe": "Compiling iPXE",
@@ -12,6 +16,7 @@
     "lang_download": "Download",
     "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",
@@ -23,9 +28,11 @@
     "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_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:"
-}
+}
\ No newline at end of file
diff --git a/modules-available/serversetup/lang/en/templates/ipaddress.json b/modules-available/serversetup/lang/en/templates/ipaddress.json
deleted file mode 100644
index 699aeacc..00000000
--- a/modules-available/serversetup/lang/en/templates/ipaddress.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "lang_active": "Active",
-    "lang_bootAddress": "Boot Address of the Server",
-    "lang_bootHint": "The Boot menu must be recreated after changing the IP address. Usually this is done automatically, but the process can also be triggered manually in the section of the boot menu.",
-    "lang_chooseIP": "Please select the IP address that the client server will use to boot.",
-    "lang_set": "Set"
-}
\ No newline at end of file
diff --git a/modules-available/serversetup/lang/en/templates/ipxe_update.json b/modules-available/serversetup/lang/en/templates/ipxe_update.json
deleted file mode 100644
index b33b12dd..00000000
--- a/modules-available/serversetup/lang/en/templates/ipxe_update.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "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