Merge branch 'main' into testing

org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt/l10n.properties

@@ -3,15 +3,15 @@ conletName = VM Management
 VMsSummary = VMs (running/total)
 
 assignedTo = Assigned to
-currentCpus = Current CPUs
-currentRam = Current RAM
+currentCpus = Current vCPUs
+currentRam = Current vRAM
 guestOs = Guest OS
-maximumCpus = Maximum CPUs
-maximumRam = Maximum RAM
+maximumCpus = Maximum vCPUs
+maximumRam = Maximum vRAM
 notInUse = Currently closed
 nodeName = Node
-requestedCpus = Requested CPUs
-requestedRam = Requested RAM
+requestedCpus = Requested vCPUs
+requestedRam = Requested vRAM
 runnerVersion = Runner version
 running = Running
 since = Since

org.jdrupes.vmoperator.vmmgmt/resources/org/jdrupes/vmoperator/vmmgmt/l10n_de.properties

@@ -7,15 +7,15 @@ Last\ hour = Letzte Stunde
 Last\ day = Letzter Tag
 
 assignedTo = Zugewiesen an
-currentCpus = Aktuelle CPUs
-currentRam = Akuelles RAM
+currentCpus = Aktuelle vCPUs
+currentRam = Akuelles vRAM
 guestOs = Gast BS
-maximumCpus = Maximale CPUs
-maximumRam = Maximales RAM
+maximumCpus = Maximale vCPUs
+maximumRam = Maximales vRAM
 nodeName = Knoten
 notInUse = Derzeit geschlossen
-requestedCpus = Angeforderte CPUs
-requestedRam = Angefordertes RAM
+requestedCpus = Angeforderte vCPUs
+requestedRam = Angefordertes vRAM
 runnerVersion = Runner-Version
 running = Gestartet
 since = Seit

webpages/index.md

@@ -11,8 +11,8 @@ layout: vm-operator
 
 ![Overview picture](index-pic.svg)
 
-This project provides an easy to use and flexible solution
-for running QEMU/KVM based VMs in Kubernetes pods.
+This project provides an easy to use and flexible solution for
+running QEMU/KVM based virtual machines (VMs) in Kubernetes pods.
 
 The image used for the VM pods combines QEMU and a control program
 for starting and managing the QEMU process. This application is called