diff --git a/.github/workflows/ci-integration-tests.yml b/.github/workflows/ci-integration-tests.yml
index 7e30ddbeb..ec1dff197 100644
--- a/.github/workflows/ci-integration-tests.yml
+++ b/.github/workflows/ci-integration-tests.yml
@@ -101,8 +101,8 @@ jobs:
     - name: IRC notification
       # see https://github.com/marketplace/actions/irc-message-action
       uses: Gottox/irc-message-action@v2
-      # never run in forks
-      if: failure() && github.repository_owner == 'openSUSE'
+      # never run in forks or when triggered manually
+      if: failure() && github.repository_owner == 'openSUSE' && github.event_name != 'workflow_dispatch'
       with:
         channel: "#yast"
         nickname: github-action
diff --git a/.github/workflows/weblate-merge-po.yml b/.github/workflows/weblate-merge-po.yml
index 7d13aeae9..bcf87d155 100644
--- a/.github/workflows/weblate-merge-po.yml
+++ b/.github/workflows/weblate-merge-po.yml
@@ -92,7 +92,7 @@ jobs:
         if: steps.check_changes.outputs.po_updated == 'true'
         working-directory: ./agama
         run: |
-          web/share/update-manifest.py web/src/manifest.json
+          web/share/update-languages.py > web/src/languages.json
           # use a unique branch to avoid possible conflicts with already existing branches
           git checkout -b "po_merge_${GITHUB_RUN_ID}"
           git commit -a -m "Update web PO files"$'\n\n'"Agama-weblate commit: `git -C ../agama-weblate rev-parse HEAD`"
diff --git a/doc/dbus/bus/org.opensuse.Agama.Storage1.Proposal.bus.xml b/doc/dbus/bus/org.opensuse.Agama.Storage1.Proposal.bus.xml
index 3a5ee0600..fc5aa6a04 100644
--- a/doc/dbus/bus/org.opensuse.Agama.Storage1.Proposal.bus.xml
+++ b/doc/dbus/bus/org.opensuse.Agama.Storage1.Proposal.bus.xml
@@ -27,14 +27,7 @@
     </signal>
   </interface>
   <interface name="org.opensuse.Agama.Storage1.Proposal">
-    <property type="s" name="BootDevice" access="read"/>
-    <property type="b" name="LVM" access="read"/>
-    <property type="as" name="SystemVGDevices" access="read"/>
-    <property type="s" name="EncryptionPassword" access="read"/>
-    <property type="s" name="EncryptionMethod" access="read"/>
-    <property type="s" name="EncryptionPBKDFunction" access="read"/>
-    <property type="s" name="SpacePolicy" access="read"/>
-    <property type="aa{sv}" name="Volumes" access="read"/>
+    <property type="a{sv}" name="Settings" access="read"/>
     <property type="aa{sv}" name="Actions" access="read"/>
   </interface>
 </node>
diff --git a/doc/dbus/org.opensuse.Agama.Storage1.Proposal.Calculator.doc.xml b/doc/dbus/org.opensuse.Agama.Storage1.Proposal.Calculator.doc.xml
index 6b5130f2f..ec60f49dc 100644
--- a/doc/dbus/org.opensuse.Agama.Storage1.Proposal.Calculator.doc.xml
+++ b/doc/dbus/org.opensuse.Agama.Storage1.Proposal.Calculator.doc.xml
@@ -18,13 +18,14 @@
       <!--
         MountPath               s
         MountOptions            as
-        TargetDevice            s
-        TargetVG                s
+        Target                  s (options: "default", "new_partition", "new_vg", "device", "filesystem")
+        TargetDevice            s (only makes sense if Target is not "default")
         FsType                  s
         MinSize                 t (bytes)
         MaxSize                 t (bytes. Optional, max size is considered as unlimited if omitted)
         AutoSize                b
-        Snapshots               b
+        Snapshots               b (makes sense only for btrfs)
+        Transactional           b (makes sense only for btrfs)
         Outline                 a{sv}
           Required              b
           FsTypes               as
@@ -39,20 +40,41 @@
       Calculates a new proposal.
     -->
     <method name="Calculate">
-    <!--
-      BootDevice              s
-      LVM                     b
-      SystemVGDevices         as
-      EncryptionPassword      s
-      EncryptionMethod        s
-      EncryptionPBKDFunction  s
-      SpacePolicy             s
-      SpaceActions            a{ss}
-      Volumes                 aa{sv}
-        List of volumes to create. The values for each volume are the same as the values returned
-        by DefaultVolume method. The Outline (if given) would be ignored.
-    -->
+      <!--
+        Target                 s (options: "disk", "newLvmVg", "reusedLvmVg")
+        TargeDevice            s (optional: does not make sense if Target is "newLvmVg")
+        TargetPVDevices        as (optional: only makes sense if Target is "newLvmVg")
+        ConfigureBoot          b
+        BootDevice             s
+        EncryptionPassword     s
+        EncryptionMethod       s
+        EncryptionPBKDFunction s
+        SpacePolicy            s
+        SpaceActions           aa{sv}
+        Volumes                aa{sv}
+
+        Each space action has the following properties:
+          Device                 s
+          Action                 s (options: "force_delete", "resize")
+
+        Each volume has the following properties:
+          MountPath               s
+          MountOptions            as
+          Target                  s (options: "default", "new_partition", "new_vg", "device", "filesystem")
+          TargetDevice            s (only makes sense if Target is not "default")
+          FsType                  s
+          MinSize                 t (bytes)
+          MaxSize                 t (bytes. Optional, max size is considered as unlimited if omitted)
+          AutoSize                b
+          Snapshots               b (makes sense only for btrfs)
+          Transactional           b (makes sense only for btrfs)
+      -->
       <arg name="settings" direction="in" type="a{sv}"/>
+      <!--
+        Whether the proposal was correctly calculated:
+          0: success
+          1: failure
+      -->
       <arg name="result" direction="out" type="u"/>
     </method>
     <property type="ao" name="AvailableDevices" access="read"/>
diff --git a/doc/dbus/org.opensuse.Agama.Storage1.Proposal.doc.xml b/doc/dbus/org.opensuse.Agama.Storage1.Proposal.doc.xml
index a597c317e..9b7bea10a 100644
--- a/doc/dbus/org.opensuse.Agama.Storage1.Proposal.doc.xml
+++ b/doc/dbus/org.opensuse.Agama.Storage1.Proposal.doc.xml
@@ -4,26 +4,36 @@
     Interfaces with the properties of the calculated proposal.
   -->
   <interface name="org.opensuse.Agama.Storage1.Proposal">
-    <property type="s" name="BootDevice" access="read"/>
-    <property type="b" name="LVM" access="read"/>
-    <property type="as" name="SystemVGDevices" access="read"/>
-    <property type="s" name="EncryptionPassword" access="read"/>
-    <property type="s" name="EncryptionMethod" access="read"/>
-    <property type="s" name="EncryptionPBKDFunction" access="read"/>
-    <property type="s" name="SpacePolicy" access="read"/>
     <!--
-      List of volumes used for calculating the proposal.
+      Proposal settings:
+        Target                 s (options: "disk", "newLvmVg", "reusedLvmVg")
+        TargeDevice            s (optional: does not make sense if Target is "newLvmVg")
+        TargetPVDevices        as (optional: only makes sense if Target is "newLvmVg")
+        ConfigureBoot          b
+        BootDevice             s
+        DefaultBootDevice      s
+        EncryptionPassword     s
+        EncryptionMethod       s
+        EncryptionPBKDFunction s
+        SpacePolicy            s
+        SpaceActions           aa{sv}
+        Volumes                aa{sv}
+
+      Each space action has the following properties:
+        Device                 s
+        Action                 s (options: "force_delete", "resize")
+
       Each volume has the following properties:
         MountPath               s
         MountOptions            as
-        TargetDevice            s
-        TargetVG                s
+        Target                  s (options: "default", "new_partition", "new_vg", "device", "filesystem")
+        TargetDevice            s (only makes sense if Target is not "default")
         FsType                  s
         MinSize                 t (bytes)
         MaxSize                 t (bytes. Optional, max size is considered as unlimited if omitted)
         AutoSize                b
-        Snapshots               b ( makes sense only for btrfs )
-        Transactional           b ( makes sense only for btrfs )
+        Snapshots               b (makes sense only for btrfs)
+        Transactional           b (makes sense only for btrfs)
         Outline                 a{sv}
           Required              b
           FsTypes               as
@@ -32,10 +42,11 @@
           SnapshotsAffectSizes  b
           SizeRelevantVolumes   as
     -->
-    <property type="aa{sv}" name="Volumes" access="read"/>
+    <property type="a{sv}" name="Settings" access="read"/>
     <!--
       Actions to perform in the system in order to create the volumes.
       Each action has the following properties:
+        Device  s
         Text    s
         Subvol  b
         Delete  b
diff --git a/doc/images/storage_ui/agama_guided.png b/doc/images/storage_ui/agama_guided.png
index 9344740c8..f37d111c2 100644
Binary files a/doc/images/storage_ui/agama_guided.png and b/doc/images/storage_ui/agama_guided.png differ
diff --git a/doc/images/storage_ui/transactional.png b/doc/images/storage_ui/transactional.png
new file mode 100644
index 000000000..68177aeb7
Binary files /dev/null and b/doc/images/storage_ui/transactional.png differ
diff --git a/doc/storage_ui.md b/doc/storage_ui.md
index 9001757d8..1393cd327 100644
--- a/doc/storage_ui.md
+++ b/doc/storage_ui.md
@@ -21,16 +21,12 @@ the selection of the operating system to install, "product" in Agama jargon.
 This document describes the Agama interface for a traditional (non-transactional) system. See the
 section "interface changes for transactional systems" for the alternative.
 
-### Representation of the Actions to Perform
+### Representation of the Result
 
-Another important point to consider is that currently the list of (libstorage-ng) actions is the
-only way we have to represent the result of a given proposal. That representation is far from ideal.
-It doesn't offer a convenient high-level view of the final layout or of the really significant
-actions (it includes too many intermediate steps by default).
-
-A complete design for a more convenient representation of the result is out of the scope of this
-proposal. Nevertheless, small changes (like grouping the actions based on the operating system
-they affect) are somehow suggested in some of the upcoming sections and mock-ups.
+The result of the storage setup is represented in the mockups of this document as a section of the
+storage page titled "result", which includes a list of (libstorage-ng) actions and a table
+representing the final state of the affected devices. That is far from ideal, but a complete design
+for a more convenient representation of the result is out of the scope of this proposal.
 
 In the long term, we may need to come with a better alternative to show the result.
 
@@ -71,18 +67,18 @@ user.
 ![Initial storage screen](images/storage_ui/agama_guided.png)
 
 Every change to any of the configuration options will result in an immediate re-calculation of the
-"planned actions" section which represents the result. Changes in the configuration of encryption,
-btrfs snapshots or the target devices can also imply refreshing the description of the file systems.
-In a similar way, changes in those volumes or the target device may result in some disk being
-included or excluded in the section "find space".
+section that presents the result. Changes in the configuration of encryption, btrfs snapshots or the
+target devices can also imply refreshing the description of the file systems. In a similar way,
+changes in those volumes or the target device may result in a change in the number of disks
+mentioned in the sentence about finding space.
 
 The table with the file systems actually represents the volumes used as input for the Agama variant
 of the `GuidedProposal`. Compared to YaST, Agama turns the volumes into a much more visible concept.
 The users will be able to see and adjust most of their attributes. Users could even define new
 volumes that are not initially part of the configuration of the selected product.
 
-Pop-up dialogs will be used to modify the target device(s), the encryption configuration or the
-booting setup, as well as to add or edit a given volume.
+Pop-up dialogs will be used to modify the target device(s), the encryption configuration, the
+booting setup or the strategy to find free space, as well as to add or edit a given volume.
 
 All file systems will be created by default at the chosen target disk or at the default LVM volume
 group (in the case of LVM-based proposal). The user will be able to manually overwrite the location
@@ -92,9 +88,9 @@ system at the `vdb1` partition. Continue reading to understand all the possible
 
 Defining the settings and the list of volumes also defines, as a direct consequence, the disks
 affected by the installation process. It may be needed to make some space in those disks. That
-deserves a dedicated section in the proposal page that is described below.
+deserves a dedicated "find space" setting that is described below.
 
-### Device Selection and General Settings
+### Device Selection
 
 As seen on the image above, the main device to install the system can be chosen at the very top of
 the storage proposal page. Although a Linux installation can extend over several disks, the storage
@@ -109,29 +105,21 @@ which devices will be partitioned in order to allocate the physical volumes of t
 In that case, the file systems will be created by default as new LVM logical volumes at that new
 volume group.
 
+### General Settings
+
 The device selection is followed by some global settings that define how the installation is going
 to look and what are the possibilities in terms of booting and structuring the file systems. Those
 settings include the usage of btrfs snapshots, which in YaST is presented relatively hidden as one
 of the configuration options for the root file system.
 
-One of the main features of the `GuidedProposal` is its ability to automatically determine any extra
-partition that may be needed for booting the new system, like PReP, EFI, Zipl or any other described
-at the [corresponding YaST
-document](https://github.com/yast/yast-storage-ng/blob/master/doc/boot-requirements.md). The
-algorithm can create those partitions or reuse existing ones that are already in the system if the
-user wants to keep them (see the section about finding space). The behavior of that feature can be
-also be tweaked in the "settings" section of the page.
-
-![Dialog to configure booting](images/storage_ui/boot_config_popup.png)
-
 ### File Systems
 
-The next section contains the table that displays the file systems to be created, volumes in YaST
-jargon. The size of each volume is specified as a couple of lower and upper limits (the upper one is
-optional in all cases). With the current approach of the YaST `GuidedProposal` there are some
-volumes that may need to recalculate those limits based on the proposal configuration (eg. whether
-Btrfs snapshots are enabled) or its relationship with others volumes. Their limits will be set as
-"auto-calculated" by default. For more details, see the corresponding section below.
+The "settings" section also contains the table that displays the file systems to be created, volumes
+in YaST jargon. The size of each volume is specified as a couple of lower and upper limits (the
+upper one is optional in all cases). With the current approach of the YaST `GuidedProposal` there
+are some volumes that may need to recalculate those limits based on the proposal configuration (eg.
+whether Btrfs snapshots are enabled) or its relationship with others volumes. Their limits will be
+set as "auto-calculated" by default. For more details, see the corresponding section below.
 
 If btrfs is used for the root file system, it will be possible to define subvolumes for it. Those
 subvolumes are represented in the same table, nested on the entry of the root file system. They can
@@ -155,6 +143,18 @@ specify an an alternative location using the following form that offers several
 When the option to reuse an existing device is chosen, size limits cannot be adjusted. The size of
 the reused device will be displayed in the table of file systems in the corresponding column.
 
+### Configuration of Booting Partitions
+
+One of the main features of the `GuidedProposal` is its ability to automatically determine any extra
+partition that may be needed for booting the new system, like PReP, EFI, Zipl or any other described
+at the [corresponding YaST
+document](https://github.com/yast/yast-storage-ng/blob/master/doc/boot-requirements.md). The
+algorithm can create those partitions or reuse existing ones that are already in the system if the
+user wants to keep them (see the section about finding space). The behavior of that feature can be
+also be tweaked in the "settings" section of the page.
+
+![Dialog to configure booting](images/storage_ui/boot_config_popup.png)
+
 ### Finding Space for the Volumes
 
 Similar to YaST, Agama will offer by default the option to automatically make space for the new
@@ -164,7 +164,8 @@ three automatic modes.
 As an alternative, the Agama proposal will offer a custom mode in which the user will explicitly
 select which partitions to keep, delete or resize.
 
-That will result in up to four possibilities presented in the corresponding section.
+That will result in up to four possibilities presented at a pop-up dialog if the user clicks on the
+corresponding option at the botton of the "settings" section.
 
 - Delete everything in the disk(s). Obviously, all previous data is removed.
 - Shrink existing partition(s). The information is kept, but partitions are resized as needed to make
@@ -249,9 +250,11 @@ In those systems, it makes no sense to disable Btrfs snapshots, which are requir
 functionality. Is not only that snapshots are mandatory in transactional systems, they are actually
 used with a different purpose when compared to read-write systems.
 
-Thus, if the system being installed is transactional, that will be clearly stated at the "settings"
-section of the storage proposal page. The setting to use btrfs snapshots will not be there and the
-root file system will be labeled as "transactional" in the corresponding table.
+Thus, if the system being installed is transactional, that will be clearly stated at the top of the
+page. The setting to use btrfs snapshots will not be there and the root file system will be labeled as
+"transactional" in the corresponding table.
+
+![Interface changes for transactional systems](images/storage_ui/transactional.png)
 
 ## Advanced Preparations
 
diff --git a/products.d/ALP-Dolomite.yaml b/products.d/ALP-Dolomite.yaml
index 60103a639..93d796e73 100644
--- a/products.d/ALP-Dolomite.yaml
+++ b/products.d/ALP-Dolomite.yaml
@@ -11,9 +11,16 @@ description: 'SUSE ALP Dolomite is a minimum immutable OS core, focused on
 # Do not manually change any translations! See README.md for more details.
 translations:
   description:
+    ca: El SUSE ALP Dolomite és un nucli de sistema operatiu mínim immutable,
+      centrat en la seguretat per proporcionar el mínim necessari per executar
+      càrregues de treball i serveis com ara contenidors o màquines virtuals.
     cs: SUSE ALP Dolomite je minimální neměnitelný základní OS, zaměřený na
       bezpečnost pro poskytování úplného minima ke spuštění úloh a služeb v
       kontejnerech nebo virtuálních strojích.
+    de: SUSE ALP Dolomite ist ein minimaler, unveränderlicher Betriebssystemkern,
+      der sich auf die Sicherheit konzentriert und das absolute Minimum für die
+      Ausführung von Arbeitslasten und Diensten als Container oder virtuelle
+      Maschinen bietet.
     es: SUSE ALP Dolomite es un núcleo de sistema operativo mínimo e inmutable,
       centrado en la seguridad para proporcionar lo mínimo necesario para
       ejecutar cargas de trabajo y servicios como contenedores o máquinas
@@ -33,6 +40,7 @@ translations:
     sv: SUSE ALP Dolomite är en minimal oföränderlig OS-kärna, fokuserad på säkerhet
       för att tillhandahålla det absoluta minimum för att köra
       arbetsbelastningar och tjänster som behållare eller virtuella maskiner.
+    zh_Hans: SUSE ALP Dolomite 是最小的不可变操作系统核心，专注于安全性，提供最低限度的容器化或虚拟机工作负载和服务。
 software:
   mandatory_patterns:
     - alp_base_zypper
diff --git a/products.d/microos-desktop.yaml b/products.d/microos-desktop.yaml
index 97d351d86..8dafa1ac5 100644
--- a/products.d/microos-desktop.yaml
+++ b/products.d/microos-desktop.yaml
@@ -12,6 +12,10 @@ description: 'A distribution for the desktop offering automatic updates and
 # Do not manually change any translations! See README.md for more details.
 translations:
   description:
+    ca: Una distribució per a l'escriptori que ofereix actualitzacions automàtiques
+      i retrocessos sobre els fonaments de l'openSUSE MicroSO. Inclou el Podman
+      Container Runtime i permet gestionar programari mitjançant el Programari
+      del Gnome o el KDE Discover.
     es: Una distribución para escritorio que ofrece actualizaciones automáticas y
       reversión sobre los fundamentos de openSUSE MicroOS. Incluye Podman
       Container Runtime y permite administrar software usando Gnome Software o
@@ -30,6 +34,8 @@ translations:
       möjligheten att rulla tillbaka byggt ovanpå grunden av openSUSE MicroOS.
       Inkluderar Podman behållarkörtid och gör det möjligt att hantera
       programvara med Gnome Programvara eller KDE Discover.
+    zh_Hans: 在 openSUSE MicroOS 基础上提供自动更新和回滚的桌面设备发行版。包含 Podman 容器运行时，且允许透过 GNOME
+      Software 或 KDE Discover 管理软件。
 software:
   installation_repositories:
     - url: https://download.opensuse.org/tumbleweed/repo/oss/
diff --git a/products.d/microos.yaml b/products.d/microos.yaml
index a0cec5d77..596d60186 100644
--- a/products.d/microos.yaml
+++ b/products.d/microos.yaml
@@ -12,6 +12,17 @@ description: 'A quick, small distribution designed to host container workloads
 # Do not manually change any translations! See README.md for more details.
 translations:
   description:
+    ca: Una distribució ràpida i petita dissenyada per allotjar càrregues de treball
+      de contenidors amb administració i pedaços automatitzats. L'openSUSE
+      MicroSO proporciona actualitzacions transaccionals (atòmiques) en un
+      sistema de fitxers d'arrel btrfs només de lectura. Com a distribució
+      contínua, el programari està sempre actualitzat.
+    de: Eine schnelle, kleine Distribution, die für den Betrieb von
+      Container-Arbeitslasten mit automatischer Verwaltung und automatisiertem
+      Patching entwickelt wurde. openSUSE MicroOS bietet transaktionale
+      (atomare) Aktualisierungen auf einem schreibgeschützten
+      btrfs-Wurzeldateisystem. Als Distribution mit rollierenden
+      Veröffentlichungen ist die Software immer auf dem neuesten Stand.
     es: Una distribución pequeña y rápida diseñada para alojar cargas de trabajo de
       contenedores con administración y parches automatizados. openSUSE MicroOS
       proporciona actualizaciones transaccionales (atómicas) en un sistema de
@@ -35,6 +46,8 @@ translations:
       patchning. openSUSE MicroOS tillhandahåller transaktionella (atomära)
       uppdateringar på ett skrivskyddat btrfs-rootfilsystem. Som rullande
       releasedistribution är mjukvaran alltid uppdaterad.
+    zh_Hans: 一个快速、小型的发行版，旨在通过自动化管理和修补来托管容器工作负载。openSUSE MicroOS 提供基于只读 Btrfs
+      根文件系统之上的事务性（原子）更新。作为滚动发行版，它的软件始终保持最新。
 software:
   installation_repositories:
     - url: https://download.opensuse.org/tumbleweed/repo/oss/
diff --git a/products.d/tumbleweed.yaml b/products.d/tumbleweed.yaml
index 590008e63..a4d5a11d7 100644
--- a/products.d/tumbleweed.yaml
+++ b/products.d/tumbleweed.yaml
@@ -12,9 +12,18 @@ description: 'The Tumbleweed distribution is a pure rolling release version of
 # Do not manually change any translations! See README.md for more details.
 translations:
   description:
+    ca: La distribució Tumbleweed és una versió purament contínua d'openSUSE que
+      conté les últimes versions estables de tot el programari en lloc de
+      dependre de cicles de llançament periòdics rígids. El projecte fa això per
+      als usuaris que volen el programari estable més nou.
     cs: Tumbleweed je rolující verze distribuce openSUSE obsahující poslední
       "stabilní" verze veškerého software namísto pevných pravidelných vydání.
       Projekt je určen pro uživatele, kteří chtějí nejnovější stabilní software.
+    de: Die Tumbleweed-Distribution ist eine Version mit reinen rollierenden
+      Veröffentlichungen von openSUSE, die die neuesten „stabilen“ Versionen der
+      gesamten Software enthält, anstatt sich auf starre periodische
+      Veröffentlichungszyklen zu verlassen. Das Projekt tut dies für Benutzer,
+      die die neueste, stabile Software wünschen.
     es: La distribución Tumbleweed es una versión pura de lanzamiento continuo de
       openSUSE que contiene las últimas versiones "estables" de todo el software
       en lugar de depender de ciclos de lanzamiento periódicos menos flexibles.
@@ -42,6 +51,8 @@ translations:
       innehåller de senaste "stabila" versionerna av all programvara istället
       för att förlita sig på stela periodiska utgivningscykler. Projektet gör
       detta för användare som vill ha den senaste stabila programvaran.
+    zh_Hans: Tumbleweed 发行版是 openSUSE
+      的纯滚动发布版本，其并不依赖于严格的定时发布周期，而是持续包含所有最新“稳定”版本的软件。该项目为追求最新稳定软件的用户而生。
 software:
   installation_repositories:
     - url: https://download.opensuse.org/tumbleweed/repo/oss/
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 33d52732a..fa2c072e0 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -103,12 +103,16 @@ dependencies = [
  "cidr",
  "clap",
  "config",
+ "futures-util",
  "gettext-rs",
  "http-body-util",
+ "hyper 1.2.0",
+ "hyper-util",
  "jsonwebtoken",
  "log",
  "macaddr",
  "once_cell",
+ "openssl",
  "pam",
  "pin-project",
  "rand",
@@ -121,6 +125,7 @@ dependencies = [
  "systemd-journal-logger",
  "thiserror",
  "tokio",
+ "tokio-openssl",
  "tokio-stream",
  "tokio-test",
  "tower",
@@ -3366,6 +3371,18 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-openssl"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ffab79df67727f6acf57f1ff743091873c24c579b1e2ce4d8f53e47ded4d63d"
+dependencies = [
+ "futures-util",
+ "openssl",
+ "openssl-sys",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-stream"
 version = "0.1.15"
diff --git a/rust/WEB-SERVER.md b/rust/WEB-SERVER.md
index 8e91bc671..6637309e5 100644
--- a/rust/WEB-SERVER.md
+++ b/rust/WEB-SERVER.md
@@ -51,12 +51,26 @@ $ sudo ./target/debug/agama-web-server serve
 
 If it fails to compile, please check whether `clang-devel` and `pam-devel` are installed.
 
-You can add a `--listen` flag if you want to use a different port:
+By default the server uses port 3000 and listens on all network interfaces. You
+can use the `--address` option if you want to use a different port or a specific
+network interface:
 
 ```
-$ sudo ./target/debug/agama-web-server serve --listen 0.0.0.0:5678
+$ sudo ./target/debug/agama-web-server serve --address :::5678
 ```
 
+Some more examples:
+
+- Both IPv6 and IPv4, all interfaces: `--address :::5678`
+- Both IPv6 and IPv4, only local loopback : `--address ::1:5678`
+- IPv4 only, all interfaces: `--address 0.0.0.0:5678`
+- IPv4 only, only local loopback : `--address 127.0.0.1:5678`
+- IPv4, only specific interface: `--address 192.168.1.2:5678` (use the IP
+  address of that interface)
+
+The server can optionally listen on a secondary address, use the `--address2`
+option for that.
+
 ## Trying the server
 
 You can check whether the server is up and running by just performing a ping:
@@ -105,3 +119,28 @@ Now, you can use the following command to connect:
 $ websocat ws://localhost:3000/ws
     -H "Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3MDg1MTA5MzB9.3HmKAC5u4H_FigMqEa9e74OFAq40UldjlaExrOGqE0U"
 ```
+
+## SSL/TLS (HTTPS) Support
+
+The web server supports encrypted communication using the HTTPS protocol.
+
+The SSL certificate used by the server can be specified by the `--cert` and
+`--key` command line options which should point to the PEM files:
+
+```
+$ sudo ./target/debug/agama-web-server serve --cert certificate.pem --key key.pem
+```
+The certificate is expected in the PEM format, if you have a certificate in
+another format you can convert it using the openSSL tools.
+
+If a SSL certificate is not specified via command line then the server generates
+a self-signed certificate. Currently it is only kept in memory and generated
+again at each start.
+
+The HTTPS protocol is required for external connections, the HTTP connections
+are automatically redirected to HTTPS. *But it still means that the original
+HTTP communication can be intercepted by an attacker, do not rely on this
+redirection!*
+
+For internal connections coming from the same machine (via the
+`http://localhost` URL) the unencrypted HTTP communication is allowed.
diff --git a/rust/agama-server/Cargo.toml b/rust/agama-server/Cargo.toml
index b714ad84b..76ab2b682 100644
--- a/rust/agama-server/Cargo.toml
+++ b/rust/agama-server/Cargo.toml
@@ -49,6 +49,11 @@ chrono = { version = "0.4.34", default-features = false, features = [
 pam = "0.8.0"
 serde_with = "3.6.1"
 pin-project = "1.1.5"
+openssl = "0.10.64"
+hyper = "1.2.0"
+hyper-util = "0.1.3"
+tokio-openssl = "0.6.4"
+futures-util = { version = "0.3.30", default-features = false, features = ["alloc"] }
 
 [[bin]]
 name = "agama-dbus-server"
diff --git a/rust/agama-server/src/agama-web-server.rs b/rust/agama-server/src/agama-web-server.rs
index 8a1416878..186828f59 100644
--- a/rust/agama-server/src/agama-web-server.rs
+++ b/rust/agama-server/src/agama-web-server.rs
@@ -3,6 +3,7 @@ use std::{
     io::{self, Write},
     os::unix::fs::OpenOptionsExt,
     path::{Path, PathBuf},
+    pin::Pin,
     process::{ExitCode, Termination},
 };
 
@@ -12,8 +13,20 @@ use agama_server::{
     web::{self, generate_token, run_monitor},
 };
 use anyhow::Context;
+use axum::{
+    extract::Request as AxumRequest,
+    http::{Request, Response},
+    Router,
+};
 use clap::{Args, Parser, Subcommand};
+use futures_util::pin_mut;
+use hyper::body::Incoming;
+use hyper_util::rt::{TokioExecutor, TokioIo};
+use hyper_util::server::conn::auto::Builder;
+use openssl::ssl::{Ssl, SslAcceptor, SslFiletype, SslMethod};
 use tokio::sync::broadcast::channel;
+use tokio_openssl::SslStream;
+use tower::Service;
 use tracing_subscriber::prelude::*;
 use utoipa::OpenApi;
 
@@ -27,22 +40,6 @@ enum Commands {
     Openapi,
 }
 
-#[derive(Debug, Args)]
-pub struct ServeArgs {
-    // Address to listen on (":::3000" listens for both IPv6 and IPv4
-    // connections unless manually disabled in /proc/sys/net/ipv6/bindv6only)
-    #[arg(long, default_value = ":::3000")]
-    address: String,
-    // Agama D-Bus address
-    #[arg(long, default_value = "unix:path=/run/agama/bus")]
-    dbus_address: String,
-    // Directory containing the web UI code.
-    #[arg(long)]
-    web_ui_dir: Option<PathBuf>,
-    #[arg(long)]
-    generate_token: Option<PathBuf>,
-}
-
 #[derive(Parser, Debug)]
 #[command(
     version,
@@ -64,32 +61,279 @@ fn find_web_ui_dir() -> PathBuf {
     Path::new(DEFAULT_WEB_UI_DIR).into()
 }
 
+#[derive(Args, Debug)]
+struct ServeArgs {
+    // Address/port to listen on (":::3000" listens for both IPv6 and IPv4
+    // connections unless manually disabled in /proc/sys/net/ipv6/bindv6only)
+    #[arg(long, default_value = ":::3000", help = "Primary address to listen on")]
+    address: String,
+    #[arg(
+        long,
+        default_value = None,
+        help = "Optional secondary address to listen on"
+    )]
+    address2: Option<String>,
+    #[arg(
+        long,
+        default_value = None,
+        help = "Path to the SSL private key file in PEM format"
+    )]
+    key: Option<String>,
+    #[arg(
+        long,
+        default_value = None,
+        help = "Path to the SSL certificate file in PEM format"
+    )]
+    cert: Option<String>,
+    // Agama D-Bus address
+    #[arg(
+        long,
+        default_value = "unix:path=/run/agama/bus",
+        help = "The D-Bus address for connecting to the Agama service"
+    )]
+    dbus_address: String,
+    // Directory containing the web UI code.
+    #[arg(long)]
+    web_ui_dir: Option<PathBuf>,
+    #[arg(long)]
+    generate_token: Option<PathBuf>,
+}
+
+impl ServeArgs {
+    /// Builds an SSL acceptor using a provided SSL certificate or generates a self-signed one
+    fn ssl_acceptor(&self) -> Result<SslAcceptor, openssl::error::ErrorStack> {
+        let mut tls_builder = SslAcceptor::mozilla_modern_v5(SslMethod::tls_server())?;
+
+        if let (Some(cert), Some(key)) = (self.cert.clone(), self.key.clone()) {
+            tracing::info!("Loading PEM certificate: {}", cert);
+            tls_builder.set_certificate_file(PathBuf::from(cert), SslFiletype::PEM)?;
+
+            tracing::info!("Loading PEM key: {}", key);
+            tls_builder.set_private_key_file(PathBuf::from(key), SslFiletype::PEM)?;
+        } else {
+            let (cert, key) = agama_server::cert::create_certificate()?;
+
+            tls_builder.set_private_key(&key)?;
+            tls_builder.set_certificate(&cert)?;
+        }
+
+        // check that the key belongs to the certificate
+        tls_builder.check_private_key()?;
+
+        Ok(tls_builder.build())
+    }
+}
+
+/// Checks whether the connection uses SSL or not
+/// `stream`: the TCP stream containing a request from client
+async fn is_ssl_stream(stream: &tokio::net::TcpStream) -> bool {
+    // a buffer for reading the first byte from the TCP connection
+    let mut buf = [0u8; 1];
+
+    // peek() receives the data without removing it from the stream,
+    // the data is not consumed, it will be read from the stream again later
+    stream
+        .peek(&mut buf)
+        .await
+        // SSL3.0/TLS1.x starts with byte 0x16
+        // SSL2 starts with 0x80 (but should not be used as it is considered insecure)
+        // see https://stackoverflow.com/q/3897883
+        // otherwise consider the stream as a plain HTTP stream possibly starting with
+        // "GET ... HTTP/1.1" or "POST ... HTTP/1.1" or a similar line
+        .is_ok_and(|_| buf[0] == 0x16u8 || buf[0] == 0x80u8)
+}
+
+/// Builds a response for the HTTP -> HTTPS redirection
+/// returns (HTTP response status code) 308 permanent redirect
+fn redirect_https(host: &str, uri: &hyper::Uri) -> Response<String> {
+    let builder = Response::builder()
+        // build the redirection target URL
+        .header("Location", format!("https://{}{}", host, uri))
+        .status(hyper::StatusCode::PERMANENT_REDIRECT);
+
+    // according to documentation this can fail only if builder was previosly fed with data
+    // which failed to parse into an internal representation (e.g. invalid header)
+    builder
+        .body(String::from(""))
+        .expect("Failed to create redirection request")
+}
+
+/// Builds an error response for the HTTP -> HTTPS redirection when we cannot build
+/// the redirect response from the original request
+/// returns error 400
+fn redirect_error() -> Response<String> {
+    let builder = Response::builder().status(hyper::StatusCode::BAD_REQUEST);
+
+    let msg = "HTTP protocol is not allowed for external requests, please use HTTPS.\n";
+    // according to documentation this can fail only if builder was previosly fed with data
+    // which failed to parse into an internal representation (e.g. invalid header)
+    builder
+        .body(String::from(msg))
+        .expect("Failed to create an error response")
+}
+
+/// Builds a router for the HTTP -> HTTPS redirection
+/// if the redirection URL cannot be built from the original request it returns error 400
+/// instead of the redirection
+fn https_redirect() -> Router {
+    // see https://docs.rs/axum/latest/axum/routing/struct.Router.html#example
+    let redirect_service = tower::service_fn(|req: AxumRequest| async move {
+        if let Some(host) = req.headers().get("host").and_then(|h| h.to_str().ok()) {
+            Ok(redirect_https(host, req.uri()))
+        } else {
+            Ok(redirect_error())
+        }
+    });
+
+    Router::new()
+        // the wildcard path below does not match an empty path, we need to match it explicitly
+        .route_service("/", redirect_service)
+        .route_service("/*path", redirect_service)
+}
+
+/// handle the HTTPS connection
+async fn handle_https_stream(
+    tls_acceptor: SslAcceptor,
+    addr: std::net::SocketAddr,
+    tcp_stream: tokio::net::TcpStream,
+    service: axum::Router,
+) {
+    // handle HTTPS connection
+    let ssl = Ssl::new(tls_acceptor.context()).unwrap();
+    let mut tls_stream = SslStream::new(ssl, tcp_stream).unwrap();
+    if let Err(err) = SslStream::accept(Pin::new(&mut tls_stream)).await {
+        tracing::error!("Error during TSL handshake from {}: {}", addr, err);
+    } else {
+        let stream = TokioIo::new(tls_stream);
+        let hyper_service = hyper::service::service_fn(move |request: Request<Incoming>| {
+            service.clone().call(request)
+        });
+
+        let ret = Builder::new(TokioExecutor::new())
+            .serve_connection_with_upgrades(stream, hyper_service)
+            .await;
+
+        if let Err(err) = ret {
+            tracing::error!("Error serving connection from {}: {}", addr, err);
+        }
+    }
+}
+
+/// handle the HTTP connection
+async fn handle_http_stream(
+    addr: std::net::SocketAddr,
+    tcp_stream: tokio::net::TcpStream,
+    service: axum::Router,
+    redirector_service: axum::Router,
+) {
+    let stream = TokioIo::new(tcp_stream);
+    let hyper_service = hyper::service::service_fn(move |request: Request<Incoming>| {
+        // check if it is local connection or external
+        // the to_canonical() converts IPv4-mapped IPv6 addresses
+        // to plain IPv4, then is_loopback() works correctly for the IPv4 connections
+        if addr.ip().to_canonical().is_loopback() {
+            // accept plain HTTP on the local connection
+            service.clone().call(request)
+        } else {
+            // redirect external connections to HTTPS
+            redirector_service.clone().call(request)
+        }
+    });
+
+    let ret = Builder::new(TokioExecutor::new())
+        .serve_connection_with_upgrades(stream, hyper_service)
+        .await;
+
+    if let Err(err) = ret {
+        tracing::error!("Error serving connection from {}: {}", addr, err);
+    }
+}
+
+/// Starts the web server
+async fn start_server(address: String, service: Router, ssl_acceptor: SslAcceptor) {
+    tracing::info!("Starting Agama web server at {}", address);
+
+    // see https://github.com/tokio-rs/axum/blob/main/examples/low-level-openssl/src/main.rs
+    // how to use axum with openSSL
+    let listener = tokio::net::TcpListener::bind(&address)
+        .await
+        .unwrap_or_else(|error| {
+            let msg = format!("Error: could not listen on {}: {}", &address, error);
+            tracing::error!(msg);
+            panic!("{}", msg)
+        });
+
+    pin_mut!(listener);
+
+    let redirector = https_redirect();
+
+    loop {
+        let tower_service = service.clone();
+        let redirector_service = redirector.clone();
+        let tls_acceptor = ssl_acceptor.clone();
+
+        // Wait for a new tcp connection; if it fails we cannot do much, so print an error and die
+        let (tcp_stream, addr) = listener
+            .accept()
+            .await
+            .expect("Failed to open port for listening");
+
+        tokio::spawn(async move {
+            if is_ssl_stream(&tcp_stream).await {
+                // handle HTTPS connection
+                handle_https_stream(tls_acceptor, addr, tcp_stream, tower_service).await;
+            } else {
+                // handle HTTP connection
+                handle_http_stream(addr, tcp_stream, tower_service, redirector_service).await;
+            }
+        });
+    }
+}
+
 /// Start serving the API.
-///
-/// `args`: command-line arguments.
+/// `options`: command-line arguments.
 async fn serve_command(args: ServeArgs) -> anyhow::Result<()> {
     let journald = tracing_journald::layer().context("could not connect to journald")?;
     tracing_subscriber::registry().with(journald).init();
 
-    let listener = tokio::net::TcpListener::bind(&args.address)
-        .await
-        .unwrap_or_else(|_| panic!("could not listen on {}", &args.address));
-
     let (tx, _) = channel(16);
     run_monitor(tx.clone()).await?;
 
     let config = web::ServiceConfig::load()?;
 
-    if let Some(token_file) = args.generate_token {
+    if let Some(token_file) = args.generate_token.clone() {
         write_token(&token_file, &config.jwt_secret).context("could not create the token file")?;
     }
 
     let dbus = connection_to(&args.dbus_address).await?;
-    let web_ui_dir = args.web_ui_dir.unwrap_or(find_web_ui_dir());
+    let web_ui_dir = args.web_ui_dir.clone().unwrap_or(find_web_ui_dir());
     let service = web::service(config, tx, dbus, web_ui_dir).await?;
-    axum::serve(listener, service)
-        .await
-        .expect("could not mount app on listener");
+    // TODO: Move elsewhere? Use a singleton? (It would be nice to use the same
+    // generated self-signed certificate on both ports.)
+    let ssl_acceptor = if let Ok(ssl_acceptor) = args.ssl_acceptor() {
+        ssl_acceptor
+    } else {
+        return Err(anyhow::anyhow!("SSL initialization failed"));
+    };
+
+    let mut addresses = vec![args.address];
+
+    if let Some(a) = args.address2 {
+        addresses.push(a)
+    }
+
+    let servers: Vec<_> = addresses
+        .iter()
+        .map(|a| {
+            tokio::spawn(start_server(
+                a.clone(),
+                service.clone(),
+                ssl_acceptor.clone(),
+            ))
+        })
+        .collect();
+
+    futures_util::future::join_all(servers).await;
 
     Ok(())
 }
@@ -102,7 +346,7 @@ fn openapi_command() -> anyhow::Result<()> {
 
 async fn run_command(cli: Cli) -> anyhow::Result<()> {
     match cli.command {
-        Commands::Serve(args) => serve_command(args).await,
+        Commands::Serve(options) => serve_command(options).await,
         Commands::Openapi => openapi_command(),
     }
 }
diff --git a/rust/agama-server/src/cert.rs b/rust/agama-server/src/cert.rs
new file mode 100644
index 000000000..db02bf951
--- /dev/null
+++ b/rust/agama-server/src/cert.rs
@@ -0,0 +1,92 @@
+use openssl::asn1::Asn1Time;
+use openssl::bn::{BigNum, MsbOption};
+use openssl::error::ErrorStack;
+use openssl::hash::MessageDigest;
+use openssl::pkey::{PKey, Private};
+use openssl::rsa::Rsa;
+use openssl::x509::extension::{
+    BasicConstraints, KeyUsage, SubjectAlternativeName, SubjectKeyIdentifier,
+};
+use openssl::x509::{X509NameBuilder, X509};
+
+// TODO: move the certificate related functions into a struct
+//
+// struct Certificate {
+//     certificate: X509,
+//     key: PKey<Private>,
+// }
+//
+// impl Certificate {
+//     // read from file, support some default location
+//     // (like /etc/agama.d/ssl/{certificate,key}.pem ?)
+//     pub read(cert: &str, key: &str) -> Result<Self>;
+//     // generate a self-signed certificate
+//     pub new() -> Self
+//     // dump to file
+//     pub write(...)
+// }
+
+/// Generates a self-signed SSL certificate
+/// see https://github.com/sfackler/rust-openssl/blob/master/openssl/examples/mk_certs.rs
+pub fn create_certificate() -> Result<(X509, PKey<Private>), ErrorStack> {
+    let rsa = Rsa::generate(2048)?;
+    let key = PKey::from_rsa(rsa)?;
+
+    let mut x509_name = X509NameBuilder::new()?;
+    x509_name.append_entry_by_text("O", "Agama")?;
+    x509_name.append_entry_by_text("CN", "localhost")?;
+    let x509_name = x509_name.build();
+
+    let mut builder = X509::builder()?;
+    builder.set_version(2)?;
+    let serial_number = {
+        let mut serial = BigNum::new()?;
+        serial.rand(159, MsbOption::MAYBE_ZERO, false)?;
+        serial.to_asn1_integer()?
+    };
+    builder.set_serial_number(&serial_number)?;
+    builder.set_subject_name(&x509_name)?;
+    builder.set_pubkey(&key)?;
+
+    let not_before = Asn1Time::days_from_now(0)?;
+    builder.set_not_before(&not_before)?;
+    let not_after = Asn1Time::days_from_now(365)?;
+    builder.set_not_after(&not_after)?;
+
+    builder.append_extension(BasicConstraints::new().critical().ca().build()?)?;
+    builder.append_extension(
+        KeyUsage::new()
+            .critical()
+            .key_cert_sign()
+            .crl_sign()
+            .build()?,
+    )?;
+
+    builder.append_extension(
+        SubjectAlternativeName::new()
+            // use the default Agama host name
+            // TODO: use the gethostname crate and use the current real hostname
+            .dns("agama")
+            // use the default name for the mDNS/Avahi
+            // TODO: check which name is actually used by mDNS, to avoid
+            // conflicts it might actually use something like agama-2.local
+            .dns("agama.local")
+            .build(&builder.x509v3_context(None, None))?,
+    )?;
+
+    let subject_key_identifier =
+        SubjectKeyIdentifier::new().build(&builder.x509v3_context(None, None))?;
+    builder.append_extension(subject_key_identifier)?;
+
+    builder.sign(&key, MessageDigest::sha256())?;
+    let cert = builder.build();
+
+    // for debugging you might dump the certificate to a file:
+    // use std::io::Write;
+    // let mut cert_file = std::fs::File::create("agama_cert.pem").unwrap();
+    // let mut key_file = std::fs::File::create("agama_key.pem").unwrap();
+    // cert_file.write_all(cert.to_pem().unwrap().as_ref()).unwrap();
+    // key_file.write_all(key.private_key_to_pem_pkcs8().unwrap().as_ref()).unwrap();
+
+    Ok((cert, key))
+}
diff --git a/rust/agama-server/src/lib.rs b/rust/agama-server/src/lib.rs
index 3cb0e7834..d73b21f9c 100644
--- a/rust/agama-server/src/lib.rs
+++ b/rust/agama-server/src/lib.rs
@@ -1,3 +1,4 @@
+pub mod cert;
 pub mod error;
 pub mod l10n;
 pub mod manager;
diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
index 7428942da..ddf051cbe 100644
--- a/rust/agama-server/src/network/model.rs
+++ b/rust/agama-server/src/network/model.rs
@@ -603,6 +603,7 @@ pub enum ConnectionConfig {
     Bond(BondConfig),
     Vlan(VlanConfig),
     Bridge(BridgeConfig),
+    Infiniband(InfinibandConfig),
 }
 
 #[derive(Default, Debug, PartialEq, Clone, Serialize)]
@@ -1215,3 +1216,43 @@ pub struct BridgePortConfig {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub path_cost: Option<u32>,
 }
+
+#[derive(Default, Debug, PartialEq, Clone, Serialize)]
+pub struct InfinibandConfig {
+    pub p_key: Option<i32>,
+    pub parent: Option<String>,
+    pub transport_mode: InfinibandTransportMode,
+}
+
+#[derive(Default, Debug, PartialEq, Clone, Serialize)]
+pub enum InfinibandTransportMode {
+    #[default]
+    Datagram,
+    Connected,
+}
+
+#[derive(Debug, Error)]
+#[error("Invalid infiniband transport-mode: {0}")]
+pub struct InvalidInfinibandTransportMode(String);
+
+impl FromStr for InfinibandTransportMode {
+    type Err = InvalidInfinibandTransportMode;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "datagram" => Ok(Self::Datagram),
+            "connected" => Ok(Self::Connected),
+            _ => Err(InvalidInfinibandTransportMode(s.to_string())),
+        }
+    }
+}
+
+impl fmt::Display for InfinibandTransportMode {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let name = match &self {
+            InfinibandTransportMode::Datagram => "datagram",
+            InfinibandTransportMode::Connected => "connected",
+        };
+        write!(f, "{}", name)
+    }
+}
diff --git a/rust/agama-server/src/network/nm/dbus.rs b/rust/agama-server/src/network/nm/dbus.rs
index 75876ad16..7630c8aac 100644
--- a/rust/agama-server/src/network/nm/dbus.rs
+++ b/rust/agama-server/src/network/nm/dbus.rs
@@ -23,6 +23,7 @@ const DUMMY_KEY: &str = "dummy";
 const VLAN_KEY: &str = "vlan";
 const BRIDGE_KEY: &str = "bridge";
 const BRIDGE_PORT_KEY: &str = "bridge-port";
+const INFINIBAND_KEY: &str = "infiniband";
 
 /// Converts a connection struct into a HashMap that can be sent over D-Bus.
 ///
@@ -97,6 +98,10 @@ pub fn connection_to_dbus<'a>(
             connection_dbus.insert("type", BRIDGE_KEY.into());
             result.insert(BRIDGE_KEY, bridge_config_to_dbus(bridge));
         }
+        ConnectionConfig::Infiniband(infiniband) => {
+            connection_dbus.insert("type", INFINIBAND_KEY.into());
+            result.insert(INFINIBAND_KEY, infiniband_config_to_dbus(infiniband));
+        }
         _ => {}
     }
 
@@ -141,6 +146,11 @@ pub fn connection_from_dbus(conn: OwnedNestedHash) -> Option<Connection> {
         return Some(connection);
     }
 
+    if let Some(infiniband_config) = infiniband_config_from_dbus(&conn) {
+        connection.config = ConnectionConfig::Infiniband(infiniband_config);
+        return Some(connection);
+    }
+
     if conn.get(DUMMY_KEY).is_some() {
         connection.config = ConnectionConfig::Dummy;
         return Some(connection);
@@ -477,6 +487,45 @@ fn bridge_port_config_from_dbus(conn: &OwnedNestedHash) -> Option<BridgePortConf
     Some(bpc)
 }
 
+fn infiniband_config_to_dbus(config: &InfinibandConfig) -> HashMap<&str, zvariant::Value> {
+    let mut infiniband_config: HashMap<&str, zvariant::Value> = HashMap::from([
+        (
+            "transport-mode",
+            Value::new(config.transport_mode.to_string()),
+        ),
+        ("p-key", Value::new(config.p_key.unwrap_or(-1))),
+    ]);
+
+    if let Some(parent) = &config.parent {
+        infiniband_config.insert("parent", parent.into());
+    }
+
+    infiniband_config
+}
+
+fn infiniband_config_from_dbus(conn: &OwnedNestedHash) -> Option<InfinibandConfig> {
+    let Some(infiniband) = conn.get(INFINIBAND_KEY) else {
+        return None;
+    };
+
+    let mut infiniband_config = InfinibandConfig::default();
+
+    if let Some(p_key) = infiniband.get("p-key") {
+        infiniband_config.p_key = Some(*p_key.downcast_ref::<i32>()?);
+    }
+
+    if let Some(parent) = infiniband.get("parent") {
+        infiniband_config.parent = Some(parent.downcast_ref::<str>()?.to_string());
+    }
+
+    if let Some(transport_mode) = infiniband.get("transport-mode") {
+        infiniband_config.transport_mode =
+            InfinibandTransportMode::from_str(transport_mode.downcast_ref::<str>()?).ok()?;
+    }
+
+    Some(infiniband_config)
+}
+
 /// Converts a MatchConfig struct into a HashMap that can be sent over D-Bus.
 ///
 /// * `match_config`: MatchConfig to convert.
@@ -852,7 +901,7 @@ mod test {
     };
     use crate::network::{
         model::*,
-        nm::dbus::{BOND_KEY, ETHERNET_KEY, WIRELESS_KEY, WIRELESS_SECURITY_KEY},
+        nm::dbus::{BOND_KEY, ETHERNET_KEY, INFINIBAND_KEY, WIRELESS_KEY, WIRELESS_SECURITY_KEY},
     };
     use agama_lib::network::types::{BondMode, SSID};
     use cidr::IpInet;
@@ -1080,6 +1129,64 @@ mod test {
         }
     }
 
+    #[test]
+    fn test_connection_from_dbus_infiniband() {
+        let uuid = Uuid::new_v4().to_string();
+        let connection_section = HashMap::from([
+            ("id".to_string(), Value::new("ib0").to_owned()),
+            ("uuid".to_string(), Value::new(uuid).to_owned()),
+        ]);
+
+        let infiniband_section = HashMap::from([
+            ("p-key".to_string(), Value::new(0x8001 as i32).to_owned()),
+            ("parent".to_string(), Value::new("ib0").to_owned()),
+            (
+                "transport-mode".to_string(),
+                Value::new("datagram").to_owned(),
+            ),
+        ]);
+
+        let dbus_conn = HashMap::from([
+            ("connection".to_string(), connection_section),
+            (INFINIBAND_KEY.to_string(), infiniband_section),
+        ]);
+
+        let connection = connection_from_dbus(dbus_conn).unwrap();
+        let ConnectionConfig::Infiniband(infiniband) = &connection.config else {
+            panic!("Wrong connection type")
+        };
+        assert_eq!(infiniband.p_key, Some(0x8001));
+        assert_eq!(infiniband.parent, Some("ib0".to_string()));
+        assert_eq!(infiniband.transport_mode, InfinibandTransportMode::Datagram);
+    }
+
+    #[test]
+    fn test_dbus_from_infiniband_connection() {
+        let config = InfinibandConfig {
+            p_key: Some(0x8002),
+            parent: Some("ib1".to_string()),
+            transport_mode: InfinibandTransportMode::Connected,
+        };
+        let mut infiniband = build_base_connection();
+        infiniband.config = ConnectionConfig::Infiniband(config);
+        let infiniband_dbus = connection_to_dbus(&infiniband, None);
+
+        let infiniband = infiniband_dbus.get(INFINIBAND_KEY).unwrap();
+        let p_key: i32 = *infiniband.get("p-key").unwrap().downcast_ref().unwrap();
+        assert_eq!(p_key, 0x8002);
+        let parent: &str = infiniband.get("parent").unwrap().downcast_ref().unwrap();
+        assert_eq!(parent, "ib1");
+        let transport_mode: &str = infiniband
+            .get("transport-mode")
+            .unwrap()
+            .downcast_ref()
+            .unwrap();
+        assert_eq!(
+            transport_mode,
+            InfinibandTransportMode::Connected.to_string()
+        );
+    }
+
     #[test]
     fn test_dbus_from_wireless_connection() {
         let config = WirelessConfig {
diff --git a/rust/package/agama.changes b/rust/package/agama.changes
index 8e64449ff..ef4e3e943 100644
--- a/rust/package/agama.changes
+++ b/rust/package/agama.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar  13 12:42:58 UTC 2024 - Jorik Cronenberg <jorik.cronenberg@suse.com>
+
+- Add infiniband to network model (gh#openSUSE/agama#1032).
+
 -------------------------------------------------------------------
 Thu Mar  7 10:52:58 UTC 2024 - Michal Filka <mfilka@suse.com>
 
@@ -5,6 +10,19 @@ Thu Mar  7 10:52:58 UTC 2024 - Michal Filka <mfilka@suse.com>
   for handling authentication token management with new agama web
   server
 
+-------------------------------------------------------------------
+Thu Feb 29 09:49:18 UTC 2024 - Ladislav Slezák <lslezak@suse.com>
+
+- Web server:
+  - Accept also IPv6 connections (gh#openSUSE/agama#1057)
+  - Added SSL (HTTPS) support (gh#openSUSE/agama#1062)
+    - Use either the cerfificate specified via command line
+      arguments or generate a self-signed certificate
+    - Redirect external HTTP requests to HTTPS
+    - Allow HTTP for internal connections (http://localhost)
+  - Optionally listen on a secondary address
+    (to allow listening on both HTTP/80 and HTTPS/433 ports)
+
 -------------------------------------------------------------------
 Tue Feb 27 15:55:28 UTC 2024 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 
diff --git a/service/Gemfile.lock b/service/Gemfile.lock
index a70c881f9..9f8554476 100755
--- a/service/Gemfile.lock
+++ b/service/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    agama (7)
+    agama-yast (7.devel737)
       cfa (~> 1.0.2)
       cfa_grub2 (~> 2.0.0)
       cheetah (~> 1.0.0)
@@ -26,7 +26,9 @@ GEM
     docile (1.4.0)
     eventmachine (1.2.7)
     fast_gettext (2.3.0)
-    nokogiri (1.15.5-x86_64-linux)
+    mini_portile2 (2.8.5)
+    nokogiri (1.15.5)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     packaging_rake_tasks (1.5.4)
       rake
@@ -63,7 +65,7 @@ PLATFORMS
   x86_64-linux-gnu
 
 DEPENDENCIES
-  agama!
+  agama-yast!
   byebug
   packaging_rake_tasks (~> 1.5.1)
   rake (~> 13.0.6)
diff --git a/service/lib/agama/dbus/base_tree.rb b/service/lib/agama/dbus/base_tree.rb
index db28aa487..a699f03bf 100644
--- a/service/lib/agama/dbus/base_tree.rb
+++ b/service/lib/agama/dbus/base_tree.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -47,11 +47,16 @@ def initialize(service, root_path, logger: nil)
       #
       # @param objects [Array]
       def objects=(objects)
-        try_add_objects(objects)
         try_update_objects(objects)
+        try_add_objects(objects)
         try_delete_objects(objects)
       end
 
+      # Unexports the current D-Bus objects of this tree.
+      def clean
+        dbus_objects.each { |o| service.unexport(o) }
+      end
+
     private
 
       # @return [::DBus::ObjectServer]
diff --git a/service/lib/agama/dbus/hash_validator.rb b/service/lib/agama/dbus/hash_validator.rb
new file mode 100644
index 000000000..a7c7a4c3e
--- /dev/null
+++ b/service/lib/agama/dbus/hash_validator.rb
@@ -0,0 +1,154 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2024] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require "agama/dbus/types"
+
+module Agama
+  module DBus
+    # Validates a Hash (dictionary) from D-Bus according to an scheme.
+    #
+    # This validation is useful to check the expected types of a D-Bus call when some parameter is
+    # a dictionary with variant types.
+    #
+    # @example
+    #   # Let's say there is a D-Bus method with the following signature:
+    #
+    #   dbus_method :Calculate, "in settings:a{sv}"
+    #
+    #   # The settings parameter will be transformed to a ruby Hash and this class allows to
+    #   # validate the types of the hash values.
+    #
+    #   scheme = {
+    #     "ID"       => Integer,
+    #     "Name"     => String,
+    #     "Children" => Agama::DBus::Types.Array.new(Integer)
+    #   }
+    #
+    #   value1 = { "ID" => 10, "Name" => "Foo", "Color" => "red" }
+    #   validator = HashValidator.new(value1, scheme: scheme)
+    #   validator.valid?          #=> true
+    #   validator.missing_keys    #=> ["Children"]
+    #   validator.extra_keys      #=> ["Color"]
+    #   validator.issues          #=> ["Unknown D-Bus property Color"]
+    #
+    #   value2 = { "ID" => 10, "Name" => 33 }
+    #   validator = HashValidator.new(value2, scheme: scheme)
+    #   validator.valid?          #=> false
+    #   validator.missing_keys    #=> ["Children"]
+    #   validator.wrong_type_keys #=> ["Name"]
+    #   validator.issues.size     #=> 1
+    class HashValidator
+      # @param value [Hash{String => Object}] Hash to validate.
+      # @param scheme [Hash{String => Class, Types::BOOL, Types::Array, Types::Hash}] Scheme
+      #   for validating the hash.
+      def initialize(value, scheme:)
+        @value = value
+        @scheme = scheme
+      end
+
+      # Whether the hash is valid.
+      #
+      # The hash is consider as valid if there is no key with wrong type. Missing and extra keys are
+      # not validated.
+      #
+      # @return [Boolean]
+      def valid?
+        wrong_type_keys.none?
+      end
+
+      # Keys with correct type.
+      #
+      # Missing and extra keys are ignored.
+      #
+      # @return [Array<String>]
+      def valid_keys
+        value.keys.select { |k| valid_key?(k) }
+      end
+
+      # Keys with incorrect type.
+      #
+      # Missing and extra keys are ignored.
+      #
+      # @return [Array<String>]
+      def wrong_type_keys
+        value.keys.select { |k| !extra_key?(k) && wrong_type_key?(k) }
+      end
+
+      # Keys not included in the scheme.
+      #
+      # @return [Array<String>]
+      def extra_keys
+        value.keys.select { |k| extra_key?(k) }
+      end
+
+      # Keys included in the scheme but missing in the hash value.
+      #
+      # @return [Array<String>]
+      def missing_keys
+        scheme.keys - value.keys
+      end
+
+      # List of issues.
+      #
+      # There is an issue for each extra key and for each key with wrong type.
+      #
+      # @return [Array<String>]
+      def issues
+        issues = []
+
+        extra_keys.map do |key|
+          issues << "Unknown D-Bus property #{key}"
+        end
+
+        wrong_type_keys.map do |key|
+          type = scheme[key]
+          value = self.value[key]
+
+          issues << "D-Bus property #{key} must be #{type}: #{value} (#{value.class})"
+        end
+
+        issues
+      end
+
+    private
+
+      # @return [Hash{String => Object}]
+      attr_reader :value
+
+      # @return [Hash{String => Class, Types::BOOL, Types::Array, Types::Hash}]
+      attr_reader :scheme
+
+      def valid_key?(key)
+        !(extra_key?(key) || wrong_type_key?(key))
+      end
+
+      def extra_key?(key)
+        !scheme.keys.include?(key)
+      end
+
+      def wrong_type_key?(key)
+        type = scheme[key]
+        checker = Types::Checker.new(type)
+        !checker.match?(value[key])
+      end
+    end
+  end
+end
diff --git a/service/lib/agama/dbus/storage/device.rb b/service/lib/agama/dbus/storage/device.rb
index 4e1b07a20..17ecbe167 100644
--- a/service/lib/agama/dbus/storage/device.rb
+++ b/service/lib/agama/dbus/storage/device.rb
@@ -30,8 +30,15 @@ module Storage
       #
       # The D-Bus object includes the required interfaces for the storage object that it represents.
       class Device < BaseObject
-        # @return [Y2Storage::Device]
-        attr_reader :storage_device
+        # sid of the Y2Storage device.
+        #
+        # @note A Y2Storage device is a wrapper over a libstorage-ng object. If the source
+        #   devicegraph does not exist anymore (e.g., after reprobing), then the Y2Storage device
+        #   object cannot be used (memory error). The device sid is stored to avoid accessing to
+        #   the old Y2Storage device when updating the represented device, see {#storage_device=}.
+        #
+        # @return [Integer]
+        attr_reader :sid
 
         # Constructor
         #
@@ -43,6 +50,7 @@ def initialize(storage_device, path, tree, logger: nil)
           super(path, logger: logger)
 
           @storage_device = storage_device
+          @sid = storage_device.sid
           @tree = tree
           add_interfaces
         end
@@ -54,12 +62,13 @@ def initialize(storage_device, path, tree, logger: nil)
         #
         # @param value [Y2Storage::Device]
         def storage_device=(value)
-          if value.sid != storage_device.sid
+          if value.sid != sid
             raise "Cannot update the D-Bus object because the given device has a different sid: " \
-                  "#{value} instead of #{storage_device.sid}"
+                  "#{value} instead of #{sid}"
           end
 
           @storage_device = value
+          @sid = value.sid
 
           interfaces_and_properties.each do |interface, properties|
             dbus_properties_changed(interface, properties, [])
@@ -71,6 +80,9 @@ def storage_device=(value)
         # @return [DevicesTree]
         attr_reader :tree
 
+        # @return [Y2Storage::Device]
+        attr_reader :storage_device
+
         # Adds the required interfaces according to the storage object.
         def add_interfaces
           interfaces = Interfaces::Device.constants
diff --git a/service/lib/agama/dbus/storage/devices_tree.rb b/service/lib/agama/dbus/storage/devices_tree.rb
index c06501bd1..000bc1725 100644
--- a/service/lib/agama/dbus/storage/devices_tree.rb
+++ b/service/lib/agama/dbus/storage/devices_tree.rb
@@ -36,10 +36,19 @@ def path_for(device)
           ::DBus::ObjectPath.new(File.join(root_path, device.sid.to_s))
         end
 
-        # Updates the D-Bus tree according to the given devicegraph
+        # Updates the D-Bus tree according to the given devicegraph.
+        #
+        # @note In the devices tree it is important to avoid updating D-Bus nodes. Note that an
+        #   already exported D-Bus object could require to add or remove interfaces (e.g., an
+        #   existing partition needs to add the Filesystem interface after formatting the
+        #   partition). Dynamically adding or removing interfaces is not possible with ruby-dbus
+        #   once the object is exported on D-Bus.
+        #
+        #   Updating the currently exported D-Bus objects is avoided by calling to {#clean} first.
         #
         # @param devicegraph [Y2Storage::Devicegraph]
         def update(devicegraph)
+          clean
           self.objects = devices(devicegraph)
         end
 
@@ -52,17 +61,17 @@ def create_dbus_object(device)
         end
 
         # @see BaseTree
-        # @param dbus_object [Device]
-        # @param device [Y2Storage::Device]
-        def update_dbus_object(dbus_object, device)
-          dbus_object.storage_device = device
+        #
+        # @note D-Bus objects representing devices cannot be safely updated, see {#update}.
+        def update_dbus_object(_dbus_object, _device)
+          nil
         end
 
         # @see BaseTree
         # @param dbus_object [Device]
         # @param device [Y2Storage::Device]
         def dbus_object?(dbus_object, device)
-          dbus_object.storage_device.sid == device.sid
+          dbus_object.sid == device.sid
         end
 
         # Devices to be exported.
@@ -70,13 +79,16 @@ def dbus_object?(dbus_object, device)
         # Right now, only the required information for calculating a proposal is exported, that is:
         # * Potential candidate devices (i.e., disk devices, MDs).
         # * Partitions of the candidate devices in order to indicate how to find free space.
-        #
-        # TODO: export LVM VGs and file systems of directly formatted devices.
+        # * LVM volume groups and logical volumes.
         #
         # @param devicegraph [Y2Storage::Devicegraph]
         # @return [Array<Y2Storage::Device>]
         def devices(devicegraph)
-          devices = devicegraph.disk_devices + devicegraph.software_raids
+          devices = devicegraph.disk_devices +
+            devicegraph.software_raids +
+            devicegraph.lvm_vgs +
+            devicegraph.lvm_lvs
+
           devices + partitions_from(devices)
         end
 
diff --git a/service/lib/agama/dbus/storage/interfaces/device.rb b/service/lib/agama/dbus/storage/interfaces/device.rb
index 98f09690c..6376f6a0c 100644
--- a/service/lib/agama/dbus/storage/interfaces/device.rb
+++ b/service/lib/agama/dbus/storage/interfaces/device.rb
@@ -33,9 +33,13 @@ module Device
 
 require "agama/dbus/storage/interfaces/device/block"
 require "agama/dbus/storage/interfaces/device/component"
+require "agama/dbus/storage/interfaces/device/device"
 require "agama/dbus/storage/interfaces/device/drive"
 require "agama/dbus/storage/interfaces/device/filesystem"
+require "agama/dbus/storage/interfaces/device/lvm_lv"
+require "agama/dbus/storage/interfaces/device/lvm_vg"
 require "agama/dbus/storage/interfaces/device/md"
 require "agama/dbus/storage/interfaces/device/multipath"
+require "agama/dbus/storage/interfaces/device/partition"
 require "agama/dbus/storage/interfaces/device/partition_table"
 require "agama/dbus/storage/interfaces/device/raid"
diff --git a/service/lib/agama/dbus/storage/interfaces/device/block.rb b/service/lib/agama/dbus/storage/interfaces/device/block.rb
index b5c0e0001..def101b5d 100644
--- a/service/lib/agama/dbus/storage/interfaces/device/block.rb
+++ b/service/lib/agama/dbus/storage/interfaces/device/block.rb
@@ -44,11 +44,11 @@ def self.apply?(storage_device)
             BLOCK_INTERFACE = "org.opensuse.Agama.Storage1.Block"
             private_constant :BLOCK_INTERFACE
 
-            # Name of the block device
+            # Position of the first block of the region.
             #
-            # @return [String] e.g., "/dev/sda"
-            def block_name
-              storage_device.name
+            # @return [Integer]
+            def block_start
+              storage_device.start
             end
 
             # Whether the block device is currently active
@@ -58,6 +58,13 @@ def block_active
               storage_device.active?
             end
 
+            # Whether the block device is encrypted.
+            #
+            # @return [Boolean]
+            def block_encrypted
+              storage_device.encrypted?
+            end
+
             # Name of the udev by-id links
             #
             # @return [Array<String>]
@@ -98,9 +105,10 @@ def block_systems
 
             def self.included(base)
               base.class_eval do
-                dbus_interface BLOCK_INTERFACE  do
-                  dbus_reader :block_name, "s", dbus_name: "Name"
+                dbus_interface BLOCK_INTERFACE do
+                  dbus_reader :block_start, "t", dbus_name: "Start"
                   dbus_reader :block_active, "b", dbus_name: "Active"
+                  dbus_reader :block_encrypted, "b", dbus_name: "Encrypted"
                   dbus_reader :block_udev_ids, "as", dbus_name: "UdevIds"
                   dbus_reader :block_udev_paths, "as", dbus_name: "UdevPaths"
                   dbus_reader :block_size, "t", dbus_name: "Size"
diff --git a/service/lib/agama/dbus/storage/interfaces/device/component.rb b/service/lib/agama/dbus/storage/interfaces/device/component.rb
index c66422b2b..a4de9ce3e 100644
--- a/service/lib/agama/dbus/storage/interfaces/device/component.rb
+++ b/service/lib/agama/dbus/storage/interfaces/device/component.rb
@@ -84,6 +84,8 @@ def self.included(base)
               base.class_eval do
                 dbus_interface COMPONENT_INTERFACE do
                   dbus_reader :component_type, "s", dbus_name: "Type"
+                  # The names are provided just in case the device is component of a device that
+                  # is not exported yet (e.g., Bcache devices).
                   dbus_reader :component_device_names, "as", dbus_name: "DeviceNames"
                   dbus_reader :component_devices, "ao", dbus_name: "Devices"
                 end
diff --git a/service/lib/agama/dbus/storage/interfaces/device/device.rb b/service/lib/agama/dbus/storage/interfaces/device/device.rb
new file mode 100644
index 000000000..6aef6084b
--- /dev/null
+++ b/service/lib/agama/dbus/storage/interfaces/device/device.rb
@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2024] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require "dbus"
+require "y2storage/device_description"
+
+module Agama
+  module DBus
+    module Storage
+      module Interfaces
+        module Device
+          # Interface for a device.
+          #
+          # @note This interface is intended to be included by {Agama::DBus::Storage::Device}.
+          module Device
+            # Whether this interface should be implemented for the given device.
+            #
+            # @note All devices implement this interface.
+            #
+            # @param _storage_device [Y2Storage::Device]
+            # @return [Boolean]
+            def self.apply?(_storage_device)
+              true
+            end
+
+            DEVICE_INTERFACE = "org.opensuse.Agama.Storage1.Device"
+            private_constant :DEVICE_INTERFACE
+
+            # sid of the device.
+            #
+            # @return [Integer]
+            def device_sid
+              storage_device.sid
+            end
+
+            # Name to represent the device.
+            #
+            # @return [String] e.g., "/dev/sda".
+            def device_name
+              storage_device.display_name || ""
+            end
+
+            # Description of the device.
+            #
+            # @return [String] e.g., "EXT4 Partition".
+            def device_description
+              Y2Storage::DeviceDescription.new(storage_device).to_s
+            end
+
+            def self.included(base)
+              base.class_eval do
+                dbus_interface DEVICE_INTERFACE do
+                  dbus_reader :device_sid, "u", dbus_name: "SID"
+                  dbus_reader :device_name, "s", dbus_name: "Name"
+                  dbus_reader :device_description, "s", dbus_name: "Description"
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/service/lib/agama/dbus/storage/interfaces/device/drive.rb b/service/lib/agama/dbus/storage/interfaces/device/drive.rb
index 0466ad798..51c2f0d7c 100644
--- a/service/lib/agama/dbus/storage/interfaces/device/drive.rb
+++ b/service/lib/agama/dbus/storage/interfaces/device/drive.rb
@@ -85,7 +85,10 @@ def drive_model
             #
             # @return [String]
             def drive_bus
-              storage_device.bus || ""
+              # FIXME: not sure whether checking for "none" is robust enough
+              return "" if storage_device.bus.nil? || storage_device.bus.casecmp?("none")
+
+              storage_device.bus
             end
 
             # Bus Id for DASD
@@ -110,7 +113,15 @@ def drive_driver
             def drive_transport
               return "" unless storage_device.respond_to?(:transport)
 
-              storage_device.transport.to_s
+              transport = storage_device.transport
+              return "" if transport.nil? || transport.is?(:unknown)
+
+              # FIXME: transport does not have proper i18n support at yast2-storage-ng, so we are
+              # just duplicating some logic from yast2-storage-ng here
+              return "USB" if transport.is?(:usb)
+              return "IEEE 1394" if transport.is?(:sbp)
+
+              transport.to_s
             end
 
             # More info about the device
diff --git a/service/lib/agama/dbus/storage/interfaces/device/filesystem.rb b/service/lib/agama/dbus/storage/interfaces/device/filesystem.rb
index 36ee17c2e..545a17981 100644
--- a/service/lib/agama/dbus/storage/interfaces/device/filesystem.rb
+++ b/service/lib/agama/dbus/storage/interfaces/device/filesystem.rb
@@ -20,6 +20,7 @@
 # find current contact information at www.suse.com.
 
 require "dbus"
+require "y2storage/filesystem_label"
 
 module Agama
   module DBus
@@ -44,6 +45,15 @@ def self.apply?(storage_device)
             FILESYSTEM_INTERFACE = "org.opensuse.Agama.Storage1.Filesystem"
             private_constant :FILESYSTEM_INTERFACE
 
+            # SID of the file system.
+            #
+            # It is useful to detect whether a file system is new.
+            #
+            # @return [Integer]
+            def filesystem_sid
+              storage_device.filesystem.sid
+            end
+
             # File system type.
             #
             # @return [String] e.g., "ext4"
@@ -51,18 +61,27 @@ def filesystem_type
               storage_device.filesystem.type.to_s
             end
 
-            # Whether the filesystem contains the directory layout of an ESP partition.
+            # Mount path of the file system.
             #
-            # @return [Boolean]
-            def filesystem_efi?
-              storage_device.filesystem.efi?
+            # @return [String] Empty if not mounted.
+            def filesystem_mount_path
+              storage_device.filesystem.mount_path || ""
+            end
+
+            # Label of the file system.
+            #
+            # @return [String] Empty if it has no label.
+            def filesystem_label
+              Y2Storage::FilesystemLabel.new(storage_device).to_s
             end
 
             def self.included(base)
               base.class_eval do
-                dbus_interface FILESYSTEM_INTERFACE  do
+                dbus_interface FILESYSTEM_INTERFACE do
+                  dbus_reader :filesystem_sid, "u", dbus_name: "SID"
                   dbus_reader :filesystem_type, "s", dbus_name: "Type"
-                  dbus_reader :filesystem_efi?, "b", dbus_name: "EFI"
+                  dbus_reader :filesystem_mount_path, "s", dbus_name: "MountPath"
+                  dbus_reader :filesystem_label, "s", dbus_name: "Label"
                 end
               end
             end
diff --git a/service/lib/agama/dbus/storage/interfaces/device/lvm_lv.rb b/service/lib/agama/dbus/storage/interfaces/device/lvm_lv.rb
new file mode 100644
index 000000000..93757ffdf
--- /dev/null
+++ b/service/lib/agama/dbus/storage/interfaces/device/lvm_lv.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2024] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require "dbus"
+
+module Agama
+  module DBus
+    module Storage
+      module Interfaces
+        module Device
+          # Interface for LVM logical volume.
+          #
+          # @note This interface is intended to be included by {Agama::DBus::Storage::Device} if
+          #   needed.
+          module LvmLv
+            # Whether this interface should be implemented for the given device.
+            #
+            # @note LVM logical volumes implement this interface.
+            #
+            # @param storage_device [Y2Storage::Device]
+            # @return [Boolean]
+            def self.apply?(storage_device)
+              storage_device.is?(:lvm_lv)
+            end
+
+            LOGICAL_VOLUME_INTERFACE = "org.opensuse.Agama.Storage1.LVM.LogicalVolume"
+            private_constant :LOGICAL_VOLUME_INTERFACE
+
+            # LVM volume group hosting the this logical volume.
+            #
+            # @return [Array<::DBus::ObjectPath>]
+            def lvm_lv_vg
+              tree.path_for(storage_device.lvm_vg)
+            end
+
+            def self.included(base)
+              base.class_eval do
+                dbus_interface LOGICAL_VOLUME_INTERFACE do
+                  dbus_reader :lvm_lv_vg, "o", dbus_name: "VolumeGroup"
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/service/lib/agama/dbus/storage/interfaces/device/lvm_vg.rb b/service/lib/agama/dbus/storage/interfaces/device/lvm_vg.rb
new file mode 100644
index 000000000..8d219fc6d
--- /dev/null
+++ b/service/lib/agama/dbus/storage/interfaces/device/lvm_vg.rb
@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2024] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require "dbus"
+
+module Agama
+  module DBus
+    module Storage
+      module Interfaces
+        module Device
+          # Interface for a LVM Volume Group.
+          #
+          # @note This interface is intended to be included by {Agama::DBus::Storage::Device} if
+          #   needed.
+          module LvmVg
+            # Whether this interface should be implemented for the given device.
+            #
+            # @note LVM Volume Groups implement this interface.
+            #
+            # @param storage_device [Y2Storage::Device]
+            # @return [Boolean]
+            def self.apply?(storage_device)
+              storage_device.is?(:lvm_vg)
+            end
+
+            VOLUME_GROUP_INTERFACE = "org.opensuse.Agama.Storage1.LVM.VolumeGroup"
+            private_constant :VOLUME_GROUP_INTERFACE
+
+            # Size of the volume group in bytes
+            #
+            # @return [Integer]
+            def lvm_vg_size
+              storage_device.size.to_i
+            end
+
+            # D-Bus paths of the objects representing the physical volumes.
+            #
+            # @return [Array<String>]
+            def lvm_vg_pvs
+              storage_device.lvm_pvs.map { |p| tree.path_for(p.plain_blk_device) }
+            end
+
+            # D-Bus paths of the objects representing the logical volumes.
+            #
+            # @return [Array<String>]
+            def lvm_vg_lvs
+              storage_device.lvm_lvs.map { |l| tree.path_for(l) }
+            end
+
+            def self.included(base)
+              base.class_eval do
+                dbus_interface VOLUME_GROUP_INTERFACE do
+                  dbus_reader :lvm_vg_size, "t", dbus_name: "Size"
+                  dbus_reader :lvm_vg_pvs, "ao", dbus_name: "PhysicalVolumes"
+                  dbus_reader :lvm_vg_lvs, "ao", dbus_name: "LogicalVolumes"
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/service/lib/agama/dbus/storage/interfaces/device/partition.rb b/service/lib/agama/dbus/storage/interfaces/device/partition.rb
new file mode 100644
index 000000000..050d83666
--- /dev/null
+++ b/service/lib/agama/dbus/storage/interfaces/device/partition.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2024] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require "dbus"
+
+module Agama
+  module DBus
+    module Storage
+      module Interfaces
+        module Device
+          # Interface for partition.
+          #
+          # @note This interface is intended to be included by {Agama::DBus::Storage::Device} if
+          #   needed.
+          module Partition
+            # Whether this interface should be implemented for the given device.
+            #
+            # @note Partitions implement this interface.
+            #
+            # @param storage_device [Y2Storage::Device]
+            # @return [Boolean]
+            def self.apply?(storage_device)
+              storage_device.is?(:partition)
+            end
+
+            PARTITION_INTERFACE = "org.opensuse.Agama.Storage1.Partition"
+            private_constant :PARTITION_INTERFACE
+
+            # Device hosting the partition table of this partition.
+            #
+            # @return [Array<::DBus::ObjectPath>]
+            def partition_device
+              tree.path_for(storage_device.partitionable)
+            end
+
+            # Whether it is a (valid) EFI System partition
+            #
+            # @return [Boolean]
+            def partition_efi
+              storage_device.efi_system?
+            end
+
+            def self.included(base)
+              base.class_eval do
+                dbus_interface PARTITION_INTERFACE do
+                  dbus_reader :partition_device, "o", dbus_name: "Device"
+                  dbus_reader :partition_efi, "b", dbus_name: "EFI"
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/service/lib/agama/dbus/storage/interfaces/device/partition_table.rb b/service/lib/agama/dbus/storage/interfaces/device/partition_table.rb
index 546ddfd93..97dcb90e2 100644
--- a/service/lib/agama/dbus/storage/interfaces/device/partition_table.rb
+++ b/service/lib/agama/dbus/storage/interfaces/device/partition_table.rb
@@ -60,11 +60,22 @@ def partition_table_partitions
               storage_device.partition_table.partitions.map { |p| tree.path_for(p) }
             end
 
+            # Available slots within a partition table, that is, the spaces that can be used to
+            # create a new partition.
+            #
+            # @return [Array<Array(Integer, Integer)>] The first block and the size of each slot.
+            def partition_table_unused_slots
+              storage_device.partition_table.unused_partition_slots.map do |slot|
+                [slot.region.start, slot.region.size.to_i]
+              end
+            end
+
             def self.included(base)
               base.class_eval do
                 dbus_interface PARTITION_TABLE_INTERFACE do
                   dbus_reader :partition_table_type, "s", dbus_name: "Type"
                   dbus_reader :partition_table_partitions, "ao", dbus_name: "Partitions"
+                  dbus_reader :partition_table_unused_slots, "a(tt)", dbus_name: "UnusedSlots"
                 end
               end
             end
diff --git a/service/lib/agama/dbus/storage/manager.rb b/service/lib/agama/dbus/storage/manager.rb
index 188062579..968673363 100644
--- a/service/lib/agama/dbus/storage/manager.rb
+++ b/service/lib/agama/dbus/storage/manager.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2022-2023] SUSE LLC
+# Copyright (c) [2022-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -152,7 +152,9 @@ def default_volume(mount_path)
         # @param dbus_settings [Hash]
         # @return [Integer] 0 success; 1 error
         def calculate_proposal(dbus_settings)
-          settings = ProposalSettingsConversion.from_dbus(dbus_settings, config: config)
+          settings = ProposalSettingsConversion.from_dbus(dbus_settings,
+            config: config, logger: logger)
+
           logger.info(
             "Calculating storage proposal from D-Bus.\n " \
             "D-Bus settings: #{dbus_settings}\n" \
@@ -289,6 +291,7 @@ def register_proposal_callbacks
           proposal.on_calculate do
             export_proposal
             proposal_properties_changed
+            refresh_staging_devices
           end
         end
 
@@ -332,6 +335,11 @@ def refresh_system_devices
           system_devices_tree.update(devicegraph)
         end
 
+        def refresh_staging_devices
+          devicegraph = Y2Storage::StorageManager.instance.staging
+          staging_devices_tree.update(devicegraph)
+        end
+
         def refresh_iscsi_nodes
           nodes = backend.iscsi.nodes
           iscsi_nodes_tree.update(nodes)
@@ -348,6 +356,10 @@ def system_devices_tree
           @system_devices_tree ||= DevicesTree.new(@service, tree_path("system"), logger: logger)
         end
 
+        def staging_devices_tree
+          @staging_devices_tree ||= DevicesTree.new(@service, tree_path("staging"), logger: logger)
+        end
+
         def tree_path(tree_root)
           File.join(PATH, tree_root)
         end
diff --git a/service/lib/agama/dbus/storage/proposal.rb b/service/lib/agama/dbus/storage/proposal.rb
index 2d55331f3..f33e2e61a 100644
--- a/service/lib/agama/dbus/storage/proposal.rb
+++ b/service/lib/agama/dbus/storage/proposal.rb
@@ -19,20 +19,18 @@
 # To contact SUSE LLC about this file by physical or electronic mail, you may
 # find current contact information at www.suse.com.
 
-require "dbus"
 require "agama/dbus/base_object"
 require "agama/dbus/storage/proposal_settings_conversion"
+require "dbus"
 
 module Agama
   module DBus
     module Storage
-      # D-Bus object to manage the storage proposal
+      # D-Bus object to manage the storage proposal.
       class Proposal < BaseObject
         PATH = "/org/opensuse/Agama/Storage1/Proposal"
         private_constant :PATH
 
-        # Constructor
-        #
         # @param backend [Agama::Storage::Proposal]
         # @param logger [Logger]
         def initialize(backend, logger)
@@ -44,88 +42,22 @@ def initialize(backend, logger)
         private_constant :STORAGE_PROPOSAL_INTERFACE
 
         dbus_interface STORAGE_PROPOSAL_INTERFACE do
-          dbus_reader :boot_device, "s"
-
-          dbus_reader :lvm, "b", dbus_name: "LVM"
-
-          dbus_reader :system_vg_devices, "as", dbus_name: "SystemVGDevices"
-
-          dbus_reader :encryption_password, "s"
-
-          dbus_reader :encryption_method, "s"
-
-          dbus_reader :encryption_pbkd_function, "s", dbus_name: "EncryptionPBKDFunction"
-
-          dbus_reader :space_policy, "s"
-
-          dbus_reader :space_actions, "aa{sv}"
-
-          dbus_reader :volumes, "aa{sv}"
-
+          dbus_reader :settings, "a{sv}"
           dbus_reader :actions, "aa{sv}"
         end
 
-        # Device used as boot device by the storage proposal
-        #
-        # @return [String] Empty string if no device has been selected yet.
-        def boot_device
-          dbus_settings.fetch("BootDevice", "")
-        end
-
-        # Whether the proposal creates logical volumes
+        # Proposal settings.
         #
-        # @return [Boolean]
-        def lvm
-          dbus_settings.fetch("LVM", false)
-        end
-
-        def system_vg_devices
-          dbus_settings.fetch("SystemVGDevices", [])
-        end
-
-        # Password for encrypting devices
-        #
-        # @return [String]
-        def encryption_password
-          dbus_settings.fetch("EncryptionPassword", "")
-        end
-
-        # Encryption method
+        # @see ProposalSettingsConversion::ToDBus
         #
-        # @return [String] For the possible values, check Y2Storage::EncryptionMethod.all
-        def encryption_method
-          dbus_settings.fetch("EncryptionMethod", "")
-        end
-
-        # PBKD function
-        #
-        # @return [String] For the possible values, check Y2Storage::PbkdFunction.all
-        def encryption_pbkd_function
-          dbus_settings.fetch("EncryptionPBKDFunction", "")
-        end
-
-        # Space policy strategy
-        #
-        # @return [String] For the possible values, check Agama::Storage::SpaceSettings
-        def space_policy
-          dbus_settings.fetch("SpacePolicy", "")
-        end
-
-        # Space actions
-        #
-        # @return [Array<Hash>]
-        def space_actions
-          dbus_settings.fetch("SpaceActions", [])
-        end
+        # @return [Hash]
+        def settings
+          return {} unless backend.settings
 
-        # Volumes used to calculate the storage proposal
-        #
-        # @return [Array<Hash>]
-        def volumes
-          dbus_settings.fetch("Volumes", [])
+          ProposalSettingsConversion.to_dbus(backend.settings)
         end
 
-        # List of sorted actions in D-Bus format
+        # List of sorted actions in D-Bus format.
         #
         # @see #to_dbus_action
         #
@@ -142,19 +74,17 @@ def actions
         # @return [Logger]
         attr_reader :logger
 
-        # @return [Hash]
-        def dbus_settings
-          return {} unless backend.settings
-
-          @dbus_settings ||= ProposalSettingsConversion.to_dbus(backend.settings)
-        end
-
-        # Converts an action to D-Bus format
+        # Converts an action to D-Bus format.
         #
         # @param action [Y2Storage::CompoundAction]
-        # @return [Hash]
+        # @return [Hash<String, Object>]
+        #   * "Device" [String]
+        #   * "Text" [String]
+        #   * "Subvol" [Boolean]
+        #   * "Delete" [Boolean]
         def to_dbus_action(action)
           {
+            "Device" => action.target_device.sid,
             "Text"   => action.sentence,
             "Subvol" => action.device_is?(:btrfs_subvolume),
             "Delete" => action.delete?
diff --git a/service/lib/agama/dbus/storage/proposal_settings_conversion.rb b/service/lib/agama/dbus/storage/proposal_settings_conversion.rb
index 47ac4f953..dc8e94ffc 100644
--- a/service/lib/agama/dbus/storage/proposal_settings_conversion.rb
+++ b/service/lib/agama/dbus/storage/proposal_settings_conversion.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -31,10 +31,11 @@ module ProposalSettingsConversion
         #
         # @param dbus_settings [Hash]
         # @param config [Agama::Config]
+        # @param logger [Logger, nil]
         #
         # @return [Agama::Storage::ProposalSettings]
-        def self.from_dbus(dbus_settings, config:)
-          FromDBus.new(dbus_settings, config: config).convert
+        def self.from_dbus(dbus_settings, config:, logger: nil)
+          FromDBus.new(dbus_settings, config: config, logger: logger).convert
         end
 
         # Performs conversion to D-Bus format.
diff --git a/service/lib/agama/dbus/storage/proposal_settings_conversion/from_dbus.rb b/service/lib/agama/dbus/storage/proposal_settings_conversion/from_dbus.rb
index 412607d72..c817076e5 100644
--- a/service/lib/agama/dbus/storage/proposal_settings_conversion/from_dbus.rb
+++ b/service/lib/agama/dbus/storage/proposal_settings_conversion/from_dbus.rb
@@ -19,12 +19,15 @@
 # To contact SUSE LLC about this file by physical or electronic mail, you may
 # find current contact information at www.suse.com.
 
-require "y2storage/encryption_method"
-require "y2storage/pbkd_function"
+require "agama/dbus/hash_validator"
+require "agama/dbus/storage/volume_conversion"
+require "agama/dbus/types"
+require "agama/storage/device_settings"
 require "agama/storage/proposal_settings"
 require "agama/storage/proposal_settings_reader"
 require "agama/storage/space_settings"
-require "agama/dbus/storage/volume_conversion"
+require "y2storage/encryption_method"
+require "y2storage/pbkd_function"
 
 module Agama
   module DBus
@@ -34,25 +37,23 @@ module ProposalSettingsConversion
         class FromDBus
           # @param dbus_settings [Hash]
           # @param config [Agama::Config]
-          def initialize(dbus_settings, config:)
+          # @param logger [Logger, nil]
+          def initialize(dbus_settings, config:, logger: nil)
             @dbus_settings = dbus_settings
             @config = config
+            @logger = logger || Logger.new($stdout)
           end
 
           # Performs the conversion from D-Bus format.
           #
           # @return [Agama::Storage::ProposalSettings]
           def convert
-            settings = Agama::Storage::ProposalSettingsReader.new(config).read
+            logger.info("D-Bus settings: #{dbus_settings}")
 
-            settings.tap do |target|
-              dbus_settings.each do |dbus_property, dbus_value|
-                converter = CONVERSIONS[dbus_property]
-                # FIXME: likely ignoring the wrong attribute is not the best
-                next unless converter
+            dbus_settings_issues.each { |i| logger.warn(i) }
 
-                send(converter, target, dbus_value)
-              end
+            Agama::Storage::ProposalSettingsReader.new(config).read.tap do |target|
+              valid_dbus_properties.each { |p| conversion(target, p) }
             end
           end
 
@@ -64,36 +65,145 @@ def convert
           # @return [Agama::Config]
           attr_reader :config
 
-          # D-Bus attributes and their converters.
-          CONVERSIONS = {
-            "BootDevice"             => :boot_device_conversion,
-            "LVM"                    => :lvm_conversion,
-            "SystemVGDevices"        => :system_vg_devices_conversion,
-            "EncryptionPassword"     => :encryption_password_conversion,
-            "EncryptionMethod"       => :encryption_method_conversion,
-            "EncryptionPBKDFunction" => :encryption_pbkd_function_conversion,
-            "SpacePolicy"            => :space_policy_conversion,
-            "SpaceActions"           => :space_actions_conversion,
-            "Volumes"                => :volumes_conversion
-          }.freeze
-          private_constant :CONVERSIONS
+          # @return [Logger]
+          attr_reader :logger
+
+          DBUS_PROPERTIES = [
+            {
+              name:       "Target",
+              type:       String,
+              conversion: :device_conversion
+            },
+            {
+              name: "TargetDevice",
+              type: String
+            },
+            {
+              name: "TargetPVDevices",
+              type: Types::Array.new(String)
+            },
+            {
+              name:       "ConfigureBoot",
+              type:       Types::BOOL,
+              conversion: :configure_boot_conversion
+            },
+            {
+              name:       "BootDevice",
+              type:       String,
+              conversion: :boot_device_conversion
+            },
+            {
+              name:       "EncryptionPassword",
+              type:       String,
+              conversion: :encryption_password_conversion
+            },
+            {
+              name:       "EncryptionMethod",
+              type:       String,
+              conversion: :encryption_method_conversion
+            },
+            {
+              name:       "EncryptionPBKDFunction",
+              type:       String,
+              conversion: :encryption_pbkd_function_conversion
+            },
+            {
+              name:       "SpacePolicy",
+              type:       String,
+              conversion: :space_policy_conversion
+            },
+            {
+              name:       "SpaceActions",
+              type:       Types::Array.new(Types::Hash.new(key: String, value: String)),
+              conversion: :space_actions_conversion
+            },
+            {
+              name:       "Volumes",
+              type:       Types::Array.new(Types::Hash.new(key: String)),
+              conversion: :volumes_conversion
+            }
+          ].freeze
+
+          private_constant :DBUS_PROPERTIES
+
+          # Issues detected in the D-Bus settings, see {HashValidator#issues}.
+          #
+          # @return [Array<String>]
+          def dbus_settings_issues
+            validator.issues
+          end
+
+          # D-Bus properties with valid type, see {HashValidator#valid_keys}.
+          #
+          # @return [Array<String>]
+          def valid_dbus_properties
+            validator.valid_keys
+          end
+
+          # Validator for D-Bus settings.
+          #
+          # @return [HashValidator]
+          def validator
+            return @validator if @validator
+
+            scheme = DBUS_PROPERTIES.map { |p| [p[:name], p[:type]] }.to_h
+            @validator = HashValidator.new(dbus_settings, scheme: scheme)
+          end
+
+          # @param target [Agama::Storage::ProposalSettings]
+          # @param dbus_property_name [String]
+          def conversion(target, dbus_property_name)
+            dbus_property = DBUS_PROPERTIES.find { |d| d[:name] == dbus_property_name }
+            conversion_method = dbus_property[:conversion]
+
+            return unless conversion_method
+
+            send(conversion_method, target, dbus_settings[dbus_property_name])
+          end
 
           # @param target [Agama::Storage::ProposalSettings]
           # @param value [String]
-          def boot_device_conversion(target, value)
-            target.boot_device = value.empty? ? nil : value
+          def device_conversion(target, value)
+            device_settings = case value
+            when "disk"
+              disk_device_conversion
+            when "newLvmVg"
+              new_lvm_vg_device_conversion
+            when "reusedLvmVg"
+              reused_lvm_vg_device_conversion
+            end
+
+            target.device = device_settings
+          end
+
+          # @return [Agama::Storage::DeviceSettings::Disk]
+          def disk_device_conversion
+            device = dbus_settings["TargetDevice"]
+            Agama::Storage::DeviceSettings::Disk.new(device)
+          end
+
+          # @return [Agama::Storage::DeviceSettings::NewLvmVg]
+          def new_lvm_vg_device_conversion
+            candidates = dbus_settings["TargetPVDevices"] || []
+            Agama::Storage::DeviceSettings::NewLvmVg.new(candidates)
+          end
+
+          # @return [Agama::Storage::DeviceSettings::ReusedLvmVg]
+          def reused_lvm_vg_device_conversion
+            device = dbus_settings["TargetDevice"]
+            Agama::Storage::DeviceSettings::ReusedLvmVg.new(device)
           end
 
           # @param target [Agama::Storage::ProposalSettings]
           # @param value [Boolean]
-          def lvm_conversion(target, value)
-            target.lvm.enabled = value
+          def configure_boot_conversion(target, value)
+            target.boot.configure = value
           end
 
           # @param target [Agama::Storage::ProposalSettings]
-          # @param value [Array<String>]
-          def system_vg_devices_conversion(target, value)
-            target.lvm.system_vg_devices = value
+          # @param value [String]
+          def boot_device_conversion(target, value)
+            target.boot.device = value.empty? ? nil : value
           end
 
           # @param target [Agama::Storage::ProposalSettings]
@@ -144,7 +254,9 @@ def volumes_conversion(target, value)
             return if value.empty?
 
             required_volumes = target.volumes.select { |v| v.outline.required? }
-            volumes = value.map { |v| VolumeConversion.from_dbus(v, config: config) }
+            volumes = value.map do |dbus_volume|
+              VolumeConversion.from_dbus(dbus_volume, config: config, logger: logger)
+            end
 
             target.volumes = volumes + missing_volumes(required_volumes, volumes)
           end
diff --git a/service/lib/agama/dbus/storage/proposal_settings_conversion/to_dbus.rb b/service/lib/agama/dbus/storage/proposal_settings_conversion/to_dbus.rb
index d4820e847..b1d725e69 100644
--- a/service/lib/agama/dbus/storage/proposal_settings_conversion/to_dbus.rb
+++ b/service/lib/agama/dbus/storage/proposal_settings_conversion/to_dbus.rb
@@ -20,6 +20,7 @@
 # find current contact information at www.suse.com.
 
 require "agama/dbus/storage/volume_conversion"
+require "agama/storage/device_settings"
 
 module Agama
   module DBus
@@ -34,19 +35,27 @@ def initialize(settings)
 
           # Performs the conversion to D-Bus format.
           #
-          # @return [Hash]
+          # @return [Hash<String, Object>]
+          #   * "Target" [String]
+          #   * "Device" [String] Optional
+          #   * "CandidatePVDevices" [Array<String>] Optional
+          #   * "ConfigureBoot" [Boolean]
+          #   * "BootDevice" [String]
+          #   * "DefaultBootDevice" [String]
+          #   * "EncryptionPassword" [String]
+          #   * "EncryptionMethod" [String]
+          #   * "EncryptionPBKDFunction" [String]
+          #   * "SpacePolicy" [String]
+          #   * "SpaceActions" [Array<Hash>] see {#space_actions_conversion}
+          #   * "Volumes" [Array<Hash>] see {#volumes_conversion}
           def convert
-            {
-              "BootDevice"             => settings.boot_device.to_s,
-              "LVM"                    => settings.lvm.enabled?,
-              "SystemVGDevices"        => settings.lvm.system_vg_devices,
-              "EncryptionPassword"     => settings.encryption.password.to_s,
-              "EncryptionMethod"       => settings.encryption.method.id.to_s,
-              "EncryptionPBKDFunction" => settings.encryption.pbkd_function&.value || "",
-              "SpacePolicy"            => settings.space.policy.to_s,
-              "SpaceActions"           => space_actions_conversion,
-              "Volumes"                => settings.volumes.map { |v| VolumeConversion.to_dbus(v) }
-            }
+            target = device_conversion
+
+            DBUS_PROPERTIES.each do |dbus_property, conversion|
+              target[dbus_property] = send(conversion)
+            end
+
+            target
           end
 
         private
@@ -54,12 +63,110 @@ def convert
           # @return [Agama::Storage::ProposalSettings]
           attr_reader :settings
 
-          # @return [Array<Hash>]
+          DBUS_PROPERTIES = {
+            "ConfigureBoot"          => :configure_boot_conversion,
+            "BootDevice"             => :boot_device_conversion,
+            "DefaultBootDevice"      => :default_boot_device_conversion,
+            "EncryptionPassword"     => :encryption_password_conversion,
+            "EncryptionMethod"       => :encryption_method_conversion,
+            "EncryptionPBKDFunction" => :encryption_pbkd_function_conversion,
+            "SpacePolicy"            => :space_policy_conversion,
+            "SpaceActions"           => :space_actions_conversion,
+            "Volumes"                => :volumes_conversion
+          }.freeze
+
+          private_constant :DBUS_PROPERTIES
+
+          # @return [Hash]
+          def device_conversion
+            device_settings = settings.device
+
+            case device_settings
+            when Agama::Storage::DeviceSettings::Disk
+              disk_device_conversion(device_settings)
+            when Agama::Storage::DeviceSettings::NewLvmVg
+              new_lvm_vg_device_conversion(device_settings)
+            when Agama::Storage::DeviceSettings::ReusedLvmVg
+              reused_lvm_vg_device_conversion(device_settings)
+            end
+          end
+
+          # @param device_settings [Agama::Storage::DeviceSettings::Disk]
+          # @return [Hash]
+          def disk_device_conversion(device_settings)
+            {
+              "Target"       => "disk",
+              "TargetDevice" => device_settings.name || ""
+            }
+          end
+
+          # @param device_settings [Agama::Storage::DeviceSettings::NewLvmVg]
+          # @return [Hash]
+          def new_lvm_vg_device_conversion(device_settings)
+            {
+              "Target"          => "newLvmVg",
+              "TargetPVDevices" => device_settings.candidate_pv_devices
+            }
+          end
+
+          # @param device_settings [Agama::Storage::DeviceSettings::Disk]
+          # @return [Hash]
+          def reused_lvm_vg_device_conversion(device_settings)
+            {
+              "Target"       => "reusedLvmVg",
+              "TargetDevice" => device_settings.name || ""
+            }
+          end
+
+          # @return [Boolean]
+          def configure_boot_conversion
+            settings.boot.configure?
+          end
+
+          # @return [String]
+          def boot_device_conversion
+            settings.boot.device || ""
+          end
+
+          # @return [String]
+          def default_boot_device_conversion
+            settings.default_boot_device || ""
+          end
+
+          # @return [String]
+          def encryption_password_conversion
+            settings.encryption.password.to_s
+          end
+
+          # @return [String]
+          def encryption_method_conversion
+            settings.encryption.method.id.to_s
+          end
+
+          # @return [String]
+          def encryption_pbkd_function_conversion
+            settings.encryption.pbkd_function&.value || ""
+          end
+
+          # @return [String]
+          def space_policy_conversion
+            settings.space.policy.to_s
+          end
+
+          # @return [Array<Hash<String, Object>>]
+          #   For each action:
+          #   * "Device" [String]
+          #   * "Action" [String]
           def space_actions_conversion
             settings.space.actions.each_with_object([]) do |(device, action), actions|
               actions << { "Device" => device, "Action" => action.to_s }
             end
           end
+
+          # @return [Array<Hash>] see {VolumeConversion::ToDBus}.
+          def volumes_conversion
+            settings.volumes.map { |v| VolumeConversion.to_dbus(v) }
+          end
         end
       end
     end
diff --git a/service/lib/agama/dbus/storage/volume_conversion.rb b/service/lib/agama/dbus/storage/volume_conversion.rb
index 75481e1a0..4c62d6b86 100644
--- a/service/lib/agama/dbus/storage/volume_conversion.rb
+++ b/service/lib/agama/dbus/storage/volume_conversion.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -31,10 +31,11 @@ module VolumeConversion
         #
         # @param dbus_volume [Hash]
         # @param config [Agama::Config]
+        # @param logger [Logger, nil]
         #
         # @return [Agama::Storage::Volume]
-        def self.from_dbus(dbus_volume, config:)
-          FromDBus.new(dbus_volume, config: config).convert
+        def self.from_dbus(dbus_volume, config:, logger: nil)
+          FromDBus.new(dbus_volume, config: config, logger: logger).convert
         end
 
         # Performs conversion to D-Bus format.
diff --git a/service/lib/agama/dbus/storage/volume_conversion/from_dbus.rb b/service/lib/agama/dbus/storage/volume_conversion/from_dbus.rb
index 3499c599f..b2440dab4 100644
--- a/service/lib/agama/dbus/storage/volume_conversion/from_dbus.rb
+++ b/service/lib/agama/dbus/storage/volume_conversion/from_dbus.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -19,7 +19,10 @@
 # To contact SUSE LLC about this file by physical or electronic mail, you may
 # find current contact information at www.suse.com.
 
+require "agama/dbus/hash_validator"
+require "agama/dbus/types"
 require "agama/storage/volume"
+require "agama/storage/volume_location"
 require "agama/storage/volume_templates_builder"
 require "y2storage/disk_size"
 require "y2storage/filesystems/type"
@@ -32,26 +35,24 @@ module VolumeConversion
         class FromDBus
           # @param dbus_volume [Hash]
           # @param config [Agama::Config]
-          def initialize(dbus_volume, config:)
+          # @param logger [Logger, nil]
+          def initialize(dbus_volume, config:, logger: nil)
             @dbus_volume = dbus_volume
             @config = config
+            @logger = logger || Logger.new($stdout)
           end
 
           # Performs the conversion from D-Bus format.
           #
           # @return [Agama::Storage::Volume]
           def convert
-            builder = Agama::Storage::VolumeTemplatesBuilder.new_from_config(config)
-            volume = builder.for(dbus_volume["MountPath"] || "")
+            logger.info("D-Bus volume: #{dbus_volume}")
 
-            volume.tap do |target|
-              dbus_volume.each do |dbus_property, dbus_value|
-                converter = CONVERSIONS[dbus_property]
-                # FIXME: likely ignoring the wrong attribute is not the best
-                next unless converter
+            dbus_volume_issues.each { |i| logger.warn(i) }
 
-                send(converter, target, dbus_value)
-              end
+            builder = Agama::Storage::VolumeTemplatesBuilder.new_from_config(config)
+            builder.for(dbus_volume["MountPath"] || "").tap do |target|
+              valid_dbus_properties.each { |p| conversion(target, p) }
             end
           end
 
@@ -63,19 +64,89 @@ def convert
           # @return [Agama::Config]
           attr_reader :config
 
-          # D-Bus attributes and their converters.
-          CONVERSIONS = {
-            "MountPath"    => :mount_path_conversion,
-            "MountOptions" => :mount_options_conversion,
-            "TargetDevice" => :target_device_conversion,
-            "TargetVG"     => :target_vg_conversion,
-            "FsType"       => :fs_type_conversion,
-            "MinSize"      => :min_size_conversion,
-            "MaxSize"      => :max_size_conversion,
-            "AutoSize"     => :auto_size_conversion,
-            "Snapshots"    => :snapshots_conversion
-          }.freeze
-          private_constant :CONVERSIONS
+          # @return [Logger]
+          attr_reader :logger
+
+          DBUS_PROPERTIES = [
+            {
+              name:       "MountPath",
+              type:       String,
+              conversion: :mount_path_conversion
+            },
+            {
+              name:       "MountOptions",
+              type:       Types::Array.new(String),
+              conversion: :mount_options_conversion
+            },
+            {
+              name:       "Target",
+              type:       String,
+              conversion: :target_conversion
+            },
+            {
+              name:       "TargetDevice",
+              type:       String,
+              conversion: :target_device_conversion
+            },
+            {
+              name:       "FsType",
+              type:       String,
+              conversion: :fs_type_conversion
+            },
+            {
+              name:       "MinSize",
+              type:       Integer,
+              conversion: :min_size_conversion
+            },
+            {
+              name:       "MaxSize",
+              type:       Integer,
+              conversion: :max_size_conversion
+            },
+            {
+              name:       "AutoSize",
+              type:       Types::BOOL,
+              conversion: :auto_size_conversion
+            },
+            {
+              name:       "Snapshots",
+              type:       Types::BOOL,
+              conversion: :snapshots_conversion
+            }
+          ].freeze
+
+          private_constant :DBUS_PROPERTIES
+
+          # Issues detected in the D-Bus volume, see {HashValidator#issues}.
+          #
+          # @return [Array<String>]
+          def dbus_volume_issues
+            validator.issues
+          end
+
+          # D-Bus properties with valid type, see {HashValidator#valid_keys}.
+          #
+          # @return [Array<String>]
+          def valid_dbus_properties
+            validator.valid_keys
+          end
+
+          # Validator for D-Bus volume.
+          #
+          # @return [HashValidator]
+          def validator
+            return @validator if @validator
+
+            scheme = DBUS_PROPERTIES.map { |p| [p[:name], p[:type]] }.to_h
+            @validator = HashValidator.new(dbus_volume, scheme: scheme)
+          end
+
+          # @param target [Agama::Storage::Volume]
+          # @param dbus_property_name [String]
+          def conversion(target, dbus_property_name)
+            dbus_property = DBUS_PROPERTIES.find { |d| d[:name] == dbus_property_name }
+            send(dbus_property[:conversion], target, dbus_volume[dbus_property_name])
+          end
 
           # @param target [Agama::Storage::Volume]
           # @param value [String]
@@ -92,13 +163,16 @@ def mount_options_conversion(target, value)
           # @param target [Agama::Storage::Volume]
           # @param value [String]
           def target_device_conversion(target, value)
-            target.device = value
+            target.location.device = value
           end
 
           # @param target [Agama::Storage::Volume]
           # @param value [String]
-          def target_vg_conversion(target, value)
-            target.separate_vg_name = value
+          def target_conversion(target, value)
+            target_value = value.downcase.to_sym
+            return unless Agama::Storage::VolumeLocation.targets.include?(target_value)
+
+            target.location.target = target_value
           end
 
           # @param target [Agama::Storage::Volume]
diff --git a/service/lib/agama/dbus/storage/volume_conversion/to_dbus.rb b/service/lib/agama/dbus/storage/volume_conversion/to_dbus.rb
index 3f586f7d2..5a7969900 100644
--- a/service/lib/agama/dbus/storage/volume_conversion/to_dbus.rb
+++ b/service/lib/agama/dbus/storage/volume_conversion/to_dbus.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -32,21 +32,33 @@ def initialize(volume)
 
           # Performs the conversion to D-Bus format.
           #
-          # @return [Hash]
+          # @return [Hash<String, Object>]
+          #   * "MountPath" [String]
+          #   * "MountOptions" [Array<String>]
+          #   * "TargetDevice" [String]
+          #   * "TargetVG" [String]
+          #   * "FsType" [String]
+          #   * "MinSize" [Integer]
+          #   * "MaxSize" [Integer] Optional
+          #   * "AutoSize" [Boolean]
+          #   * "Snapshots" [Booelan]
+          #   * "Transactional" [Boolean]
+          #   * "Outline" [Hash] see {#outline_conversion}
           def convert
             {
               "MountPath"     => volume.mount_path.to_s,
               "MountOptions"  => volume.mount_options,
-              "TargetDevice"  => volume.device.to_s,
-              "TargetVG"      => volume.separate_vg_name.to_s,
+              "Target"        => volume.location.target.to_s,
+              "TargetDevice"  => volume.location.device.to_s,
               "FsType"        => volume.fs_type&.to_human_string || "",
               "MinSize"       => volume.min_size&.to_i,
               "AutoSize"      => volume.auto_size?,
               "Snapshots"     => volume.btrfs.snapshots?,
-              "Transactional" => volume.btrfs.read_only?
+              "Transactional" => volume.btrfs.read_only?,
+              "Outline"       => outline_conversion
             }.tap do |target|
+              # Some volumes could not have "MaxSize".
               max_size_conversion(target)
-              outline_conversion(target)
             end
           end
 
@@ -62,11 +74,20 @@ def max_size_conversion(target)
             target["MaxSize"] = volume.max_size.to_i
           end
 
-          # @param target [Hash]
-          def outline_conversion(target)
+          # Converts volume outline to D-Bus.
+          #
+          # @return [Hash<String, Object>]
+          #   * "Required" [Boolean]
+          #   * "FsTypes" [Array<String>]
+          #   * "SupportAutoSize" [Boolean]
+          #   * "AdjustByRam" [Boolean]
+          #   * "SnapshotsConfigurable" [Boolean]
+          #   * "SnapshotsAffectSizes" [Boolean]
+          #   * "SizeRelevantVolumes" [Array<String>]
+          def outline_conversion
             outline = volume.outline
 
-            target["Outline"] = {
+            {
               "Required"              => outline.required?,
               "FsTypes"               => outline.filesystems.map(&:to_human_string),
               "SupportAutoSize"       => outline.adaptive_sizes?,
diff --git a/service/lib/agama/dbus/types.rb b/service/lib/agama/dbus/types.rb
new file mode 100644
index 000000000..0109dd5e4
--- /dev/null
+++ b/service/lib/agama/dbus/types.rb
@@ -0,0 +1,159 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2024] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+module Agama
+  module DBus
+    # This module offers classes to help to validate the expected types from a D-Bus call when
+    # variant types are involved, typically using dictionaries.
+    #
+    # @example
+    #   # Let's say there is a D-Bus method with the following signature:
+    #
+    #   dbus_method :Calculate, "in settings:a{sv}"
+    #
+    #   # The settings parameter will be transformed to a ruby Hash. This module provides a
+    #   # {Checker} class that helps to validate the expected types.
+    #
+    #   # Checks whether the value is a String
+    #   checker = Types::Checker.new(String)
+    #   checker.match?(settings["Foo"])
+    #
+    #   # Checks whether the value is bool
+    #   checker = Types::Checker.new(Types::BOOL)
+    #   checker.match?(settings["Foo"])
+    #
+    #   # Checks whether the value is an Array of String
+    #   checker = Types::Checker.new(Types::Array.new(String))
+    #   checker.match?(settings["Foo"])
+    #
+    #   # Checks whether the value is a Hash of String keys and Integer values
+    #   checker = Types::Checker.new(Types::Hash.new(k: String, v: Integer))
+    #   checker.match?(settings["Foo"])
+    #
+    # See {HashValidator} for validating hashes coming from D-Bus according to a scheme.
+    module Types
+      # Type representing a boolean (true or false).
+      BOOL = :bool
+
+      # Type representing an array of values.
+      class Array
+        # @return [Class, BOOL, Array, Hash, nil]
+        attr_reader :elements_type
+
+        # @param elements_type [Class, BOOL, Array, Hash, nil] The type of the elements in the
+        #   array. If nil, the type of the elements is not checked.
+        def initialize(elements_type = nil)
+          @elements_type = elements_type
+        end
+      end
+
+      # Type representing a hash.
+      class Hash
+        # @return [Class, BOOL, Array, Hash, nil]
+        attr_reader :keys_type
+
+        # @return [Class, BOOL, Array, Hash, nil]
+        attr_reader :values_type
+
+        # @param key [Class, BOOL, Array, Hash, nil] The type of keys. If nil, the type of the keys
+        #   is not checked.
+        # @param value [Class, BOOL, Array, Hash, nil] The type of values. If nil, the type of the
+        #   values is not checked.
+        def initialize(key: nil, value: nil)
+          @keys_type = key
+          @values_type = value
+        end
+      end
+
+      # Checks whether a value matches a type.
+      class Checker
+        # @param type [Class, BOOL, Array, Hash] The type to check.
+        def initialize(type)
+          @type = type
+        end
+
+        # Whether the given value matches the type.
+        #
+        # @param value [Object]
+        # @return [Boolean]
+        def match?(value)
+          case type
+          when BOOL
+            match_bool?(value)
+          when Agama::DBus::Types::Array
+            match_array?(value)
+          when Agama::DBus::Types::Hash
+            match_hash?(value)
+          when Class, Module
+            value.is_a?(type)
+          else
+            false
+          end
+        end
+
+      private
+
+        # @return [Class, BOOL, Array, Hash]
+        attr_reader :type
+
+        # Whether the value matches with {BOOL} type.
+        #
+        # @return [Boolean]
+        def match_bool?(value)
+          value.is_a?(TrueClass) || value.is_a?(FalseClass)
+        end
+
+        # Whether the value matches with {Array} type.
+        #
+        # @return [Boolean]
+        def match_array?(value)
+          return false unless value.is_a?(::Array)
+
+          if type.elements_type
+            checker = Checker.new(type.elements_type)
+            return value.all? { |v| checker.match?(v) }
+          end
+
+          true
+        end
+
+        # Whether the value matches with {Hash} type.
+        #
+        # @return [Boolean]
+        def match_hash?(value)
+          return false unless value.is_a?(::Hash)
+
+          if type.keys_type
+            checker = Checker.new(Types::Array.new(type.keys_type))
+            return false unless checker.match?(value.keys)
+          end
+
+          if type.values_type
+            checker = Checker.new(Types::Array.new(type.values_type))
+            return false unless checker.match?(value.values)
+          end
+
+          true
+        end
+      end
+    end
+  end
+end
diff --git a/service/lib/agama/storage/lvm_settings.rb b/service/lib/agama/storage/boot_settings.rb
similarity index 68%
rename from service/lib/agama/storage/lvm_settings.rb
rename to service/lib/agama/storage/boot_settings.rb
index 245ad27b4..4ef2e4dca 100644
--- a/service/lib/agama/storage/lvm_settings.rb
+++ b/service/lib/agama/storage/boot_settings.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -21,22 +21,21 @@
 
 module Agama
   module Storage
-    # Settings regarding LVM for the Agama storage proposal
-    class LvmSettings
-      # Whether to use LVM
+    # Class for configuring the boot settings of the Agama storage proposal.
+    class BootSettings
+      # Whether to configure partitions for booting.
       #
       # @return [Boolean]
-      attr_accessor :enabled
-      alias_method :enabled?, :enabled
+      attr_accessor :configure
+      alias_method :configure?, :configure
 
-      # Devices to use for the system LVM volume group
+      # Device to use for booting.
       #
-      # @return [Array<String>]
-      attr_accessor :system_vg_devices
+      # @return [String, nil]
+      attr_accessor :device
 
       def initialize
-        @enabled = false
-        @system_vg_devices = []
+        @configure = true
       end
     end
   end
diff --git a/service/lib/agama/storage/device_settings.rb b/service/lib/agama/storage/device_settings.rb
new file mode 100644
index 000000000..ec44343cd
--- /dev/null
+++ b/service/lib/agama/storage/device_settings.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2024] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+module Agama
+  module Storage
+    # Module for the settings to configure the device of the Agama storage proposal.
+    module DeviceSettings
+      # Class to be used when the target device is a disk.
+      class Disk
+        # Name of the device to use.
+        #
+        # @return [String, nil]
+        attr_accessor :name
+
+        # @param name [String, nil]
+        def initialize(name = nil)
+          @name = name
+        end
+      end
+
+      # Class to be used when the target device is a reused LVM volume group.
+      class ReusedLvmVg
+        # Name of the LVM volume group to reuse.
+        #
+        # @return [String, nil]
+        attr_accessor :name
+
+        # @param name [String, nil]
+        def initialize(name = nil)
+          @name = name
+        end
+      end
+
+      # Class to be used when the target device is a new LVM volume group.
+      class NewLvmVg
+        # List of candidate devices to create physical volumes.
+        #
+        # @return [Array<String>]
+        attr_accessor :candidate_pv_devices
+
+        # @param candidates [Array<String>]
+        def initialize(candidates = [])
+          @candidate_pv_devices = candidates
+        end
+      end
+    end
+  end
+end
diff --git a/service/lib/agama/storage/proposal.rb b/service/lib/agama/storage/proposal.rb
index 0b3d546dc..ec6c63b1f 100644
--- a/service/lib/agama/storage/proposal.rb
+++ b/service/lib/agama/storage/proposal.rb
@@ -19,18 +19,32 @@
 # To contact SUSE LLC about this file by physical or electronic mail, you may
 # find current contact information at www.suse.com.
 
-require "y2storage"
 require "agama/issue"
 require "agama/storage/actions"
+require "agama/storage/device_settings"
 require "agama/storage/proposal_settings_conversion"
+require "yast"
+require "y2storage"
 
 module Agama
   module Storage
     # Backend class to calculate a storage proposal.
     class Proposal
+      include Yast::I18n
+
+      # Settings used for calculating the proposal.
+      #
+      # @note Some values are recoverd from Y2Storage, see
+      #   {ProposalSettingsConversion::FromY2Storage}
+      #
+      # @return [ProposalSettings, nil] nil if no proposal has been calculated yet.
+      attr_reader :settings
+
       # @param config [Config] Agama config
       # @param logger [Logger]
       def initialize(config, logger: nil)
+        textdomain "agama"
+
         @config = config
         @logger = logger || Logger.new($stdout)
         @on_calculate_callbacks = []
@@ -60,40 +74,16 @@ def available_devices
       # @param settings [Agamal::Storage::ProposalSettings] settings to calculate the proposal.
       # @return [Boolean] whether the proposal was correctly calculated.
       def calculate(settings)
-        # Use the first available device if no boot device is indicated.
-        settings.boot_device ||= available_devices.first&.name
-
-        @original_settings = settings
+        select_target_device(settings) if missing_target_device?(settings)
 
         calculate_proposal(settings)
 
+        @settings = ProposalSettingsConversion.from_y2storage(proposal.settings, settings)
         @on_calculate_callbacks.each(&:call)
 
         success?
       end
 
-      # Settings used for calculating the proposal.
-      #
-      # Note that this settings might differ from the {#original_settings}. For example, the sizes
-      # of some volumes could be adjusted if auto size is set.
-      #
-      # @return [ProposalSettings, nil] nil if no proposal has been calculated yet.
-      def settings
-        return nil unless calculated?
-
-        ProposalSettingsConversion.from_y2storage(
-          proposal.settings,
-          config: config
-        ).tap do |settings|
-          # The conversion from Y2Storage cannot infer the space policy. Copying space policy from
-          # the original settings.
-          settings.space.policy = original_settings.space.policy
-          # FIXME: The conversion from Y2Storage cannot reliably infer the system VG devices in all
-          #   cases. Copying system VG devices from the original settings.
-          settings.lvm.system_vg_devices = original_settings.lvm.system_vg_devices
-        end
-      end
-
       # Storage actions.
       #
       # @return [Array<Y2Storage::CompoundAction>]
@@ -110,7 +100,7 @@ def issues
         return [] if !calculated? || success?
 
         [
-          boot_device_issue,
+          target_device_issue,
           missing_devices_issue,
           proposal_issue
         ].compact
@@ -124,11 +114,6 @@ def issues
       # @return [Logger]
       attr_reader :logger
 
-      # Settings originally used for calculating the proposal (without conversion from Y2Storage).
-      #
-      # @return [Agama::Storage::ProposalSettings]
-      attr_reader :original_settings
-
       # @return [Y2Storage::MinGuidedProposal, nil]
       def proposal
         storage_manager.proposal
@@ -141,6 +126,36 @@ def calculated?
         !proposal.nil?
       end
 
+      # Selects the first available device as target device for installation.
+      #
+      # @param settings [ProposalSettings]
+      def select_target_device(settings)
+        device = available_devices.first&.name
+        return unless device
+
+        case settings.device
+        when DeviceSettings::Disk
+          settings.device.name = device
+        when DeviceSettings::NewLvmVg
+          settings.device.candidate_pv_devices = [device]
+        when DeviceSettings::ReusedLvmVg
+          # TODO: select an existing VG?
+        end
+      end
+
+      # Whether the given settings has no target device for the installation.
+      #
+      # @param settings [ProposalSettings]
+      # @return [Boolean]
+      def missing_target_device?(settings)
+        case settings.device
+        when DeviceSettings::Disk, DeviceSettings::ReusedLvmVg
+          settings.device.name.nil?
+        when DeviceSettings::NewLvmVg
+          settings.device.candidate_pv_devices.empty?
+        end
+      end
+
       # Instantiates and executes a Y2Storage proposal with the given settings
       #
       # @param settings [Y2Storage::ProposalSettings]
@@ -171,13 +186,13 @@ def storage_manager
         Y2Storage::StorageManager.instance
       end
 
-      # Returns an issue if there is no boot device.
+      # Returns an issue if there is no target device.
       #
       # @return [Issue, nil]
-      def boot_device_issue
-        return if settings.boot_device
+      def target_device_issue
+        return unless missing_target_device?(settings)
 
-        Issue.new("No device selected for installation",
+        Issue.new(_("No device selected for installation"),
           source:   Issue::Source::CONFIG,
           severity: Issue::Severity::ERROR)
       end
@@ -186,13 +201,23 @@ def boot_device_issue
       #
       # @return [Issue, nil]
       def missing_devices_issue
-        # At this moment, only the boot device is checked.
-        return unless settings.boot_device
-        return if available_devices.map(&:name).include?(settings.boot_device)
-
-        Issue.new("Selected device is not found in the system",
+        available = available_devices.map(&:name)
+        missing = settings.installation_devices.reject { |d| available.include?(d) }
+
+        return if missing.none?
+
+        Issue.new(
+          format(
+            n_(
+              "The following selected device is not found in the system: %{devices}",
+              "The following selected devices are not found in the system: %{devices}",
+              missing.size
+            ),
+            devices: missing.join(", ")
+          ),
           source:   Issue::Source::CONFIG,
-          severity: Issue::Severity::ERROR)
+          severity: Issue::Severity::ERROR
+        )
       end
 
       # Returns an issue if the proposal is not valid.
@@ -201,7 +226,7 @@ def missing_devices_issue
       def proposal_issue
         return if success?
 
-        Issue.new("Cannot accommodate the required file systems for installation",
+        Issue.new(_("Cannot accommodate the required file systems for installation"),
           source:   Issue::Source::CONFIG,
           severity: Issue::Severity::ERROR)
       end
diff --git a/service/lib/agama/storage/proposal_settings.rb b/service/lib/agama/storage/proposal_settings.rb
index c0e237de5..77e142dda 100644
--- a/service/lib/agama/storage/proposal_settings.rb
+++ b/service/lib/agama/storage/proposal_settings.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2022-2023] SUSE LLC
+# Copyright (c) [2022-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -19,7 +19,8 @@
 # To contact SUSE LLC about this file by physical or electronic mail, you may
 # find current contact information at www.suse.com.
 
-require "agama/storage/lvm_settings"
+require "agama/storage/boot_settings"
+require "agama/storage/device_settings"
 require "agama/storage/encryption_settings"
 require "agama/storage/space_settings"
 
@@ -27,38 +28,94 @@ module Agama
   module Storage
     # Settings used to calculate an storage proposal.
     class ProposalSettings
-      # Configuration of LVM
+      # Target device settings.
       #
-      # @return [LvmSettings]
-      attr_reader :lvm
+      # @return [DeviceSettings::Disk, DeviceSettings::NewLvmVg, DeviceSettings::ReusedLvmVg]
+      attr_accessor :device
 
-      # Encryption settings
+      # Boot settings.
       #
-      # @return [EncryptionSettings]
-      attr_reader :encryption
+      # @return [BootSettings]
+      attr_accessor :boot
 
-      # Settings to configure the behavior when making space to allocate the new partitions
+      # Encryption settings.
       #
-      # @return [SpaceSettings]
-      attr_reader :space
+      # @return [EncryptionSettings]
+      attr_accessor :encryption
 
-      # Device name of the disk that will be used for booting the system and also to allocate all
-      # the partitions, except those that have been explicitly assigned to other disk(s).
+      # Settings to configure the behavior when making space to allocate the new partitions.
       #
-      # @return [String, nil] nil if no device has been selected yet.
-      attr_accessor :boot_device
+      # @return [SpaceSettings]
+      attr_accessor :space
 
-      # Set of volumes to create
+      # Set of volumes to create.
       #
       # @return [Array<Volume>]
       attr_accessor :volumes
 
       def initialize
-        @lvm = LvmSettings.new
+        @device = DeviceSettings::Disk.new
+        @boot = BootSettings.new
         @encryption = EncryptionSettings.new
         @space = SpaceSettings.new
         @volumes = []
       end
+
+      # All devices involved in the installation.
+      #
+      # @return [Array<String>]
+      def installation_devices
+        [boot_device, target_devices, volume_devices]
+          .flatten
+          .compact
+          .uniq
+      end
+
+      # Default device to use for configuring boot.
+      #
+      # @return [String, nil]
+      def default_boot_device
+        case device
+        when DeviceSettings::Disk
+          device.name
+        when DeviceSettings::NewLvmVg
+          device.candidate_pv_devices.min
+        when DeviceSettings::ReusedLvmVg
+          # TODO: Decide what device to use.
+        end
+      end
+
+    private
+
+      # Device used for booting.
+      #
+      # @return [String, nil]
+      def boot_device
+        return nil unless boot.configure?
+
+        boot.device
+      end
+
+      # Target devices for the installation depending on the device settings.
+      #
+      # @return [Array<String>]
+      def target_devices
+        case device
+        when DeviceSettings::Disk, DeviceSettings::ReusedLvmVg
+          [device.name].compact
+        when DeviceSettings::NewLvmVg
+          device.candidate_pv_devices
+        else
+          []
+        end
+      end
+
+      # Devices directly assigned to the volumes.
+      #
+      # @return [Array<String>]
+      def volume_devices
+        volumes.map(&:location).reject(&:reuse_device?).map(&:device)
+      end
     end
   end
 end
diff --git a/service/lib/agama/storage/proposal_settings_conversion.rb b/service/lib/agama/storage/proposal_settings_conversion.rb
index 56e860a39..f8439c753 100644
--- a/service/lib/agama/storage/proposal_settings_conversion.rb
+++ b/service/lib/agama/storage/proposal_settings_conversion.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -26,17 +26,17 @@ module Agama
   module Storage
     # Conversions for the proposal settings.
     module ProposalSettingsConversion
-      # Performs conversion from Y2Storage format.
+      # Performs conversion from Y2Storage.
       #
-      # @param settings [Y2Storage::ProposalSettings]
-      # @param config [Agama::Config]
+      # @param y2storage_settings [Y2Storage::ProposalSettings]
+      # @param settings [Agama::Storage::ProposalSettings]
       #
       # @return [Agama::Storage::ProposalSettings]
-      def self.from_y2storage(settings, config:)
-        FromY2Storage.new(settings, config: config).convert
+      def self.from_y2storage(y2storage_settings, settings)
+        FromY2Storage.new(y2storage_settings, settings).convert
       end
 
-      # Performs conversion to Y2Storage format.
+      # Performs conversion to Y2Storage.
       #
       # @param settings [Agama::Storage::ProposalSettings]
       # @param config [Agama::Config]
diff --git a/service/lib/agama/storage/proposal_settings_conversion/from_y2storage.rb b/service/lib/agama/storage/proposal_settings_conversion/from_y2storage.rb
index a60a0c59a..475e53e25 100644
--- a/service/lib/agama/storage/proposal_settings_conversion/from_y2storage.rb
+++ b/service/lib/agama/storage/proposal_settings_conversion/from_y2storage.rb
@@ -19,30 +19,32 @@
 # To contact SUSE LLC about this file by physical or electronic mail, you may
 # find current contact information at www.suse.com.
 
-require "agama/storage/proposal_settings"
 require "agama/storage/volume_conversion"
 
 module Agama
   module Storage
     module ProposalSettingsConversion
-      # Proposal settings conversion from Y2Storage format.
+      # Proposal settings conversion from Y2Storage.
+      #
+      # @note This class does not perform a real conversion from Y2Storage settings. Instead of
+      #   that, it copies the given settings and recovers some values from Y2Storage.
+      #   A real conversion is not needed because the original settings are always available.
+      #   Moreover, Agama introduces some concepts that do not exist in the Y2Storage settings
+      #   (e.g., target, boot device or space policy), which could be impossible to infer.
       class FromY2Storage
-        # @param settings [Y2Storage::ProposalSettings]
-        # @param config [Agama::Config]
-        def initialize(settings, config:)
+        # @param y2storage_settings [Y2Storage::ProposalSettings]
+        # @param settings [Agama::Storage::ProposalSettings] Settings to be copied and modified.
+        def initialize(y2storage_settings, settings)
+          @y2storage_settings = y2storage_settings
           @settings = settings
-          @config = config
         end
 
-        # Performs the conversion from Y2Storage format.
+        # Performs the conversion from Y2Storage.
         #
         # @return [Agama::Storage::ProposalSettings]
         def convert
-          ProposalSettings.new.tap do |target|
-            boot_device_conversion(target)
-            lvm_conversion(target)
-            encryption_conversion(target)
-            space_settings_conversion(target)
+          settings.dup.tap do |target|
+            space_actions_conversion(target)
             volumes_conversion(target)
           end
         end
@@ -50,82 +52,32 @@ def convert
       private
 
         # @return [Y2Storage::ProposalSettings]
-        attr_reader :settings
-
-        # @return [Agama::Config]
-        attr_reader :config
-
-        # @param target [Agama::Storage::ProposalSettings]
-        def boot_device_conversion(target)
-          target.boot_device = settings.root_device
-        end
-
-        # @param target [Agama::Storage::ProposalSettings]
-        def lvm_conversion(target)
-          target.lvm.enabled = settings.lvm
-
-          # FIXME: The candidate devices list represents the system VG devices if it contains any
-          #   device different to the root device. If the candidate devices only contains the root
-          #   device, then there is no way to know whether the root device was explicitly assigned
-          #   as system VG device. Note that candidate devices will also contain the root device
-          #   when the system VG devices list was empty.
-          candidate_devices = settings.candidate_devices || []
-          return unless candidate_devices.reject { |d| d == settings.root_device }.any?
+        attr_reader :y2storage_settings
 
-          target.lvm.system_vg_devices = settings.candidate_devices
-        end
-
-        # @param target [Agama::Storage::ProposalSettings]
-        def encryption_conversion(target)
-          target.encryption.password = settings.encryption_password
-          target.encryption.method = settings.encryption_method
-          target.encryption.pbkd_function = settings.encryption_pbkdf
-        end
+        # @return [Agama::Storage::ProposalSettings]
+        attr_reader :settings
 
-        # @note The space policy cannot be inferred from Y2Storage settings.
+        # Recovers space actions.
+        #
+        # @note Space actions are generated in the conversion of the settings to Y2Storage format,
+        #   see {ProposalSettingsConversion::ToY2Storage}.
+        #
         # @param target [Agama::Storage::ProposalSettings]
-        def space_settings_conversion(target)
-          target.space.actions = settings.space_settings.actions
+        def space_actions_conversion(target)
+          target.space.actions = y2storage_settings.space_settings.actions
         end
 
+        # Some values of the volumes have to be recovered from Y2Storage proposal.
+        #
         # @param target [Agama::Storage::ProposalSettings]
         def volumes_conversion(target)
-          target.volumes = volumes.select(&:proposed?).map do |spec|
-            VolumeConversion.from_y2storage(spec, config: config)
-          end
-
-          fallbacks_conversion(target)
-        end
-
-        # @param target [Agama::Storage::ProposalSettings]
-        def fallbacks_conversion(target)
-          target.volumes.each do |volume|
-            volume.min_size_fallback_for = volumes_with_min_size_fallback(volume.mount_path)
-            volume.max_size_fallback_for = volumes_with_max_size_fallback(volume.mount_path)
-          end
-        end
-
-        # @param mount_path [String]
-        # @return [Array<String>]
-        def volumes_with_min_size_fallback(mount_path)
-          specs = volumes.select { |s| s.fallback_for_min_size == mount_path }
-          specs.map(&:mount_point)
+          target.volumes = target.volumes.map { |v| volume_conversion(v) }
         end
 
-        # @param mount_path [String]
-        # @return [Array<String>]
-        def volumes_with_max_size_fallback(mount_path)
-          specs = volumes.select { |s| s.fallback_for_max_size == mount_path }
-          specs.map(&:mount_point)
-        end
-
-        # Volumes from settings.
-        #
-        # Note that volumes might be nil in Y2Storage settings.
-        #
-        # @return [Array<Y2Storage::VolumeSpecification>]
-        def volumes
-          settings.volumes || []
+        # @param volume [Agama::Storage::Volume]
+        # @return [Agama::Storage::Volume]
+        def volume_conversion(volume)
+          VolumeConversion.from_y2storage(volume)
         end
       end
     end
diff --git a/service/lib/agama/storage/proposal_settings_conversion/to_y2storage.rb b/service/lib/agama/storage/proposal_settings_conversion/to_y2storage.rb
index e7ca55e48..c38add3cf 100644
--- a/service/lib/agama/storage/proposal_settings_conversion/to_y2storage.rb
+++ b/service/lib/agama/storage/proposal_settings_conversion/to_y2storage.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -20,13 +20,14 @@
 # find current contact information at www.suse.com.
 
 require "y2storage"
+require "agama/storage/device_settings"
 require "agama/storage/volume_conversion"
 require "agama/storage/volume_templates_builder"
 
 module Agama
   module Storage
     module ProposalSettingsConversion
-      # Proposal settings conversion to Y2Storage format.
+      # Proposal settings conversion to Y2Storage.
       class ToY2Storage
         # @param settings [Agama::Storage::ProposalSettings]
         # @param config [Agama::Config]
@@ -35,7 +36,7 @@ def initialize(settings, config:)
           @config = config
         end
 
-        # Performs the conversion to Y2Storage format.
+        # Performs the conversion to Y2Storage.
         #
         # @return [Y2Storage::ProposalSettings]
         def convert
@@ -43,9 +44,8 @@ def convert
           # generic default values that are independent of the product (there is no YaST
           # ProductFeatures mechanism in place).
           Y2Storage::ProposalSettings.new_for_current_product.tap do |target|
-            boot_device_conversion(target)
-            candidate_devices_conversion(target)
-            lvm_conversion(target)
+            device_conversion(target)
+            boot_conversion(target)
             encryption_conversion(target)
             space_policy_conversion(target)
             volumes_conversion(target)
@@ -61,31 +61,56 @@ def convert
         attr_reader :config
 
         # @param target [Y2Storage::ProposalSettings]
-        def boot_device_conversion(target)
-          target.root_device = settings.boot_device
+        def device_conversion(target)
+          device_settings = settings.device
+
+          case device_settings
+          when DeviceSettings::Disk
+            disk_device_conversion(target)
+          when DeviceSettings::NewLvmVg
+            new_lvm_vg_device_conversion(target, device_settings)
+          when DeviceSettings::ReusedLvmVg
+            reused_lvm_vg_device_conversion(target, device_settings)
+          end
         end
 
         # @param target [Y2Storage::ProposalSettings]
-        def candidate_devices_conversion(target)
-          candidate_devices = []
-
-          if settings.lvm.enabled? && settings.lvm.system_vg_devices.any?
-            candidate_devices = settings.lvm.system_vg_devices
-          elsif settings.boot_device
-            candidate_devices = [settings.boot_device]
-          end
+        def disk_device_conversion(target)
+          target.lvm = false
+          target.candidate_devices = [boot_device].compact
+        end
 
-          target.candidate_devices = candidate_devices
+        # @param target [Y2Storage::ProposalSettings]
+        # @param device_settings [DeviceSettings::NewLvmVg]
+        def new_lvm_vg_device_conversion(target, device_settings)
+          enable_lvm(target)
+          target.candidate_devices = device_settings.candidate_pv_devices
         end
 
         # @param target [Y2Storage::ProposalSettings]
-        def lvm_conversion(target)
-          lvm = settings.lvm.enabled?
+        # @param _device_settings [DeviceSettings::ReusedLvmVg]
+        def reused_lvm_vg_device_conversion(target, _device_settings)
+          enable_lvm(target)
+          # TODO: Sets the reused VG (not supported by yast2-storage-ng yet).
+          # TODO: Decide what to consider as candidate devices.
+          target.candidate_devices = []
+        end
 
-          target.lvm = lvm
-          target.separate_vgs = lvm
+        # @param target [Y2Storage::ProposalSettings]
+        def enable_lvm(target)
+          target.lvm = true
+          # Activate support for dedicated volume groups.
+          target.separate_vgs = true
           # Prevent VG reuse
           target.lvm_vg_reuse = false
+          # Create VG as big as needed to allocate the LVs.
+          target.lvm_vg_strategy = :use_needed
+        end
+
+        # @param target [Y2Storage::ProposalSettings]
+        def boot_conversion(target)
+          target.boot = settings.boot.configure?
+          target.root_device = boot_device
         end
 
         # @param target [Y2Storage::ProposalSettings]
@@ -118,12 +143,14 @@ def volumes_conversion(target)
           target.swap_reuse = :none
 
           volumes = settings.volumes.map { |v| VolumeConversion.to_y2storage(v) }
+
           disabled_volumes = missing_volumes.map do |volume|
             VolumeConversion.to_y2storage(volume).tap { |v| v.proposed = false }
           end
 
           target.volumes = volumes + disabled_volumes
 
+          volume_device_conversion(target)
           fallbacks_conversion(target)
         end
 
@@ -136,6 +163,15 @@ def missing_volumes
             .reject { |t| t.mount_path.empty? }
         end
 
+        # Assigns the target device if needed.
+        #
+        # @param target [Y2Storage::ProposalSettings]
+        def volume_device_conversion(target)
+          return unless settings.device.is_a?(DeviceSettings::Disk)
+
+          target.volumes.select(&:proposed?).each { |v| v.device ||= settings.device.name }
+        end
+
         # @param target [Y2Storage::ProposalSettings]
         def fallbacks_conversion(target)
           target.volumes.each do |spec|
@@ -160,19 +196,24 @@ def find_max_size_fallback(mount_path)
           volume&.mount_path
         end
 
+        # Device used for booting.
+        #
+        # @return [String, nil]
+        def boot_device
+          settings.boot.device || settings.default_boot_device
+        end
+
         # All block devices affected by the space policy.
         #
-        # This includes the partitions from the boot device, the candidate devices and from the
-        # devices directly assigned to a volume as target device. If a device is not partitioned,
-        # then the device itself is included.
+        # @see ProposalSettings#installation_devices
+        #
+        # If a device is partitioned, then its partitions are included instead of the device.
         #
         # @return [Array<String>]
         def all_devices
-          devices = [settings.boot_device] +
-            settings.lvm.system_vg_devices +
-            settings.volumes.map(&:device)
-
-          devices.compact.uniq.map { |d| device_or_partitions(d) }.flatten
+          settings.installation_devices
+            .map { |d| device_or_partitions(d) }
+            .flatten
         end
 
         # @param device [String]
diff --git a/service/lib/agama/storage/proposal_settings_reader.rb b/service/lib/agama/storage/proposal_settings_reader.rb
index fff9245e9..e0c038fd6 100644
--- a/service/lib/agama/storage/proposal_settings_reader.rb
+++ b/service/lib/agama/storage/proposal_settings_reader.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -19,10 +19,11 @@
 # To contact SUSE LLC about this file by physical or electronic mail, you may
 # find current contact information at www.suse.com.
 
+require "agama/storage/device_settings"
+require "agama/storage/space_settings"
+require "agama/storage/volume_templates_builder"
 require "y2storage/encryption_method"
 require "y2storage/pbkd_function"
-require "agama/storage/volume_templates_builder"
-require "agama/storage/space_settings"
 
 module Agama
   module Storage
@@ -63,7 +64,9 @@ def read
       # @param settings [Agama::Storage::ProposalSettings]
       # @param value [Boolean]
       def lvm_reader(settings, value)
-        settings.lvm.enabled = value
+        return unless value
+
+        settings.device = DeviceSettings::NewLvmVg.new
       end
 
       # @param settings [Agama::Storage::ProposalSettings]
diff --git a/service/lib/agama/storage/volume.rb b/service/lib/agama/storage/volume.rb
index 6b6c231dc..2ff73300d 100644
--- a/service/lib/agama/storage/volume.rb
+++ b/service/lib/agama/storage/volume.rb
@@ -23,6 +23,7 @@
 require "y2storage/disk_size"
 require "agama/storage/btrfs_settings"
 require "agama/storage/volume_outline"
+require "agama/storage/volume_location"
 
 module Agama
   module Storage
@@ -58,15 +59,10 @@ class Volume
       # @return [Array<String>]
       attr_accessor :mount_options
 
-      # Used to locate the volume in a separate disk
+      # Location of the volume
       #
-      # @return [String, nil]
-      attr_accessor :device
-
-      # Used to locate the volume in a separate VG
-      #
-      # @return [String, nil]
-      attr_accessor :separate_vg_name
+      # @return [VolumeLocation]
+      attr_accessor :location
 
       # Min size for the volume
       #
@@ -98,6 +94,7 @@ def initialize(mount_path)
         @max_size = Y2Storage::DiskSize.unlimited
         @btrfs = BtrfsSettings.new
         @outline = VolumeOutline.new
+        @location = VolumeLocation.new
       end
 
       def_delegators :outline,
diff --git a/service/lib/agama/storage/volume_conversion.rb b/service/lib/agama/storage/volume_conversion.rb
index 73ca398f9..432f39034 100644
--- a/service/lib/agama/storage/volume_conversion.rb
+++ b/service/lib/agama/storage/volume_conversion.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -26,17 +26,15 @@ module Agama
   module Storage
     # Conversions for a volume
     module VolumeConversion
-      # Performs conversion from Y2Storage format.
-      #
-      # @param spec [Y2Storage::VolumeSpecification]
-      # @param config [Agama::Config]
+      # Performs conversion from Y2Storage.
       #
+      # @param volume [Agama::Storage::Volume]
       # @return [Agama::Storage::Volume]
-      def self.from_y2storage(spec, config:)
-        FromY2Storage.new(spec, config: config).convert
+      def self.from_y2storage(volume)
+        FromY2Storage.new(volume).convert
       end
 
-      # Performs conversion to Y2Storage format.
+      # Performs conversion to Y2Storage.
       #
       # @param volume [Agama::Storage::Volume]
       # @return [Y2Storage::VolumeSpecification]
diff --git a/service/lib/agama/storage/volume_conversion/from_y2storage.rb b/service/lib/agama/storage/volume_conversion/from_y2storage.rb
index 364531699..d7f1b9322 100644
--- a/service/lib/agama/storage/volume_conversion/from_y2storage.rb
+++ b/service/lib/agama/storage/volume_conversion/from_y2storage.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -20,71 +20,51 @@
 # find current contact information at www.suse.com.
 
 require "y2storage/storage_manager"
-require "agama/storage/volume_templates_builder"
 
 module Agama
   module Storage
     module VolumeConversion
-      # Volume conversion from Y2Storage format.
+      # Volume conversion from Y2Storage.
+      #
+      # @note This class does not perform a real conversion from Y2Storage. Instead of that, it
+      #   copies the given volume and recovers some values from Y2Storage.
       class FromY2Storage
-        # @param spec [Y2Storage::VolumeSpecification]
-        # @param config [Agama::Config]
-        def initialize(spec, config:)
-          @spec = spec
-          @config = config
+        # @param volume [Agama::Storage::ProposalSettings]
+        def initialize(volume)
+          @volume = volume
         end
 
-        # Performs the conversion from Y2Storage format.
+        # Performs the conversion from Y2Storage.
         #
         # @return [Agama::Storage::Volume]
         def convert
-          volume = VolumeTemplatesBuilder.new_from_config(config).for(spec.mount_point || "")
-
-          volume.tap do |target|
-            target.device = spec.device
-            target.separate_vg_name = spec.separate_vg_name
-            target.mount_options = spec.mount_options
-            target.fs_type = spec.fs_type
-
+          volume.dup.tap do |target|
             sizes_conversion(target)
-            btrfs_conversion(target)
           end
         end
 
       private
 
-        # @return [Y2Storage::VolumeSpecification]
-        attr_reader :spec
-
-        # @return [Agama::Config]
-        attr_reader :config
+        # @return [Agama::Storage::ProposalSettings]
+        attr_reader :volume
 
         # @param target [Agama::Storage::Volume]
         def sizes_conversion(target)
-          target.auto_size = !spec.ignore_fallback_sizes? || !spec.ignore_snapshots_sizes?
-
-          # The volume specification contains the min and max sizes for the volume. But the final
-          # range of sizes used by the Y2Storage proposal depends on the fallback sizes (if this
-          # volume is fallback for other volume) and the size for snapshots (if snapshots is
-          # active). The planned device contains the real range of sizes used by the proposal.
+          # The final range of sizes used by the Y2Storage proposal depends on the fallback sizes
+          # (if this volume is fallback for other volume) and the size for snapshots (if snapshots
+          # is active). The planned device contains the real range of sizes used by the proposal.
           #
           # From Agama point of view, this is the way of recovering the range of sizes used by
           # Y2Storage when a volume is set to have auto size.
-          planned = planned_device_for(spec.mount_point)
-          target.min_size = planned&.min || spec.min_size
-          target.max_size = planned&.max || spec.max_size
-        end
+          planned = planned_device_for(target.mount_path)
+          return unless planned
 
-        # @param target [Agama::Storage::Volume]
-        def btrfs_conversion(target)
-          target.btrfs.snapshots = spec.snapshots?
-          target.btrfs.subvolumes = spec.subvolumes
-          target.btrfs.default_subvolume = spec.btrfs_default_subvolume
-          target.btrfs.read_only = spec.btrfs_read_only
+          target.min_size = planned.min
+          target.max_size = planned.max
         end
 
         # Planned device for the given mount path.
-
+        #
         # @param mount_path [String]
         # @return [Y2Storage::Planned::Device, nil]
         def planned_device_for(mount_path)
diff --git a/service/lib/agama/storage/volume_conversion/to_y2storage.rb b/service/lib/agama/storage/volume_conversion/to_y2storage.rb
index 605da3577..dd258c3bc 100644
--- a/service/lib/agama/storage/volume_conversion/to_y2storage.rb
+++ b/service/lib/agama/storage/volume_conversion/to_y2storage.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -25,20 +25,18 @@
 module Agama
   module Storage
     module VolumeConversion
-      # Volume conversion to Y2Storage format.
+      # Volume conversion to Y2Storage.
       class ToY2Storage
         # @param volume [Agama::Storage::Volume]
         def initialize(volume)
           @volume = volume
         end
 
-        # Performs the conversion to Y2Storage format.
+        # Performs the conversion to Y2Storage.
         #
         # @return [Y2Storage::VolumeSpecification]
         def convert # rubocop:disable Metrics/AbcSize
           Y2Storage::VolumeSpecification.new({}).tap do |target|
-            target.device = volume.device
-            target.separate_vg_name = volume.separate_vg_name
             target.mount_point = volume.mount_path
             target.mount_options = volume.mount_options.join(",")
             target.proposed = true
@@ -50,6 +48,7 @@ def convert # rubocop:disable Metrics/AbcSize
 
             sizes_conversion(target)
             btrfs_conversion(target)
+            location_conversion(target)
           end
         end
 
@@ -64,6 +63,7 @@ def sizes_conversion(target)
 
           target.ignore_fallback_sizes = !auto
           target.ignore_snapshots_sizes = !auto
+          target.ignore_adjust_by_ram = !auto
 
           # The range of sizes is defined by the volume outline in case of auto size (mix and max
           # sizes cannot be configured if auto size is set).
@@ -88,6 +88,29 @@ def btrfs_conversion(target)
           target.btrfs_default_subvolume = volume.btrfs.default_subvolume
           target.btrfs_read_only = volume.btrfs.read_only?
         end
+
+        # @param target [Y2Storage::VolumeSpecification]
+        def location_conversion(target)
+          location = volume.location
+          return if location.default?
+
+          if location.reuse_device?
+            target.reuse_name = location.device
+            target.reformat = location.target == :device
+            return
+          end
+
+          target.device = location.device
+          target.separate_vg_name = vg_name(target) if location.target == :new_vg
+        end
+
+        # Name to be used as separate_vg_name for the given Y2Storage volume
+        #
+        # @param target [Y2Storage::VolumeSpecification]
+        def vg_name(target)
+          mount_point = target.root? ? "root" : target.mount_point.sub(%r{^/}, "")
+          "vg-#{mount_point.tr("/", "_")}"
+        end
       end
     end
   end
diff --git a/service/lib/agama/storage/volume_location.rb b/service/lib/agama/storage/volume_location.rb
new file mode 100644
index 000000000..885aa6b21
--- /dev/null
+++ b/service/lib/agama/storage/volume_location.rb
@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2024] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+module Agama
+  module Storage
+    # Settings specifying what device should be used for a given Volume and how
+    class VolumeLocation
+      # @see .targets
+      TARGETS = [:default, :new_partition, :new_vg, :device, :filesystem].freeze
+      private_constant :TARGETS
+
+      # What to do to allocate the volume
+      #
+      # @return [Symbol] see {.targets}
+      attr_reader :target
+
+      # Concrete device to allocate the volume, the exact meaning depends on {#target}
+      #
+      # @return [String, nil]
+      attr_accessor :device
+
+      # All possible values for #target:
+      #
+      #   - :default new partition or logical volume in the default device
+      #   - :new_partition new partition at the disk pointed by {#device}
+      #   - :new_vg new LV in a new dedicated VG created at a the disk pointed  by {#device}
+      #   - :device the existing block device specified by {#device} is used and reformatted
+      #   - :filesystem: the existing filesystem on the device specified by {#device} is mounted
+      #
+      # @return [Array<Symbol>]
+      def self.targets
+        TARGETS
+      end
+
+      # Constructor
+      def initialize
+        @target = :default
+      end
+
+      # Sets the value of {#target} ensuring it is valid
+      def target=(value)
+        return unless TARGETS.include?(value)
+
+        @target = value
+      end
+
+      # @return [Boolean]
+      def default?
+        target == :default
+      end
+
+      # Whether the chosen target implies reusing an existing device (formatting it or not)
+      #
+      # @return [Boolean]
+      def reuse_device?
+        [:device, :filesystem].include?(target)
+      end
+    end
+  end
+end
diff --git a/service/package/gem2rpm.yml b/service/package/gem2rpm.yml
index fef1bc79d..7b8e9bd8c 100644
--- a/service/package/gem2rpm.yml
+++ b/service/package/gem2rpm.yml
@@ -38,8 +38,7 @@
     Requires:       yast2-iscsi-client >= 4.5.7
     Requires:       yast2-network
     Requires:       yast2-proxy
-    # ProposalSettings#swap_reuse
-    Requires:       yast2-storage-ng >= 5.0.3
+    Requires:       yast2-storage-ng >= 5.0.10
     Requires:       yast2-users
     %ifarch s390 s390x
     Requires:       yast2-s390 >= 4.6.4
diff --git a/service/package/rubygem-agama-yast.changes b/service/package/rubygem-agama-yast.changes
index 5f5103245..1e8f813af 100644
--- a/service/package/rubygem-agama-yast.changes
+++ b/service/package/rubygem-agama-yast.changes
@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Wed Apr  3 15:12:05 UTC 2024 - José Iván López González <jlopez@suse.com>
+
+- Add new proposal settings to allow configuring the boot device
+  and to select different scenarios for the installation device:
+  a disk, a new LVM volume group or reuse an LVM volume group
+  (gh#openSUSE/agama#1068).
+
+-------------------------------------------------------------------
+Fri Mar 22 09:18:20 UTC 2024 - Ancor Gonzalez Sosa <ancor@suse.com>
+
+- Make it possible to use non-auto sizes for volumes with
+  adjust_by_ram (gh#openSUSE/agama#1111).
+
+-------------------------------------------------------------------
+Thu Mar 21 10:35:09 UTC 2024 - Ancor Gonzalez Sosa <ancor@suse.com>
+
+- Extend the storage D-Bus API: new attributes for the volumes
+  (Target and TargetDevice) to decide where to locate each of them
+  (gh#openSUSE/agama#1105).
+
+-------------------------------------------------------------------
+Tue Mar 19 14:09:54 UTC 2024 - José Iván López González <jlopez@suse.com>
+
+- Extend the storage D-Bus API: export LVM volume groups and
+  logical volumes, export staging devices, add Device and Partition
+  interfaces, export unused slots (gh#openSUSE/agama#1104).
+
 -------------------------------------------------------------------
 Tue Feb 27 15:53:46 UTC 2024 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 
diff --git a/service/po/ca.po b/service/po/ca.po
new file mode 100644
index 000000000..4ecd7f73a
--- /dev/null
+++ b/service/po/ca.po
@@ -0,0 +1,190 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-03-05 02:04+0000\n"
+"PO-Revision-Date: 2024-03-05 12:42+0000\n"
+"Last-Translator: David Medina <medipas@gmail.com>\n"
+"Language-Team: Catalan <https://l10n.opensuse.org/projects/agama/"
+"agama-service-master/ca/>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.9.1\n"
+
+#. Runs the config phase
+#: service/lib/agama/manager.rb:88
+msgid "Probing Storage"
+msgstr "Sondant l'emmagatzematge"
+
+#: service/lib/agama/manager.rb:89
+msgid "Probing Software"
+msgstr "Sondant el programari"
+
+#. Runs the install phase
+#. rubocop:disable Metrics/AbcSize
+#: service/lib/agama/manager.rb:109
+msgid "Partitioning"
+msgstr "Particions"
+
+#. propose software after /mnt is already separated, so it uses proper
+#. target
+#: service/lib/agama/manager.rb:117
+msgid "Installing Software"
+msgstr "Instal·lant programari"
+
+#: service/lib/agama/manager.rb:120
+msgid "Writing Users"
+msgstr "Escrivint els usuaris"
+
+#: service/lib/agama/manager.rb:121
+msgid "Writing Network Configuration"
+msgstr "Escrivint la configuració de la xarxa"
+
+#: service/lib/agama/manager.rb:122
+msgid "Saving Language Settings"
+msgstr "Desant els paràmetres de llengua"
+
+#: service/lib/agama/manager.rb:123
+msgid "Writing repositories information"
+msgstr "Escrivint la informació dels repositoris"
+
+#: service/lib/agama/manager.rb:124
+msgid "Finishing storage configuration"
+msgstr "Acabant la configuració de l'emmagatzematge"
+
+#. Callback to handle unsigned files
+#.
+#. @param filename [String] File name
+#. @param repo_id [Integer] Repository ID. It might be -1 if there is not an associated repo.
+#: service/lib/agama/software/callbacks/signature.rb:63
+#, perl-brace-format
+msgid "The file %{filename} from repository %{repo_name} (%{repo_url})"
+msgstr "El fitxer %{filename} del repositori %{repo_name} (%{repo_url})"
+
+#: service/lib/agama/software/callbacks/signature.rb:67
+#, perl-brace-format
+msgid "The file %{filename}"
+msgstr "El fitxer %{filename}"
+
+#: service/lib/agama/software/callbacks/signature.rb:71
+#, perl-brace-format
+msgid ""
+"%{source} is not digitally signed. The origin and integrity of the file cannot"
+" be verified. Use it anyway?"
+msgstr ""
+"%{source} no està signat digitalment. L'origen i la integritat del fitxer no "
+"es poden verificar. Voleu usar-lo tanmateix?"
+
+#. Callback to handle signature verification failures
+#.
+#. @param key [Hash] GPG key data (id, name, fingerprint, etc.)
+#. @param _repo_id [Integer] Repository ID
+#: service/lib/agama/software/callbacks/signature.rb:94
+#, perl-brace-format
+msgid ""
+"The key %{id} (%{name}) with fingerprint %{fingerprint} is unknown. Do you wan"
+"t to trust this key?"
+msgstr ""
+"La clau %{id} (%{name}) amb l'empremta digital %{fingerprint} és "
+"desconeguda. Voleu confiar en aquesta clau?"
+
+#. as we use liveDVD with normal like ENV, lets temporary switch to normal to use its repos
+#: service/lib/agama/software/manager.rb:134
+msgid "Initializing target repositories"
+msgstr "Iniciant els repositoris de destinació"
+
+#: service/lib/agama/software/manager.rb:135
+msgid "Initializing sources"
+msgstr "Iniciant les fonts"
+
+#: service/lib/agama/software/manager.rb:140
+msgid "Refreshing repositories metadata"
+msgstr "Refrescant les metadades dels repositoris"
+
+#: service/lib/agama/software/manager.rb:141
+msgid "Calculating the software proposal"
+msgstr "Calculant la proposta de programari"
+
+#. Writes the repositories information to the installed system
+#: service/lib/agama/software/manager.rb:190
+msgid "Writing repositories to the target system"
+msgstr "Escrivint els repositoris al sistema de destinació"
+
+#: service/lib/agama/software/manager.rb:196
+msgid "Restoring original repositories"
+msgstr "Restaurant els repositoris originals"
+
+#. Issues related to the software proposal.
+#.
+#. Repositories that could not be probed are reported as errors.
+#.
+#. @return [Array<Agama::Issue>]
+#: service/lib/agama/software/manager.rb:470
+#, c-format
+msgid "Could not read repository \"%s\""
+msgstr "No s'ha pogut llegir el repositori %s."
+
+#. Issue when a product is missing
+#.
+#. @return [Agama::Issue]
+#: service/lib/agama/software/manager.rb:480
+msgid "Product not selected yet"
+msgstr "Encara no s'ha seleccionat el producte."
+
+#. Issue when a product requires registration but it is not registered yet.
+#.
+#. @return [Agama::Issue]
+#: service/lib/agama/software/manager.rb:489
+msgid "Product must be registered"
+msgstr "El producte ha d'estar registrat."
+
+#. Returns solver error messages from the last attempt
+#.
+#. @return [Array<String>] Error messages
+#: service/lib/agama/software/proposal.rb:227
+#, c-format
+msgid "Found %s dependency issues."
+msgstr "S'han trobat %s problemes de dependències."
+
+#. Probes storage devices and performs an initial proposal
+#: service/lib/agama/storage/manager.rb:112
+msgid "Activating storage devices"
+msgstr "Activant els dispositius d'emmagatzematge"
+
+#: service/lib/agama/storage/manager.rb:113
+msgid "Probing storage devices"
+msgstr "Sondant els dispositius d'emmagatzematge"
+
+#: service/lib/agama/storage/manager.rb:114
+msgid "Calculating the storage proposal"
+msgstr "Calculant la proposta d'emmagatzematge"
+
+#: service/lib/agama/storage/manager.rb:115
+msgid "Selecting Linux Security Modules"
+msgstr "Seleccionant els mòduls de seguretat de Linux"
+
+#. Prepares the partitioning to install the system
+#: service/lib/agama/storage/manager.rb:123
+msgid "Preparing bootloader proposal"
+msgstr "Preparant la proposta de carregador d'arrencada"
+
+#. first make bootloader proposal to be sure that required packages are installed
+#: service/lib/agama/storage/manager.rb:128
+msgid "Adding storage-related packages"
+msgstr "Afegint paquets relacionats amb l'emmagatzematge"
+
+#: service/lib/agama/storage/manager.rb:129
+msgid "Preparing the storage devices"
+msgstr "Preparant els dispositius d'emmagatzematge"
+
+#: service/lib/agama/storage/manager.rb:130
+msgid "Writing bootloader sysconfig"
+msgstr "Escrivint la configuració de sistema del carregador d'arrencada"
diff --git a/service/po/fr.po b/service/po/fr.po
index 0e252cae4..c8ab08599 100644
--- a/service/po/fr.po
+++ b/service/po/fr.po
@@ -8,10 +8,10 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-02-04 02:09+0000\n"
-"PO-Revision-Date: 2024-02-01 14:42+0000\n"
+"PO-Revision-Date: 2024-03-05 02:05+0000\n"
 "Last-Translator: faila fail <yassadmi@proton.me>\n"
-"Language-Team: French <https://l10n.opensuse.org/projects/agama/agama-"
-"service-master/fr/>\n"
+"Language-Team: French <https://l10n.opensuse.org/projects/agama/"
+"agama-service-master/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -143,7 +143,6 @@ msgstr "Le produit n'est pas encore sélectionné"
 #.
 #. @return [Agama::Issue]
 #: service/lib/agama/software/manager.rb:489
-#, fuzzy
 msgid "Product must be registered"
 msgstr "Le produit doit être enregistré"
 
@@ -153,7 +152,7 @@ msgstr "Le produit doit être enregistré"
 #: service/lib/agama/software/proposal.rb:227
 #, c-format
 msgid "Found %s dependency issues."
-msgstr "%s problèmes de dépendance  trouvé(s) (Need a plural option)"
+msgstr "%s problème(s) de dépendance trouvé(s)."
 
 #. Probes storage devices and performs an initial proposal
 #: service/lib/agama/storage/manager.rb:112
@@ -165,9 +164,8 @@ msgid "Probing storage devices"
 msgstr "Sonde les périphériques de stockage"
 
 #: service/lib/agama/storage/manager.rb:114
-#, fuzzy
 msgid "Calculating the storage proposal"
-msgstr "Calcul de la capacité de stockage envisagée"
+msgstr "Calcul de la proposition de stockage"
 
 #: service/lib/agama/storage/manager.rb:115
 msgid "Selecting Linux Security Modules"
diff --git a/service/po/zh_Hans.po b/service/po/zh_Hans.po
new file mode 100644
index 000000000..2ef7c575a
--- /dev/null
+++ b/service/po/zh_Hans.po
@@ -0,0 +1,186 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-03-04 02:50+0000\n"
+"PO-Revision-Date: 2024-03-04 15:43+0000\n"
+"Last-Translator: Monstorix <monstorix@outlook.com>\n"
+"Language-Team: Chinese (Simplified) <https://l10n.opensuse.org/projects/"
+"agama/agama-service-master/zh_Hans/>\n"
+"Language: zh_Hans\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.9.1\n"
+
+#. Runs the config phase
+#: service/lib/agama/manager.rb:88
+msgid "Probing Storage"
+msgstr "正在探测存储"
+
+#: service/lib/agama/manager.rb:89
+msgid "Probing Software"
+msgstr "正在探测软件"
+
+#. Runs the install phase
+#. rubocop:disable Metrics/AbcSize
+#: service/lib/agama/manager.rb:109
+msgid "Partitioning"
+msgstr "正在分区"
+
+#. propose software after /mnt is already separated, so it uses proper
+#. target
+#: service/lib/agama/manager.rb:117
+msgid "Installing Software"
+msgstr "正在安装软件"
+
+#: service/lib/agama/manager.rb:120
+msgid "Writing Users"
+msgstr "正在写入用户"
+
+#: service/lib/agama/manager.rb:121
+msgid "Writing Network Configuration"
+msgstr "正在写入网络配置"
+
+#: service/lib/agama/manager.rb:122
+msgid "Saving Language Settings"
+msgstr "正在保存语言设置"
+
+#: service/lib/agama/manager.rb:123
+msgid "Writing repositories information"
+msgstr "正在写入软件仓库信息"
+
+#: service/lib/agama/manager.rb:124
+msgid "Finishing storage configuration"
+msgstr "正在完成存储配置"
+
+#. Callback to handle unsigned files
+#.
+#. @param filename [String] File name
+#. @param repo_id [Integer] Repository ID. It might be -1 if there is not an associated repo.
+#: service/lib/agama/software/callbacks/signature.rb:63
+#, perl-brace-format
+msgid "The file %{filename} from repository %{repo_name} (%{repo_url})"
+msgstr "来自 %{repo_name} 的文件 %{filename} （%{repo_url}）"
+
+#: service/lib/agama/software/callbacks/signature.rb:67
+#, perl-brace-format
+msgid "The file %{filename}"
+msgstr "文件 %{filename}"
+
+#: service/lib/agama/software/callbacks/signature.rb:71
+#, perl-brace-format
+msgid ""
+"%{source} is not digitally signed. The origin and integrity of the file cannot"
+" be verified. Use it anyway?"
+msgstr "%{source} 未经过数字签名。因此无法验证文件来源和完整性。是否仍要使用它？"
+
+#. Callback to handle signature verification failures
+#.
+#. @param key [Hash] GPG key data (id, name, fingerprint, etc.)
+#. @param _repo_id [Integer] Repository ID
+#: service/lib/agama/software/callbacks/signature.rb:94
+#, perl-brace-format
+msgid ""
+"The key %{id} (%{name}) with fingerprint %{fingerprint} is unknown. Do you wan"
+"t to trust this key?"
+msgstr "密钥 %{id} （%{name}）（指纹为 %{fingerprint})）未知。您想要信任该密钥吗？"
+
+#. as we use liveDVD with normal like ENV, lets temporary switch to normal to use its repos
+#: service/lib/agama/software/manager.rb:134
+msgid "Initializing target repositories"
+msgstr "正在初始化目标仓库"
+
+#: service/lib/agama/software/manager.rb:135
+msgid "Initializing sources"
+msgstr "正在初始化软件源"
+
+#: service/lib/agama/software/manager.rb:140
+msgid "Refreshing repositories metadata"
+msgstr "正在刷新软件仓库元数据"
+
+#: service/lib/agama/software/manager.rb:141
+msgid "Calculating the software proposal"
+msgstr "正在计算软件提案"
+
+#. Writes the repositories information to the installed system
+#: service/lib/agama/software/manager.rb:190
+msgid "Writing repositories to the target system"
+msgstr "正在将软件仓库写入目标系统"
+
+#: service/lib/agama/software/manager.rb:196
+msgid "Restoring original repositories"
+msgstr "正在还原初始软件仓库"
+
+#. Issues related to the software proposal.
+#.
+#. Repositories that could not be probed are reported as errors.
+#.
+#. @return [Array<Agama::Issue>]
+#: service/lib/agama/software/manager.rb:470
+#, c-format
+msgid "Could not read repository \"%s\""
+msgstr "无法读取仓库 “ %s”"
+
+#. Issue when a product is missing
+#.
+#. @return [Agama::Issue]
+#: service/lib/agama/software/manager.rb:480
+msgid "Product not selected yet"
+msgstr "尚未选择产品"
+
+#. Issue when a product requires registration but it is not registered yet.
+#.
+#. @return [Agama::Issue]
+#: service/lib/agama/software/manager.rb:489
+msgid "Product must be registered"
+msgstr "产品必须注册"
+
+#. Returns solver error messages from the last attempt
+#.
+#. @return [Array<String>] Error messages
+#: service/lib/agama/software/proposal.rb:227
+#, c-format
+msgid "Found %s dependency issues."
+msgstr "找到 %s 个依赖问题。"
+
+#. Probes storage devices and performs an initial proposal
+#: service/lib/agama/storage/manager.rb:112
+msgid "Activating storage devices"
+msgstr "正在激活存储设备"
+
+#: service/lib/agama/storage/manager.rb:113
+msgid "Probing storage devices"
+msgstr "正在探测存储设备"
+
+#: service/lib/agama/storage/manager.rb:114
+msgid "Calculating the storage proposal"
+msgstr "正在计算存储提案"
+
+#: service/lib/agama/storage/manager.rb:115
+msgid "Selecting Linux Security Modules"
+msgstr "正在选择 Linux 安全模块"
+
+#. Prepares the partitioning to install the system
+#: service/lib/agama/storage/manager.rb:123
+msgid "Preparing bootloader proposal"
+msgstr "正在准备引导加载程序提案"
+
+#. first make bootloader proposal to be sure that required packages are installed
+#: service/lib/agama/storage/manager.rb:128
+msgid "Adding storage-related packages"
+msgstr "正在添加存储相关软件包"
+
+#: service/lib/agama/storage/manager.rb:129
+msgid "Preparing the storage devices"
+msgstr "正在准备存储设备"
+
+#: service/lib/agama/storage/manager.rb:130
+msgid "Writing bootloader sysconfig"
+msgstr "正在写入引导加载程序 sysconfig"
diff --git a/service/test/agama/dbus/hash_validator_test.rb b/service/test/agama/dbus/hash_validator_test.rb
new file mode 100644
index 000000000..69b995af3
--- /dev/null
+++ b/service/test/agama/dbus/hash_validator_test.rb
@@ -0,0 +1,197 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2024] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require_relative "../../test_helper"
+require "agama/dbus/hash_validator"
+require "agama/dbus/types"
+
+describe Agama::DBus::HashValidator do
+  subject { described_class.new(value, scheme: scheme) }
+
+  let(:scheme) do
+    {
+      "Name"     => String,
+      "Surname"  => Agama::DBus::Types::Array.new(String),
+      "Age"      => Integer,
+      "Height"   => Integer,
+      "Children" => Array
+    }
+  end
+
+  describe "#valid?" do
+    context "if there is any key with unexpected type" do
+      let(:value) do
+        {
+          "Gender" => "Male",
+          "Height" => true
+        }
+      end
+
+      it "returns false" do
+        expect(subject.valid?).to eq(false)
+      end
+    end
+
+    context "if there is no key with unexpected type" do
+      let(:value) do
+        {
+          "Name"   => "John",
+          "Gender" => "Male",
+          "Height" => 175
+        }
+      end
+
+      it "returns true" do
+        expect(subject.valid?).to eq(true)
+      end
+    end
+  end
+
+  describe "#valid_keys" do
+    let(:value) do
+      {
+        "Name"     => "John",
+        "Gender"   => "Male",
+        "Age"      => 45,
+        "Height"   => true,
+        "Children" => ["Mark", "Zara"]
+      }
+    end
+
+    it "returns the hash keys defined in the scheme and with the type indicated in the scheme" do
+      expect(subject.valid_keys).to eq(["Name", "Age", "Children"])
+    end
+  end
+
+  describe "#wrong_type_keys" do
+    context "if the hash contains the same types as the scheme" do
+      let(:value) do
+        {
+          "Name"     => "John",
+          "Age"      => 45,
+          "Children" => ["Mark", "Zara"]
+        }
+      end
+
+      it "returns an empty list" do
+        expect(subject.wrong_type_keys).to eq([])
+      end
+    end
+
+    context "if the hash contains types different to the scheme" do
+      let(:value) do
+        {
+          "Name"     => true,
+          "Age"      => 45,
+          "Children" => "none"
+        }
+      end
+
+      it "returns the keys with wrong type" do
+        expect(subject.wrong_type_keys).to eq(["Name", "Children"])
+      end
+    end
+  end
+
+  describe "#extra_keys" do
+    context "if the hash does not contain keys that are not included in the scheme" do
+      let(:value) do
+        {
+          "Name"     => "Jhon",
+          "Children" => []
+        }
+      end
+
+      it "returns an empty list" do
+        expect(subject.extra_keys).to eq([])
+      end
+    end
+
+    context "if the hash contains some keys that are not included in the scheme" do
+      let(:value) do
+        {
+          "Name"     => "Jhon",
+          "Gender"   => "Male",
+          "Birthday" => nil,
+          "Children" => []
+        }
+      end
+
+      it "returns a list with the extra keys" do
+        expect(subject.extra_keys).to eq(["Gender", "Birthday"])
+      end
+    end
+  end
+
+  describe "#missing_keys" do
+    context "if the hash contains all the keys defined in the scheme" do
+      let(:value) do
+        {
+          "Name"     => "Jhon",
+          "Surname"  => [],
+          "Age"      => 45,
+          "Height"   => 176,
+          "Children" => []
+        }
+      end
+
+      it "returns an empty list" do
+        expect(subject.missing_keys).to eq([])
+      end
+    end
+
+    context "if the hash does not contain any of the keys defined in the scheme" do
+      let(:value) do
+        {
+          "Surname" => [],
+          "Age"     => 45,
+          "Height"  => 176
+        }
+      end
+
+      it "returns a list with the missing keys" do
+        expect(subject.missing_keys).to eq(["Name", "Children"])
+      end
+    end
+  end
+
+  describe "#issues" do
+    let(:value) do
+      {
+        "Name"     => "John",
+        "Age"      => 45,
+        "Gender"   => "Male",
+        "Birthday" => nil,
+        "Height"   => "175",
+        "Children" => {}
+      }
+    end
+
+    it "generates an issue for each extra key and for each wrong type" do
+      expect(subject.issues).to contain_exactly(
+        /Unknown .* Gender/,
+        /Unknown .* Birthday/,
+        /Height must be/,
+        /Children must be/
+      )
+    end
+  end
+end
diff --git a/service/test/agama/dbus/storage/device_test.rb b/service/test/agama/dbus/storage/device_test.rb
index 649131a83..efb5ffe72 100644
--- a/service/test/agama/dbus/storage/device_test.rb
+++ b/service/test/agama/dbus/storage/device_test.rb
@@ -19,19 +19,23 @@
 # To contact SUSE LLC about this file by physical or electronic mail, you may
 # find current contact information at www.suse.com.
 
-require "agama/dbus/storage/device"
-require "agama/dbus/storage/devices_tree"
-require "dbus"
 require_relative "../../../test_helper"
 require_relative "../../storage/storage_helpers"
 require_relative "./interfaces/device/block_examples"
 require_relative "./interfaces/device/component_examples"
+require_relative "./interfaces/device/device_examples"
 require_relative "./interfaces/device/drive_examples"
 require_relative "./interfaces/device/filesystem_examples"
+require_relative "./interfaces/device/lvm_lv_examples"
+require_relative "./interfaces/device/lvm_vg_examples"
 require_relative "./interfaces/device/md_examples"
 require_relative "./interfaces/device/multipath_examples"
+require_relative "./interfaces/device/partition_examples"
 require_relative "./interfaces/device/partition_table_examples"
 require_relative "./interfaces/device/raid_examples"
+require "agama/dbus/storage/device"
+require "agama/dbus/storage/devices_tree"
+require "dbus"
 
 describe Agama::DBus::Storage::Device do
   include Agama::RSpec::StorageHelpers
@@ -65,6 +69,10 @@
 
       let(:device) { devicegraph.find_by_name("/dev/sda") }
 
+      it "defines the Device interface" do
+        expect(subject).to include_dbus_interface("org.opensuse.Agama.Storage1.Device")
+      end
+
       it "defines the Drive interface" do
         expect(subject).to include_dbus_interface("org.opensuse.Agama.Storage1.Drive")
       end
@@ -79,6 +87,10 @@
 
       let(:device) { devicegraph.dm_raids.first }
 
+      it "defines the Device interface" do
+        expect(subject).to include_dbus_interface("org.opensuse.Agama.Storage1.Device")
+      end
+
       it "defines the Drive interface" do
         expect(subject).to include_dbus_interface("org.opensuse.Agama.Storage1.Drive")
       end
@@ -97,6 +109,10 @@
 
       let(:device) { devicegraph.md_raids.first }
 
+      it "defines the Device interface" do
+        expect(subject).to include_dbus_interface("org.opensuse.Agama.Storage1.Device")
+      end
+
       it "does not define the Drive interface" do
         expect(subject).to_not include_dbus_interface("org.opensuse.Agama.Storage1.Drive")
       end
@@ -110,6 +126,64 @@
       end
     end
 
+    context "when the given device is a LVM volume group" do
+      let(:scenario) { "trivial_lvm.yml" }
+
+      let(:device) { devicegraph.find_by_name("/dev/vg0") }
+
+      it "defines the Device interface" do
+        expect(subject).to include_dbus_interface("org.opensuse.Agama.Storage1.Device")
+      end
+
+      it "does not define the Drive interface" do
+        expect(subject).to_not include_dbus_interface("org.opensuse.Agama.Storage1.Drive")
+      end
+
+      it "defines the LVM.VolumeGroup interface" do
+        expect(subject).to include_dbus_interface("org.opensuse.Agama.Storage1.LVM.VolumeGroup")
+      end
+    end
+
+    context "when the given device is a LVM logical volume" do
+      let(:scenario) { "trivial_lvm.yml" }
+
+      let(:device) { devicegraph.find_by_name("/dev/vg0/lv1") }
+
+      it "defines the Device interface" do
+        expect(subject).to include_dbus_interface("org.opensuse.Agama.Storage1.Device")
+      end
+
+      it "does not define the Drive interface" do
+        expect(subject).to_not include_dbus_interface("org.opensuse.Agama.Storage1.Drive")
+      end
+
+      it "defines the LVM.LogicalVolume interface" do
+        expect(subject).to include_dbus_interface("org.opensuse.Agama.Storage1.LVM.LogicalVolume")
+      end
+    end
+
+    context "when the given device is a partition" do
+      let(:scenario) { "partitioned_md.yml" }
+
+      let(:device) { devicegraph.find_by_name("/dev/sda1") }
+
+      it "defines the Device interface" do
+        expect(subject).to include_dbus_interface("org.opensuse.Agama.Storage1.Device")
+      end
+
+      it "defines the Block interface" do
+        expect(subject).to include_dbus_interface("org.opensuse.Agama.Storage1.Block")
+      end
+
+      it "does not define the Drive interface" do
+        expect(subject).to_not include_dbus_interface("org.opensuse.Agama.Storage1.Drive")
+      end
+
+      it "defines the Partition interface" do
+        expect(subject).to include_dbus_interface("org.opensuse.Agama.Storage1.Partition")
+      end
+    end
+
     context "when the given device has a partition table" do
       let(:scenario) { "partitioned_md.yml" }
 
@@ -130,8 +204,30 @@
           .to_not include_dbus_interface("org.opensuse.Agama.Storage1.PartitionTable")
       end
     end
+
+    context "when the device is formatted" do
+      let(:scenario) { "multipath-formatted.xml" }
+
+      let(:device) { devicegraph.find_by_name("/dev/mapper/0QEMU_QEMU_HARDDISK_mpath1") }
+
+      it "defines the Filesystem interface" do
+        expect(subject).to include_dbus_interface("org.opensuse.Agama.Storage1.Filesystem")
+      end
+    end
+
+    context "when the device is no formatted" do
+      let(:scenario) { "partitioned_md.yml" }
+
+      let(:device) { devicegraph.find_by_name("/dev/sda") }
+
+      it "does not define the Filesystem interface" do
+        expect(subject).to_not include_dbus_interface("org.opensuse.Agama.Storage1.Filesystem")
+      end
+    end
   end
 
+  include_examples "Device interface"
+
   include_examples "Drive interface"
 
   include_examples "RAID interface"
@@ -142,6 +238,12 @@
 
   include_examples "Block interface"
 
+  include_examples "LVM.VolumeGroup interface"
+
+  include_examples "LVM.LogicalVolume interface"
+
+  include_examples "Partition interface"
+
   include_examples "PartitionTable interface"
 
   include_examples "Filesystem interface"
@@ -168,12 +270,6 @@
     context "if the given device has the same sid" do
       let(:new_device) { devicegraph.find_by_name("/dev/sda") }
 
-      it "sets the new device" do
-        subject.storage_device = new_device
-
-        expect(subject.storage_device).to equal(new_device)
-      end
-
       it "emits a properties changed signal for each interface" do
         subject.interfaces_and_properties.each_key do |interface|
           expect(subject).to receive(:dbus_properties_changed).with(interface, anything, anything)
diff --git a/service/test/agama/dbus/storage/devices_tree_test.rb b/service/test/agama/dbus/storage/devices_tree_test.rb
index 42e0024a3..a876c2f77 100644
--- a/service/test/agama/dbus/storage/devices_tree_test.rb
+++ b/service/test/agama/dbus/storage/devices_tree_test.rb
@@ -22,8 +22,8 @@
 require_relative "../../../test_helper"
 require_relative "../../storage/storage_helpers"
 require "agama/dbus/storage/devices_tree"
-require "y2storage"
 require "dbus"
+require "y2storage"
 
 describe Agama::DBus::Storage::DevicesTree do
   include Agama::RSpec::StorageHelpers
@@ -87,7 +87,8 @@
       mock_storage(devicegraph: scenario)
 
       allow(service).to receive(:get_node).with(root_path, anything).and_return(root_node)
-      allow(root_node).to receive(:descendant_objects).and_return(dbus_objects)
+      # Returning an empty list for the second call to mock the effect of calling to #clear.
+      allow(root_node).to receive(:descendant_objects).and_return(dbus_objects, [])
 
       allow(service).to receive(:export)
       allow(service).to receive(:unexport)
@@ -102,57 +103,48 @@
 
     let(:devicegraph) { Y2Storage::StorageManager.instance.probed }
 
-    context "if a device is not exported yet" do
-      let(:dbus_objects) { [] }
+    let(:dbus_objects) { [dbus_object1, dbus_object2] }
+    let(:dbus_object1) { Agama::DBus::Storage::Device.new(sda, subject.path_for(sda), subject) }
+    let(:dbus_object2) { Agama::DBus::Storage::Device.new(sdb, subject.path_for(sdb), subject) }
+    let(:sda) { devicegraph.find_by_name("/dev/sda") }
+    let(:sdb) { devicegraph.find_by_name("/dev/sdb") }
 
-      it "exports a D-Bus object" do
-        sda = devicegraph.find_by_name("/dev/sda")
-        sdb = devicegraph.find_by_name("/dev/sdb")
-        md0 = devicegraph.find_by_name("/dev/md0")
-        sda1 = devicegraph.find_by_name("/dev/sda1")
-        sda2 = devicegraph.find_by_name("/dev/sda2")
-        md0p1 = devicegraph.find_by_name("/dev/md0p1")
-
-        expect(service).to export_object("#{root_path}/#{sda.sid}")
-        expect(service).to export_object("#{root_path}/#{sdb.sid}")
-        expect(service).to export_object("#{root_path}/#{md0.sid}")
-        expect(service).to export_object("#{root_path}/#{sda1.sid}")
-        expect(service).to export_object("#{root_path}/#{sda2.sid}")
-        expect(service).to export_object("#{root_path}/#{md0p1.sid}")
-        expect(service).to_not receive(:export)
+    it "unexports the current D-Bus objects" do
+      expect(service).to unexport_object("#{root_path}/#{sda.sid}")
+      expect(service).to unexport_object("#{root_path}/#{sdb.sid}")
 
-        subject.update(devicegraph)
-      end
+      subject.update(devicegraph)
     end
 
-    context "if a device is already exported" do
-      let(:dbus_objects) { [dbus_object1] }
-      let(:dbus_object1) { Agama::DBus::Storage::Device.new(sda, subject.path_for(sda), subject) }
-      let(:sda) { devicegraph.find_by_name("/dev/sda") }
-
-      it "does not export a D-Bus object" do
-        expect(service).to_not export_object("#{root_path}/#{sda.sid}")
-
-        subject.update(devicegraph)
-      end
-
-      it "updates the D-Bus object" do
-        expect(dbus_object1.storage_device).to equal(sda)
+    it "exports disk devices and partitions" do
+      md0 = devicegraph.find_by_name("/dev/md0")
+      sda1 = devicegraph.find_by_name("/dev/sda1")
+      sda2 = devicegraph.find_by_name("/dev/sda2")
+      md0p1 = devicegraph.find_by_name("/dev/md0p1")
+
+      expect(service).to export_object("#{root_path}/#{sda.sid}")
+      expect(service).to export_object("#{root_path}/#{sdb.sid}")
+      expect(service).to export_object("#{root_path}/#{md0.sid}")
+      expect(service).to export_object("#{root_path}/#{sda1.sid}")
+      expect(service).to export_object("#{root_path}/#{sda2.sid}")
+      expect(service).to export_object("#{root_path}/#{md0p1.sid}")
+      expect(service).to_not receive(:export)
+
+      subject.update(devicegraph)
+    end
 
-        subject.update(devicegraph)
+    context "if there are LVM volume groups" do
+      let(:scenario) { "trivial_lvm.yml" }
 
-        expect(dbus_object1.storage_device).to_not equal(sda)
-        expect(dbus_object1.storage_device.sid).to equal(sda.sid)
-      end
-    end
+      let(:dbus_objects) { [] }
 
-    context "if an exported D-Bus object does not represent any of the current devices" do
-      let(:dbus_objects) { [dbus_object1] }
-      let(:dbus_object1) { Agama::DBus::Storage::Device.new(sdd, subject.path_for(sdd), subject) }
-      let(:sdd) { instance_double(Y2Storage::Disk, sid: 1, is?: false, filesystem: false) }
+      it "exports the LVM volume groups and the logical volumes" do
+        vg0 = devicegraph.find_by_name("/dev/vg0")
+        lv1 = devicegraph.find_by_name("/dev/vg0/lv1")
 
-      it "unexports the D-Bus object" do
-        expect(service).to unexport_object("#{root_path}/1")
+        expect(service).to receive(:export)
+        expect(service).to export_object("#{root_path}/#{vg0.sid}")
+        expect(service).to export_object("#{root_path}/#{lv1.sid}")
 
         subject.update(devicegraph)
       end
diff --git a/service/test/agama/dbus/storage/interfaces/device/block_examples.rb b/service/test/agama/dbus/storage/interfaces/device/block_examples.rb
index 11590a339..ba3ec052a 100644
--- a/service/test/agama/dbus/storage/interfaces/device/block_examples.rb
+++ b/service/test/agama/dbus/storage/interfaces/device/block_examples.rb
@@ -27,9 +27,13 @@
 
     let(:device) { devicegraph.find_by_name("/dev/sda") }
 
-    describe "#block_name" do
-      it "returns the name of the device" do
-        expect(subject.block_name).to eq("/dev/sda")
+    describe "#block_start" do
+      before do
+        allow(device).to receive(:start).and_return(345)
+      end
+
+      it "returns the first block of the region" do
+        expect(subject.block_start).to eq(345)
       end
     end
 
@@ -43,6 +47,12 @@
       end
     end
 
+    describe "#block_encrypted" do
+      it "returns whether the device is encrypted" do
+        expect(subject.block_encrypted).to eq(false)
+      end
+    end
+
     describe "#block_udev_ids" do
       before do
         allow(device).to receive(:udev_ids).and_return(udev_ids)
diff --git a/service/test/agama/dbus/storage/interfaces/device/device_examples.rb b/service/test/agama/dbus/storage/interfaces/device/device_examples.rb
new file mode 100644
index 000000000..2afc12315
--- /dev/null
+++ b/service/test/agama/dbus/storage/interfaces/device/device_examples.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2024] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require_relative "../../../../../test_helper"
+require "y2storage/device_description"
+
+shared_examples "Device interface" do
+  describe "Device D-Bus interface" do
+    let(:scenario) { "partitioned_md.yml" }
+
+    let(:device) { devicegraph.find_by_name("/dev/sda") }
+
+    describe "#device_sid" do
+      before do
+        allow(device).to receive(:sid).and_return(123)
+      end
+
+      it "returns the SID of the device" do
+        expect(subject.device_sid).to eq(123)
+      end
+    end
+
+    describe "#device_name" do
+      it "returns the name of the device" do
+        expect(subject.device_name).to eq("/dev/sda")
+      end
+    end
+
+    describe "#device_description" do
+      before do
+        allow(Y2Storage::DeviceDescription).to receive(:new).with(device).and_return(description)
+      end
+
+      let(:description) { instance_double(Y2Storage::DeviceDescription, to_s: "test") }
+
+      it "returns the description of the device" do
+        expect(subject.device_description).to eq("test")
+      end
+    end
+  end
+end
diff --git a/service/test/agama/dbus/storage/interfaces/device/drive_examples.rb b/service/test/agama/dbus/storage/interfaces/device/drive_examples.rb
index 62595298c..42d9c082e 100644
--- a/service/test/agama/dbus/storage/interfaces/device/drive_examples.rb
+++ b/service/test/agama/dbus/storage/interfaces/device/drive_examples.rb
@@ -192,13 +192,29 @@
         allow(device).to receive(:transport).and_return(transport)
       end
 
-      let(:transport) { instance_double(Y2Storage::DataTransport, to_s: "usb") }
+      let(:transport) { Y2Storage::DataTransport::FCOE }
 
       it "returns the transport" do
-        expect(subject.drive_transport).to eq("usb")
+        expect(subject.drive_transport).to eq("fcoe")
       end
 
-      context "if transport is unknown" do
+      context "if transport is Unknown" do
+        let(:transport) { Y2Storage::DataTransport::UNKNOWN }
+
+        it "returns an empty string" do
+          expect(subject.drive_transport).to eq("")
+        end
+      end
+
+      context "if transport is USB" do
+        let(:transport) { Y2Storage::DataTransport::USB }
+
+        it "returns the corresponding string" do
+          expect(subject.drive_transport).to eq("USB")
+        end
+      end
+
+      context "if transport is missing" do
         let(:transport) { nil }
 
         it "returns an empty string" do
diff --git a/service/test/agama/dbus/storage/interfaces/device/filesystem_examples.rb b/service/test/agama/dbus/storage/interfaces/device/filesystem_examples.rb
index c581bd766..71694a3ab 100644
--- a/service/test/agama/dbus/storage/interfaces/device/filesystem_examples.rb
+++ b/service/test/agama/dbus/storage/interfaces/device/filesystem_examples.rb
@@ -20,6 +20,7 @@
 # find current contact information at www.suse.com.
 
 require_relative "../../../../../test_helper"
+require "y2storage/filesystem_label"
 
 shared_examples "Filesystem interface" do
   describe "Filesystem D-Bus interface" do
@@ -27,15 +28,49 @@
 
     let(:device) { devicegraph.find_by_name("/dev/mapper/0QEMU_QEMU_HARDDISK_mpath1") }
 
+    describe "#filesystem_sid" do
+      it "returns the file system SID" do
+        expect(subject.filesystem_sid).to eq(45)
+      end
+    end
+
     describe "#filesystem_type" do
       it "returns the file system type" do
         expect(subject.filesystem_type).to eq("ext4")
       end
     end
 
-    describe "#filesystem_efi?" do
-      it "returns whether the file system is an EFI" do
-        expect(subject.filesystem_efi?).to eq(false)
+    describe "#filesystem_mount_path" do
+      context "if the file system is mounted" do
+        before do
+          device.filesystem.mount_path = "/test"
+        end
+
+        it "returns the mount path" do
+          expect(subject.filesystem_mount_path).to eq("/test")
+        end
+      end
+
+      context "if the file system is not mounted" do
+        before do
+          device.filesystem.mount_path = ""
+        end
+
+        it "returns empty string" do
+          expect(subject.filesystem_mount_path).to eq("")
+        end
+      end
+    end
+
+    describe "#filesystem_label" do
+      before do
+        allow(Y2Storage::FilesystemLabel).to receive(:new).with(device).and_return(label)
+      end
+
+      let(:label) { instance_double(Y2Storage::FilesystemLabel, to_s: "photos") }
+
+      it "returns the label of the file system" do
+        expect(subject.filesystem_label).to eq("photos")
       end
     end
   end
diff --git a/service/test/agama/dbus/storage/interfaces/device/lvm_lv_examples.rb b/service/test/agama/dbus/storage/interfaces/device/lvm_lv_examples.rb
new file mode 100644
index 000000000..9f96a71ec
--- /dev/null
+++ b/service/test/agama/dbus/storage/interfaces/device/lvm_lv_examples.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2024] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require_relative "../../../../../test_helper"
+
+shared_examples "LVM.LogicalVolume interface" do
+  describe "LVM.LogicalVolume D-Bus interface" do
+    let(:scenario) { "trivial_lvm.yml" }
+
+    let(:device) { devicegraph.find_by_name("/dev/vg0/lv1") }
+
+    describe "#lvm_lv_vg" do
+      it "returns the path of the host volume group" do
+        vg0 = devicegraph.find_by_name("/dev/vg0")
+
+        expect(subject.lvm_lv_vg).to eq(tree.path_for(vg0))
+      end
+    end
+  end
+end
diff --git a/service/test/agama/dbus/storage/interfaces/device/lvm_vg_examples.rb b/service/test/agama/dbus/storage/interfaces/device/lvm_vg_examples.rb
new file mode 100644
index 000000000..2e716acde
--- /dev/null
+++ b/service/test/agama/dbus/storage/interfaces/device/lvm_vg_examples.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2024] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require_relative "../../../../../test_helper"
+
+shared_examples "LVM.VolumeGroup interface" do
+  describe "LVM.VolumeGroup D-Bus interface" do
+    let(:scenario) { "trivial_lvm.yml" }
+
+    let(:device) { devicegraph.find_by_name("/dev/vg0") }
+
+    describe "#lvm_vg_size" do
+      before do
+        allow(device).to receive(:size).and_return(size)
+      end
+
+      let(:size) { Y2Storage::DiskSize.new(1024) }
+
+      it "returns the size in bytes" do
+        expect(subject.lvm_vg_size).to eq(1024)
+      end
+    end
+
+    describe "#lvm_vg_pvs" do
+      it "returns the D-Bus path of the physical volumes" do
+        sda1 = devicegraph.find_by_name("/dev/sda1")
+
+        expect(subject.lvm_vg_pvs).to contain_exactly(tree.path_for(sda1))
+      end
+    end
+
+    describe "#lvm_vg_lvs" do
+      it "returns the D-Bus path of the logical volumes" do
+        lv1 = devicegraph.find_by_name("/dev/vg0/lv1")
+
+        expect(subject.lvm_vg_lvs).to contain_exactly(tree.path_for(lv1))
+      end
+    end
+  end
+end
diff --git a/service/test/agama/dbus/storage/interfaces/device/partition_examples.rb b/service/test/agama/dbus/storage/interfaces/device/partition_examples.rb
new file mode 100644
index 000000000..f99b71d52
--- /dev/null
+++ b/service/test/agama/dbus/storage/interfaces/device/partition_examples.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2024] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require_relative "../../../../../test_helper"
+
+shared_examples "Partition interface" do
+  describe "Partition D-Bus interface" do
+    let(:scenario) { "partitioned_md.yml" }
+
+    let(:device) { devicegraph.find_by_name("/dev/sda1") }
+
+    describe "#partition_device" do
+      it "returns the path of the host device" do
+        sda = devicegraph.find_by_name("/dev/sda")
+
+        expect(subject.partition_device).to eq(tree.path_for(sda))
+      end
+    end
+
+    describe "#partition_efi" do
+      before do
+        allow(device).to receive(:efi_system?).and_return(true)
+      end
+
+      it "returns whether it is an EFI partition" do
+        expect(subject.partition_efi).to eq(true)
+      end
+    end
+  end
+end
diff --git a/service/test/agama/dbus/storage/interfaces/device/partition_table_examples.rb b/service/test/agama/dbus/storage/interfaces/device/partition_table_examples.rb
index 1af30111a..22fb9efae 100644
--- a/service/test/agama/dbus/storage/interfaces/device/partition_table_examples.rb
+++ b/service/test/agama/dbus/storage/interfaces/device/partition_table_examples.rb
@@ -20,6 +20,9 @@
 # find current contact information at www.suse.com.
 
 require_relative "../../../../../test_helper"
+require "y2storage/disk_size"
+require "y2storage/partition_tables/partition_slot"
+require "y2storage/region"
 
 shared_examples "PartitionTable interface" do
   describe "PartitionTable D-Bus interface" do
@@ -39,5 +42,34 @@
         expect(subject.partition_table_partitions).to contain_exactly(tree.path_for(md0p1))
       end
     end
+
+    describe "#partition_table_unused_slots" do
+      before do
+        allow(device).to receive(:partition_table).and_return(partition_table)
+        allow(partition_table).to receive(:unused_partition_slots).and_return(unused_slots)
+      end
+
+      let(:partition_table) { device.partition_table }
+
+      let(:unused_slots) do
+        [
+          instance_double(Y2Storage::PartitionTables::PartitionSlot, region: region1),
+          instance_double(Y2Storage::PartitionTables::PartitionSlot, region: region2)
+        ]
+      end
+
+      let(:region1) do
+        instance_double(Y2Storage::Region, start: 234, size: Y2Storage::DiskSize.new(1024))
+      end
+
+      let(:region2) do
+        instance_double(Y2Storage::Region, start: 987, size: Y2Storage::DiskSize.new(2048))
+      end
+
+      it "returns the information about the unused slots" do
+        md0p1 = devicegraph.find_by_name("/dev/md0p1")
+        expect(subject.partition_table_unused_slots).to contain_exactly([234, 1024], [987, 2048])
+      end
+    end
   end
 end
diff --git a/service/test/agama/dbus/storage/manager_test.rb b/service/test/agama/dbus/storage/manager_test.rb
index 958725b21..7e8566058 100644
--- a/service/test/agama/dbus/storage/manager_test.rb
+++ b/service/test/agama/dbus/storage/manager_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -22,6 +22,7 @@
 require_relative "../../../test_helper"
 require "agama/dbus/storage/manager"
 require "agama/dbus/storage/proposal"
+require "agama/storage/device_settings"
 require "agama/storage/manager"
 require "agama/storage/proposal"
 require "agama/storage/proposal_settings"
@@ -262,8 +263,9 @@
   describe "#calculate_proposal" do
     let(:dbus_settings) do
       {
-        "BootDevice"         => "/dev/vda",
-        "LVM"                => true,
+        "Target"             => "disk",
+        "TargetDevice"       => "/dev/vda",
+        "BootDevice"         => "/dev/vdb",
         "EncryptionPassword" => "n0ts3cr3t",
         "Volumes"            => dbus_volumes
       }
@@ -279,9 +281,9 @@
     it "calculates a proposal with settings having values from D-Bus" do
       expect(proposal).to receive(:calculate) do |settings|
         expect(settings).to be_a(Agama::Storage::ProposalSettings)
-        expect(settings.boot_device).to eq "/dev/vda"
-        expect(settings.lvm).to be_a(Agama::Storage::LvmSettings)
-        expect(settings.lvm.enabled).to eq true
+        expect(settings.device).to be_a(Agama::Storage::DeviceSettings::Disk)
+        expect(settings.device.name).to eq "/dev/vda"
+        expect(settings.boot.device).to eq "/dev/vdb"
         expect(settings.encryption).to be_a(Agama::Storage::EncryptionSettings)
         expect(settings.encryption.password).to eq("n0ts3cr3t")
         expect(settings.volumes).to contain_exactly(
@@ -296,12 +298,12 @@
     context "when the D-Bus settings does not include some values" do
       let(:dbus_settings) { {} }
 
-      it "calculates a proposal with default/empty values for the missing settings" do
+      it "calculates a proposal with default values for the missing settings" do
         expect(proposal).to receive(:calculate) do |settings|
           expect(settings).to be_a(Agama::Storage::ProposalSettings)
-          expect(settings.boot_device).to eq nil
-          expect(settings.lvm).to be_a(Agama::Storage::LvmSettings)
-          expect(settings.lvm.enabled).to eq false
+          expect(settings.device).to be_a(Agama::Storage::DeviceSettings::Disk)
+          expect(settings.device.name).to be_nil
+          expect(settings.boot.device).to be_nil
           expect(settings.encryption).to be_a(Agama::Storage::EncryptionSettings)
           expect(settings.encryption.password).to be_nil
           expect(settings.volumes).to eq([])
diff --git a/service/test/agama/dbus/storage/proposal_settings_conversion/from_dbus_test.rb b/service/test/agama/dbus/storage/proposal_settings_conversion/from_dbus_test.rb
index 3114f1a9e..b65221e7c 100644
--- a/service/test/agama/dbus/storage/proposal_settings_conversion/from_dbus_test.rb
+++ b/service/test/agama/dbus/storage/proposal_settings_conversion/from_dbus_test.rb
@@ -20,14 +20,15 @@
 # find current contact information at www.suse.com.
 
 require_relative "../../../../test_helper"
-require "y2storage/encryption_method"
-require "y2storage/pbkd_function"
+require "agama/dbus/storage/proposal_settings_conversion/from_dbus"
 require "agama/config"
+require "agama/storage/device_settings"
 require "agama/storage/proposal_settings"
-require "agama/dbus/storage/proposal_settings_conversion/from_dbus"
+require "y2storage/encryption_method"
+require "y2storage/pbkd_function"
 
 describe Agama::DBus::Storage::ProposalSettingsConversion::FromDBus do
-  subject { described_class.new(dbus_settings, config: config) }
+  subject { described_class.new(dbus_settings, config: config, logger: logger) }
 
   let(:config) { Agama::Config.new(config_data) }
 
@@ -59,12 +60,25 @@
     }
   end
 
+  let(:logger) { Logger.new($stdout, level: :warn) }
+
+  before do
+    allow(Agama::Storage::EncryptionSettings)
+      .to receive(:available_methods).and_return(
+        [
+          Y2Storage::EncryptionMethod::LUKS1,
+          Y2Storage::EncryptionMethod::LUKS2
+        ]
+      )
+  end
+
   describe "#convert" do
     let(:dbus_settings) do
       {
-        "BootDevice"             => "/dev/sda",
-        "LVM"                    => true,
-        "SystemVGDevices"        => ["/dev/sda", "/dev/sdb"],
+        "Target"                 => "disk",
+        "TargetDevice"           => "/dev/sda",
+        "ConfigureBoot"          => true,
+        "BootDevice"             => "/dev/sdb",
         "EncryptionPassword"     => "notsecret",
         "EncryptionMethod"       => "luks1",
         "EncryptionPBKDFunction" => "pbkdf2",
@@ -90,16 +104,20 @@
       settings = subject.convert
 
       expect(settings).to be_a(Agama::Storage::ProposalSettings)
-      expect(settings.boot_device).to eq("/dev/sda")
-      expect(settings.lvm.enabled?).to eq(true)
-      expect(settings.lvm.system_vg_devices).to contain_exactly("/dev/sda", "/dev/sdb")
+      expect(settings.device).to be_a(Agama::Storage::DeviceSettings::Disk)
+      expect(settings.device.name).to eq("/dev/sda")
+      expect(settings.boot.configure?).to eq(true)
+      expect(settings.boot.device).to eq("/dev/sdb")
       expect(settings.encryption.method).to eq(Y2Storage::EncryptionMethod::LUKS1)
       expect(settings.encryption.pbkd_function).to eq(Y2Storage::PbkdFunction::PBKDF2)
       expect(settings.space.policy).to eq(:custom)
       expect(settings.space.actions).to eq({
         "/dev/sda" => :force_delete, "/dev/sdb1" => :resize
       })
-      expect(settings.volumes.map(&:mount_path)).to contain_exactly("/", "/test")
+      expect(settings.volumes).to contain_exactly(
+        an_object_having_attributes(mount_path: "/"),
+        an_object_having_attributes(mount_path: "/test")
+      )
     end
 
     context "when some values are not provided from D-Bus" do
@@ -109,22 +127,96 @@
         settings = subject.convert
 
         expect(settings).to be_a(Agama::Storage::ProposalSettings)
-        expect(settings.boot_device).to be_nil
-        expect(settings.lvm.enabled?).to eq(false)
+        expect(settings.device).to be_a(Agama::Storage::DeviceSettings::Disk)
+        expect(settings.device.name).to be_nil
+        expect(settings.boot.configure?).to eq(true)
+        expect(settings.boot.device).to be_nil
         expect(settings.encryption.method).to eq(Y2Storage::EncryptionMethod::LUKS2)
         expect(settings.encryption.pbkd_function).to eq(Y2Storage::PbkdFunction::ARGON2ID)
         expect(settings.space.policy).to eq(:delete)
-        expect(settings.volumes.map(&:mount_path)).to contain_exactly("/", "swap")
+        expect(settings.volumes).to contain_exactly(
+          an_object_having_attributes(mount_path: "/"),
+          an_object_having_attributes(mount_path: "swap")
+        )
+      end
+    end
+
+    context "when 'Target' is not provided from D-Bus" do
+      let(:dbus_settings) { {} }
+
+      it "sets device settings to create partitions" do
+        settings = subject.convert
+
+        expect(settings.device).to be_a(Agama::Storage::DeviceSettings::Disk)
+        expect(settings.device.name).to be_nil
+      end
+    end
+
+    context "when 'Target' has 'disk' value" do
+      let(:dbus_settings) do
+        {
+          "Target"       => "disk",
+          "TargetDevice" => "/dev/vda"
+        }
+      end
+
+      it "sets device settings to create partitions in the indicated device" do
+        settings = subject.convert
+
+        expect(settings.device).to be_a(Agama::Storage::DeviceSettings::Disk)
+        expect(settings.device.name).to eq("/dev/vda")
       end
     end
 
-    context "when an empty boot device is provided from D-Bus" do
-      let(:dbus_settings) { { "BootDevice" => "" } }
+    context "when 'Target' has 'newLvmVg' value" do
+      let(:dbus_settings) do
+        {
+          "Target"          => "newLvmVg",
+          "TargetPVDevices" => ["/dev/vda", "/dev/vdb"]
+        }
+      end
+
+      it "sets device settings to create a new LVM volume group in the indicated devices" do
+        settings = subject.convert
+
+        expect(settings.device).to be_a(Agama::Storage::DeviceSettings::NewLvmVg)
+        expect(settings.device.candidate_pv_devices).to contain_exactly("/dev/vda", "/dev/vdb")
+      end
+    end
+
+    context "when 'Target' has 'reusedLvmVg' value" do
+      let(:dbus_settings) do
+        {
+          "Target"       => "reusedLvmVg",
+          "TargetDevice" => "/dev/vg0"
+        }
+      end
 
-      it "sets the boot device to nil" do
+      it "sets device settings to reuse the indicated LVM volume group" do
         settings = subject.convert
 
-        expect(settings.boot_device).to be_nil
+        expect(settings.device).to be_a(Agama::Storage::DeviceSettings::ReusedLvmVg)
+        expect(settings.device.name).to eq("/dev/vg0")
+      end
+    end
+
+    context "when some value provided from D-Bus has unexpected type" do
+      let(:dbus_settings) { { "BootDevice" => 1 } }
+
+      it "ignores the value" do
+        settings = subject.convert
+
+        expect(settings.boot.device).to be_nil
+      end
+    end
+
+    context "when some unexpected setting is provided from D-Bus" do
+      let(:dbus_settings) { { "Foo" => 1 } }
+
+      it "does not fail" do
+        settings = subject.convert
+
+        expect(settings).to be_a(Agama::Storage::ProposalSettings)
       end
     end
 
@@ -133,12 +225,17 @@
 
       it "completes the volumes with the default volumes from config" do
         settings = subject.convert
-        expect(settings.volumes.map(&:mount_path)).to contain_exactly("/", "swap")
+        expect(settings.volumes).to contain_exactly(
+          an_object_having_attributes(mount_path: "/"),
+          an_object_having_attributes(mount_path: "swap")
+        )
       end
 
       it "ignores templates of non-default volumes" do
         settings = subject.convert
-        expect(settings.volumes.map(&:mount_path)).to_not include("/home")
+        expect(settings.volumes).to_not include(
+          an_object_having_attributes(mount_path: "/home")
+        )
       end
     end
 
@@ -153,22 +250,30 @@
 
       it "completes the volumes with the mandatory volumes" do
         settings = subject.convert
-        expect(settings.volumes.map(&:mount_path)).to include("/")
+        expect(settings.volumes).to include(
+          an_object_having_attributes(mount_path: "/")
+        )
       end
 
       it "includes the volumes provided from D-Bus" do
         settings = subject.convert
-        expect(settings.volumes.map(&:mount_path)).to include("/test")
+        expect(settings.volumes).to include(
+          an_object_having_attributes(mount_path: "/test")
+        )
       end
 
       it "ignores default volumes that are not mandatory" do
         settings = subject.convert
-        expect(settings.volumes.map(&:mount_path)).to_not include("swap")
+        expect(settings.volumes).to_not include(
+          an_object_having_attributes(mount_path: "swap")
+        )
       end
 
       it "ignores templates for excluded volumes" do
         settings = subject.convert
-        expect(settings.volumes.map(&:mount_path)).to_not include("/home")
+        expect(settings.volumes).to_not include(
+          an_object_having_attributes(mount_path: "/home")
+        )
       end
     end
   end
diff --git a/service/test/agama/dbus/storage/proposal_settings_conversion/to_dbus_test.rb b/service/test/agama/dbus/storage/proposal_settings_conversion/to_dbus_test.rb
index 44ef43b0c..76700c39c 100644
--- a/service/test/agama/dbus/storage/proposal_settings_conversion/to_dbus_test.rb
+++ b/service/test/agama/dbus/storage/proposal_settings_conversion/to_dbus_test.rb
@@ -20,20 +20,20 @@
 # find current contact information at www.suse.com.
 
 require_relative "../../../../test_helper"
-require "y2storage/encryption_method"
-require "y2storage/pbkd_function"
 require "agama/dbus/storage/proposal_settings_conversion/to_dbus"
+require "agama/storage/device_settings"
 require "agama/storage/proposal_settings"
 require "agama/storage/volume"
+require "y2storage/encryption_method"
+require "y2storage/pbkd_function"
 
 describe Agama::DBus::Storage::ProposalSettingsConversion::ToDBus do
   let(:default_settings) { Agama::Storage::ProposalSettings.new }
 
   let(:custom_settings) do
     Agama::Storage::ProposalSettings.new.tap do |settings|
-      settings.boot_device = "/dev/sda"
-      settings.lvm.enabled = true
-      settings.lvm.system_vg_devices = ["/dev/sda", "/dev/sdb"]
+      settings.device.name = "/dev/sda"
+      settings.boot.device = "/dev/sdb"
       settings.encryption.password = "notsecret"
       settings.encryption.method = Y2Storage::EncryptionMethod::LUKS2
       settings.encryption.pbkd_function = Y2Storage::PbkdFunction::ARGON2ID
@@ -46,9 +46,11 @@
   describe "#convert" do
     it "converts the settings to a D-Bus hash" do
       expect(described_class.new(default_settings).convert).to eq(
+        "Target"                 => "disk",
+        "TargetDevice"           => "",
+        "ConfigureBoot"          => true,
         "BootDevice"             => "",
-        "LVM"                    => false,
-        "SystemVGDevices"        => [],
+        "DefaultBootDevice"      => "",
         "EncryptionPassword"     => "",
         "EncryptionMethod"       => "luks2",
         "EncryptionPBKDFunction" => "pbkdf2",
@@ -58,9 +60,11 @@
       )
 
       expect(described_class.new(custom_settings).convert).to eq(
-        "BootDevice"             => "/dev/sda",
-        "LVM"                    => true,
-        "SystemVGDevices"        => ["/dev/sda", "/dev/sdb"],
+        "Target"                 => "disk",
+        "TargetDevice"           => "/dev/sda",
+        "ConfigureBoot"          => true,
+        "BootDevice"             => "/dev/sdb",
+        "DefaultBootDevice"      => "/dev/sda",
         "EncryptionPassword"     => "notsecret",
         "EncryptionMethod"       => "luks2",
         "EncryptionPBKDFunction" => "argon2id",
@@ -80,7 +84,7 @@
             "MountPath"     => "/test",
             "MountOptions"  => [],
             "TargetDevice"  => "",
-            "TargetVG"      => "",
+            "Target"        => "default",
             "FsType"        => "",
             "MinSize"       => 0,
             "AutoSize"      => false,
@@ -99,5 +103,62 @@
         ]
       )
     end
+
+    context "when the device is set to create partitions" do
+      let(:settings) do
+        Agama::Storage::ProposalSettings.new.tap do |settings|
+          settings.device = Agama::Storage::DeviceSettings::Disk.new("/dev/vda")
+        end
+      end
+
+      it "generates settings to use a disk as target device" do
+        dbus_settings = described_class.new(settings).convert
+
+        expect(dbus_settings).to include(
+          "Target"       => "disk",
+          "TargetDevice" => "/dev/vda"
+        )
+
+        expect(dbus_settings).to_not include("TargetPVDevices")
+      end
+    end
+
+    context "when the device is set to create a new LVM volume group" do
+      let(:settings) do
+        Agama::Storage::ProposalSettings.new.tap do |settings|
+          settings.device = Agama::Storage::DeviceSettings::NewLvmVg.new(["/dev/vda"])
+        end
+      end
+
+      it "generates settings to create a LVM volume group as target device" do
+        dbus_settings = described_class.new(settings).convert
+
+        expect(dbus_settings).to include(
+          "Target"          => "newLvmVg",
+          "TargetPVDevices" => ["/dev/vda"]
+        )
+
+        expect(dbus_settings).to_not include("TargetDevice")
+      end
+    end
+
+    context "when the device is set to reuse a LVM volume group" do
+      let(:settings) do
+        Agama::Storage::ProposalSettings.new.tap do |settings|
+          settings.device = Agama::Storage::DeviceSettings::ReusedLvmVg.new("/dev/vg0")
+        end
+      end
+
+      it "generates settings to reuse a LVM volume group as target device" do
+        dbus_settings = described_class.new(settings).convert
+
+        expect(dbus_settings).to include(
+          "Target"       => "reusedLvmVg",
+          "TargetDevice" => "/dev/vg0"
+        )
+
+        expect(dbus_settings).to_not include("TargetPVDevices")
+      end
+    end
   end
 end
diff --git a/service/test/agama/dbus/storage/proposal_settings_conversion_test.rb b/service/test/agama/dbus/storage/proposal_settings_conversion_test.rb
index f4a0c1502..236e98db3 100644
--- a/service/test/agama/dbus/storage/proposal_settings_conversion_test.rb
+++ b/service/test/agama/dbus/storage/proposal_settings_conversion_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -30,8 +30,10 @@
 
     let(:dbus_settings) { {} }
 
+    let(:logger) { Logger.new($stdout, level: :warn) }
+
     it "generates proposal settings from D-Bus settings" do
-      result = described_class.from_dbus(dbus_settings, config: config)
+      result = described_class.from_dbus(dbus_settings, config: config, logger: logger)
       expect(result).to be_a(Agama::Storage::ProposalSettings)
     end
   end
diff --git a/service/test/agama/dbus/storage/proposal_test.rb b/service/test/agama/dbus/storage/proposal_test.rb
index 790014eea..cfc18c7be 100644
--- a/service/test/agama/dbus/storage/proposal_test.rb
+++ b/service/test/agama/dbus/storage/proposal_test.rb
@@ -21,6 +21,7 @@
 
 require_relative "../../../test_helper"
 require "agama/dbus/storage/proposal"
+require "agama/storage/device_settings"
 require "agama/storage/proposal"
 require "agama/storage/proposal_settings"
 require "agama/storage/volume"
@@ -29,212 +30,66 @@
 describe Agama::DBus::Storage::Proposal do
   subject { described_class.new(backend, logger) }
 
-  let(:logger) { Logger.new($stdout, level: :warn) }
-
   let(:backend) do
     instance_double(Agama::Storage::Proposal, settings: settings)
   end
 
-  let(:settings) { nil }
-
-  describe "#boot_device" do
-    context "if a proposal has not been calculated yet" do
-      let(:settings) { nil }
-
-      it "returns an empty string" do
-        expect(subject.boot_device).to eq ""
-      end
-    end
-
-    context "if a proposal has been calculated" do
-      let(:settings) do
-        Agama::Storage::ProposalSettings.new.tap { |s| s.boot_device = "/dev/vda" }
-      end
-
-      it "returns the candidate devices used by the proposal" do
-        expect(subject.boot_device).to eq "/dev/vda"
-      end
-    end
-  end
-
-  describe "#lvm" do
-    context "if a proposal has not been calculated yet" do
-      let(:settings) { nil }
-
-      it "returns false" do
-        expect(subject.lvm).to eq(false)
-      end
-    end
-
-    context "if a proposal has been calculated" do
-      let(:settings) do
-        Agama::Storage::ProposalSettings.new.tap { |s| s.lvm.enabled = true }
-      end
-
-      it "return whether LVM was used" do
-        expect(subject.lvm).to eq(true)
-      end
-    end
-  end
-
-  describe "#system_vg_devices" do
-    context "if a proposal has not been calculated yet" do
-      let(:settings) { nil }
-
-      it "returns an empty list" do
-        expect(subject.system_vg_devices).to eq([])
-      end
-    end
-
-    context "if a proposal has been calculated" do
-      let(:settings) do
-        Agama::Storage::ProposalSettings.new.tap { |s| s.lvm.system_vg_devices = ["/dev/vda"] }
-      end
-
-      it "returns the devices used for the system VG" do
-        expect(subject.system_vg_devices).to contain_exactly("/dev/vda")
-      end
-    end
-  end
-
-  describe "#encryption_password" do
-    context "if a proposal has not been calculated yet" do
-      let(:settings) { nil }
-
-      it "returns an empty string" do
-        expect(subject.encryption_password).to eq("")
-      end
-    end
-
-    context "if a proposal has been calculated" do
-      let(:settings) do
-        Agama::Storage::ProposalSettings.new.tap { |s| s.encryption.password = "n0ts3cr3t" }
-      end
-
-      it "return the encryption password used by the proposal" do
-        expect(subject.encryption_password).to eq("n0ts3cr3t")
-      end
-    end
-  end
-
-  describe "#encryption_method" do
-    context "if a proposal has not been calculated yet" do
-      let(:settings) { nil }
-
-      it "returns an empty string" do
-        expect(subject.encryption_method).to eq("")
-      end
-    end
-
-    context "if a proposal has been calculated" do
-      let(:settings) do
-        Agama::Storage::ProposalSettings.new.tap { |s| s.encryption.method = luks2 }
-      end
-
-      let(:luks2) { Y2Storage::EncryptionMethod::LUKS2 }
-
-      it "return the encryption method used by the proposal" do
-        expect(subject.encryption_method).to eq(luks2.id.to_s)
-      end
-    end
-  end
-
-  describe "#encryption_pbkd_function" do
-    context "if a proposal has not been calculated yet" do
-      let(:settings) { nil }
-
-      it "returns an empty string" do
-        expect(subject.encryption_pbkd_function).to eq("")
-      end
-    end
-
-    context "if a proposal has been calculated" do
-      let(:settings) do
-        Agama::Storage::ProposalSettings.new.tap { |s| s.encryption.pbkd_function = argon2id }
-      end
-
-      let(:argon2id) { Y2Storage::PbkdFunction::ARGON2ID }
-
-      it "return the encryption method used by the proposal" do
-        expect(subject.encryption_pbkd_function).to eq(argon2id.value)
-      end
-    end
-  end
-
-  describe "#space_policy" do
-    context "if a proposal has not been calculated yet" do
-      let(:settings) { nil }
-
-      it "returns an empty string" do
-        expect(subject.space_policy).to eq("")
-      end
-    end
-
-    context "if a proposal has been calculated" do
-      let(:settings) do
-        Agama::Storage::ProposalSettings.new.tap { |s| s.space.policy = :delete }
-      end
+  let(:logger) { Logger.new($stdout, level: :warn) }
 
-      it "return the space policy used by the proposal" do
-        expect(subject.space_policy).to eq("delete")
-      end
-    end
-  end
+  let(:settings) { nil }
 
-  describe "#space_actions" do
+  describe "#settings" do
     context "if a proposal has not been calculated yet" do
       let(:settings) { nil }
 
-      it "returns an empty list" do
-        expect(subject.space_actions).to eq([])
+      it "returns an empty hash" do
+        expect(subject.settings).to eq({})
       end
     end
 
     context "if a proposal has been calculated" do
       let(:settings) do
         Agama::Storage::ProposalSettings.new.tap do |settings|
+          settings.device = Agama::Storage::DeviceSettings::Disk.new("/dev/vda")
+          settings.boot.device = "/dev/vdb"
+          settings.encryption.password = "n0ts3cr3t"
+          settings.encryption.method = luks2
+          settings.encryption.pbkd_function = argon2id
+          settings.space.policy = :custom
           settings.space.actions = {
             "/dev/vda1" => :force_delete,
             "/dev/vda2" => :resize
           }
+          settings.volumes = [
+            Agama::Storage::Volume.new("/test1"),
+            Agama::Storage::Volume.new("/test2")
+          ]
         end
       end
 
-      it "return a list with a hash for each action" do
-        expect(subject.space_actions).to contain_exactly(
-          { "Device" => "/dev/vda1", "Action" => "force_delete" },
-          { "Device" => "/dev/vda2", "Action" => "resize" }
-        )
-      end
-    end
-  end
-
-  describe "#volumes" do
-    let(:settings) do
-      Agama::Storage::ProposalSettings.new.tap { |s| s.volumes = calculated_volumes }
-    end
-
-    context "if the calculated settings has no volumes" do
-      let(:calculated_volumes) { [] }
-
-      it "returns an empty list" do
-        expect(subject.volumes).to eq([])
-      end
-    end
-
-    context "if the calculated settings has volumes" do
-      let(:calculated_volumes) { [calculated_volume1, calculated_volume2] }
-      let(:calculated_volume1) { Agama::Storage::Volume.new("/test1") }
-      let(:calculated_volume2) { Agama::Storage::Volume.new("/test2") }
-
-      it "returns a list with a hash for each volume" do
-        expect(subject.volumes.size).to eq(2)
-        expect(subject.volumes).to all(be_a(Hash))
+      let(:luks2) { Y2Storage::EncryptionMethod::LUKS2 }
 
-        volume1, volume2 = subject.volumes
+      let(:argon2id) { Y2Storage::PbkdFunction::ARGON2ID }
 
-        expect(volume1).to include("MountPath" => "/test1")
-        expect(volume2).to include("MountPath" => "/test2")
+      it "returns the proposal settings in D-Bus format" do
+        expect(subject.settings).to include(
+          "Target"                 => "disk",
+          "TargetDevice"           => "/dev/vda",
+          "ConfigureBoot"          => true,
+          "BootDevice"             => "/dev/vdb",
+          "EncryptionPassword"     => "n0ts3cr3t",
+          "EncryptionMethod"       => luks2.id.to_s,
+          "EncryptionPBKDFunction" => argon2id.value,
+          "SpacePolicy"            => "custom",
+          "SpaceActions"           => [
+            { "Device" => "/dev/vda1", "Action" => "force_delete" },
+            { "Device" => "/dev/vda2", "Action" => "resize" }
+          ],
+          "Volumes"                => [
+            include("MountPath" => "/test1"),
+            include("MountPath" => "/test2")
+          ]
+        )
       end
     end
   end
@@ -257,14 +112,18 @@
 
       let(:action1) do
         instance_double(Y2Storage::CompoundAction,
-          sentence: "test1", device_is?: false, delete?: false)
+          sentence: "test1", target_device: device1, device_is?: false, delete?: false)
       end
 
       let(:action2) do
         instance_double(Y2Storage::CompoundAction,
-          sentence: "test2", device_is?: true, delete?: true)
+          sentence: "test2", target_device: device2, device_is?: true, delete?: true)
       end
 
+      let(:device1) { instance_double(Y2Storage::Device, sid: 1) }
+
+      let(:device2) { instance_double(Y2Storage::Device, sid: 2) }
+
       it "returns a list with a hash for each action" do
         expect(subject.actions.size).to eq(2)
         expect(subject.actions).to all(be_a(Hash))
@@ -272,12 +131,14 @@
         action1, action2 = subject.actions
 
         expect(action1).to eq({
+          "Device" => 1,
           "Text"   => "test1",
           "Subvol" => false,
           "Delete" => false
         })
 
         expect(action2).to eq({
+          "Device" => 2,
           "Text"   => "test2",
           "Subvol" => true,
           "Delete" => true
diff --git a/service/test/agama/dbus/storage/volume_conversion/from_dbus_test.rb b/service/test/agama/dbus/storage/volume_conversion/from_dbus_test.rb
index c44187937..e3d3e2bfa 100644
--- a/service/test/agama/dbus/storage/volume_conversion/from_dbus_test.rb
+++ b/service/test/agama/dbus/storage/volume_conversion/from_dbus_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -61,13 +61,15 @@
     }
   end
 
+  let(:logger) { Logger.new($stdout, level: :warn) }
+
   describe "#convert" do
     let(:dbus_volume) do
       {
         "MountPath"    => "/test",
         "MountOptions" => ["rw", "default"],
         "TargetDevice" => "/dev/sda",
-        "TargetVG"     => "/dev/system",
+        "Target"       => "new_vg",
         "FsType"       => "Ext4",
         "MinSize"      => 1024,
         "MaxSize"      => 2048,
@@ -89,8 +91,8 @@
       expect(volume).to be_a(Agama::Storage::Volume)
       expect(volume.mount_path).to eq("/test")
       expect(volume.mount_options).to contain_exactly("rw", "default")
-      expect(volume.device).to eq("/dev/sda")
-      expect(volume.separate_vg_name).to eq("/dev/system")
+      expect(volume.location.device).to eq("/dev/sda")
+      expect(volume.location.target).to eq(:new_vg)
       expect(volume.fs_type).to eq(Y2Storage::Filesystems::Type::EXT4)
       expect(volume.auto_size?).to eq(false)
       expect(volume.min_size.to_i).to eq(1024)
@@ -107,8 +109,7 @@
         expect(volume).to be_a(Agama::Storage::Volume)
         expect(volume.mount_path).to eq("/test")
         expect(volume.mount_options).to contain_exactly("data=ordered")
-        expect(volume.device).to be_nil
-        expect(volume.separate_vg_name).to be_nil
+        expect(volume.location.target).to eq :default
         expect(volume.fs_type).to eq(Y2Storage::Filesystems::Type::BTRFS)
         expect(volume.auto_size?).to eq(false)
         expect(volume.min_size.to_i).to eq(5 * (1024**3))
@@ -243,5 +244,20 @@
         expect(volume.btrfs.snapshots?).to eq(false)
       end
     end
+
+    context "when the D-Bus settings provide a Target that makes no sense" do
+      let(:dbus_volume) do
+        {
+          "MountPath" => "/test",
+          "Target"    => "new_disk"
+        }
+      end
+
+      it "ignores the Target value provided from D-Bus and uses :default" do
+        volume = subject.convert
+
+        expect(volume.location.target).to eq :default
+      end
+    end
   end
 end
diff --git a/service/test/agama/dbus/storage/volume_conversion/to_dbus_test.rb b/service/test/agama/dbus/storage/volume_conversion/to_dbus_test.rb
index 9fffa181a..9fc2db274 100644
--- a/service/test/agama/dbus/storage/volume_conversion/to_dbus_test.rb
+++ b/service/test/agama/dbus/storage/volume_conversion/to_dbus_test.rb
@@ -20,10 +20,10 @@
 # find current contact information at www.suse.com.
 
 require_relative "../../../../test_helper"
-require "y2storage/filesystems/type"
-require "y2storage/disk_size"
 require "agama/dbus/storage/volume_conversion/to_dbus"
 require "agama/storage/volume"
+require "y2storage/filesystems/type"
+require "y2storage/disk_size"
 
 describe Agama::DBus::Storage::VolumeConversion::ToDBus do
   let(:default_volume) { Agama::Storage::Volume.new("/test") }
@@ -47,8 +47,8 @@
       volume.btrfs.snapshots = true
       volume.btrfs.read_only = true
       volume.mount_options = ["rw", "default"]
-      volume.device = "/dev/sda"
-      volume.separate_vg_name = "/dev/system"
+      volume.location.device = "/dev/sda"
+      volume.location.target = :new_partition
       volume.min_size = Y2Storage::DiskSize.new(1024)
       volume.max_size = Y2Storage::DiskSize.new(2048)
       volume.auto_size = true
@@ -61,7 +61,7 @@
         "MountPath"     => "/test",
         "MountOptions"  => [],
         "TargetDevice"  => "",
-        "TargetVG"      => "",
+        "Target"        => "default",
         "FsType"        => "",
         "MinSize"       => 0,
         "AutoSize"      => false,
@@ -82,7 +82,7 @@
         "MountPath"     => "/test",
         "MountOptions"  => ["rw", "default"],
         "TargetDevice"  => "/dev/sda",
-        "TargetVG"      => "/dev/system",
+        "Target"        => "new_partition",
         "FsType"        => "Ext4",
         "MinSize"       => 1024,
         "MaxSize"       => 2048,
diff --git a/service/test/agama/dbus/storage/volume_conversion_test.rb b/service/test/agama/dbus/storage/volume_conversion_test.rb
index 5f158a185..5dd15d7a9 100644
--- a/service/test/agama/dbus/storage/volume_conversion_test.rb
+++ b/service/test/agama/dbus/storage/volume_conversion_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -30,8 +30,10 @@
 
     let(:dbus_volume) { {} }
 
+    let(:logger) { Logger.new($stdout, level: :warn) }
+
     it "generates a volume from D-Bus settings" do
-      result = described_class.from_dbus(dbus_volume, config: config)
+      result = described_class.from_dbus(dbus_volume, config: config, logger: logger)
       expect(result).to be_a(Agama::Storage::Volume)
     end
   end
diff --git a/service/test/agama/dbus/types_test.rb b/service/test/agama/dbus/types_test.rb
new file mode 100644
index 000000000..6661508be
--- /dev/null
+++ b/service/test/agama/dbus/types_test.rb
@@ -0,0 +1,167 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2024] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require_relative "../../test_helper"
+require "agama/dbus/types"
+
+describe Agama::DBus::Types::Checker do
+  describe "#match?" do
+    describe "for Bool type" do
+      subject { described_class.new(Agama::DBus::Types::BOOL) }
+
+      it "returns true if the given value is true or false" do
+        expect(subject.match?(true)).to eq(true)
+        expect(subject.match?(false)).to eq(true)
+      end
+
+      it "returns false otherwise" do
+        expect(subject.match?(nil)).to eq(false)
+        expect(subject.match?("foo")).to eq(false)
+        expect(subject.match?(10)).to eq(false)
+        expect(subject.match?([])).to eq(false)
+        expect(subject.match?({})).to eq(false)
+      end
+    end
+
+    describe "for Array type" do
+      subject { described_class.new(array_type) }
+
+      let(:array_type) { Agama::DBus::Types::Array.new }
+
+      it "returns true if the given value is an array" do
+        expect(subject.match?([])).to eq(true)
+        expect(subject.match?([1, 2])).to eq(true)
+      end
+
+      it "returns false otherwise" do
+        expect(subject.match?(nil)).to eq(false)
+        expect(subject.match?("foo")).to eq(false)
+        expect(subject.match?(10)).to eq(false)
+        expect(subject.match?(true)).to eq(false)
+        expect(subject.match?({})).to eq(false)
+      end
+
+      context "if the elements of the array have to be of a specific type" do
+        let(:array_type) { Agama::DBus::Types::Array.new(String) }
+
+        it "returns true if all the elements match the given type" do
+          expect(subject.match?([])).to eq(true)
+          expect(subject.match?(["foo", "bar"])).to eq(true)
+        end
+
+        it "returns false otherwise" do
+          expect(subject.match?([nil])).to eq(false)
+          expect(subject.match?([10])).to eq(false)
+          expect(subject.match?([true])).to eq(false)
+          expect(subject.match?([[]])).to eq(false)
+          expect(subject.match?([{}])).to eq(false)
+        end
+      end
+    end
+
+    describe "for Hash type" do
+      subject { described_class.new(hash_type) }
+
+      let(:hash_type) { Agama::DBus::Types::Hash.new }
+
+      it "returns true if the given value is an hash" do
+        expect(subject.match?({})).to eq(true)
+        expect(subject.match?({ foo: "", bar: 1 })).to eq(true)
+      end
+
+      it "returns false otherwise" do
+        expect(subject.match?(nil)).to eq(false)
+        expect(subject.match?("foo")).to eq(false)
+        expect(subject.match?(10)).to eq(false)
+        expect(subject.match?(true)).to eq(false)
+        expect(subject.match?([])).to eq(false)
+      end
+
+      context "if the keys of the hash have to be of a specific type" do
+        let(:hash_type) { Agama::DBus::Types::Hash.new(key: String) }
+
+        it "returns true if all the keys match the given type" do
+          expect(subject.match?({})).to eq(true)
+          expect(subject.match?({ "foo" => "", "bar" => 1 })).to eq(true)
+        end
+
+        it "returns false otherwise" do
+          expect(subject.match?({ nil: 1 })).to eq(false)
+          expect(subject.match?({ a: 1 })).to eq(false)
+          expect(subject.match?({ 10 => 1 })).to eq(false)
+          expect(subject.match?({ true => 1 })).to eq(false)
+          expect(subject.match?({ [] => 1 })).to eq(false)
+          expect(subject.match?({ {} => 1 })).to eq(false)
+        end
+      end
+
+      context "if the values of the hash have to be of a specific type" do
+        let(:hash_type) { Agama::DBus::Types::Hash.new(value: Integer) }
+
+        it "returns true if all the values match the given type" do
+          expect(subject.match?({})).to eq(true)
+          expect(subject.match?({ "foo" => 1, bar: 2 })).to eq(true)
+        end
+
+        it "returns false otherwise" do
+          expect(subject.match?({ foo: nil })).to eq(false)
+          expect(subject.match?({ foo: 1.0 })).to eq(false)
+          expect(subject.match?({ foo: "" })).to eq(false)
+          expect(subject.match?({ foo: [] })).to eq(false)
+          expect(subject.match?({ foo: {} })).to eq(false)
+        end
+      end
+
+      context "if the keys and the values of the hash have to be of a specific type" do
+        let(:hash_type) do
+          Agama::DBus::Types::Hash.new(key: String, value: Agama::DBus::Types::BOOL)
+        end
+
+        it "returns true if all the keys and values match the given types" do
+          expect(subject.match?({})).to eq(true)
+          expect(subject.match?({ "foo" => true, "bar" => false })).to eq(true)
+        end
+
+        it "returns false otherwise" do
+          expect(subject.match?({ "foo" => nil })).to eq(false)
+          expect(subject.match?({ foo: true })).to eq(false)
+        end
+      end
+    end
+
+    describe "for other types" do
+      subject { described_class.new(Array) }
+
+      it "returns true if the given value is an instance of the given type" do
+        expect(subject.match?([])).to eq(true)
+        expect(subject.match?([1, 2])).to eq(true)
+      end
+
+      it "returns false otherwise" do
+        expect(subject.match?(nil)).to eq(false)
+        expect(subject.match?("foo")).to eq(false)
+        expect(subject.match?(10)).to eq(false)
+        expect(subject.match?(true)).to eq(false)
+        expect(subject.match?({})).to eq(false)
+      end
+    end
+  end
+end
diff --git a/service/test/agama/storage/proposal_settings_conversion/from_y2storage_test.rb b/service/test/agama/storage/proposal_settings_conversion/from_y2storage_test.rb
index c01e40a4e..93f0f9e51 100644
--- a/service/test/agama/storage/proposal_settings_conversion/from_y2storage_test.rb
+++ b/service/test/agama/storage/proposal_settings_conversion/from_y2storage_test.rb
@@ -20,168 +20,60 @@
 # find current contact information at www.suse.com.
 
 require_relative "../../../test_helper"
-require "agama/storage/proposal_settings_conversion/from_y2storage"
 require "agama/config"
+require "agama/storage/proposal_settings"
+require "agama/storage/proposal_settings_conversion/from_y2storage"
 require "y2storage"
 
 describe Agama::Storage::ProposalSettingsConversion::FromY2Storage do
-  subject { described_class.new(y2storage_settings, config: config) }
-
-  let(:config) { Agama::Config.new }
+  subject { described_class.new(y2storage_settings, original_settings) }
+
+  let(:y2storage_settings) do
+    Y2Storage::ProposalSettings.new.tap do |settings|
+      settings.space_settings.actions = {
+        "/dev/sda"  => :force_delete,
+        "/dev/sdb1" => :resize
+      }
+    end
+  end
 
-  describe "#convert" do
-    let(:y2storage_settings) do
-      Y2Storage::ProposalSettings.new.tap do |settings|
-        settings.root_device = "/dev/sda"
-        settings.lvm = false
-        settings.candidate_devices = ["/dev/sda"]
-        settings.encryption_password = "notsecret"
-        settings.encryption_method = Y2Storage::EncryptionMethod::LUKS2
-        settings.encryption_pbkdf = Y2Storage::PbkdFunction::ARGON2ID
-        settings.space_settings.actions = {
-          "/dev/sda"  => :force_delete,
-          "/dev/sdb1" => :resize
-        }
-        settings.volumes = []
-      end
+  let(:original_settings) do
+    Agama::Storage::ProposalSettings.new.tap do |settings|
+      settings.device.name = "/dev/sda"
+      settings.boot.device = "/dev/sdb"
+      settings.encryption.password = "notsecret"
+      settings.encryption.method = Y2Storage::EncryptionMethod::LUKS2
+      settings.encryption.pbkd_function = Y2Storage::PbkdFunction::ARGON2ID
+      settings.space.policy = :delete
+      settings.space.actions = []
+      settings.volumes = [Agama::Storage::Volume.new("/test")]
     end
+  end
 
-    it "converts the Y2Storage settings to Agama settings" do
+  describe "#convert" do
+    it "generates settings with the same values as the given settings" do
       settings = subject.convert
 
       expect(settings).to be_a(Agama::Storage::ProposalSettings)
-      expect(settings).to have_attributes(
-        boot_device: "/dev/sda",
-        lvm:         an_object_having_attributes(
-          enabled:           false,
-          system_vg_devices: []
-        ),
-        encryption:  an_object_having_attributes(
-          password:      "notsecret",
-          method:        Y2Storage::EncryptionMethod::LUKS2,
-          pbkd_function: Y2Storage::PbkdFunction::ARGON2ID
-        ),
-        space:       an_object_having_attributes(
-          actions: { "/dev/sda" => :force_delete, "/dev/sdb1" => :resize }
-        ),
-        volumes:     []
+      expect(settings.device).to be_a(Agama::Storage::DeviceSettings::Disk)
+      expect(settings.device.name).to eq("/dev/sda")
+      expect(settings.boot.device).to eq("/dev/sdb")
+      expect(settings.encryption.password).to eq("notsecret")
+      expect(settings.encryption.method).to eq(Y2Storage::EncryptionMethod::LUKS2)
+      expect(settings.encryption.pbkd_function).to eq(Y2Storage::PbkdFunction::ARGON2ID)
+      expect(settings.space.policy).to eq(:delete)
+      expect(settings.volumes).to contain_exactly(
+        an_object_having_attributes(mount_path: "/test")
       )
     end
 
-    context "LVM settings conversion" do
-      before do
-        y2storage_settings.root_device = "/dev/sda"
-        y2storage_settings.candidate_devices = candidate_devices
-      end
-
-      context "when the candidate devices only includes the root device" do
-        let(:candidate_devices) { ["/dev/sda"] }
-
-        it "does not set system VG devices" do
-          settings = subject.convert
-
-          expect(settings).to have_attributes(
-            lvm: an_object_having_attributes(
-              system_vg_devices: []
-            )
-          )
-        end
-      end
-
-      context "when the candidate devices includes the root device and other devices" do
-        let(:candidate_devices) { ["/dev/sda", "/dev/sdb"] }
-
-        it "sets the candidate devices as system VG devices" do
-          settings = subject.convert
-
-          expect(settings).to have_attributes(
-            lvm: an_object_having_attributes(
-              system_vg_devices: contain_exactly("/dev/sda", "/dev/sdb")
-            )
-          )
-        end
-      end
-
-      context "when the candidate devices only includes other devices" do
-        let(:candidate_devices) { ["/dev/sdb", "/dev/sdc"] }
-
-        it "sets the candidate devices as system VG devices" do
-          settings = subject.convert
-
-          expect(settings).to have_attributes(
-            lvm: an_object_having_attributes(
-              system_vg_devices: contain_exactly("/dev/sdb", "/dev/sdc")
-            )
-          )
-        end
-
-        it "does not set the root device as system VG device" do
-          settings = subject.convert
-
-          expect(settings.lvm.system_vg_devices).to_not include("/dev/sda")
-        end
-      end
-    end
-
-    context "volumes conversion" do
-      before do
-        y2storage_settings.volumes = [spec1, spec2, spec3]
-      end
-
-      let(:spec1) do
-        Y2Storage::VolumeSpecification.new({}).tap do |spec|
-          spec.mount_point = "/"
-          spec.proposed = true
-        end
-      end
-
-      let(:spec2) do
-        Y2Storage::VolumeSpecification.new({}).tap do |spec|
-          spec.mount_point = "/home"
-          spec.proposed = true
-          spec.fallback_for_min_size = "/"
-          spec.fallback_for_max_size = "/"
-        end
-      end
-
-      let(:spec3) do
-        Y2Storage::VolumeSpecification.new({}).tap do |spec|
-          spec.mount_point = "swap"
-          spec.proposed = false
-          spec.fallback_for_min_size = "/"
-          spec.fallback_for_max_size = "/home"
-        end
-      end
-
-      it "only includes volumes for the proposed specs" do
-        settings = subject.convert
-
-        expect(settings).to have_attributes(
-          volumes: contain_exactly(
-            an_object_having_attributes(mount_path: "/"),
-            an_object_having_attributes(mount_path: "/home")
-          )
-        )
-      end
-
-      it "sets the fallbacks for min and max sizes" do
-        settings = subject.convert
+    it "restores the space actions from Y2Storage" do
+      settings = subject.convert
 
-        expect(settings).to have_attributes(
-          volumes: contain_exactly(
-            an_object_having_attributes(
-              mount_path:            "/",
-              min_size_fallback_for: contain_exactly("/home", "swap"),
-              max_size_fallback_for: contain_exactly("/home")
-            ),
-            an_object_having_attributes(
-              mount_path:            "/home",
-              min_size_fallback_for: be_empty,
-              max_size_fallback_for: contain_exactly("swap")
-            )
-          )
-        )
-      end
+      expect(settings.space.actions).to eq(
+        "/dev/sda"  => :force_delete,
+        "/dev/sdb1" => :resize
+      )
     end
   end
 end
diff --git a/service/test/agama/storage/proposal_settings_conversion/to_y2storage_test.rb b/service/test/agama/storage/proposal_settings_conversion/to_y2storage_test.rb
index 404cb716d..1fc608795 100644
--- a/service/test/agama/storage/proposal_settings_conversion/to_y2storage_test.rb
+++ b/service/test/agama/storage/proposal_settings_conversion/to_y2storage_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -21,9 +21,10 @@
 
 require_relative "../../../test_helper"
 require_relative "../storage_helpers"
-require "agama/storage/proposal_settings_conversion/to_y2storage"
-require "agama/storage/proposal_settings"
 require "agama/config"
+require "agama/storage/device_settings"
+require "agama/storage/proposal_settings"
+require "agama/storage/proposal_settings_conversion/to_y2storage"
 require "y2storage"
 
 describe Agama::Storage::ProposalSettingsConversion::ToY2Storage do
@@ -36,15 +37,17 @@
   describe "#convert" do
     let(:settings) do
       Agama::Storage::ProposalSettings.new.tap do |settings|
-        settings.boot_device = "/dev/sda"
-        settings.lvm.enabled = true
-        settings.lvm.system_vg_devices = ["/dev/sda", "/dev/sdb"]
+        settings.device.name = "/dev/sdc"
+        settings.boot.device = "/dev/sda"
         settings.encryption.password = "notsecret"
         settings.encryption.method = Y2Storage::EncryptionMethod::LUKS2
         settings.encryption.pbkd_function = Y2Storage::PbkdFunction::ARGON2ID
         settings.space.policy = :custom
         settings.space.actions = { "/dev/sda" => :force_delete }
-        volume = Agama::Storage::Volume.new("/test").tap { |v| v.device = "/dev/sdc" }
+        volume = Agama::Storage::Volume.new("/test").tap do |vol|
+          vol.location.target = :new_partition
+          vol.location.device = "/dev/sdb"
+        end
         settings.volumes = [volume]
       end
     end
@@ -53,111 +56,202 @@
       y2storage_settings = subject.convert
 
       expect(y2storage_settings).to be_a(Y2Storage::ProposalSettings)
-      expect(y2storage_settings).to have_attributes(
-        candidate_devices:   contain_exactly("/dev/sda", "/dev/sdb"),
-        root_device:         "/dev/sda",
-        swap_reuse:          :none,
-        lvm:                 true,
-        separate_vgs:        true,
-        lvm_vg_reuse:        false,
-        encryption_password: "notsecret",
-        encryption_method:   Y2Storage::EncryptionMethod::LUKS2,
-        encryption_pbkdf:    Y2Storage::PbkdFunction::ARGON2ID,
-        space_settings:      an_object_having_attributes(
-          strategy: :bigger_resize,
-          actions:  { "/dev/sda" => :force_delete }
-        ),
-        volumes:             include(an_object_having_attributes(mount_point: "/test"))
+      expect(y2storage_settings.root_device).to eq("/dev/sda")
+      expect(y2storage_settings.candidate_devices).to eq(["/dev/sda"])
+      expect(y2storage_settings.swap_reuse).to eq(:none)
+      expect(y2storage_settings.lvm).to eq(false)
+      expect(y2storage_settings.encryption_password).to eq("notsecret")
+      expect(y2storage_settings.encryption_method).to eq(Y2Storage::EncryptionMethod::LUKS2)
+      expect(y2storage_settings.encryption_pbkdf).to eq(Y2Storage::PbkdFunction::ARGON2ID)
+      expect(y2storage_settings.space_settings.strategy).to eq(:bigger_resize)
+      expect(y2storage_settings.space_settings.actions).to eq({ "/dev/sda" => :force_delete })
+      expect(y2storage_settings.volumes).to include(
+        an_object_having_attributes(
+          mount_point: "/test",
+          device:      "/dev/sdb"
+        )
       )
     end
 
-    context "candidate devices conversion" do
-      context "when LVM is not set" do
-        before do
-          settings.lvm.enabled = false
-          settings.lvm.system_vg_devices = ["/dev/sdb"]
+    context "device conversion" do
+      shared_examples "lvm conversion" do
+        it "configures LVM settings" do
+          y2storage_settings = subject.convert
+
+          expect(y2storage_settings.lvm).to eq(true)
+          expect(y2storage_settings.separate_vgs).to eq(true)
+          expect(y2storage_settings.lvm_vg_reuse).to eq(false)
+          expect(y2storage_settings.lvm_vg_strategy).to eq(:use_needed)
         end
+      end
 
-        context "and there is a boot device" do
-          before do
-            settings.boot_device = "/dev/sda"
+      before do
+        settings.volumes = [
+          Agama::Storage::Volume.new("/test1"),
+          Agama::Storage::Volume.new("/test2"),
+          Agama::Storage::Volume.new("/test3").tap do |volume|
+            volume.location.target = :new_partition
+            volume.location.device = "/dev/sdb"
           end
+        ]
+      end
 
-          it "uses the boot device as candidate device" do
-            y2storage_settings = subject.convert
+      context "when the device settings is set to use a disk" do
+        before do
+          settings.device = Agama::Storage::DeviceSettings::Disk.new("/dev/sda")
+          settings.boot.device = "/dev/sdb"
+        end
 
-            expect(y2storage_settings).to have_attributes(
-              candidate_devices: contain_exactly("/dev/sda")
-            )
-          end
+        it "sets lvm to false" do
+          y2storage_settings = subject.convert
+
+          expect(y2storage_settings.lvm).to eq(false)
         end
 
-        context "and there is no boot device" do
+        it "sets the target device as device for the volumes with missing device" do
+          y2storage_settings = subject.convert
+
+          expect(y2storage_settings.volumes).to contain_exactly(
+            an_object_having_attributes(mount_point: "/test1", device: "/dev/sda"),
+            an_object_having_attributes(mount_point: "/test2", device: "/dev/sda"),
+            an_object_having_attributes(mount_point: "/test3", device: "/dev/sdb")
+          )
+        end
+
+        it "sets the boot device as candidate device" do
+          y2storage_settings = subject.convert
+
+          expect(y2storage_settings.candidate_devices).to contain_exactly("/dev/sdb")
+        end
+
+        context "and no boot device is selected" do
           before do
-            settings.boot_device = nil
+            settings.boot.device = nil
           end
 
-          it "does not set candidate devices" do
+          it "sets the target device as candidate device" do
             y2storage_settings = subject.convert
 
-            expect(y2storage_settings).to have_attributes(
-              candidate_devices: be_empty
-            )
+            expect(y2storage_settings.candidate_devices).to contain_exactly("/dev/sda")
           end
         end
       end
 
-      context "when LVM is set but no system VG devices are indicated" do
+      context "when the device settings is set to create a new LVM volume group" do
         before do
-          settings.lvm.enabled = true
-          settings.lvm.system_vg_devices = []
+          settings.device = Agama::Storage::DeviceSettings::NewLvmVg.new(["/dev/sda", "/dev/sdb"])
         end
 
-        context "and there is a boot device" do
-          before do
-            settings.boot_device = "/dev/sda"
-          end
+        include_examples "lvm conversion"
 
-          it "uses the boot device as candidate device" do
-            y2storage_settings = subject.convert
+        it "sets the candidate PV devices as candidate devices" do
+          y2storage_settings = subject.convert
 
-            expect(y2storage_settings).to have_attributes(
-              candidate_devices: contain_exactly("/dev/sda")
-            )
-          end
+          expect(y2storage_settings.candidate_devices).to contain_exactly("/dev/sda", "/dev/sdb")
         end
 
-        context "and there is no boot device" do
-          before do
-            settings.boot_device = nil
-          end
-
-          it "does not set candidate device" do
-            y2storage_settings = subject.convert
+        it "does not set the device for the volumes with missing device" do
+          y2storage_settings = subject.convert
 
-            expect(y2storage_settings).to have_attributes(
-              candidate_devices: be_empty
-            )
-          end
+          expect(y2storage_settings.volumes).to contain_exactly(
+            an_object_having_attributes(mount_point: "/test1", device: nil),
+            an_object_having_attributes(mount_point: "/test2", device: nil),
+            an_object_having_attributes(mount_point: "/test3", device: "/dev/sdb")
+          )
         end
       end
 
-      context "when LVM is set and some system VG devices are indicated" do
+      context "when the device settings is set to reuse a LVM volume group" do
         before do
-          settings.lvm.enabled = true
-          settings.lvm.system_vg_devices = ["/dev/sdb", "/dev/sdc"]
+          settings.device = Agama::Storage::DeviceSettings::ReusedLvmVg.new("/dev/vg0")
         end
 
-        it "uses the system VG devices as candidate devices" do
+        include_examples "lvm conversion"
+
+        xit "sets the reused LVM volume group as target device" do
+          # TODO: Feature not supported yet by yast2-storage-ng.
+        end
+
+        it "does not set the device for the volumes with missing device" do
           y2storage_settings = subject.convert
 
-          expect(y2storage_settings).to have_attributes(
-            candidate_devices: contain_exactly("/dev/sdb", "/dev/sdc")
+          expect(y2storage_settings.volumes).to contain_exactly(
+            an_object_having_attributes(mount_point: "/test1", device: nil),
+            an_object_having_attributes(mount_point: "/test2", device: nil),
+            an_object_having_attributes(mount_point: "/test3", device: "/dev/sdb")
           )
         end
       end
     end
 
+    context "boot conversion" do
+      context "if boot configuration is enabled" do
+        before do
+          settings.boot.configure = true
+        end
+
+        it "sets boot to true" do
+          y2storage_settings = subject.convert
+
+          expect(y2storage_settings.boot).to eq(true)
+        end
+      end
+
+      context "if boot configuration is disabled" do
+        before do
+          settings.boot.configure = false
+        end
+
+        it "sets boot to false" do
+          y2storage_settings = subject.convert
+
+          expect(y2storage_settings.boot).to eq(false)
+        end
+      end
+
+      context "if a boot device is selected" do
+        before do
+          settings.boot.device = "/dev/sda"
+        end
+
+        it "sets the boot device as root device" do
+          y2storage_settings = subject.convert
+
+          expect(y2storage_settings.root_device).to eq("/dev/sda")
+        end
+      end
+
+      context "if no boot device is selected" do
+        before do
+          settings.boot.device = nil
+        end
+
+        context "and the device settings is set to use a disk" do
+          before do
+            settings.device = Agama::Storage::DeviceSettings::Disk.new("/dev/sda")
+          end
+
+          it "sets the target device as root device" do
+            y2storage_settings = subject.convert
+
+            expect(y2storage_settings.root_device).to eq("/dev/sda")
+          end
+        end
+
+        context "and the device settings is set to create a new LVM volume group" do
+          before do
+            settings.device = Agama::Storage::DeviceSettings::NewLvmVg.new(["/dev/sda", "/dev/sdb"])
+          end
+
+          it "sets the first candidate device as root device" do
+            y2storage_settings = subject.convert
+
+            expect(y2storage_settings.root_device).to eq("/dev/sda")
+          end
+        end
+      end
+    end
+
     context "space policy conversion" do
       before do
         mock_storage(devicegraph: "staging-plain-partitions.yaml")
diff --git a/service/test/agama/storage/proposal_settings_conversion_test.rb b/service/test/agama/storage/proposal_settings_conversion_test.rb
index 63f9cde50..085e35f37 100644
--- a/service/test/agama/storage/proposal_settings_conversion_test.rb
+++ b/service/test/agama/storage/proposal_settings_conversion_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -20,19 +20,19 @@
 # find current contact information at www.suse.com.
 
 require_relative "../../test_helper"
-require "agama/storage/proposal_settings_conversion"
-require "agama/storage/proposal_settings"
 require "agama/config"
+require "agama/storage/proposal_settings"
+require "agama/storage/proposal_settings_conversion"
 require "y2storage"
 
 describe Agama::Storage::ProposalSettingsConversion do
   describe "#from_y2storage" do
-    let(:config) { Agama::Config.new }
-
     let(:y2storage_settings) { Y2Storage::ProposalSettings.new }
 
+    let(:settings) { Agama::Storage::ProposalSettings.new }
+
     it "generates proposal settings from Y2Storage settings" do
-      result = described_class.from_y2storage(y2storage_settings, config: config)
+      result = described_class.from_y2storage(y2storage_settings, settings)
       expect(result).to be_a(Agama::Storage::ProposalSettings)
     end
   end
diff --git a/service/test/agama/storage/proposal_settings_reader_test.rb b/service/test/agama/storage/proposal_settings_reader_test.rb
index b5bed59cf..ed7b77b19 100644
--- a/service/test/agama/storage/proposal_settings_reader_test.rb
+++ b/service/test/agama/storage/proposal_settings_reader_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2022-2023] SUSE LLC
+# Copyright (c) [2022-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -20,9 +20,10 @@
 # find current contact information at www.suse.com.
 
 require_relative "../../test_helper"
-require "agama/storage/proposal_settings_reader"
-require "agama/storage/proposal_settings"
 require "agama/config"
+require "agama/storage/device_settings"
+require "agama/storage/proposal_settings"
+require "agama/storage/proposal_settings_reader"
 require "y2storage"
 
 describe Agama::Storage::ProposalSettingsReader do
@@ -31,147 +32,132 @@
   subject { described_class.new(config) }
 
   describe "#read" do
-    let(:config_data) do
-      {
-        "storage" => {
-          "lvm"              => true,
-          "space_policy"     => "delete",
-          "encryption"       => {
-            "method"        => "luks2",
-            "pbkd_function" => "argon2id"
-          },
-          "volumes"          => ["/", "swap"],
-          "volume_templates" => [
-            {
-              "mount_path" => "/",
-              "outline"    => { "required" => true }
-            },
-            {
-              "mount_path" => "/home",
-              "outline"    => { "required" => false }
-            },
-            {
-              "mount_path" => "swap",
-              "outline"    => { "required" => false }
-            }
-          ]
-        }
-      }
-    end
-
-    it "generates proposal settings from the config" do
-      settings = subject.read
-
-      expect(settings).to be_a(Agama::Storage::ProposalSettings)
-      expect(settings).to have_attributes(
-        boot_device: nil,
-        lvm:         an_object_having_attributes(
-          enabled?:          true,
-          system_vg_devices: be_empty
-        ),
-        encryption:  an_object_having_attributes(
-          password:      nil,
-          method:        Y2Storage::EncryptionMethod::LUKS2,
-          pbkd_function: Y2Storage::PbkdFunction::ARGON2ID
-        ),
-        space:       an_object_having_attributes(
-          policy:  :delete,
-          actions: {}
-        ),
-        volumes:     contain_exactly(
-          an_object_having_attributes(mount_path: "/"),
-          an_object_having_attributes(mount_path: "swap")
-        )
-      )
-    end
-
     context "when the config does not contain storage section" do
       let(:config_data) { {} }
 
       it "generates proposal settings with default values" do
         settings = subject.read
 
-        expect(settings).to have_attributes(
-          boot_device: nil,
-          lvm:         an_object_having_attributes(
-            enabled?:          false,
-            system_vg_devices: be_empty
-          ),
-          encryption:  an_object_having_attributes(
-            password:      nil,
-            method:        Y2Storage::EncryptionMethod::LUKS2,
-            pbkd_function: Y2Storage::PbkdFunction::PBKDF2
-          ),
-          space:       an_object_having_attributes(
-            policy:  :keep,
-            actions: {}
-          ),
-          volumes:     be_empty
-        )
+        expect(settings).to be_a(Agama::Storage::ProposalSettings)
+        expect(settings.device).to be_a(Agama::Storage::DeviceSettings::Disk)
+        expect(settings.device.name).to be_nil
+        expect(settings.boot.device).to be_nil
+        expect(settings.encryption.password).to be_nil
+        expect(settings.encryption.method).to eq(Y2Storage::EncryptionMethod::LUKS2)
+        expect(settings.encryption.pbkd_function).to eq(Y2Storage::PbkdFunction::PBKDF2)
+        expect(settings.space.policy).to eq(:keep)
+        expect(settings.space.actions).to eq({})
+        expect(settings.volumes).to be_empty
       end
     end
 
-    context "when the config contains an unknown encryption method" do
+    context "when the config contains a storage section" do
       let(:config_data) do
         {
           "storage" => {
-            "encyption" => {
-              "method" => "fooenc"
-            }
+            "lvm"              => false,
+            "space_policy"     => "delete",
+            "encryption"       => {
+              "method"        => "luks2",
+              "pbkd_function" => "argon2id"
+            },
+            "volumes"          => ["/", "swap"],
+            "volume_templates" => [
+              {
+                "mount_path" => "/",
+                "outline"    => { "required" => true }
+              },
+              {
+                "mount_path" => "/home",
+                "outline"    => { "required" => false }
+              },
+              {
+                "mount_path" => "swap",
+                "outline"    => { "required" => false }
+              }
+            ]
           }
         }
       end
 
-      it "uses the default encryption method" do
+      it "generates proposal settings from the config" do
         settings = subject.read
 
-        expect(settings).to have_attributes(
-          encryption: an_object_having_attributes(
-            method: Y2Storage::EncryptionMethod::LUKS2
-          )
+        expect(settings).to be_a(Agama::Storage::ProposalSettings)
+        expect(settings.device).to be_a(Agama::Storage::DeviceSettings::Disk)
+        expect(settings.device.name).to be_nil
+        expect(settings.boot.device).to be_nil
+        expect(settings.encryption.password).to be_nil
+        expect(settings.encryption.method).to eq(Y2Storage::EncryptionMethod::LUKS2)
+        expect(settings.encryption.pbkd_function).to eq(Y2Storage::PbkdFunction::ARGON2ID)
+        expect(settings.space.policy).to eq(:delete)
+        expect(settings.space.actions).to eq({})
+        expect(settings.volumes).to contain_exactly(
+          an_object_having_attributes(mount_path: "/"),
+          an_object_having_attributes(mount_path: "swap")
         )
       end
-    end
 
-    context "when the config contains an unknown password derivation function" do
-      let(:config_data) do
-        {
-          "storage" => {
-            "encyption" => {
-              "pbkd_function" => "foo"
-            }
-          }
-        }
+      context "if lvm is disabled" do
+        before do
+          config_data["storage"]["lvm"] = false
+        end
+
+        it "generates device settings to use a disk as target device" do
+          settings = subject.read
+
+          expect(settings.device).to be_a(Agama::Storage::DeviceSettings::Disk)
+          expect(settings.device.name).to be_nil
+        end
       end
 
-      it "sets the default derivation function" do
-        settings = subject.read
+      context "if lvm is enabled" do
+        before do
+          config_data["storage"]["lvm"] = true
+        end
 
-        expect(settings).to have_attributes(
-          encryption: an_object_having_attributes(
-            pbkd_function: Y2Storage::PbkdFunction::PBKDF2
-          )
-        )
+        it "generates device settings to use a new LVM volume group as target device" do
+          settings = subject.read
+
+          expect(settings.device).to be_a(Agama::Storage::DeviceSettings::NewLvmVg)
+          expect(settings.device.candidate_pv_devices).to be_empty
+        end
       end
-    end
 
-    context "when the config contains an unknown space policy" do
-      let(:config_data) do
-        {
-          "storage" => {
-            "space_policy" => "foo"
-          }
-        }
+      context "if the encryption method is unknown" do
+        before do
+          config_data["storage"]["encryption"]["method"] = "fooenc"
+        end
+
+        it "uses the default encryption method" do
+          settings = subject.read
+
+          expect(settings.encryption.method).to eq(Y2Storage::EncryptionMethod::LUKS2)
+        end
       end
 
-      it "uses the default space policy" do
-        settings = subject.read
+      context "if the password derivation function is unknown" do
+        before do
+          config_data["storage"]["encryption"]["pbkd_function"] = "foo"
+        end
 
-        expect(settings).to have_attributes(
-          space: an_object_having_attributes(
-            policy: :keep
-          )
-        )
+        it "uses the default derivation function" do
+          settings = subject.read
+
+          expect(settings.encryption.pbkd_function).to eq(Y2Storage::PbkdFunction::PBKDF2)
+        end
+      end
+
+      context "if the space policy is unknown" do
+        before do
+          config_data["storage"]["space_policy"] = "foo"
+        end
+
+        it "uses the default space policy" do
+          settings = subject.read
+
+          expect(settings.space.policy).to eq(:keep)
+        end
       end
     end
   end
diff --git a/service/test/agama/storage/proposal_settings_test.rb b/service/test/agama/storage/proposal_settings_test.rb
new file mode 100644
index 000000000..82fcc58d8
--- /dev/null
+++ b/service/test/agama/storage/proposal_settings_test.rb
@@ -0,0 +1,173 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2024] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require_relative "../../test_helper"
+require "agama/storage/device_settings"
+require "agama/storage/proposal_settings"
+require "agama/storage/volume"
+
+describe Agama::Storage::ProposalSettings do
+  describe "#default_boot_device" do
+    context "when the device is configured to use a disk" do
+      before do
+        subject.device = Agama::Storage::DeviceSettings::Disk.new
+      end
+
+      context "and no device is selected yet" do
+        before do
+          subject.device.name = nil
+        end
+
+        it "returns nil" do
+          expect(subject.default_boot_device).to be_nil
+        end
+      end
+
+      context "and a device is selected" do
+        before do
+          subject.device.name = "/dev/sda"
+        end
+
+        it "returns the target device" do
+          expect(subject.default_boot_device).to eq("/dev/sda")
+        end
+      end
+    end
+
+    context "when the device is configured to create a new LVM volume group" do
+      before do
+        subject.device = Agama::Storage::DeviceSettings::NewLvmVg.new
+      end
+
+      context "and no device is selected yet" do
+        before do
+          subject.device.candidate_pv_devices = []
+        end
+
+        it "returns nil" do
+          expect(subject.default_boot_device).to be_nil
+        end
+      end
+
+      context "and some candidate devices for creating the LVM physical volumes are selected" do
+        before do
+          subject.device.candidate_pv_devices = ["/dev/sdc", "/dev/sda", "/dev/sdb"]
+        end
+
+        it "returns the first candidate device in alphabetical order" do
+          expect(subject.default_boot_device).to eq("/dev/sda")
+        end
+      end
+    end
+  end
+
+  describe "#installation_devices" do
+    shared_examples "boot device" do
+      context "when boot is set to be configured" do
+        before do
+          subject.boot.configure = true
+          subject.boot.device = "/dev/sdc"
+        end
+
+        it "includes the boot device" do
+          expect(subject.installation_devices).to include("/dev/sdc")
+        end
+      end
+
+      context "when boot is not set to be configured" do
+        before do
+          subject.boot.configure = false
+          subject.boot.device = "/dev/sdc"
+        end
+
+        it "does not include the boot device" do
+          expect(subject.installation_devices).to_not include("/dev/sdc")
+        end
+      end
+    end
+
+    shared_examples "volume devices" do
+      before do
+        subject.volumes = [volume1, volume2]
+      end
+
+      let(:volume1) do
+        Agama::Storage::Volume.new("/").tap do |volume|
+          volume.location.target = :new_partition
+          volume.location.device = "/dev/sdd"
+        end
+      end
+
+      let(:volume2) do
+        Agama::Storage::Volume.new("/").tap do |volume|
+          volume.location.target = :new_partition
+          volume.location.device = "/dev/sde"
+        end
+      end
+
+      it "includes the devices assigned to the volumes" do
+        expect(subject.installation_devices).to include("/dev/sdd", "/dev/sde")
+      end
+    end
+
+    context "when the device is configured to use a disk" do
+      before do
+        subject.device = Agama::Storage::DeviceSettings::Disk.new("/dev/sda")
+      end
+
+      it "includes the target device" do
+        expect(subject.installation_devices).to include("/dev/sda")
+      end
+
+      include_examples "boot device"
+
+      include_examples "volume devices"
+    end
+
+    context "when the device is configured to create a new LVM volume group" do
+      before do
+        subject.device = Agama::Storage::DeviceSettings::NewLvmVg.new(["/dev/sda", "/dev/sdb"])
+      end
+
+      it "includes the target devices for creating new LVM physical volumes" do
+        expect(subject.installation_devices).to include("/dev/sda", "/dev/sdb")
+      end
+
+      include_examples "boot device"
+
+      include_examples "volume devices"
+    end
+
+    context "when the device is configured to reuse a LVM volume group" do
+      before do
+        subject.device = Agama::Storage::DeviceSettings::ReusedLvmVg.new("/dev/vg0")
+      end
+
+      it "includes the target LVM volume group" do
+        expect(subject.installation_devices).to include("/dev/vg0")
+      end
+
+      include_examples "boot device"
+
+      include_examples "volume devices"
+    end
+  end
+end
diff --git a/service/test/agama/storage/proposal_test.rb b/service/test/agama/storage/proposal_test.rb
index c56237b39..a9bf94206 100644
--- a/service/test/agama/storage/proposal_test.rb
+++ b/service/test/agama/storage/proposal_test.rb
@@ -21,9 +21,10 @@
 
 require_relative "../../test_helper"
 require_relative "storage_helpers"
+require "agama/config"
+require "agama/storage/device_settings"
 require "agama/storage/proposal"
 require "agama/storage/proposal_settings"
-require "agama/config"
 require "y2storage"
 
 describe Agama::Storage::Proposal do
@@ -39,14 +40,15 @@
 
   let(:achievable_settings) do
     Agama::Storage::ProposalSettings.new.tap do |settings|
-      settings.boot_device = "/dev/sdb"
+      settings.device.name = "/dev/sdb"
+      settings.boot.device = "/dev/sda"
       settings.volumes = [Agama::Storage::Volume.new("/")]
     end
   end
 
   let(:impossible_settings) do
     Agama::Storage::ProposalSettings.new.tap do |settings|
-      settings.boot_device = "/dev/sdb"
+      settings.device.name = "/dev/sdb"
       settings.volumes = [
         # The boot disk size is 500 GiB, so it cannot accomodate a 1 TiB volume.
         Agama::Storage::Volume.new("/").tap { |v| v.min_size = Y2Storage::DiskSize.TiB(1) }
@@ -89,11 +91,10 @@
       subject.calculate(achievable_settings)
 
       expect(Y2Storage::StorageManager.instance.proposal).to_not be_nil
-      expect(Y2Storage::StorageManager.instance.proposal.settings).to have_attributes(
-        root_device: "/dev/sdb",
-        volumes:     contain_exactly(
-          an_object_having_attributes(mount_point: "/")
-        )
+      y2storage_settings = Y2Storage::StorageManager.instance.proposal.settings
+      expect(y2storage_settings.root_device).to eq("/dev/sda")
+      expect(y2storage_settings.volumes).to contain_exactly(
+        an_object_having_attributes(mount_point: "/", device: "/dev/sdb")
       )
     end
 
@@ -115,17 +116,43 @@
       expect(subject.calculate(impossible_settings)).to eq(false)
     end
 
-    context "if the given settings does not indicate a boot device" do
-      let(:settings) do
-        achievable_settings.tap { |s| s.boot_device = nil }
+    context "if the given device settings sets a disk as target" do
+      before do
+        achievable_settings.device = Agama::Storage::DeviceSettings::Disk.new
       end
 
-      it "calculates a new proposal using the first disk as boot device" do
-        subject.calculate(settings)
+      context "and the target disk is not indicated" do
+        before do
+          achievable_settings.device.name = nil
+        end
 
-        expect(Y2Storage::StorageManager.instance.proposal.settings).to have_attributes(
-          root_device: "/dev/sda"
-        )
+        it "sets the first available device as target device for volumes" do
+          subject.calculate(achievable_settings)
+          y2storage_settings = Y2Storage::StorageManager.instance.proposal.settings
+
+          expect(y2storage_settings.volumes).to contain_exactly(
+            an_object_having_attributes(mount_point: "/", device: "/dev/sda")
+          )
+        end
+      end
+    end
+
+    context "if the given device settings sets a new LVM volume group as target" do
+      before do
+        achievable_settings.device = Agama::Storage::DeviceSettings::NewLvmVg.new
+      end
+
+      context "and the target disks for physical volumes are not indicated" do
+        before do
+          achievable_settings.device.candidate_pv_devices = []
+        end
+
+        it "sets the first available device as candidate device" do
+          subject.calculate(achievable_settings)
+          y2storage_settings = Y2Storage::StorageManager.instance.proposal.settings
+
+          expect(y2storage_settings.candidate_devices).to contain_exactly("/dev/sda")
+        end
       end
     end
   end
@@ -137,79 +164,19 @@
 
     context "if the proposal was already calculated" do
       before do
-        subject.calculate(settings)
-      end
-
-      let(:settings) do
-        achievable_settings.tap do |settings|
-          settings.space.policy = :custom
-          settings.space.actions = { "/dev/sda" => :force_delete }
-        end
+        subject.calculate(achievable_settings)
       end
 
       it "returns the settings used for calculating the proposal" do
         expect(subject.settings).to be_a(Agama::Storage::ProposalSettings)
 
         expect(subject.settings).to have_attributes(
-          boot_device: "/dev/sdb",
-          volumes:     contain_exactly(
+          device:  an_object_having_attributes(name: "/dev/sdb"),
+          volumes: contain_exactly(
             an_object_having_attributes(mount_path: "/")
-          ),
-          # Checking space policy explicitly here because the settings converter cannot infer the
-          # space policy from the Y2Storage settings. The space policy is directly recovered from
-          # the original settings passed to #calculate.
-          space:       an_object_having_attributes(policy: :custom)
+          )
         )
       end
-
-      # Checking system VG devices explicitly here because the settings converter cannot infer the
-      # system VG devices from the Y2Storage settings in all cases. The system VG devices are
-      # directly recovered from the original settings passed to #calculate.
-      context "system VG devices" do
-        let(:settings) do
-          achievable_settings.tap do |settings|
-            settings.lvm.system_vg_devices = system_vg_devices
-          end
-        end
-
-        context "if no devices were assigned as system VG devices" do
-          let(:system_vg_devices) { [] }
-
-          it "returns settings containing no system VG devices " do
-            expect(subject.settings).to have_attributes(
-              lvm: an_object_having_attributes(
-                system_vg_devices: be_empty
-              )
-            )
-          end
-        end
-
-        context "if only boot device was assigned as system VG device" do
-          let(:system_vg_devices) { ["/dev/sdb"] }
-
-          # This case cannot be inferred by conversion from Y2Storage, so the test does not pass if
-          # system VG devices are not copied from the settings passed to #calculate.
-          it "returns settings containing only boot device as system VG device" do
-            expect(subject.settings).to have_attributes(
-              lvm: an_object_having_attributes(
-                system_vg_devices: contain_exactly("/dev/sdb")
-              )
-            )
-          end
-        end
-
-        context "if several devices were assigned as system VG devices" do
-          let(:system_vg_devices) { ["/dev/sdb", "/dev/sdc"] }
-
-          it "returns settings containing the system VG devices" do
-            expect(subject.settings).to have_attributes(
-              lvm: an_object_having_attributes(
-                system_vg_devices: contain_exactly("/dev/sdb", "/dev/sdc")
-              )
-            )
-          end
-        end
-      end
     end
   end
 
@@ -263,13 +230,13 @@
         )
       end
 
-      context "and the settings does not indicate a boot device" do
+      context "and the settings does not indicate a target device" do
         before do
           # Avoid to automatically set the first device
           allow(subject).to receive(:available_devices).and_return([])
         end
 
-        let(:settings) { impossible_settings.tap { |s| s.boot_device = nil } }
+        let(:settings) { impossible_settings.tap { |s| s.device.name = nil } }
 
         it "includes an error because a device is not selected" do
           subject.calculate(settings)
@@ -279,19 +246,23 @@
           )
 
           expect(subject.issues).to_not include(
-            an_object_having_attributes(description: /device is not found/)
+            an_object_having_attributes(description: /is not found/)
+          )
+
+          expect(subject.issues).to_not include(
+            an_object_having_attributes(description: /are not found/)
           )
         end
       end
 
-      context "and the boot device is missing in the system" do
-        let(:settings) { impossible_settings.tap { |s| s.boot_device = "/dev/vdz" } }
+      context "and some installation device is missing in the system" do
+        let(:settings) { impossible_settings.tap { |s| s.device.name = "/dev/vdz" } }
 
         it "includes an error because the device is not found" do
           subject.calculate(settings)
 
           expect(subject.issues).to include(
-            an_object_having_attributes(description: /device is not found/)
+            an_object_having_attributes(description: /is not found/)
           )
         end
       end
diff --git a/service/test/agama/storage/proposal_volumes_test.rb b/service/test/agama/storage/proposal_volumes_test.rb
index 7a722ea5f..d6f3867f6 100644
--- a/service/test/agama/storage/proposal_volumes_test.rb
+++ b/service/test/agama/storage/proposal_volumes_test.rb
@@ -29,7 +29,13 @@
 
 describe Agama::Storage::Proposal do
   include Agama::RSpec::StorageHelpers
-  before { mock_storage }
+  before do
+    allow(Yast::SCR).to receive(:Read).and_call_original
+    allow(Yast::SCR).to receive(:Read).with(path(".proc.meminfo"))
+      .and_return("memtotal" => 8388608)
+
+    mock_storage
+  end
 
   subject(:proposal) { described_class.new(config, logger: logger) }
 
@@ -42,7 +48,7 @@
 
   let(:cfg_volumes) { ["/", "swap"] }
 
-  let(:cfg_templates) { [root_template, other_template] }
+  let(:cfg_templates) { [root_template, swap_template, other_template] }
   let(:root_template) do
     {
       "mount_path" => "/", "filesystem" => "btrfs", "size" => { "auto" => true },
@@ -55,6 +61,14 @@
       }
     }
   end
+  let(:swap_template) do
+    {
+      "mount_path" => "swap", "filesystem" => "swap", "size" => { "auto" => true },
+      "outline" => {
+        "auto_size" => { "base_min" => "1 GiB", "base_max" => "2 GiB", "adjust_by_ram" => true }
+      }
+    }
+  end
   let(:other_template) do
     {
       "mount_path" => "/two", "filesystem" => "xfs",
@@ -69,11 +83,14 @@
   end
 
   let(:y2storage_proposal) do
-    instance_double(Y2Storage::MinGuidedProposal, propose: true, failed?: false)
+    instance_double(Y2Storage::MinGuidedProposal,
+      propose: true, failed?: false, settings: y2storage_settings, planned_devices: [])
   end
 
   let(:vol_builder) { Agama::Storage::VolumeTemplatesBuilder.new_from_config(config) }
 
+  let(:y2storage_settings) { Y2Storage::ProposalSettings.new }
+
   # Constructs a Agama volume with the given set of attributes
   #
   # @param attrs [Hash] set of attributes and their values (sizes can be provided as strings)
@@ -99,7 +116,7 @@ def test_vol(path, attrs = {})
   # 'y2storage_proposal'
   #
   # @param specs [Hash] arguments to check on each VolumeSpecification object
-  def expect_proposal_with_expects(*specs)
+  def expect_proposal_with_specs(*specs)
     expect(Y2Storage::MinGuidedProposal).to receive(:new) do |**args|
       expect(args[:settings]).to be_a(Y2Storage::ProposalSettings)
       expect(args[:settings].volumes).to all(be_a(Y2Storage::VolumeSpecification))
@@ -116,16 +133,20 @@ def expect_proposal_with_expects(*specs)
 
     describe "#calculate" do
       before do
+        allow(Y2Storage::StorageManager.instance)
+          .to receive(:proposal).and_return(y2storage_proposal)
+
         allow(Y2Storage::StorageManager.instance).to receive(:proposal=)
       end
 
       it "runs the Y2Storage proposal with the correct set of VolumeSpecification" do
-        expect_proposal_with_expects(
+        expect_proposal_with_specs(
           {
             mount_point: "/", proposed: true, snapshots: false,
             ignore_fallback_sizes: false, ignore_snapshots_sizes: false,
             min_size: Y2Storage::DiskSize.GiB(10)
           },
+          { mount_point: "swap", proposed: false },
           { mount_point: "/two", proposed: false, fallback_for_min_size: "/" }
         )
         proposal.calculate(settings)
@@ -153,16 +174,20 @@ def expect_proposal_with_expects(*specs)
 
     describe "#calculate" do
       before do
+        allow(Y2Storage::StorageManager.instance)
+          .to receive(:proposal).and_return(y2storage_proposal)
+
         allow(Y2Storage::StorageManager.instance).to receive(:proposal=)
       end
 
       it "runs the Y2Storage proposal with the correct set of VolumeSpecification" do
-        expect_proposal_with_expects(
+        expect_proposal_with_specs(
           {
             mount_point: "/", proposed: true, snapshots: true,
             ignore_fallback_sizes: false, ignore_snapshots_sizes: false,
             min_size: Y2Storage::DiskSize.GiB(10)
           },
+          { mount_point: "swap", proposed: false },
           { mount_point: "/two", proposed: true, fallback_for_min_size: "/" }
         )
         proposal.calculate(settings)
@@ -191,16 +216,20 @@ def expect_proposal_with_expects(*specs)
 
     describe "#calculate" do
       before do
+        allow(Y2Storage::StorageManager.instance)
+          .to receive(:proposal).and_return(y2storage_proposal)
+
         allow(Y2Storage::StorageManager.instance).to receive(:proposal=)
       end
 
       it "runs the Y2Storage proposal with the correct set of VolumeSpecification" do
-        expect_proposal_with_expects(
+        expect_proposal_with_specs(
           {
             mount_point: "/", proposed: true, snapshots: true,
             ignore_fallback_sizes: false, ignore_snapshots_sizes: false,
             min_size: Y2Storage::DiskSize.GiB(10)
           },
+          { mount_point: "swap", proposed: false },
           { mount_point: "/two", proposed: false, fallback_for_min_size: "/" }
         )
         proposal.calculate(settings)
@@ -224,21 +253,73 @@ def expect_proposal_with_expects(*specs)
     end
   end
 
+  context "when auto size is used and it is affected by RAM size" do
+    let(:volumes) { [test_vol("/"), test_vol("swap")] }
+
+    describe "#calculate" do
+      before do
+        allow(Y2Storage::StorageManager.instance)
+          .to receive(:proposal).and_return(y2storage_proposal)
+
+        allow(Y2Storage::StorageManager.instance).to receive(:proposal=)
+      end
+
+      it "runs the Y2Storage proposal with the correct set of VolumeSpecification" do
+        expect_proposal_with_specs(
+          { mount_point: "/", proposed: true },
+          { mount_point: "/two", proposed: false },
+          {
+            mount_point: "swap", proposed: true, ignore_adjust_by_ram: false,
+            min_size: Y2Storage::DiskSize.GiB(1)
+          }
+        )
+        proposal.calculate(settings)
+      end
+    end
+
+    describe "#settings" do
+      it "returns settings with a set of volumes with adjusted sizes" do
+        proposal.calculate(settings)
+
+        expect(proposal.settings.volumes).to contain_exactly(
+          an_object_having_attributes(mount_path: "/", auto_size: true),
+          an_object_having_attributes(
+            mount_path: "swap",
+            auto_size?: true,
+            min_size:   Y2Storage::DiskSize.GiB(8)
+          )
+        )
+      end
+    end
+  end
+
   context "when fixed sizes are enforced" do
-    let(:volumes) { [test_vol("/", auto_size: false, min_size: "6 GiB")] }
+    let(:volumes) do
+      [
+        test_vol("/", auto_size: false, min_size: "6 GiB"),
+        test_vol("swap", auto_size: false, min_size: "1 GiB")
+      ]
+    end
 
     describe "#calculate" do
       before do
+        allow(Y2Storage::StorageManager.instance)
+          .to receive(:proposal).and_return(y2storage_proposal)
+
         allow(Y2Storage::StorageManager.instance).to receive(:proposal=)
       end
 
       it "runs the Y2Storage proposal with the correct set of VolumeSpecification" do
-        expect_proposal_with_expects(
+        expect_proposal_with_specs(
           {
             mount_point: "/", proposed: true, snapshots: false,
             ignore_fallback_sizes: true, ignore_snapshots_sizes: true,
             min_size: Y2Storage::DiskSize.GiB(6)
           },
+          {
+            mount_point: "swap", proposed: true, ignore_adjust_by_ram: true,
+            min_size: Y2Storage::DiskSize.GiB(1)
+          },
           { mount_point: "/two", proposed: false, fallback_for_min_size: "/" }
         )
         proposal.calculate(settings)
@@ -256,6 +337,12 @@ def expect_proposal_with_expects(*specs)
             auto_size?: false,
             min_size:   Y2Storage::DiskSize.GiB(6),
             outline:    an_object_having_attributes(min_size_fallback_for: ["/two"])
+          ),
+          an_object_having_attributes(
+            mount_path: "swap",
+            auto_size?: false,
+            min_size:   Y2Storage::DiskSize.GiB(1),
+            outline:    an_object_having_attributes(adjust_by_ram: true)
           )
         )
       end
diff --git a/service/test/agama/storage/volume_conversion/from_y2storage_test.rb b/service/test/agama/storage/volume_conversion/from_y2storage_test.rb
index c21495500..55da4f8ed 100644
--- a/service/test/agama/storage/volume_conversion/from_y2storage_test.rb
+++ b/service/test/agama/storage/volume_conversion/from_y2storage_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -22,8 +22,8 @@
 require_relative "../../../test_helper"
 require_relative "../storage_helpers"
 require_relative "../../rspec/matchers/storage"
+require "agama/storage/volume"
 require "agama/storage/volume_conversion/from_y2storage"
-require "agama/config"
 require "y2storage"
 
 describe Agama::Storage::VolumeConversion::FromY2Storage do
@@ -31,84 +31,53 @@
 
   before { mock_storage }
 
-  subject { described_class.new(spec, config: config) }
-
-  let(:config) { Agama::Config.new }
-
-  describe "#convert" do
-    let(:spec) do
-      Y2Storage::VolumeSpecification.new({}).tap do |spec|
-        spec.mount_point = "/"
-        spec.device = "/dev/sda"
-        spec.separate_vg_name = "/dev/vg0"
-        spec.mount_options = ["defaults", "ro"]
-        spec.fs_type = Y2Storage::Filesystems::Type::BTRFS
-        spec.min_size = Y2Storage::DiskSize.GiB(5)
-        spec.max_size = Y2Storage::DiskSize.GiB(20)
-        spec.snapshots = true
-        spec.subvolumes = ["@/home", "@/var"]
-        spec.btrfs_default_subvolume = "@"
-        spec.btrfs_read_only = true
-      end
-    end
-
-    it "converts the Y2Storage volume spec to an Agama volume" do
-      volume = subject.convert
-
-      expect(volume).to be_a(Agama::Storage::Volume)
-      expect(volume).to have_attributes(
-        mount_path:       "/",
-        device:           "/dev/sda",
-        separate_vg_name: "/dev/vg0",
-        mount_options:    contain_exactly("defaults", "ro"),
-        fs_type:          Y2Storage::Filesystems::Type::BTRFS,
-        min_size:         Y2Storage::DiskSize.GiB(5),
-        max_size:         Y2Storage::DiskSize.GiB(20),
-        btrfs:            an_object_having_attributes(
-          snapshots?:        true,
-          subvolumes:        contain_exactly("@/home", "@/var"),
-          default_subvolume: "@",
-          read_only?:        true
-        )
-      )
-
-      outline = Agama::Storage::VolumeTemplatesBuilder.new_from_config(config).for("/").outline
-      expect(volume.outline).to eq_outline(outline)
+  subject { described_class.new(volume) }
+
+  let(:btrfs) { Y2Storage::Filesystems::Type::BTRFS }
+  let(:ext4) { Y2Storage::Filesystems::Type::EXT4 }
+  let(:xfs) { Y2Storage::Filesystems::Type::XFS }
+
+  let(:volume) do
+    Agama::Storage::Volume.new("/").tap do |volume|
+      volume.location.target = :new_vg
+      volume.location.device = "/dev/sda"
+      volume.mount_options = ["defaults"]
+      volume.fs_type = btrfs
+      volume.auto_size = false
+      volume.min_size = Y2Storage::DiskSize.GiB(5)
+      volume.max_size = Y2Storage::DiskSize.GiB(20)
+      volume.btrfs.snapshots = true
+      volume.btrfs.subvolumes = ["@/home", "@/var"]
+      volume.btrfs.default_subvolume = "@"
+      volume.btrfs.read_only = true
+      volume.outline.required = true
+      volume.outline.filesystems = [btrfs, ext4, xfs]
+      volume.outline.adjust_by_ram = false
+      volume.outline.snapshots_configurable = true
+      volume.outline.snapshots_size = Y2Storage::DiskSize.GiB(10)
+      volume.outline.snapshots_percentage = 20
     end
+  end
 
-    context "auto size conversion" do
-      before do
-        spec.ignore_fallback_sizes = ignore_fallback_sizes
-        spec.ignore_snapshots_sizes = ignore_snapshots_sizes
-      end
-
-      context "if :ignore_fallback_sizes and :ignore_snapshots_sizes are set" do
-        let(:ignore_fallback_sizes) { true }
-
-        let(:ignore_snapshots_sizes) { true }
-
-        it "does not set auto size" do
-          volume = subject.convert
-
-          expect(volume).to have_attributes(
-            auto_size?: false
-          )
-        end
-      end
-
-      context "if :ignore_fallback_sizes and :ignore_snapshots_sizes are not set" do
-        let(:ignore_fallback_sizes) { false }
-
-        let(:ignore_snapshots_sizes) { false }
-
-        it "sets auto size" do
-          volume = subject.convert
-
-          expect(volume).to have_attributes(
-            auto_size?: true
-          )
-        end
-      end
+  describe "#convert" do
+    it "generates a volume with the same values as the given volume" do
+      result = subject.convert
+
+      expect(result).to be_a(Agama::Storage::Volume)
+      expect(result).to_not equal(volume)
+      expect(result.location.target).to eq(:new_vg)
+      expect(result.location.device).to eq("/dev/sda")
+      expect(result.mount_path).to eq("/")
+      expect(result.mount_options).to contain_exactly("defaults")
+      expect(result.fs_type).to eq(btrfs)
+      expect(result.auto_size).to eq(false)
+      expect(result.min_size).to eq(Y2Storage::DiskSize.GiB(5))
+      expect(result.max_size).to eq(Y2Storage::DiskSize.GiB(20))
+      expect(result.btrfs.snapshots).to eq(true)
+      expect(result.btrfs.subvolumes).to contain_exactly("@/home", "@/var")
+      expect(result.btrfs.default_subvolume).to eq("@")
+      expect(result.btrfs.read_only).to eq(true)
+      expect(result.outline).to eq_outline(volume.outline)
     end
 
     context "sizes conversion" do
@@ -131,12 +100,10 @@
         end
 
         it "sets the min and max sizes according to the planned device" do
-          volume = subject.convert
+          result = subject.convert
 
-          expect(volume).to have_attributes(
-            min_size: Y2Storage::DiskSize.GiB(10),
-            max_size: Y2Storage::DiskSize.GiB(40)
-          )
+          expect(result.min_size).to eq(Y2Storage::DiskSize.GiB(10))
+          expect(result.max_size).to eq(Y2Storage::DiskSize.GiB(40))
         end
       end
 
@@ -150,13 +117,11 @@
           end
         end
 
-        it "sets the min and max sizes according to the volume spec" do
-          volume = subject.convert
+        it "sets the sizes of the given volume" do
+          result = subject.convert
 
-          expect(volume).to have_attributes(
-            min_size: Y2Storage::DiskSize.GiB(5),
-            max_size: Y2Storage::DiskSize.GiB(20)
-          )
+          expect(result.min_size).to eq(Y2Storage::DiskSize.GiB(5))
+          expect(result.max_size).to eq(Y2Storage::DiskSize.GiB(20))
         end
       end
     end
diff --git a/service/test/agama/storage/volume_conversion/to_y2storage_test.rb b/service/test/agama/storage/volume_conversion/to_y2storage_test.rb
index ba8263aac..8b52a1372 100644
--- a/service/test/agama/storage/volume_conversion/to_y2storage_test.rb
+++ b/service/test/agama/storage/volume_conversion/to_y2storage_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -29,8 +29,8 @@
   describe "#convert" do
     let(:volume) do
       Agama::Storage::Volume.new("/").tap do |volume|
-        volume.device = "/dev/sda"
-        volume.separate_vg_name = "/dev/vg0"
+        volume.location.device = "/dev/sda"
+        volume.location.target = :new_vg
         volume.mount_options = ["defaults"]
         volume.fs_type = btrfs
         volume.auto_size = false
@@ -57,30 +57,29 @@
       spec = subject.convert
 
       expect(spec).to be_a(Y2Storage::VolumeSpecification)
-      expect(spec).to have_attributes(
-        device:                  "/dev/sda",
-        separate_vg_name:        "/dev/vg0",
-        mount_point:             "/",
-        mount_options:           "defaults",
-        proposed?:               true,
-        proposed_configurable?:  false,
-        fs_types:                contain_exactly(btrfs, ext4, xfs),
-        fs_type:                 btrfs,
-        weight:                  100,
-        adjust_by_ram?:          false,
-        ignore_fallback_sizes:   true,
-        ignore_snapshots_sizes:  true,
-        min_size:                Y2Storage::DiskSize.GiB(5),
-        max_size:                Y2Storage::DiskSize.GiB(20),
-        max_size_lvm:            Y2Storage::DiskSize.GiB(20),
-        snapshots:               true,
-        snapshots_configurable?: true,
-        snapshots_size:          Y2Storage::DiskSize.GiB(10),
-        snapshots_percentage:    20,
-        subvolumes:              ["@/home", "@/var"],
-        btrfs_default_subvolume: "@",
-        btrfs_read_only:         true
-      )
+      expect(spec.device).to eq("/dev/sda")
+      expect(spec.separate_vg_name).to eq("vg-root")
+      expect(spec.mount_point).to eq("/")
+      expect(spec.mount_options).to eq("defaults")
+      expect(spec.proposed).to eq(true)
+      expect(spec.proposed_configurable).to eq(false)
+      expect(spec.fs_types).to contain_exactly(btrfs, ext4, xfs)
+      expect(spec.fs_type).to eq(btrfs)
+      expect(spec.weight).to eq(100)
+      expect(spec.adjust_by_ram).to eq(false)
+      expect(spec.ignore_fallback_sizes).to eq(true)
+      expect(spec.ignore_snapshots_sizes).to eq(true)
+      expect(spec.ignore_adjust_by_ram).to eq(true)
+      expect(spec.min_size).to eq(Y2Storage::DiskSize.GiB(5))
+      expect(spec.max_size).to eq(Y2Storage::DiskSize.GiB(20))
+      expect(spec.max_size_lvm).to eq(Y2Storage::DiskSize.GiB(20))
+      expect(spec.snapshots).to eq(true)
+      expect(spec.snapshots_configurable).to eq(true)
+      expect(spec.snapshots_size).to eq(Y2Storage::DiskSize.GiB(10))
+      expect(spec.snapshots_percentage).to eq(20)
+      expect(spec.subvolumes).to contain_exactly("@/home", "@/var")
+      expect(spec.btrfs_default_subvolume).to eq("@")
+      expect(spec.btrfs_read_only).to eq(true)
     end
 
     context "when auto size is used" do
@@ -93,13 +92,104 @@
       it "sets the min and max spec sizes according to the volume outline" do
         spec = subject.convert
 
-        expect(spec).to have_attributes(
-          ignore_fallback_sizes:  false,
-          ignore_snapshots_sizes: false,
-          min_size:               Y2Storage::DiskSize.GiB(10),
-          max_size:               Y2Storage::DiskSize.GiB(50),
-          max_size_lvm:           Y2Storage::DiskSize.GiB(50)
-        )
+        expect(spec.ignore_fallback_sizes).to eq(false)
+        expect(spec.ignore_snapshots_sizes).to eq(false)
+        expect(spec.ignore_adjust_by_ram).to eq(false)
+        expect(spec.min_size).to eq(Y2Storage::DiskSize.GiB(10))
+        expect(spec.max_size).to eq(Y2Storage::DiskSize.GiB(50))
+        expect(spec.max_size_lvm).to eq(Y2Storage::DiskSize.GiB(50))
+      end
+    end
+
+    context "when the default target is used" do
+      before { volume.location.target = :default }
+
+      it "sets both #device and #reuse_name to nil" do
+        spec = subject.convert
+
+        expect(spec.device).to be_nil
+        expect(spec.reuse_name).to be_nil
+      end
+    end
+
+    context "when the target is a new dedicated partition" do
+      before { volume.location.target = :new_partition }
+
+      it "sets #device to the expected disk name" do
+        expect(subject.convert.device).to eq "/dev/sda"
+      end
+
+      it "sets #separate_vg_name and #reuse_name to nil" do
+        spec = subject.convert
+
+        expect(spec.reuse_name).to be_nil
+        expect(spec.separate_vg_name).to be_nil
+      end
+    end
+
+    context "when the target is a new dedicated volume group" do
+      before { volume.location.target = :new_vg }
+
+      context "when the mount point is /" do
+        it "sets #device, #separate_vg_name and #reuse_name to the expected values" do
+          spec = subject.convert
+
+          expect(spec.device).to eq "/dev/sda"
+          expect(spec.reuse_name).to be_nil
+          expect(spec.separate_vg_name).to eq "vg-root"
+        end
+      end
+
+      context "when the mount point is not the root one" do
+        let(:volume) do
+          Agama::Storage::Volume.new("/var/log").tap do |volume|
+            volume.location.device = "/dev/sda"
+          end
+        end
+
+        it "sets #device, #separate_vg_name and #reuse_name to the expected values" do
+          spec = subject.convert
+
+          expect(spec.device).to eq "/dev/sda"
+          expect(spec.reuse_name).to be_nil
+          expect(spec.separate_vg_name).to eq "vg-var_log"
+        end
+      end
+    end
+
+    context "when the target is an existing block device" do
+      before { volume.location.target = :device }
+
+      it "sets #reuse_name and #reformat to the proper values" do
+        spec = subject.convert
+
+        expect(spec.reuse_name).to eq "/dev/sda"
+        expect(spec.reformat).to eq true
+      end
+
+      it "sets #device and #separate_vg_name to nil" do
+        spec = subject.convert
+
+        expect(spec.device).to be_nil
+        expect(spec.separate_vg_name).to be_nil
+      end
+    end
+
+    context "when the target is an existing file system" do
+      before { volume.location.target = :filesystem }
+
+      it "sets #reuse_name and #reformat to the proper values" do
+        spec = subject.convert
+
+        expect(spec.reuse_name).to eq "/dev/sda"
+        expect(spec.reformat).to eq false
+      end
+
+      it "sets #device and #separate_vg_name to nil" do
+        spec = subject.convert
+
+        expect(spec.device).to be_nil
+        expect(spec.separate_vg_name).to be_nil
       end
     end
   end
diff --git a/service/test/agama/storage/volume_conversion_test.rb b/service/test/agama/storage/volume_conversion_test.rb
index e9aec67a4..141831b38 100644
--- a/service/test/agama/storage/volume_conversion_test.rb
+++ b/service/test/agama/storage/volume_conversion_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -20,19 +20,18 @@
 # find current contact information at www.suse.com.
 
 require_relative "../../test_helper"
-require "agama/storage/volume_conversion"
-require "agama/storage/volume"
 require "agama/config"
+require "agama/storage/proposal_settings"
+require "agama/storage/volume"
+require "agama/storage/volume_conversion"
 require "y2storage"
 
 describe Agama::Storage::VolumeConversion do
   describe "#from_y2storage" do
-    let(:config) { Agama::Config.new }
-
-    let(:spec) { Y2Storage::VolumeSpecification.new({}) }
+    let(:volume) { Agama::Storage::Volume.new("/test") }
 
-    it "generates a volume from a Y2Storage volume spec" do
-      result = described_class.from_y2storage(spec, config: config)
+    it "generates a volume" do
+      result = described_class.from_y2storage(volume)
       expect(result).to be_a(Agama::Storage::Volume)
     end
   end
@@ -40,7 +39,7 @@
   describe "#to_y2storage" do
     let(:volume) { Agama::Storage::Volume.new("/test") }
 
-    it "generates a Y2Storage volume spec from a volume" do
+    it "generates a Y2Storage volume spec" do
       result = described_class.to_y2storage(volume)
       expect(result).to be_a(Y2Storage::VolumeSpecification)
     end
diff --git a/service/test/fixtures/trivial_lvm.yml b/service/test/fixtures/trivial_lvm.yml
new file mode 100644
index 000000000..ff7aec269
--- /dev/null
+++ b/service/test/fixtures/trivial_lvm.yml
@@ -0,0 +1,24 @@
+---
+- disk:
+    name: /dev/sda
+    size: 200 GiB
+    partition_table:  gpt
+    partitions:
+
+    - partition:
+        size:         100 GiB
+        name:         /dev/sda1
+        id:           lvm
+
+- lvm_vg:
+    vg_name: vg0
+    lvm_pvs:
+        - lvm_pv:
+            blk_device: /dev/sda1
+
+    lvm_lvs:
+        - lvm_lv:
+            size:         100 GiB
+            lv_name:      lv1
+            file_system:  btrfs
+            mount_point:  /
diff --git a/web/.eslintignore b/web/.eslintignore
index 8faa0e3fd..fb9357ef5 100644
--- a/web/.eslintignore
+++ b/web/.eslintignore
@@ -1,2 +1,3 @@
 node_modules/*
 src/lib/*
+src/**/test-data/*
diff --git a/web/cspell.json b/web/cspell.json
index 9c7619f4a..5a6b76748 100644
--- a/web/cspell.json
+++ b/web/cspell.json
@@ -3,9 +3,11 @@
   "language": "en",
   "allowCompoundWords": false,
   "ignorePaths": [
+    "src/languages.json",
     "src/lib/cockpit.js",
     "src/lib/cockpit-po-plugin.js",
-    "src/manifest.json"
+    "src/manifest.json",
+    "src/**/test-data/*"
   ],
   "import": [
     "@cspell/dict-css/cspell-ext.json",
diff --git a/web/package/agama-web-ui.changes b/web/package/agama-web-ui.changes
index 87fbb37d5..66c5fb730 100644
--- a/web/package/agama-web-ui.changes
+++ b/web/package/agama-web-ui.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Wed Apr  3 15:16:07 UTC 2024 - José Iván López González <jlopez@suse.com>
+
+- Add new selection for the target device and for configuring the
+  boot device (gh#openSUSE/agama#1068).
+
+-------------------------------------------------------------------
+Wed Mar 27 12:41:11 UTC 2024 - Ladislav Slezák <lslezak@suse.com>
+
+- Dropping Cockpit dependency:
+  - Do not use Cockpit gettext functionality
+    (gh#openSUSE/agama#1118)
+  - Do not store the list of supported languages to the Cockpit
+    manifest file (gh#openSUSE/agama#1121)
+
+-------------------------------------------------------------------
+Tue Mar 19 14:15:30 UTC 2024 - José Iván López González <jlopez@suse.com>
+
+- In storage page, replace Planned Actions section by a new Result
+  section, unify File Systems and Settings sections, and move
+  Find Space section to a popup (gh#openSUSE/agama#1104).
+
 -------------------------------------------------------------------
 Fri Mar  1 10:56:35 UTC 2024 - José Iván López González <jlopez@suse.com>
 
diff --git a/web/po/ca.po b/web/po/ca.po
new file mode 100644
index 000000000..535d9ef0b
--- /dev/null
+++ b/web/po/ca.po
@@ -0,0 +1,2233 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-03-14 02:05+0000\n"
+"PO-Revision-Date: 2024-03-12 11:42+0000\n"
+"Last-Translator: David Medina <medipas@gmail.com>\n"
+"Language-Team: Catalan <https://l10n.opensuse.org/projects/agama/agama-web/"
+"ca/>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.9.1\n"
+
+#. TRANSLATORS: error message, %s is replaced by the server URL
+#: src/DevServerWrapper.jsx:82
+#, c-format
+msgid "The server at %s is not reachable."
+msgstr "No es pot accedir al servidor a %s."
+
+#. TRANSLATORS: error message
+#: src/DevServerWrapper.jsx:88
+msgid "Cannot connect to the Cockpit server"
+msgstr "No es pot connectar amb el servidor Cockpit."
+
+#. TRANSLATORS: button label
+#: src/DevServerWrapper.jsx:104
+msgid "Try Again"
+msgstr "Torna-ho a provar"
+
+#: src/components/core/About.jsx:43 src/components/core/About.jsx:48
+msgid "About Agama"
+msgstr "Quant a Agama"
+
+#. TRANSLATORS: content of the "About" popup (1/2)
+#: src/components/core/About.jsx:53
+msgid ""
+"Agama is an experimental installer for (open)SUSE systems. It is still under "
+"development so, please, do not use it in production environments. If you "
+"want to give it a try, we recommend using a virtual machine to prevent any "
+"possible data loss."
+msgstr ""
+"L'Agama és un instal·lador experimental per a sistemes (open)SUSE. Encara "
+"està en desenvolupament, així que, si us plau, no l'useu en entorns de "
+"producció. Si voleu provar-lo, us recomanem que feu servir una màquina "
+"virtual per evitar possibles pèrdues de dades."
+
+#. TRANSLATORS: content of the "About" popup (2/2)
+#. %s is replaced by the project URL
+#: src/components/core/About.jsx:65
+#, c-format
+msgid "For more information, please visit the project's repository at %s."
+msgstr ""
+"Per obtenir-ne més informació, visiteu el repositori del projecte a %s."
+
+#. TRANSLATORS: button label
+#: src/components/core/About.jsx:71 src/components/core/FileViewer.jsx:80
+#: src/components/core/IssuesDialog.jsx:119 src/components/core/Sidebar.jsx:157
+#: src/components/core/Terminal.jsx:48
+#: src/components/network/WifiSelector.jsx:151
+#: src/components/product/ProductPage.jsx:239
+msgid "Close"
+msgstr "Tanca"
+
+#. TRANSLATORS: page title
+#: src/components/core/DBusError.jsx:34
+msgid "D-Bus Error"
+msgstr "Error de D-Bus"
+
+#: src/components/core/DBusError.jsx:38
+msgid "Cannot connect to D-Bus"
+msgstr "No es pot connectar a D-Bus."
+
+#: src/components/core/DBusError.jsx:43
+msgid ""
+"Could not connect to the D-Bus service. Please, check whether it is running."
+msgstr ""
+"No s'ha pogut connectar amb el servei D-Bus. Si us plau, comproveu si "
+"s'executa."
+
+#. TRANSLATORS: button label
+#: src/components/core/DBusError.jsx:51
+msgid "Reload"
+msgstr "Torna a carregar"
+
+#: src/components/core/DevelopmentInfo.jsx:55
+msgid "Cockpit server"
+msgstr "Servidor Cockpit"
+
+#: src/components/core/FileViewer.jsx:65
+msgid "Reading file..."
+msgstr "Llegint el fitxer..."
+
+#: src/components/core/FileViewer.jsx:71
+msgid "Cannot read the file"
+msgstr "No es pot llegir el fitxer."
+
+#: src/components/core/InstallButton.jsx:37
+msgid ""
+"There are some reported issues. Please review them in the previous steps "
+"before proceeding with the installation."
+msgstr ""
+"Hi ha alguns problemes reportats. Reviseu-los als passos anteriors abans de "
+"continuar la instal·lació."
+
+#: src/components/core/InstallButton.jsx:49
+msgid "Confirm Installation"
+msgstr "Confirmeu la instal·lació"
+
+#: src/components/core/InstallButton.jsx:55
+msgid ""
+"If you continue, partitions on your hard disk will be modified according to "
+"the provided installation settings."
+msgstr ""
+"Si continueu, les particions del disc dur es modificaran segons la "
+"configuració d'instal·lació proporcionada."
+
+#: src/components/core/InstallButton.jsx:59
+msgid "Please, cancel and check the settings if you are unsure."
+msgstr ""
+"Si us plau, cancel·leu i comproveu-ne la configuració si no n'esteu segur."
+
+#. TRANSLATORS: button label
+#: src/components/core/InstallButton.jsx:65 src/components/core/Popup.jsx:128
+#: src/components/network/WifiConnectionForm.jsx:136
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#. TRANSLATORS: button label
+#: src/components/core/InstallButton.jsx:69
+msgid "Continue"
+msgstr "Continua"
+
+#: src/components/core/InstallButton.jsx:78
+msgid "Problems Found"
+msgstr "S'han trobat problemes."
+
+#: src/components/core/InstallButton.jsx:82
+msgid ""
+"Some problems were found when trying to start the installation. Please, have "
+"a look to the reported errors and try again."
+msgstr ""
+"S'han trobat alguns problemes en intentar iniciar la instal·lació. Si us "
+"plau, mireu els errors i torneu-ho a provar."
+
+#. TRANSLATORS: button label
+#: src/components/core/InstallButton.jsx:89 src/components/l10n/L10nPage.jsx:75
+#: src/components/l10n/L10nPage.jsx:191 src/components/l10n/L10nPage.jsx:304
+#: src/components/product/ProductPage.jsx:71
+#: src/components/product/ProductPage.jsx:140
+#: src/components/product/ProductPage.jsx:207
+#: src/components/storage/ProposalDeviceSection.jsx:169
+#: src/components/storage/ProposalDeviceSection.jsx:364
+#: src/components/storage/ProposalSettingsSection.jsx:263
+#: src/components/storage/ProposalVolumes.jsx:152
+#: src/components/storage/ProposalVolumes.jsx:287
+#: src/components/storage/ZFCPPage.jsx:511
+msgid "Accept"
+msgstr "Accepta-ho"
+
+#. TRANSLATORS: button label
+#: src/components/core/InstallButton.jsx:140
+msgid "Install"
+msgstr "Instal·la"
+
+#: src/components/core/InstallationFinished.jsx:41
+msgid "TPM sealing requires the new system to be booted directly."
+msgstr "El segellament TPM requereix que el sistema nou s'iniciï directament."
+
+#: src/components/core/InstallationFinished.jsx:46
+msgid ""
+"If a local media was used to run this installer, remove it before the next "
+"boot."
+msgstr ""
+"Si s'ha usat un mitjà local per executar aquest instal·lador, traieu-lo "
+"abans de la propera arrencada."
+
+#: src/components/core/InstallationFinished.jsx:50
+msgid "Hide details"
+msgstr "Amaga els detalls"
+
+#: src/components/core/InstallationFinished.jsx:50
+msgid "See more details"
+msgstr "Mostra'n més detalls"
+
+#. TRANSLATORS: Do not translate 'abbr' and 'title', they are part of the HTML markup
+#: src/components/core/InstallationFinished.jsx:55
+msgid ""
+"The final step to configure the <abbr title='Trusted Platform Module'>TPM</"
+"abbr> to automatically open encrypted devices will take place during the "
+"first boot of the new system. For that to work, the machine needs to boot "
+"directly to the new boot loader."
+msgstr ""
+"El pas final per configurar el <abbr title='Trusted Platform Module'>TPM</"
+"abbr> per obrir automàticament dispositius encriptats es farà durant la "
+"primera arrencada del sistema. Perquè això funcioni, la màquina ha "
+"d'arrencar directament des del carregador d'arrencada nou."
+
+#. TRANSLATORS: page title
+#: src/components/core/InstallationFinished.jsx:88
+msgid "Installation Finished"
+msgstr "S'ha acabat la instal·lació."
+
+#: src/components/core/InstallationFinished.jsx:91
+msgid "Congratulations!"
+msgstr "Enhorabona!"
+
+#: src/components/core/InstallationFinished.jsx:96
+msgid "The installation on your machine is complete."
+msgstr "La instal·lació a la màquina s'ha completat."
+
+#: src/components/core/InstallationFinished.jsx:100
+msgid "At this point you can power off the machine."
+msgstr "En aquest punt, podeu aturar la màquina."
+
+#: src/components/core/InstallationFinished.jsx:101
+msgid "At this point you can reboot the machine to log in to the new system."
+msgstr ""
+"En aquest punt, podeu reiniciar la màquina per iniciar sessió al sistema nou."
+
+#: src/components/core/InstallationFinished.jsx:113
+msgid "Finish"
+msgstr "Acaba"
+
+#: src/components/core/InstallationFinished.jsx:113
+msgid "Reboot"
+msgstr "Reinicia"
+
+#: src/components/core/InstallationProgress.jsx:32
+msgid "Installing"
+msgstr "Instal·lant"
+
+#. TRANSLATORS: search field placeholder text
+#: src/components/core/ListSearch.jsx:50
+#: src/components/software/PatternSelector.jsx:215
+#: src/components/software/PatternSelector.jsx:216
+msgid "Search"
+msgstr "Cerca"
+
+#: src/components/core/LogsButton.jsx:98
+msgid "Collecting logs..."
+msgstr "Recopilant registres..."
+
+#: src/components/core/LogsButton.jsx:98
+msgid "Download logs"
+msgstr "Baixa els registres"
+
+#: src/components/core/LogsButton.jsx:106
+msgid ""
+"The browser will run the logs download as soon as they are ready. Please, be "
+"patient."
+msgstr ""
+"El navegador executarà la baixada de registres així que estiguin a punt. Si "
+"us plau, tingueu paciència."
+
+#: src/components/core/LogsButton.jsx:114
+msgid "Something went wrong while collecting logs. Please, try again."
+msgstr ""
+"Hi ha hagut un error durant la recopilació de registres. Torneu-ho a provar."
+
+#: src/components/core/Page.jsx:93 src/components/users/UsersPage.jsx:30
+msgid "Back"
+msgstr "Enrere"
+
+#: src/components/core/Page.jsx:201
+msgid "Show global options"
+msgstr "Mostra les opcions globals"
+
+#: src/components/core/Page.jsx:215
+msgid "Page Actions"
+msgstr "Accions de la pàgina"
+
+#: src/components/core/PasswordAndConfirmationInput.jsx:35
+msgid "Passwords do not match"
+msgstr "Les contrasenyes no coincideixen."
+
+#: src/components/core/PasswordAndConfirmationInput.jsx:56
+#: src/components/network/WifiConnectionForm.jsx:125
+#: src/components/storage/iscsi/AuthFields.jsx:95
+#: src/components/storage/iscsi/AuthFields.jsx:100
+#: src/components/users/RootAuthMethods.jsx:163
+msgid "Password"
+msgstr "Contrasenya"
+
+#: src/components/core/PasswordAndConfirmationInput.jsx:60
+msgid "User password"
+msgstr "Contrasenya d'usuari"
+
+#: src/components/core/PasswordAndConfirmationInput.jsx:69
+msgid "Password confirmation"
+msgstr "Confirmació de la contrasenya"
+
+#: src/components/core/PasswordAndConfirmationInput.jsx:74
+msgid "User password confirmation"
+msgstr "Confirmació de la contrasenya d'usuari"
+
+#: src/components/core/PasswordInput.jsx:59
+msgid "Password visibility button"
+msgstr "Botó de visibilitat de la contrasenya"
+
+#: src/components/core/Popup.jsx:90
+msgid "Confirm"
+msgstr "Confirmeu-ho"
+
+#. TRANSLATORS: dropdown label
+#: src/components/core/RowActions.jsx:66
+#: src/components/storage/ProposalVolumes.jsx:123
+#: src/components/storage/ProposalVolumes.jsx:314
+msgid "Actions"
+msgstr "Accions"
+
+#: src/components/core/SectionSkeleton.jsx:29
+msgid "Waiting"
+msgstr "Escrivint"
+
+#. TRANSLATORS: button label
+#: src/components/core/ShowLogButton.jsx:47
+msgid "Show Logs"
+msgstr "Mostra els registres"
+
+#. TRANSLATORS: popup dialog title
+#: src/components/core/ShowLogButton.jsx:53
+msgid "YaST Logs"
+msgstr "Registres del YaST"
+
+#. TRANSLATORS: button label
+#: src/components/core/ShowTerminalButton.jsx:48
+msgid "Open Terminal"
+msgstr "Obre el terminal"
+
+#. TRANSLATORS: sidebar header
+#: src/components/core/Sidebar.jsx:113 src/components/core/Sidebar.jsx:121
+msgid "Installer Options"
+msgstr "Opcions de l'instal·lador"
+
+#: src/components/core/Sidebar.jsx:128
+msgid "Hide installer options"
+msgstr "Amaga les opcions de l'instal·lador"
+
+#: src/components/core/Sidebar.jsx:136
+msgid "Diagnostic tools"
+msgstr "Eines de diagnòstic"
+
+#. TRANSLATORS: Titles used for the popup displaying found section issues
+#: src/components/core/ValidationErrors.jsx:53
+msgid "Software issues"
+msgstr "Problemes de programari"
+
+#: src/components/core/ValidationErrors.jsx:54
+msgid "Product issues"
+msgstr "Problemes del producte"
+
+#: src/components/core/ValidationErrors.jsx:55
+msgid "Storage issues"
+msgstr "Problemes d'emmagatzematge"
+
+#: src/components/core/ValidationErrors.jsx:57
+msgid "Found Issues"
+msgstr "Problemes trobats"
+
+#. TRANSLATORS: %d is replaced with the number of errors found
+#: src/components/core/ValidationErrors.jsx:77
+#, c-format
+msgid "%d error found"
+msgid_plural "%d errors found"
+msgstr[0] "%d error trobat"
+msgstr[1] "%d errors trobats"
+
+#. TRANSLATORS: label for keyboard layout selection
+#: src/components/l10n/InstallerKeymapSwitcher.jsx:53
+#: src/components/l10n/L10nPage.jsx:357
+msgid "Keyboard"
+msgstr "Teclat"
+
+#. TRANSLATORS: label for keyboard layout selection
+#: src/components/l10n/InstallerKeymapSwitcher.jsx:61
+msgid "keyboard"
+msgstr "teclat"
+
+#. TRANSLATORS:
+#: src/components/l10n/InstallerKeymapSwitcher.jsx:70
+msgid "Keyboard layout cannot be changed in remote installation"
+msgstr "La disposició del teclat no es pot canviar a la instal·lació remota."
+
+#. TRANSLATORS: help text for the language selector in the sidebar,
+#. %s will be replaced by the "Localization" page link
+#: src/components/l10n/InstallerLocaleSwitcher.jsx:47
+#, c-format
+msgid ""
+"The language used by the installer. The language for the installed system "
+"can be set in the %s page."
+msgstr ""
+"La llengua usada per l'instal·lador. La llengua del sistema instal·lat es "
+"pot definir a la pàgina %s."
+
+#. TRANSLATORS: page section
+#. TRANSLATORS: page title
+#: src/components/l10n/InstallerLocaleSwitcher.jsx:56
+#: src/components/l10n/L10nPage.jsx:384
+#: src/components/overview/L10nSection.jsx:52
+msgid "Localization"
+msgstr "Localització"
+
+#: src/components/l10n/InstallerLocaleSwitcher.jsx:66
+#: src/components/l10n/L10nPage.jsx:246
+msgid "Language"
+msgstr "Llengua"
+
+#: src/components/l10n/InstallerLocaleSwitcher.jsx:74
+msgid "language"
+msgstr "llengua"
+
+#. TRANSLATORS: placeholder text for search input in the keyboard selector.
+#: src/components/l10n/KeymapSelector.jsx:53
+msgid "Filter by description or keymap code"
+msgstr "Filtra per descripció o codi de mapa de tecles"
+
+#: src/components/l10n/KeymapSelector.jsx:64
+msgid "Available keymaps"
+msgstr "Mapes de tecles disponibles"
+
+#: src/components/l10n/L10nPage.jsx:66 src/components/l10n/L10nPage.jsx:140
+msgid "Select time zone"
+msgstr "Seleccioneu la zona horària"
+
+#: src/components/l10n/L10nPage.jsx:67
+#, c-format
+msgid "%s will use the selected time zone."
+msgstr "%s usarà la zona horària seleccionada."
+
+#: src/components/l10n/L10nPage.jsx:128
+msgid "Time zone"
+msgstr "Zona horària"
+
+#: src/components/l10n/L10nPage.jsx:134
+msgid "Change time zone"
+msgstr "Canvia la zona horària"
+
+#: src/components/l10n/L10nPage.jsx:139
+msgid "Time zone not selected yet"
+msgstr "La zona horària encara no s'ha seleccionat."
+
+#: src/components/l10n/L10nPage.jsx:182 src/components/l10n/L10nPage.jsx:258
+msgid "Select language"
+msgstr "Seleccioneu una llengua"
+
+#: src/components/l10n/L10nPage.jsx:183
+#, c-format
+msgid "%s will use the selected language."
+msgstr "%s usarà la llengua seleccionada."
+
+#: src/components/l10n/L10nPage.jsx:252
+msgid "Change language"
+msgstr "Canvia la llengua"
+
+#: src/components/l10n/L10nPage.jsx:257
+msgid "Language not selected yet"
+msgstr "La llengua encara no s'ha seleccionat."
+
+#: src/components/l10n/L10nPage.jsx:295 src/components/l10n/L10nPage.jsx:369
+msgid "Select keyboard"
+msgstr "Seleccioneu el teclat"
+
+#: src/components/l10n/L10nPage.jsx:296
+#, c-format
+msgid "%s will use the selected keyboard."
+msgstr "%s usarà el teclat seleccionat."
+
+#: src/components/l10n/L10nPage.jsx:363
+msgid "Change keyboard"
+msgstr "Canvia el teclat"
+
+#: src/components/l10n/L10nPage.jsx:368
+msgid "Keyboard not selected yet"
+msgstr "El teclat encara no s'ha seleccionat."
+
+#: src/components/l10n/LocaleSelector.jsx:53
+msgid "Filter by language, territory or locale code"
+msgstr "Filtra per llengua, territori o codi local"
+
+#: src/components/l10n/LocaleSelector.jsx:64
+msgid "Available locales"
+msgstr "Llengües disponibles"
+
+#. TRANSLATORS: placeholder text for search input in the timezone selector.
+#: src/components/l10n/TimezoneSelector.jsx:75
+msgid "Filter by territory, time zone code or UTC offset"
+msgstr "Filtra per territori, codi de zona horària o desplaçament d'UTC"
+
+#: src/components/l10n/TimezoneSelector.jsx:86
+msgid "Available time zones"
+msgstr "Zones horàries disponibles"
+
+#: src/components/layout/Loading.jsx:30
+msgid "Loading installation environment, please wait."
+msgstr "Carregant l'entorn d'instal·lació. Espereu, si us plau."
+
+#. TRANSLATORS: button label
+#: src/components/network/AddressesDataList.jsx:81
+#: src/components/network/DnsDataList.jsx:87
+msgid "Remove"
+msgstr "Suprimeix"
+
+#. TRANSLATORS: input field name
+#: src/components/network/AddressesDataList.jsx:93
+#: src/components/network/AddressesDataList.jsx:94
+#: src/components/network/IpAddressInput.jsx:33
+msgid "IP Address"
+msgstr "Adreça IP"
+
+#. TRANSLATORS: input field name
+#: src/components/network/AddressesDataList.jsx:102
+#: src/components/network/AddressesDataList.jsx:103
+msgid "Prefix length or netmask"
+msgstr "Longitud del prefix o màscara de xarxa"
+
+#: src/components/network/AddressesDataList.jsx:119
+msgid "Add an address"
+msgstr "Afegeix-hi una adreça"
+
+#. TRANSLATORS: button label
+#: src/components/network/AddressesDataList.jsx:119
+msgid "Add another address"
+msgstr "Afegeix-hi una altra adreça"
+
+#: src/components/network/AddressesDataList.jsx:124
+msgid "Addresses"
+msgstr "Adreces"
+
+#: src/components/network/AddressesDataList.jsx:129
+msgid "Addresses data list"
+msgstr "Llista de dades d'adreces"
+
+#. TRANSLATORS: table header
+#. TRANSLATORS: input field for the iSCSI initiator name
+#: src/components/network/ConnectionsTable.jsx:57
+#: src/components/network/ConnectionsTable.jsx:86
+#: src/components/storage/ZFCPPage.jsx:360
+#: src/components/storage/iscsi/InitiatorForm.jsx:52
+#: src/components/storage/iscsi/InitiatorPresenter.jsx:68
+#: src/components/storage/iscsi/InitiatorPresenter.jsx:85
+#: src/components/storage/iscsi/NodesPresenter.jsx:100
+#: src/components/storage/iscsi/NodesPresenter.jsx:121
+msgid "Name"
+msgstr "Nom"
+
+#. TRANSLATORS: table header
+#: src/components/network/ConnectionsTable.jsx:59
+#: src/components/network/ConnectionsTable.jsx:87
+msgid "IP addresses"
+msgstr "Adreces IP"
+
+#: src/components/network/ConnectionsTable.jsx:67
+#: src/components/storage/ProposalVolumes.jsx:238
+#: src/components/storage/iscsi/InitiatorPresenter.jsx:49
+#: src/components/storage/iscsi/NodesPresenter.jsx:73
+#: src/components/users/FirstUser.jsx:208
+msgid "Edit"
+msgstr "Edita"
+
+#. TRANSLATORS: %s is replaced by a network connection name
+#: src/components/network/ConnectionsTable.jsx:70
+#, c-format
+msgid "Edit connection %s"
+msgstr "Edita la connexió %s"
+
+#: src/components/network/ConnectionsTable.jsx:74
+msgid "Forget"
+msgstr "Oblida-la"
+
+#. TRANSLATORS: %s is replaced by a network connection name
+#: src/components/network/ConnectionsTable.jsx:77
+#, c-format
+msgid "Forget connection %s"
+msgstr "Oblida la connexió %s"
+
+#. TRANSLATORS: %s is replaced by a network connection name
+#: src/components/network/ConnectionsTable.jsx:92
+#, c-format
+msgid "Actions for connection %s"
+msgstr "Accions per a la connexió %s"
+
+#. TRANSLATORS: input field name
+#: src/components/network/DnsDataList.jsx:78
+#: src/components/network/DnsDataList.jsx:79
+msgid "Server IP"
+msgstr "IP del servidor"
+
+#: src/components/network/DnsDataList.jsx:96
+msgid "Add DNS"
+msgstr "Afegeix-hi un DNS"
+
+#. TRANSLATORS: button label
+#: src/components/network/DnsDataList.jsx:96
+msgid "Add another DNS"
+msgstr "Afegeix-hi un altre DNS"
+
+#: src/components/network/DnsDataList.jsx:101
+msgid "DNS"
+msgstr "DNS"
+
+#. TRANSLATORS: input field name
+#: src/components/network/IpPrefixInput.jsx:33
+msgid "IP prefix or netmask"
+msgstr "Prefix IP o màscara de xarxa"
+
+#. TRANSLATORS: error message
+#: src/components/network/IpSettingsForm.jsx:87
+msgid "At least one address must be provided for selected mode"
+msgstr "S'ha de proporcionar almenys una adreça per al mode seleccionat."
+
+#. TRANSLATORS: %s is replaced by the iSCSI target node name
+#: src/components/network/IpSettingsForm.jsx:133
+#: src/components/storage/iscsi/EditNodeForm.jsx:50
+#, c-format
+msgid "Edit %s"
+msgstr "Edita %s"
+
+#. TRANSLATORS: network connection mode (automatic via DHCP or manual with static IP)
+#: src/components/network/IpSettingsForm.jsx:136
+#: src/components/network/IpSettingsForm.jsx:141
+#: src/components/network/IpSettingsForm.jsx:143
+msgid "Mode"
+msgstr "Mode"
+
+#: src/components/network/IpSettingsForm.jsx:147
+msgid "Automatic (DHCP)"
+msgstr "Automàtic (DHCP)"
+
+#. TRANSLATORS: manual network configuration mode with a static IP address
+#: src/components/network/IpSettingsForm.jsx:149
+#: src/components/storage/iscsi/NodeStartupOptions.js:25
+msgid "Manual"
+msgstr "Manual"
+
+#. TRANSLATORS: network gateway configuration
+#: src/components/network/IpSettingsForm.jsx:164
+#: src/components/network/IpSettingsForm.jsx:167
+msgid "Gateway"
+msgstr "Passarel·la"
+
+#: src/components/network/NetworkPage.jsx:38
+msgid "No wired connections found."
+msgstr "No s'ha trobat cap connexió amb fil."
+
+#: src/components/network/NetworkPage.jsx:53
+msgid ""
+"The system has not been configured for connecting to a WiFi network yet."
+msgstr ""
+"El sistema encara no s'ha configurat per connectar-se a una xarxa WiFi."
+
+#: src/components/network/NetworkPage.jsx:54
+msgid ""
+"The system does not support WiFi connections, probably because of missing or "
+"disabled hardware."
+msgstr ""
+"El sistema no admet connexions WiFi, probablement a causa del maquinari que "
+"manca o està desactivat."
+
+#: src/components/network/NetworkPage.jsx:58
+msgid "No WiFi connections found."
+msgstr "No s'ha trobat cap connexió WiFi."
+
+#. TRANSLATORS: button label
+#: src/components/network/NetworkPage.jsx:70
+#: src/components/network/NetworkPageMenu.jsx:46
+#: src/components/network/WifiSelector.jsx:134
+msgid "Connect to a Wi-Fi network"
+msgstr "Connecteu-vos a una xarxa Wi-Fi"
+
+#. TRANSLATORS: page title
+#. TRANSLATORS: page section title
+#: src/components/network/NetworkPage.jsx:169
+#: src/components/overview/NetworkSection.jsx:83
+msgid "Network"
+msgstr "Xarxa"
+
+#. TRANSLATORS: page section
+#: src/components/network/NetworkPage.jsx:171
+msgid "Wired networks"
+msgstr "Connexions amb fil"
+
+#. TRANSLATORS: page section
+#: src/components/network/NetworkPage.jsx:176
+msgid "WiFi networks"
+msgstr "Xarxes WiFi"
+
+#. TRANSLATORS: WiFi authentication mode
+#: src/components/network/WifiConnectionForm.jsx:43
+#: src/components/storage/iscsi/InitiatorPresenter.jsx:72
+msgid "None"
+msgstr "Cap"
+
+#. TRANSLATORS: WiFi authentication mode
+#: src/components/network/WifiConnectionForm.jsx:45
+msgid "WPA & WPA2 Personal"
+msgstr "WPA i WPA2 personal"
+
+#: src/components/network/WifiConnectionForm.jsx:91
+#: src/components/product/ProductPage.jsx:128
+#: src/components/product/ProductPage.jsx:194
+#: src/components/storage/ZFCPDiskForm.jsx:112
+#: src/components/storage/iscsi/DiscoverForm.jsx:108
+#: src/components/storage/iscsi/LoginForm.jsx:72
+#: src/components/users/FirstUser.jsx:238
+msgid "Something went wrong"
+msgstr "Alguna cosa ha anat malament."
+
+#: src/components/network/WifiConnectionForm.jsx:92
+msgid "Please, review provided settings and try again."
+msgstr ""
+"Si us plau, reviseu la configuració proporcionada i torneu-ho a provar."
+
+#. TRANSLATORS: SSID (Wifi network name) configuration
+#: src/components/network/WifiConnectionForm.jsx:97
+#: src/components/network/WifiConnectionForm.jsx:101
+msgid "SSID"
+msgstr "SSID"
+
+#. TRANSLATORS: Wifi security configuration (password protected or not)
+#: src/components/network/WifiConnectionForm.jsx:109
+#: src/components/network/WifiConnectionForm.jsx:112
+msgid "Security"
+msgstr "Seguretat"
+
+#. TRANSLATORS: WiFi password
+#: src/components/network/WifiConnectionForm.jsx:121
+msgid "WPA Password"
+msgstr "Contrasenya de WPA"
+
+#. TRANSLATORS: button label, connect to a WiFi network
+#: src/components/network/WifiConnectionForm.jsx:133
+msgid "Connect"
+msgstr "Connecta't"
+
+#. TRANSLATORS: button label
+#: src/components/network/WifiHiddenNetworkForm.jsx:50
+msgid "Connect to hidden network"
+msgstr "Connecta't a una xarxa oculta"
+
+#. TRANSLATORS: Wifi network status
+#: src/components/network/WifiNetworkListItem.jsx:41
+#: src/components/network/WifiNetworkListItem.jsx:99
+msgid "Connecting"
+msgstr "Connectant"
+
+#. TRANSLATORS: Wifi network status
+#: src/components/network/WifiNetworkListItem.jsx:44
+msgid "Connected"
+msgstr "Connectat"
+
+#. TRANSLATORS: Wifi network status
+#: src/components/network/WifiNetworkListItem.jsx:47
+msgid "Disconnecting"
+msgstr "Desconnectant"
+
+#. TRANSLATORS: Wifi network status
+#. TRANSLATORS: iSCSI connection status
+#: src/components/network/WifiNetworkListItem.jsx:50
+#: src/components/storage/iscsi/NodesPresenter.jsx:63
+msgid "Disconnected"
+msgstr "Desconnectat"
+
+#. TRANSLATORS: %s is replaced by a WiFi network name
+#: src/components/network/WifiNetworkListItem.jsx:97
+#, c-format
+msgid "%s connection is waiting for an state change"
+msgstr "La connexió %s espera un canvi d'estat."
+
+#. TRANSLATORS: menu label, remove the selected WiFi network settings
+#: src/components/network/WifiNetworkMenu.jsx:55
+msgid "Forget network"
+msgstr "Oblida la xarxa"
+
+#. TRANSLATORS: %s will be replaced by a language name and territory, example:
+#. "English (United States)".
+#: src/components/overview/L10nSection.jsx:34
+#, c-format
+msgid "The system will use %s as its default language."
+msgstr "El sistema usarà el %s com a llengua per defecte."
+
+#: src/components/overview/NetworkSection.jsx:59
+msgid "No network connections detected"
+msgstr "No s'ha detectat cap connexió de xarxa."
+
+#. TRANSLATORS: header for the list of active network connections,
+#. %d is replaced by the number of active connections
+#: src/components/overview/NetworkSection.jsx:68
+#, c-format
+msgid "%d connection set:"
+msgid_plural "%d connections set:"
+msgstr[0] "%d connexió establerta:"
+msgstr[1] "%d connexions establertes:"
+
+#. TRANSLATORS: page title
+#: src/components/overview/OverviewPage.jsx:48
+msgid "Installation Summary"
+msgstr "Resum de la instal·lació"
+
+#. TRANSLATORS: %s is replaced by a product name (e.g., SUSE ALP-Dolomite)
+#: src/components/overview/ProductSection.jsx:48
+#, c-format
+msgid "%s (registered)"
+msgstr "%s (registrat)"
+
+#. TRANSLATORS: page title
+#. TRANSLATORS: page section
+#: src/components/overview/ProductSection.jsx:71
+#: src/components/product/ProductPage.jsx:435
+msgid "Product"
+msgstr "Producte"
+
+#: src/components/overview/SoftwareSection.jsx:38
+msgid "Reading software repositories"
+msgstr "Lectura de repositoris de programari"
+
+#. TRANSLATORS: clickable link label
+#: src/components/overview/SoftwareSection.jsx:133
+msgid "Refresh the repositories"
+msgstr "Refresca els repositoris"
+
+#. TRANSLATORS: page section
+#. TRANSLATORS: page title
+#: src/components/overview/SoftwareSection.jsx:143
+#: src/components/software/SoftwarePage.jsx:81
+msgid "Software"
+msgstr "Programari"
+
+#: src/components/overview/StorageSection.jsx:42
+#: src/components/storage/ProposalDeviceSection.jsx:129
+msgid "No device selected yet"
+msgstr "Encara no s'ha seleccionat cap dispositiu."
+
+#. TRANSLATORS: %s will be replaced by the device name and its size,
+#. example: "/dev/sda, 20 GiB"
+#: src/components/overview/StorageSection.jsx:52
+#, c-format
+msgid "Install using device %s shrinking existing partitions as needed"
+msgstr ""
+"Instal·la al dispositiu %s reduint-ne les particions existents segons calgui"
+
+#. TRANSLATORS: %s will be replaced by the device name and its size,
+#. example: "/dev/sda, 20 GiB"
+#: src/components/overview/StorageSection.jsx:56
+#, c-format
+msgid "Install using device %s without modifying existing partitions"
+msgstr "Instal·la al dispositiu %s sense modificar-ne les particions existents"
+
+#. TRANSLATORS: %s will be replaced by the device name and its size,
+#. example: "/dev/sda, 20 GiB"
+#: src/components/overview/StorageSection.jsx:60
+#, c-format
+msgid "Install using device %s and deleting all its content"
+msgstr "Instal·la al dispositiu %s suprimint-ne tot el contingut"
+
+#. TRANSLATORS: %s will be replaced by the device name and its size,
+#. example: "/dev/sda, 20 GiB"
+#: src/components/overview/StorageSection.jsx:66
+#, c-format
+msgid "Install using device %s"
+msgstr "Instal·la al dispositiu %s"
+
+#: src/components/overview/StorageSection.jsx:83
+msgid "Probing storage devices"
+msgstr "Sondant els dispositius d'emmagatzematge"
+
+#. TRANSLATORS: page title
+#. TRANSLATORS: page section title
+#: src/components/overview/StorageSection.jsx:208
+#: src/components/storage/ProposalPage.jsx:243
+msgid "Storage"
+msgstr "Emmagatzematge"
+
+#. TRANSLATORS: %s will be replaced by the user name
+#: src/components/overview/UsersSection.jsx:80
+#, c-format
+msgid "User %s will be created"
+msgstr "Es crearà l'usuari %s"
+
+#: src/components/overview/UsersSection.jsx:87
+msgid "No user defined yet"
+msgstr "Encara no s'ha definit cap usuari."
+
+#: src/components/overview/UsersSection.jsx:101
+msgid "Root authentication set for using both, password and public SSH Key"
+msgstr ""
+"Autenticació d'arrel establerta per usar contrasenya i clau SSH pública"
+
+#: src/components/overview/UsersSection.jsx:102
+msgid "No root authentication method defined"
+msgstr "No s'ha definit cap mètode d'autenticació d'arrel."
+
+#: src/components/overview/UsersSection.jsx:103
+msgid "Root authentication set for using password"
+msgstr "Autenticació d'arrel establerta per usar contrasenya"
+
+#: src/components/overview/UsersSection.jsx:104
+msgid "Root authentication set for using public SSH Key"
+msgstr "Autenticació d'arrel establerta per usar una clau SSH pública"
+
+#. TRANSLATORS: page section title
+#: src/components/overview/UsersSection.jsx:120
+#: src/components/users/UsersPage.jsx:30
+msgid "Users"
+msgstr "Usuaris"
+
+#: src/components/product/ProductPage.jsx:63
+#: src/components/product/ProductSelectionPage.jsx:65
+msgid "Choose a product"
+msgstr "Trieu un producte"
+
+#: src/components/product/ProductPage.jsx:122
+#, c-format
+msgid "Register %s"
+msgstr "Registra %s"
+
+#: src/components/product/ProductPage.jsx:188
+#, c-format
+msgid "Deregister %s"
+msgstr "Dona de baixa %s"
+
+#. TRANSLATORS: %s is replaced by a product name (e.g., SUSE ALP-Dolomite)
+#: src/components/product/ProductPage.jsx:202
+#, c-format
+msgid "Do you want to deregister %s?"
+msgstr "Voleu donar de baixa el producte %s?"
+
+#: src/components/product/ProductPage.jsx:227
+msgid "Registered warning"
+msgstr "Avís de registre"
+
+#. TRANSLATORS: %s is replaced by a product name (e.g., SUSE ALP-Dolomite)
+#: src/components/product/ProductPage.jsx:232
+#, c-format
+msgid "The product %s must be deregistered before selecting a new product."
+msgstr ""
+"El producte %s s'ha de donar de baixa abans de seleccionar un producte nou."
+
+#: src/components/product/ProductPage.jsx:263
+msgid "Change product"
+msgstr "Canvia el producte"
+
+#: src/components/product/ProductPage.jsx:305
+msgid "Register"
+msgstr "Registra"
+
+#: src/components/product/ProductPage.jsx:337
+msgid "Deregister product"
+msgstr "Dona de baixa el producte"
+
+#: src/components/product/ProductPage.jsx:370
+msgid "Code:"
+msgstr "Codi:"
+
+#: src/components/product/ProductPage.jsx:374
+msgid "Email:"
+msgstr "Adreça electrònica:"
+
+#. TRANSLATORS: section title.
+#: src/components/product/ProductPage.jsx:390
+msgid "Registration"
+msgstr "Registre"
+
+#: src/components/product/ProductPage.jsx:399
+msgid "This product requires registration."
+msgstr "Aquest producte requereix registre."
+
+#: src/components/product/ProductPage.jsx:405
+msgid "This product does not require registration."
+msgstr "Aquest producte no requereix registre."
+
+#: src/components/product/ProductRegistrationForm.jsx:63
+msgid "Registration code"
+msgstr "Codi de registre"
+
+#: src/components/product/ProductRegistrationForm.jsx:66
+msgid "Email"
+msgstr "Adreça electrònica"
+
+#: src/components/product/ProductSelectionPage.jsx:58
+msgid "Loading available products, please wait..."
+msgstr "Carregant els productes disponibles. Espereu, si us plau..."
+
+#. TRANSLATORS: page title
+#: src/components/product/ProductSelectionPage.jsx:63
+msgid "Product selection"
+msgstr "Selecció de producte"
+
+#: src/components/product/ProductSelectionPage.jsx:72
+msgid "Select"
+msgstr "Selecciona"
+
+#: src/components/product/ProductSelector.jsx:36
+msgid "No products available for selection"
+msgstr "No hi ha productes disponibles per a la selecció."
+
+#: src/components/product/ProductSelector.jsx:42
+msgid "Available products"
+msgstr "Productes disponibles"
+
+#: src/components/questions/GenericQuestion.jsx:35
+#: src/components/questions/LuksActivationQuestion.jsx:60
+msgid "Question"
+msgstr "Pregunta"
+
+#. TRANSLATORS: error message, user entered a wrong password
+#: src/components/questions/LuksActivationQuestion.jsx:34
+msgid "Given encryption password didn't work"
+msgstr "La contrasenya d'encriptació proporcionada no ha funcionat."
+
+#: src/components/questions/LuksActivationQuestion.jsx:59
+msgid "Encrypted Device"
+msgstr "Dispositiu encriptat"
+
+#. TRANSLATORS: field label
+#: src/components/questions/LuksActivationQuestion.jsx:69
+msgid "Encryption Password"
+msgstr "Contrasenya d'encriptació"
+
+#. TRANSLATORS: pattern status, selected to install (by user)
+#: src/components/software/PatternItem.jsx:63
+msgid "selected"
+msgstr "seleccionat"
+
+#. TRANSLATORS: pattern status, selected to install (by dependencies)
+#: src/components/software/PatternItem.jsx:66
+msgid "automatically selected"
+msgstr "seleccionat automàticament"
+
+#. TRANSLATORS: pattern status, not selected to install
+#: src/components/software/PatternItem.jsx:69
+msgid "not selected"
+msgstr "no seleccionat"
+
+#: src/components/software/PatternSelector.jsx:210
+msgid "Software summary and filter options"
+msgstr "Resum de programari i opcions de filtre"
+
+#. TRANSLATORS: %s will be replaced by the estimated installation size,
+#. example: "728.8 MiB"
+#: src/components/software/UsedSize.jsx:32
+#, c-format
+msgid "Installation will take %s"
+msgstr "La instal·lació necessitarà %s"
+
+#: src/components/storage/DASDFormatProgress.jsx:61
+msgid "Waiting for progress report"
+msgstr "Esperant l'informe de progrés"
+
+#: src/components/storage/DASDFormatProgress.jsx:69
+msgid "Formatting DASD devices"
+msgstr "Formatatge de dispositius DASD"
+
+#. TRANSLATORS: DASD = Direct Access Storage Device, IBM mainframe storage technology
+#: src/components/storage/DASDPage.jsx:181
+msgid "Storage DASD"
+msgstr "Emmagatzematge DASD"
+
+#: src/components/storage/DASDTable.jsx:57
+#: src/components/storage/ZFCPPage.jsx:318
+#: src/components/storage/iscsi/InitiatorPresenter.jsx:71
+#: src/components/storage/iscsi/NodesPresenter.jsx:103
+msgid "No"
+msgstr "No"
+
+#: src/components/storage/DASDTable.jsx:57
+#: src/components/storage/ZFCPPage.jsx:318
+#: src/components/storage/iscsi/InitiatorPresenter.jsx:71
+#: src/components/storage/iscsi/NodesPresenter.jsx:103
+msgid "Yes"
+msgstr "Sí"
+
+#: src/components/storage/DASDTable.jsx:64
+#: src/components/storage/ZFCPDiskForm.jsx:118
+#: src/components/storage/ZFCPPage.jsx:301
+#: src/components/storage/ZFCPPage.jsx:361
+msgid "Channel ID"
+msgstr "Identificador del canal"
+
+#. TRANSLATORS: table header
+#: src/components/storage/DASDTable.jsx:65
+#: src/components/storage/ZFCPPage.jsx:302
+#: src/components/storage/iscsi/NodesPresenter.jsx:104
+#: src/components/storage/iscsi/NodesPresenter.jsx:125
+#: src/components/users/RootAuthMethods.jsx:157
+msgid "Status"
+msgstr "Estat"
+
+#. TRANSLATORS: The storage "Device" section's title
+#: src/components/storage/DASDTable.jsx:66
+#: src/components/storage/ProposalDeviceSection.jsx:423
+msgid "Device"
+msgstr "Dispositiu"
+
+#: src/components/storage/DASDTable.jsx:67
+msgid "Type"
+msgstr "Tipus"
+
+#: src/components/storage/DASDTable.jsx:68
+msgid "Diag"
+msgstr "Diag."
+
+#: src/components/storage/DASDTable.jsx:69
+msgid "Formatted"
+msgstr "Formatat"
+
+#: src/components/storage/DASDTable.jsx:70
+msgid "Partition Info"
+msgstr "Informació de la partició"
+
+#. TRANSLATORS: drop down menu label
+#: src/components/storage/DASDTable.jsx:105
+msgid "Perform an action"
+msgstr "Fes una acció"
+
+#. TRANSLATORS: drop down menu action, activate the device
+#: src/components/storage/DASDTable.jsx:111
+#: src/components/storage/ZFCPPage.jsx:332
+msgid "Activate"
+msgstr "Activa"
+
+#. TRANSLATORS: drop down menu action, deactivate the device
+#: src/components/storage/DASDTable.jsx:113
+#: src/components/storage/ZFCPPage.jsx:374
+msgid "Deactivate"
+msgstr "Desactiva"
+
+#. TRANSLATORS: drop down menu action, enable DIAG access method
+#: src/components/storage/DASDTable.jsx:116
+msgid "Set DIAG On"
+msgstr "Activa la diagnosi"
+
+#. TRANSLATORS: drop down menu action, disable DIAG access method
+#: src/components/storage/DASDTable.jsx:118
+msgid "Set DIAG Off"
+msgstr "Desactiva la diagnosi"
+
+#. TRANSLATORS: drop down menu action, format the disk
+#: src/components/storage/DASDTable.jsx:121
+msgid "Format"
+msgstr "Formata"
+
+#: src/components/storage/DASDTable.jsx:198
+#: src/components/storage/DASDTable.jsx:199
+msgid "Filter by min channel"
+msgstr "Filtra per canal mínim"
+
+#: src/components/storage/DASDTable.jsx:206
+msgid "Remove min channel filter"
+msgstr "Suprimeix el filtre del canal mínim"
+
+#: src/components/storage/DASDTable.jsx:219
+#: src/components/storage/DASDTable.jsx:220
+msgid "Filter by max channel"
+msgstr "Filtra per canal màxim"
+
+#: src/components/storage/DASDTable.jsx:227
+msgid "Remove max channel filter"
+msgstr "Suprimeix el filtre de canal màxim"
+
+#. TRANSLATORS: page title for iSCSI configuration
+#: src/components/storage/ISCSIPage.jsx:31
+msgid "Storage iSCSI"
+msgstr "Emmagatzematge iSCSI"
+
+#. TRANSLATORS: show/hide toggle action, this is a clickable link
+#: src/components/storage/ProposalActionsSection.jsx:70
+#, c-format
+msgid "Hide %d subvolume action"
+msgid_plural "Hide %d subvolume actions"
+msgstr[0] "Amaga %d acció de subvolum"
+msgstr[1] "Amaga %d accions de subvolum"
+
+#. TRANSLATORS: show/hide toggle action, this is a clickable link
+#: src/components/storage/ProposalActionsSection.jsx:72
+#, c-format
+msgid "Show %d subvolume action"
+msgid_plural "Show %d subvolume actions"
+msgstr[0] "Mostra %d acció de subvolum"
+msgstr[1] "Mostra %d accions de subvolum"
+
+#. TRANSLATORS: The storage "Planned Actions" section's title. The
+#. section shows a list of planned actions for the selected device, e.g.
+#. "delete partition A", "create partition B with filesystem C", ...
+#: src/components/storage/ProposalActionsSection.jsx:124
+msgid "Planned Actions"
+msgstr "Accions planificades"
+
+#. TRANSLATORS: The storage "Planned Actions" section's description
+#: src/components/storage/ProposalActionsSection.jsx:126
+msgid "Actions to create the file systems and to ensure the new system boots."
+msgstr ""
+"Accions per crear els sistemes de fitxers i per garantir l'arrencada del "
+"sistema nou."
+
+#: src/components/storage/ProposalDeviceSection.jsx:135
+msgid "Waiting for information about selected device"
+msgstr "Esperant informació sobre el dispositiu seleccionat"
+
+#: src/components/storage/ProposalDeviceSection.jsx:138
+msgid "Select the device for installing the system."
+msgstr "Seleccioneu el dispositiu on instal·lar el sistema."
+
+#: src/components/storage/ProposalDeviceSection.jsx:143
+#: src/components/storage/ProposalDeviceSection.jsx:147
+#: src/components/storage/ProposalDeviceSection.jsx:245
+msgid "Installation device"
+msgstr "Dispositiu d'instal·lació"
+
+#: src/components/storage/ProposalDeviceSection.jsx:153
+msgid "No devices found."
+msgstr "No s'ha trobat cap dispositiu."
+
+#: src/components/storage/ProposalDeviceSection.jsx:242
+msgid "Devices for creating the volume group"
+msgstr "Dispositius per crear el grup de volums"
+
+#: src/components/storage/ProposalDeviceSection.jsx:251
+msgid "Custom devices"
+msgstr "Dispositius personalitzats"
+
+#: src/components/storage/ProposalDeviceSection.jsx:315
+msgid ""
+"Configuration of the system volume group. All the file systems will be "
+"created in a logical volume of the system volume group."
+msgstr ""
+"Configuració del grup de volums del sistema. Tots els sistemes de fitxers es "
+"crearan en un volum lògic del grup de volums del sistema."
+
+#: src/components/storage/ProposalDeviceSection.jsx:321
+msgid "Configure the LVM settings"
+msgstr "Configuració dels paràmetres d'LVM"
+
+#: src/components/storage/ProposalDeviceSection.jsx:326
+#: src/components/storage/ProposalDeviceSection.jsx:346
+msgid "LVM settings"
+msgstr "Paràmetres d'LVM"
+
+#: src/components/storage/ProposalDeviceSection.jsx:333
+msgid "Waiting for information about LVM"
+msgstr "Esperant informació sobre LVM"
+
+#: src/components/storage/ProposalDeviceSection.jsx:339
+msgid "Use logical volume management (LVM)"
+msgstr "Usa la gestió de volums lògics (LVM)"
+
+#: src/components/storage/ProposalDeviceSection.jsx:347
+msgid "System Volume Group"
+msgstr "Grup de volums del sistema"
+
+#. TRANSLATORS: The storage "Device" sections's description. Do not
+#. translate 'abbr' and 'title', they are part of the HTML markup.
+#: src/components/storage/ProposalDeviceSection.jsx:414
+msgid ""
+"Select the main disk or <abbr title='Logical Volume Manager'>LVM</abbr> "
+"Volume Group for installation."
+msgstr ""
+"Seleccioneu el disc principal o el grup de volums <abbr title='Logical "
+"Volume Manager'>LVM</abbr> per a la instal·lació."
+
+#: src/components/storage/ProposalFileSystemsSection.jsx:70
+msgid "File systems"
+msgstr "Sistemes de fitxers"
+
+#: src/components/storage/ProposalPageMenu.jsx:40
+msgid "Manage and format"
+msgstr "Gestió i formatatge"
+
+#: src/components/storage/ProposalPageMenu.jsx:58
+msgid "Activate disks"
+msgstr "Activa els discs"
+
+#: src/components/storage/ProposalPageMenu.jsx:60
+msgid "zFCP"
+msgstr "zFCP"
+
+#: src/components/storage/ProposalPageMenu.jsx:76
+msgid "Connect to iSCSI targets"
+msgstr "Connecta amb objectius iSCSI"
+
+#: src/components/storage/ProposalPageMenu.jsx:78
+msgid "iSCSI"
+msgstr "iSCSI"
+
+#. TRANSLATORS: The word 'directly' is key here. For example, booting to the installer media and then choosing
+#. 'Boot from Hard Disk' from there will not work. Keep it sort (this is a hint in a form) but keep it clear.
+#. Do not translate 'abbr' and 'title', they are part of the HTML markup.
+#: src/components/storage/ProposalSettingsSection.jsx:87
+msgid ""
+"The password will not be needed to boot and access the data if the <abbr "
+"title='Trusted Platform Module'>TPM</abbr> can verify the integrity of the "
+"system. TPM sealing requires the new system to be booted directly on its "
+"first run."
+msgstr ""
+"La contrasenya no serà necessària per arrencar i accedir a les dades si el "
+"<abbr title='Trusted Platform Module'>TPM</abbr> pot verificar la integritat "
+"del sistema. El segellament de TPM requereix que el sistema nou s'iniciï "
+"directament a la primera execució."
+
+#: src/components/storage/ProposalSettingsSection.jsx:105
+msgid "Use the TPM to decrypt automatically on each boot"
+msgstr "Usa el TPM per a la desencriptació automàtica a cada arrencada"
+
+#: src/components/storage/ProposalSettingsSection.jsx:148
+msgid ""
+"Uses Btrfs for the root file system allowing to boot to a previous version "
+"of the system after configuration changes or software upgrades."
+msgstr ""
+"Usa Btrfs per al sistema de fitxers d'arrel, que permet arrencar amb una "
+"versió anterior del sistema després de canvis de configuració o "
+"actualitzacions de programari."
+
+#: src/components/storage/ProposalSettingsSection.jsx:155
+msgid "Use Btrfs Snapshots"
+msgstr "Usa instantànies de Btrfs"
+
+#: src/components/storage/ProposalSettingsSection.jsx:227
+msgid "Change encryption settings"
+msgstr "Canvia la configuració de l'encriptació"
+
+#: src/components/storage/ProposalSettingsSection.jsx:232
+#: src/components/storage/ProposalSettingsSection.jsx:253
+msgid "Encryption settings"
+msgstr "Configuració de l'encriptació"
+
+#: src/components/storage/ProposalSettingsSection.jsx:246
+msgid "Use encryption"
+msgstr "Usa encriptació"
+
+#: src/components/storage/ProposalSettingsSection.jsx:309
+msgid "Settings"
+msgstr "Configuració"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:50
+msgid "Delete current content"
+msgstr "Suprimeix el contingut actual"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:51
+msgid "All partitions will be removed and any data in the disks will be lost."
+msgstr "Totes les particions se suprimiran i es perdran les dades dels discs."
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:55
+msgid "Shrink existing partitions"
+msgstr "Redueix les particions existents"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:56
+msgid "The data is kept, but the current partitions will be resized as needed."
+msgstr ""
+"Les dades es conserven, però les particions actuals es canviaran de mida "
+"segons calgui."
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:60
+msgid "Use available space"
+msgstr "Usa l'espai disponible"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:61
+msgid ""
+"The data is kept. Only the space not assigned to any partition will be used."
+msgstr ""
+"Es conserven les dades. Només s'usarà l'espai no assignat a cap partició."
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:65
+msgid "Custom"
+msgstr "Personalitzat"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:66
+msgid "Select what to do with each partition."
+msgstr "Seleccioneu què voleu fer amb cada partició."
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:72
+msgid "Used device"
+msgstr "Dispositiu usat"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:73
+msgid "Current content"
+msgstr "Contingut actual"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:74
+#: src/components/storage/ProposalVolumes.jsx:313
+#: src/components/storage/VolumeForm.jsx:745
+msgid "Size"
+msgstr "Mida"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:75
+#: src/components/storage/ProposalVolumes.jsx:312
+msgid "Details"
+msgstr "Detalls"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:76
+msgid "Action"
+msgstr "Acció"
+
+#. TRANSLATORS: %s is replaced by partition table type (e.g., GPT)
+#: src/components/storage/ProposalSpacePolicySection.jsx:110
+#, c-format
+msgid "%s partition table"
+msgstr "Taula de particions %s"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:121
+msgid "EFI system partition"
+msgstr "Partició de sistema EFI"
+
+#. TRANSLATORS: %s is replaced by a file system type (e.g., btrfs).
+#: src/components/storage/ProposalSpacePolicySection.jsx:124
+#, c-format
+msgid "%s file system"
+msgstr "Sistema de fitxers %s"
+
+#. TRANSLATORS: %s is replaced by a LVM volume group name (e.g., /dev/vg0).
+#: src/components/storage/ProposalSpacePolicySection.jsx:131
+#, c-format
+msgid "LVM physical volume of %s"
+msgstr "Volum físic d'LVM %s"
+
+#. TRANSLATORS: %s is replaced by a RAID name (e.g., /dev/md0).
+#: src/components/storage/ProposalSpacePolicySection.jsx:134
+#, c-format
+msgid "Member of RAID %s"
+msgstr "Membre de la RAID %s"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:136
+msgid "Not identified"
+msgstr "Sense identificació"
+
+#. TRANSLATORS: %s is replaced by a disk size (e.g., 20 GiB)
+#: src/components/storage/ProposalSpacePolicySection.jsx:173
+#, c-format
+msgid "%s unused"
+msgstr "%s sense ús"
+
+#. TRANSLATORS: %s is replaced by a disk size (e.g., 2 GiB)
+#: src/components/storage/ProposalSpacePolicySection.jsx:186
+#, c-format
+msgid "Shrinkable by %s"
+msgstr "Es pot reduir %s"
+
+#. TRANSLATORS: %s is replaced by a device name (e.g., /dev/sda)
+#: src/components/storage/ProposalSpacePolicySection.jsx:221
+#, c-format
+msgid "Space action selector for %s"
+msgstr "Selector d'acció espacial per a %s"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:224
+#: src/components/storage/ProposalVolumes.jsx:233
+#: src/components/storage/iscsi/NodesPresenter.jsx:77
+msgid "Delete"
+msgstr "Suprimeix"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:228
+msgid "Allow resize"
+msgstr "Permet-ne el canvi de mida"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:230
+msgid "Do not modify"
+msgstr "No la modifiquis"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:382
+msgid "Actions to find space"
+msgstr "Accions per aconseguir espai"
+
+#. TRANSLATORS: The storage "Find Space" section's title
+#: src/components/storage/ProposalSpacePolicySection.jsx:452
+msgid "Find Space"
+msgstr "Aconseguir espai"
+
+#. TRANSLATORS: The storage "Find space" sections's description
+#: src/components/storage/ProposalSpacePolicySection.jsx:454
+msgid ""
+"Allocating the file systems might need to find free space in the devices "
+"listed below. Choose how to do it."
+msgstr ""
+"L'assignació dels sistemes de fitxers pot necessitar trobar espai lliure als "
+"dispositius que s'indiquen a continuació. Trieu com fer-ho."
+
+#: src/components/storage/ProposalTransactionalInfo.jsx:46
+msgid "Transactional root file system"
+msgstr "Sistema de fitxers d'arrel transaccional"
+
+#: src/components/storage/ProposalTransactionalInfo.jsx:49
+#, c-format
+msgid ""
+"%s is an immutable system with atomic updates. It uses a read-only Btrfs "
+"file system updated via snapshots."
+msgstr ""
+"%s és un sistema immutable amb actualitzacions atòmiques. Usa un sistema de "
+"fitxers Btrfs només de lectura actualitzat a través d'instantànies."
+
+#. TRANSLATORS: header for a list of items referring to size limits for file systems
+#: src/components/storage/ProposalVolumes.jsx:59
+msgid "These limits are affected by:"
+msgstr "Aquests límits estan afectats pel següent:"
+
+#. TRANSLATORS: list item, this affects the computed partition size limits
+#: src/components/storage/ProposalVolumes.jsx:63
+msgid "The configuration of snapshots"
+msgstr "La configuració de les instantànies"
+
+#. TRANSLATORS: list item, this affects the computed partition size limits
+#. %s is replaced by a list of the volumes (like "/home, /boot")
+#: src/components/storage/ProposalVolumes.jsx:67
+#, c-format
+msgid "Presence of other volumes (%s)"
+msgstr "La presència d'altres volums (%s)"
+
+#. TRANSLATORS: list item, describes a factor that affects the computed size of a
+#. file system; eg. adjusting the size of the swap
+#: src/components/storage/ProposalVolumes.jsx:71
+msgid "The amount of RAM in the system"
+msgstr "La quantitat de RAM del sistema"
+
+#. TRANSLATORS: dropdown menu label
+#: src/components/storage/ProposalVolumes.jsx:133
+msgid "Reset to defaults"
+msgstr "Restableix els valors predeterminats"
+
+#. TRANSLATORS: dropdown menu label
+#: src/components/storage/ProposalVolumes.jsx:141
+#: src/components/storage/ProposalVolumes.jsx:145
+msgid "Add file system"
+msgstr "Afegeix-hi un sistema de fitxers"
+
+#. TRANSLATORS: minimum device size, %s is replaced by size string, e.g. "17.5 GiB"
+#: src/components/storage/ProposalVolumes.jsx:195
+#, c-format
+msgid "At least %s"
+msgstr "Almenys %s"
+
+#. TRANSLATORS: device flag, the partition size is automatically computed
+#: src/components/storage/ProposalVolumes.jsx:201
+msgid "auto"
+msgstr "automàtica"
+
+#. TRANSLATORS: the filesystem uses a logical volume (LVM)
+#: src/components/storage/ProposalVolumes.jsx:211
+msgid "logical volume"
+msgstr "volum lògic"
+
+#: src/components/storage/ProposalVolumes.jsx:211
+msgid "partition"
+msgstr "partició"
+
+#. TRANSLATORS: filesystem flag, it uses an encryption
+#: src/components/storage/ProposalVolumes.jsx:220
+msgid "encrypted"
+msgstr "encriptada"
+
+#. TRANSLATORS: filesystem flag, it allows creating snapshots
+#: src/components/storage/ProposalVolumes.jsx:222
+msgid "with snapshots"
+msgstr "amb instantànies"
+
+#. TRANSLATORS: flag for transactional file system
+#: src/components/storage/ProposalVolumes.jsx:224
+msgid "transactional"
+msgstr "transaccional"
+
+#: src/components/storage/ProposalVolumes.jsx:279
+msgid "Edit file system"
+msgstr "Edita el sistema de fitxers"
+
+#: src/components/storage/ProposalVolumes.jsx:311
+#: src/components/storage/VolumeForm.jsx:730
+#: src/components/storage/VolumeForm.jsx:735
+msgid "Mount point"
+msgstr "Punt de muntatge"
+
+#: src/components/storage/ProposalVolumes.jsx:349
+msgid "Table with mount points"
+msgstr "Taula amb punts de muntatge"
+
+#: src/components/storage/VolumeForm.jsx:102
+msgid "Select a value"
+msgstr "Seleccioneu un valor"
+
+#. TRANSLATORS: info about possible file system types.
+#: src/components/storage/VolumeForm.jsx:255
+msgid ""
+"The options for the file system type depends on the product and the mount "
+"point."
+msgstr ""
+"Les opcions per al tipus de sistema de fitxers depenen del producte i del "
+"punt de muntatge."
+
+#: src/components/storage/VolumeForm.jsx:261
+msgid "More info for file system types"
+msgstr "Més informació sobre els tipus de sistemes de fitxers"
+
+#. TRANSLATORS: label for the file system selector.
+#: src/components/storage/VolumeForm.jsx:272
+msgid "File system type"
+msgstr "Tipus de sistema de fitxers"
+
+#. TRANSLATORS: item which affects the final computed partition size
+#: src/components/storage/VolumeForm.jsx:304
+msgid "the configuration of snapshots"
+msgstr "la configuració de les instantànies"
+
+#. TRANSLATORS: item which affects the final computed partition size
+#. %s is replaced by a list of mount points like "/home, /boot"
+#: src/components/storage/VolumeForm.jsx:309
+#, c-format
+msgid "the presence of the file system for %s"
+msgstr "la presència del sistema de fitxers per a %s"
+
+#. TRANSLATORS: conjunction for merging two list items
+#: src/components/storage/VolumeForm.jsx:311
+msgid ", "
+msgstr ", "
+
+#. TRANSLATORS: item which affects the final computed partition size
+#: src/components/storage/VolumeForm.jsx:315
+msgid "the amount of RAM in the system"
+msgstr "la quantitat de RAM del sistema"
+
+#. TRANSLATORS: the %s is replaced by the items which affect the computed size
+#: src/components/storage/VolumeForm.jsx:318
+#, c-format
+msgid "The final size depends on %s."
+msgstr "La mida final depèn de %s."
+
+#. TRANSLATORS: conjunction for merging two texts
+#: src/components/storage/VolumeForm.jsx:320
+msgid " and "
+msgstr " i "
+
+#. TRANSLATORS: the partition size is automatically computed
+#: src/components/storage/VolumeForm.jsx:325
+msgid "Automatically calculated size according to the selected product."
+msgstr "Mida calculada automàticament segons el producte seleccionat."
+
+#: src/components/storage/VolumeForm.jsx:345
+msgid "Exact size for the file system."
+msgstr "Mida exacta per al sistema de fitxers."
+
+#. TRANSLATORS: requested partition size
+#: src/components/storage/VolumeForm.jsx:357
+msgid "Exact size"
+msgstr "Mida exacta"
+
+#. TRANSLATORS: units selector (like KiB, MiB, GiB...)
+#: src/components/storage/VolumeForm.jsx:372
+msgid "Size unit"
+msgstr "Unitat de mida"
+
+#: src/components/storage/VolumeForm.jsx:400
+msgid ""
+"Limits for the file system size. The final size will be a value between the "
+"given minimum and maximum. If no maximum is given then the file system will "
+"be as big as possible."
+msgstr ""
+"Límits per a la mida del sistema de fitxers. La mida final serà un valor "
+"entre el mínim i el màxim proporcionats. Si no hi ha cap màxim, el sistema "
+"de fitxers serà el més gros possible."
+
+#. TRANSLATORS: the minimal partition size
+#: src/components/storage/VolumeForm.jsx:407
+msgid "Minimum"
+msgstr "Mínim"
+
+#. TRANSLATORS: the minium partition size
+#: src/components/storage/VolumeForm.jsx:417
+msgid "Minimum desired size"
+msgstr "Mida mínima desitjada"
+
+#: src/components/storage/VolumeForm.jsx:426
+msgid "Unit for the minimum size"
+msgstr "Unitat per a la mida mínima"
+
+#. TRANSLATORS: the maximum partition size
+#: src/components/storage/VolumeForm.jsx:437
+msgid "Maximum"
+msgstr "Màxim"
+
+#. TRANSLATORS: the maximum partition size
+#: src/components/storage/VolumeForm.jsx:448
+msgid "Maximum desired size"
+msgstr "Mida màxima desitjada"
+
+#: src/components/storage/VolumeForm.jsx:456
+msgid "Unit for the maximum size"
+msgstr "Unitat per a la mida màxima"
+
+#. TRANSLATORS: radio button label, fully automatically computed partition size, no user input
+#: src/components/storage/VolumeForm.jsx:473
+msgid "Auto"
+msgstr "Automàtica"
+
+#. TRANSLATORS: radio button label, exact partition size requested by user
+#: src/components/storage/VolumeForm.jsx:475
+msgid "Fixed"
+msgstr "Fixa"
+
+#. TRANSLATORS: radio button label, automatically computed partition size within the user provided min and max limits
+#: src/components/storage/VolumeForm.jsx:477
+msgid "Range"
+msgstr "Interval"
+
+#: src/components/storage/VolumeForm.jsx:685
+msgid "A size value is required"
+msgstr "Cal un valor de mida"
+
+#: src/components/storage/VolumeForm.jsx:690
+msgid "Minimum size is required"
+msgstr "Cal una mida mínima"
+
+#: src/components/storage/VolumeForm.jsx:694
+msgid "Maximum must be greater than minimum"
+msgstr "El màxim ha de ser superior al mínim."
+
+#: src/components/storage/ZFCPDiskForm.jsx:113
+msgid "The zFCP disk was not activated."
+msgstr "El disc zFCP no s'ha activat."
+
+#. TRANSLATORS: abbrev. World Wide Port Name
+#: src/components/storage/ZFCPDiskForm.jsx:129
+#: src/components/storage/ZFCPPage.jsx:362
+msgid "WWPN"
+msgstr "WWPN"
+
+#. TRANSLATORS: abbrev. Logical Unit Number
+#: src/components/storage/ZFCPDiskForm.jsx:140
+#: src/components/storage/ZFCPPage.jsx:363
+msgid "LUN"
+msgstr "LUN"
+
+#: src/components/storage/ZFCPPage.jsx:303
+msgid "Auto LUNs Scan"
+msgstr "Escaneig automàtic de LUN"
+
+#: src/components/storage/ZFCPPage.jsx:314
+msgid "Activated"
+msgstr "Activat"
+
+#: src/components/storage/ZFCPPage.jsx:314
+msgid "Deactivated"
+msgstr "Desactivat"
+
+#: src/components/storage/ZFCPPage.jsx:417
+msgid "No zFCP controllers found."
+msgstr "No s'ha trobat cap controlador de zFCP."
+
+#: src/components/storage/ZFCPPage.jsx:418
+msgid "Please, try to read the zFCP devices again."
+msgstr "Si us plau, intenteu tornar a llegir els dispositius zFCP."
+
+#. TRANSLATORS: button label
+#: src/components/storage/ZFCPPage.jsx:420
+msgid "Read zFCP devices"
+msgstr "Llegeix els dispositius zFCP"
+
+#. TRANSLATORS: the text in the square brackets [] will be displayed in bold
+#: src/components/storage/ZFCPPage.jsx:429
+msgid ""
+"Automatic LUN scan is [enabled]. Activating a controller which is running in "
+"NPIV mode will automatically configures all its LUNs."
+msgstr ""
+"L'exploració automàtica de LUN està [activada]. L'activació d'un controlador "
+"que s'executa en mode NPIV configurarà automàticament tots els seus LUN."
+
+#. TRANSLATORS: the text in the square brackets [] will be displayed in bold
+#: src/components/storage/ZFCPPage.jsx:432
+msgid ""
+"Automatic LUN scan is [disabled]. LUNs have to be manually configured after "
+"activating a controller."
+msgstr ""
+"L'exploració automàtica de LUN està [desactivada]. Els LUN s'han de "
+"configurar manualment després d'activar un controlador."
+
+#: src/components/storage/ZFCPPage.jsx:498
+msgid "Activate a zFCP disk"
+msgstr "Activa un disc zFCP"
+
+#: src/components/storage/ZFCPPage.jsx:537
+msgid "Please, try to activate a zFCP controller."
+msgstr "Si us plau, proveu d'activar un controlador de zFCP."
+
+#: src/components/storage/ZFCPPage.jsx:544
+msgid "Please, try to activate a zFCP disk."
+msgstr "Si us plau, proveu d'activar un disc zFCP."
+
+#. TRANSLATORS: button label
+#: src/components/storage/ZFCPPage.jsx:546
+msgid "Activate zFCP disk"
+msgstr "Activa el disc zFCP"
+
+#: src/components/storage/ZFCPPage.jsx:553
+msgid "No zFCP disks found."
+msgstr "No s'ha trobat cap disc zFCP."
+
+#. TRANSLATORS: button label
+#: src/components/storage/ZFCPPage.jsx:572
+msgid "Activate new disk"
+msgstr "Activa el disc nou"
+
+#. TRANSLATORS: section title
+#: src/components/storage/ZFCPPage.jsx:584
+msgid "Disks"
+msgstr "Discs"
+
+#. TRANSLATORS: page title
+#: src/components/storage/ZFCPPage.jsx:731
+msgid "Storage zFCP"
+msgstr "Emmagatzematge zFCP"
+
+#. TRANSLATORS: multipath device type
+#: src/components/storage/device-utils.jsx:82
+msgid "Multipath"
+msgstr "Multicamí"
+
+#. TRANSLATORS: %s is replaced by the device bus ID
+#: src/components/storage/device-utils.jsx:87
+#, c-format
+msgid "DASD %s"
+msgstr "DASD %s"
+
+#. TRANSLATORS: software RAID device, %s is replaced by the RAID level, e.g. RAID-1
+#: src/components/storage/device-utils.jsx:92
+#, c-format
+msgid "Software %s"
+msgstr "Programari %s"
+
+#: src/components/storage/device-utils.jsx:97
+msgid "SD Card"
+msgstr "Targeta SD"
+
+#. TRANSLATORS: %s is replaced by the device transport name, e.g. USB, SATA, SCSI...
+#: src/components/storage/device-utils.jsx:99
+#, c-format
+msgid "Transport %s"
+msgstr "Transport %s"
+
+#. TRANSLATORS: RAID details, %s is replaced by list of devices used by the array
+#: src/components/storage/device-utils.jsx:118
+#, c-format
+msgid "Members: %s"
+msgstr "Membres: %s"
+
+#. TRANSLATORS: RAID details, %s is replaced by list of devices used by the array
+#: src/components/storage/device-utils.jsx:127
+#, c-format
+msgid "Devices: %s"
+msgstr "Dispositius: %s"
+
+#. TRANSLATORS: multipath details, %s is replaced by list of connections used by the device
+#: src/components/storage/device-utils.jsx:136
+#, c-format
+msgid "Wires: %s"
+msgstr "Cables: %s"
+
+#. TRANSLATORS: disk partition info, %s is replaced by partition table
+#. type (MS-DOS or GPT), %d is the number of the partitions
+#: src/components/storage/device-utils.jsx:160
+#, c-format
+msgid "%s with %d partitions"
+msgstr "%s amb %d particions"
+
+#. TRANSLATORS: status message, no existing content was found on the disk,
+#. i.e. the disk is completely empty
+#: src/components/storage/device-utils.jsx:184
+msgid "No content found"
+msgstr "No s'ha trobat contingut."
+
+#: src/components/storage/device-utils.jsx:258
+msgid "Available devices"
+msgstr "Dispositius disponibles"
+
+#: src/components/storage/iscsi/AuthFields.jsx:70
+msgid "Only available if authentication by target is provided"
+msgstr "Només està disponible si es proporciona l'autenticació per destinació."
+
+#: src/components/storage/iscsi/AuthFields.jsx:77
+msgid "Authentication by target"
+msgstr "Autenticació per destinació"
+
+#: src/components/storage/iscsi/AuthFields.jsx:80
+#: src/components/storage/iscsi/AuthFields.jsx:85
+#: src/components/storage/iscsi/AuthFields.jsx:87
+#: src/components/storage/iscsi/AuthFields.jsx:112
+#: src/components/storage/iscsi/AuthFields.jsx:117
+#: src/components/storage/iscsi/AuthFields.jsx:119
+msgid "User name"
+msgstr "Nom d'usuari"
+
+#: src/components/storage/iscsi/AuthFields.jsx:91
+#: src/components/storage/iscsi/AuthFields.jsx:124
+msgid "Incorrect user name"
+msgstr "Nom d'usuari incorrecte"
+
+#: src/components/storage/iscsi/AuthFields.jsx:105
+#: src/components/storage/iscsi/AuthFields.jsx:139
+msgid "Incorrect password"
+msgstr "Contrasenya incorrecta"
+
+#: src/components/storage/iscsi/AuthFields.jsx:108
+msgid "Authentication by initiator"
+msgstr "Autenticació per iniciador"
+
+#: src/components/storage/iscsi/AuthFields.jsx:133
+msgid "Target Password"
+msgstr "Contrasenya de destinació"
+
+#. TRANSLATORS: popup title
+#: src/components/storage/iscsi/DiscoverForm.jsx:101
+msgid "Discover iSCSI Targets"
+msgstr "Descobreix les destinacions iSCSI"
+
+#: src/components/storage/iscsi/DiscoverForm.jsx:110
+#: src/components/storage/iscsi/LoginForm.jsx:73
+msgid "Make sure you provide the correct values"
+msgstr "Assegureu-vos que proporcioneu els valors correctes"
+
+#: src/components/storage/iscsi/DiscoverForm.jsx:115
+msgid "IP address"
+msgstr "Adreça IP"
+
+#. TRANSLATORS: network address
+#: src/components/storage/iscsi/DiscoverForm.jsx:122
+#: src/components/storage/iscsi/DiscoverForm.jsx:124
+msgid "Address"
+msgstr "Adreça"
+
+#: src/components/storage/iscsi/DiscoverForm.jsx:129
+msgid "Incorrect IP address"
+msgstr "Adreça IP incorrecta"
+
+#. TRANSLATORS: network port number
+#: src/components/storage/iscsi/DiscoverForm.jsx:133
+#: src/components/storage/iscsi/DiscoverForm.jsx:140
+#: src/components/storage/iscsi/DiscoverForm.jsx:142
+msgid "Port"
+msgstr "Port"
+
+#: src/components/storage/iscsi/DiscoverForm.jsx:147
+msgid "Incorrect port"
+msgstr "Port incorrecte"
+
+#: src/components/storage/iscsi/InitiatorForm.jsx:42
+msgid "Edit iSCSI Initiator"
+msgstr "Edita l'iniciador iSCSI"
+
+#. TRANSLATORS: iSCSI initiator name
+#: src/components/storage/iscsi/InitiatorForm.jsx:49
+msgid "Initiator name"
+msgstr "Nom de l'iniciador"
+
+#. TRANSLATORS: usually just keep the original text
+#. iBFT = iSCSI Boot Firmware Table, HW support for booting from iSCSI
+#: src/components/storage/iscsi/InitiatorPresenter.jsx:71
+#: src/components/storage/iscsi/InitiatorPresenter.jsx:86
+#: src/components/storage/iscsi/NodesPresenter.jsx:103
+#: src/components/storage/iscsi/NodesPresenter.jsx:124
+msgid "iBFT"
+msgstr "iBFT"
+
+#: src/components/storage/iscsi/InitiatorPresenter.jsx:72
+#: src/components/storage/iscsi/InitiatorPresenter.jsx:87
+msgid "Offload card"
+msgstr "Targeta de descàrrega"
+
+#. TRANSLATORS: iSCSI initiator section name
+#: src/components/storage/iscsi/InitiatorSection.jsx:50
+msgid "Initiator"
+msgstr "Iniciador"
+
+#. TRANSLATORS: %s is replaced by the iSCSI target name
+#: src/components/storage/iscsi/LoginForm.jsx:69
+#, c-format
+msgid "Login %s"
+msgstr "Entrada per a %s"
+
+#. TRANSLATORS: iSCSI start up mode (on boot/manual/automatic)
+#: src/components/storage/iscsi/LoginForm.jsx:76
+#: src/components/storage/iscsi/LoginForm.jsx:79
+msgid "Startup"
+msgstr "Inici"
+
+#: src/components/storage/iscsi/NodeStartupOptions.js:26
+msgid "On boot"
+msgstr "A l'arrencada"
+
+#: src/components/storage/iscsi/NodeStartupOptions.js:27
+msgid "Automatic"
+msgstr "Automàtica"
+
+#. TRANSLATORS: iSCSI connection status, %s is replaced by node label
+#: src/components/storage/iscsi/NodesPresenter.jsx:67
+#, c-format
+msgid "Connected (%s)"
+msgstr "Connectat (%s)"
+
+#: src/components/storage/iscsi/NodesPresenter.jsx:82
+msgid "Login"
+msgstr "Entrada"
+
+#: src/components/storage/iscsi/NodesPresenter.jsx:86
+msgid "Logout"
+msgstr "Sortida"
+
+#: src/components/storage/iscsi/NodesPresenter.jsx:101
+#: src/components/storage/iscsi/NodesPresenter.jsx:122
+msgid "Portal"
+msgstr "Portal"
+
+#: src/components/storage/iscsi/NodesPresenter.jsx:102
+#: src/components/storage/iscsi/NodesPresenter.jsx:123
+msgid "Interface"
+msgstr "Interfície"
+
+#: src/components/storage/iscsi/TargetsSection.jsx:139
+msgid "No iSCSI targets found."
+msgstr "No s'ha trobat cap destinació iSCSI."
+
+#: src/components/storage/iscsi/TargetsSection.jsx:140
+msgid ""
+"Please, perform an iSCSI discovery in order to find available iSCSI targets."
+msgstr ""
+"Si us plau, executeu un descobriment d'iSCSI per trobar destinacions iSCSI "
+"disponibles."
+
+#. TRANSLATORS: button label, starts iSCSI discovery
+#: src/components/storage/iscsi/TargetsSection.jsx:142
+msgid "Discover iSCSI targets"
+msgstr "Descobreix destinacions iSCSI"
+
+#. TRANSLATORS: button label, starts iSCSI discovery
+#: src/components/storage/iscsi/TargetsSection.jsx:153
+msgid "Discover"
+msgstr "Descobreix"
+
+#. TRANSLATORS: iSCSI targets section title
+#: src/components/storage/iscsi/TargetsSection.jsx:167
+msgid "Targets"
+msgstr "Destinacions"
+
+#: src/components/storage/utils.js:49
+msgid "KiB"
+msgstr "KiB"
+
+#: src/components/storage/utils.js:50
+msgid "MiB"
+msgstr "MiB"
+
+#: src/components/storage/utils.js:51
+msgid "GiB"
+msgstr "GiB"
+
+#: src/components/storage/utils.js:52
+msgid "TiB"
+msgstr "TiB"
+
+#: src/components/storage/utils.js:53
+msgid "PiB"
+msgstr "PiB"
+
+#: src/components/users/FirstUser.jsx:50
+msgid "No user defined yet."
+msgstr "Encara no s'ha definit cap usuari."
+
+#: src/components/users/FirstUser.jsx:53
+msgid ""
+"Please, be aware that a user must be defined before installing the system to "
+"be able to log into it."
+msgstr ""
+"Si us plau, tingueu en compte que cal definir un usuari abans d'instal·lar "
+"el sistema per poder-hi iniciar sessió."
+
+#. TRANSLATORS: push button label
+#: src/components/users/FirstUser.jsx:57
+msgid "Define a user now"
+msgstr "Definiu un usuari ara"
+
+#: src/components/users/FirstUser.jsx:67 src/components/users/FirstUser.jsx:242
+msgid "Full name"
+msgstr "Nom complet"
+
+#: src/components/users/FirstUser.jsx:68 src/components/users/FirstUser.jsx:256
+#: src/components/users/FirstUser.jsx:264
+#: src/components/users/FirstUser.jsx:266
+msgid "Username"
+msgstr "Nom d'usuari"
+
+#: src/components/users/FirstUser.jsx:88
+msgid "Username suggestion dropdown"
+msgstr "Menú desplegable de suggeriments de nom d'usuari"
+
+#. TRANSLATORS: dropdown username suggestions
+#: src/components/users/FirstUser.jsx:102
+msgid "Use suggested username"
+msgstr "Usa el nom d'usuari suggerit"
+
+#: src/components/users/FirstUser.jsx:212
+#: src/components/users/RootAuthMethods.jsx:99
+#: src/components/users/RootAuthMethods.jsx:111
+msgid "Discard"
+msgstr "Descarta'l"
+
+#: src/components/users/FirstUser.jsx:235
+msgid "Create user account"
+msgstr "Crea un compte d'usuari"
+
+#: src/components/users/FirstUser.jsx:235
+msgid "Edit user account"
+msgstr "Edita el compte d'usuari"
+
+#: src/components/users/FirstUser.jsx:246
+#: src/components/users/FirstUser.jsx:248
+msgid "User full name"
+msgstr "Nom complet de l'usuari"
+
+#. TRANSLATORS: check box label
+#: src/components/users/FirstUser.jsx:284
+#: src/components/users/FirstUser.jsx:288
+msgid "Edit password too"
+msgstr "Edita també la contrasenya"
+
+#: src/components/users/FirstUser.jsx:301
+msgid "user autologin"
+msgstr "entrada de sessió automàtica de l'usuari"
+
+#. TRANSLATORS: check box label
+#: src/components/users/FirstUser.jsx:305
+msgid "Auto-login"
+msgstr "Entrada automàtica"
+
+#: src/components/users/RootAuthMethods.jsx:35
+msgid "No root authentication method defined yet."
+msgstr "Encara no s'ha definit cap mètode d'autenticació d'arrel."
+
+#: src/components/users/RootAuthMethods.jsx:38
+msgid ""
+"Please, define at least one authentication method for logging into the "
+"system as root."
+msgstr ""
+"Si us plau, definiu almenys un mètode d'autenticació per iniciar sessió al "
+"sistema com a arrel."
+
+#. TRANSLATORS: push button label
+#: src/components/users/RootAuthMethods.jsx:43
+msgid "Set a password"
+msgstr "Establiu una contrasenya"
+
+#. TRANSLATORS: push button label
+#: src/components/users/RootAuthMethods.jsx:45
+msgid "Upload a SSH Public Key"
+msgstr "Carrega una clau pública SSH"
+
+#: src/components/users/RootAuthMethods.jsx:94
+#: src/components/users/RootAuthMethods.jsx:107
+msgid "Change"
+msgstr "Canvia"
+
+#: src/components/users/RootAuthMethods.jsx:94
+#: src/components/users/RootAuthMethods.jsx:107
+msgid "Set"
+msgstr "Estableix"
+
+#: src/components/users/RootAuthMethods.jsx:129
+msgid "Already set"
+msgstr "Ja s'ha establert"
+
+#: src/components/users/RootAuthMethods.jsx:130
+#: src/components/users/RootAuthMethods.jsx:134
+msgid "Not set"
+msgstr "No s'ha establert"
+
+#. TRANSLATORS: table header, user authentication method
+#: src/components/users/RootAuthMethods.jsx:155
+msgid "Method"
+msgstr "Mètode"
+
+#: src/components/users/RootAuthMethods.jsx:170
+msgid "SSH Key"
+msgstr "Clau SSH"
+
+#: src/components/users/RootAuthMethods.jsx:187
+msgid "Change the root password"
+msgstr "Canvia la contrasenya d'arrel"
+
+#: src/components/users/RootAuthMethods.jsx:187
+msgid "Set a root password"
+msgstr "Establiu una contrasenya d'arrel"
+
+#: src/components/users/RootAuthMethods.jsx:194
+msgid "Add a SSH Public Key for root"
+msgstr "Afegiu una clau pública SSH per a l'arrel"
+
+#: src/components/users/RootAuthMethods.jsx:194
+msgid "Edit the SSH Public Key for root"
+msgstr "Edita la clau pública SSH per a l'arrel"
+
+#: src/components/users/RootPasswordPopup.jsx:42
+msgid "Root password"
+msgstr "Contrasenya d'arrel"
+
+#: src/components/users/RootSSHKeyPopup.jsx:43
+msgid "Set root SSH public key"
+msgstr "Estableix la clau pública SSH per a l'arrel"
+
+#: src/components/users/RootSSHKeyPopup.jsx:71
+msgid "Root SSH public key"
+msgstr "Clau pública SSH per a l'arrel"
+
+#: src/components/users/RootSSHKeyPopup.jsx:76
+msgid "Upload, paste, or drop an SSH public key"
+msgstr "Carregueu, enganxeu o deixeu-hi anar una clau pública SSH"
+
+#. TRANSLATORS: push button label
+#: src/components/users/RootSSHKeyPopup.jsx:78
+msgid "Upload"
+msgstr "Carrega"
+
+#. TRANSLATORS: push button label, clears the related input field
+#: src/components/users/RootSSHKeyPopup.jsx:80
+msgid "Clear"
+msgstr "Neteja"
+
+#: src/components/users/UsersPage.jsx:31
+msgid "User"
+msgstr "Usuari"
+
+#: src/components/users/UsersPage.jsx:34
+msgid "Root authentication"
+msgstr "Autenticació d'arrel"
+
+#~ msgid "Btrfs snapshots required by product."
+#~ msgstr "Les instantànies de Btrfs són requerides pel producte."
diff --git a/web/po/cs.po b/web/po/cs.po
index 8b89a6254..3489070db 100644
--- a/web/po/cs.po
+++ b/web/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-03 02:07+0000\n"
+"POT-Creation-Date: 2024-03-14 02:05+0000\n"
 "PO-Revision-Date: 2023-12-31 20:39+0000\n"
 "Last-Translator: Ladislav Slezák <lslezak@suse.com>\n"
 "Language-Team: Czech <https://l10n.opensuse.org/projects/agama/agama-web/cs/"
@@ -145,9 +145,9 @@ msgstr ""
 #: src/components/product/ProductPage.jsx:207
 #: src/components/storage/ProposalDeviceSection.jsx:169
 #: src/components/storage/ProposalDeviceSection.jsx:364
-#: src/components/storage/ProposalSettingsSection.jsx:275
-#: src/components/storage/ProposalVolumes.jsx:148
-#: src/components/storage/ProposalVolumes.jsx:283
+#: src/components/storage/ProposalSettingsSection.jsx:263
+#: src/components/storage/ProposalVolumes.jsx:152
+#: src/components/storage/ProposalVolumes.jsx:287
 #: src/components/storage/ZFCPPage.jsx:511
 msgid "Accept"
 msgstr ""
@@ -288,8 +288,8 @@ msgstr ""
 
 #. TRANSLATORS: dropdown label
 #: src/components/core/RowActions.jsx:66
-#: src/components/storage/ProposalVolumes.jsx:119
-#: src/components/storage/ProposalVolumes.jsx:310
+#: src/components/storage/ProposalVolumes.jsx:123
+#: src/components/storage/ProposalVolumes.jsx:314
 msgid "Actions"
 msgstr ""
 
@@ -514,8 +514,8 @@ msgstr ""
 msgid "Addresses data list"
 msgstr ""
 
-#. TRANSLATORS: input field for the iSCSI initiator name
 #. TRANSLATORS: table header
+#. TRANSLATORS: input field for the iSCSI initiator name
 #: src/components/network/ConnectionsTable.jsx:57
 #: src/components/network/ConnectionsTable.jsx:86
 #: src/components/storage/ZFCPPage.jsx:360
@@ -534,7 +534,7 @@ msgid "IP addresses"
 msgstr ""
 
 #: src/components/network/ConnectionsTable.jsx:67
-#: src/components/storage/ProposalVolumes.jsx:234
+#: src/components/storage/ProposalVolumes.jsx:238
 #: src/components/storage/iscsi/InitiatorPresenter.jsx:49
 #: src/components/storage/iscsi/NodesPresenter.jsx:73
 #: src/components/users/FirstUser.jsx:208
@@ -733,8 +733,8 @@ msgstr ""
 msgid "Disconnecting"
 msgstr ""
 
-#. TRANSLATORS: iSCSI connection status
 #. TRANSLATORS: Wifi network status
+#. TRANSLATORS: iSCSI connection status
 #: src/components/network/WifiNetworkListItem.jsx:50
 #: src/components/storage/iscsi/NodesPresenter.jsx:63
 msgid "Disconnected"
@@ -799,8 +799,8 @@ msgstr ""
 msgid "Refresh the repositories"
 msgstr ""
 
-#. TRANSLATORS: page title
 #. TRANSLATORS: page section
+#. TRANSLATORS: page title
 #: src/components/overview/SoftwareSection.jsx:143
 #: src/components/software/SoftwarePage.jsx:81
 msgid "Software"
@@ -846,7 +846,7 @@ msgstr ""
 #. TRANSLATORS: page title
 #. TRANSLATORS: page section title
 #: src/components/overview/StorageSection.jsx:208
-#: src/components/storage/ProposalPage.jsx:239
+#: src/components/storage/ProposalPage.jsx:243
 msgid "Storage"
 msgstr ""
 
@@ -1258,7 +1258,7 @@ msgstr ""
 #. TRANSLATORS: The word 'directly' is key here. For example, booting to the installer media and then choosing
 #. 'Boot from Hard Disk' from there will not work. Keep it sort (this is a hint in a form) but keep it clear.
 #. Do not translate 'abbr' and 'title', they are part of the HTML markup.
-#: src/components/storage/ProposalSettingsSection.jsx:89
+#: src/components/storage/ProposalSettingsSection.jsx:87
 msgid ""
 "The password will not be needed to boot and access the data if the <abbr "
 "title='Trusted Platform Module'>TPM</abbr> can verify the integrity of the "
@@ -1266,53 +1266,37 @@ msgid ""
 "first run."
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:107
+#: src/components/storage/ProposalSettingsSection.jsx:105
 msgid "Use the TPM to decrypt automatically on each boot"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:152
+#: src/components/storage/ProposalSettingsSection.jsx:148
 msgid ""
 "Uses Btrfs for the root file system allowing to boot to a previous version "
 "of the system after configuration changes or software upgrades."
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:159
+#: src/components/storage/ProposalSettingsSection.jsx:155
 msgid "Use Btrfs Snapshots"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:173
-msgid "Btrfs snapshots required by product."
-msgstr ""
-
-#: src/components/storage/ProposalSettingsSection.jsx:239
+#: src/components/storage/ProposalSettingsSection.jsx:227
 msgid "Change encryption settings"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:244
-#: src/components/storage/ProposalSettingsSection.jsx:265
+#: src/components/storage/ProposalSettingsSection.jsx:232
+#: src/components/storage/ProposalSettingsSection.jsx:253
 msgid "Encryption settings"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:258
+#: src/components/storage/ProposalSettingsSection.jsx:246
 msgid "Use encryption"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:325
+#: src/components/storage/ProposalSettingsSection.jsx:309
 msgid "Settings"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:330
-msgid "Transactional system"
-msgstr ""
-
-#. TRANSLATORS: %s is replaced by a product name (e.g., openSUSE Tumbleweed)
-#: src/components/storage/ProposalSettingsSection.jsx:333
-#, c-format
-msgid ""
-"%s is an immutable system with atomic updates using a read-only Btrfs root "
-"file system."
-msgstr ""
-
 #: src/components/storage/ProposalSpacePolicySection.jsx:50
 msgid "Delete current content"
 msgstr ""
@@ -1355,13 +1339,13 @@ msgid "Current content"
 msgstr ""
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:74
-#: src/components/storage/ProposalVolumes.jsx:309
-#: src/components/storage/VolumeForm.jsx:741
+#: src/components/storage/ProposalVolumes.jsx:313
+#: src/components/storage/VolumeForm.jsx:745
 msgid "Size"
 msgstr ""
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:75
-#: src/components/storage/ProposalVolumes.jsx:308
+#: src/components/storage/ProposalVolumes.jsx:312
 msgid "Details"
 msgstr ""
 
@@ -1420,7 +1404,7 @@ msgid "Space action selector for %s"
 msgstr ""
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:224
-#: src/components/storage/ProposalVolumes.jsx:229
+#: src/components/storage/ProposalVolumes.jsx:233
 #: src/components/storage/iscsi/NodesPresenter.jsx:77
 msgid "Delete"
 msgstr ""
@@ -1449,7 +1433,18 @@ msgid ""
 "listed below. Choose how to do it."
 msgstr ""
 
-#. TRANSLATORS: header for a list of items
+#: src/components/storage/ProposalTransactionalInfo.jsx:46
+msgid "Transactional root file system"
+msgstr ""
+
+#: src/components/storage/ProposalTransactionalInfo.jsx:49
+#, c-format
+msgid ""
+"%s is an immutable system with atomic updates. It uses a read-only Btrfs "
+"file system updated via snapshots."
+msgstr ""
+
+#. TRANSLATORS: header for a list of items referring to size limits for file systems
 #: src/components/storage/ProposalVolumes.jsx:59
 msgid "These limits are affected by:"
 msgstr ""
@@ -1466,63 +1461,69 @@ msgstr ""
 msgid "Presence of other volumes (%s)"
 msgstr ""
 
+#. TRANSLATORS: list item, describes a factor that affects the computed size of a
+#. file system; eg. adjusting the size of the swap
+#: src/components/storage/ProposalVolumes.jsx:71
+msgid "The amount of RAM in the system"
+msgstr ""
+
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:129
+#: src/components/storage/ProposalVolumes.jsx:133
 msgid "Reset to defaults"
 msgstr ""
 
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:137
 #: src/components/storage/ProposalVolumes.jsx:141
+#: src/components/storage/ProposalVolumes.jsx:145
 msgid "Add file system"
 msgstr ""
 
 #. TRANSLATORS: minimum device size, %s is replaced by size string, e.g. "17.5 GiB"
-#: src/components/storage/ProposalVolumes.jsx:191
+#: src/components/storage/ProposalVolumes.jsx:195
 #, c-format
 msgid "At least %s"
 msgstr ""
 
 #. TRANSLATORS: device flag, the partition size is automatically computed
-#: src/components/storage/ProposalVolumes.jsx:197
+#: src/components/storage/ProposalVolumes.jsx:201
 msgid "auto"
 msgstr ""
 
 #. TRANSLATORS: the filesystem uses a logical volume (LVM)
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "logical volume"
 msgstr ""
 
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "partition"
 msgstr ""
 
 #. TRANSLATORS: filesystem flag, it uses an encryption
-#: src/components/storage/ProposalVolumes.jsx:216
+#: src/components/storage/ProposalVolumes.jsx:220
 msgid "encrypted"
 msgstr ""
 
 #. TRANSLATORS: filesystem flag, it allows creating snapshots
-#: src/components/storage/ProposalVolumes.jsx:218
+#: src/components/storage/ProposalVolumes.jsx:222
 msgid "with snapshots"
 msgstr ""
 
 #. TRANSLATORS: flag for transactional file system
-#: src/components/storage/ProposalVolumes.jsx:220
+#: src/components/storage/ProposalVolumes.jsx:224
 msgid "transactional"
 msgstr ""
 
-#: src/components/storage/ProposalVolumes.jsx:275
+#: src/components/storage/ProposalVolumes.jsx:279
 msgid "Edit file system"
 msgstr ""
 
-#: src/components/storage/ProposalVolumes.jsx:307
-#: src/components/storage/VolumeForm.jsx:726
-#: src/components/storage/VolumeForm.jsx:731
+#: src/components/storage/ProposalVolumes.jsx:311
+#: src/components/storage/VolumeForm.jsx:730
+#: src/components/storage/VolumeForm.jsx:735
 msgid "Mount point"
 msgstr ""
 
-#: src/components/storage/ProposalVolumes.jsx:345
+#: src/components/storage/ProposalVolumes.jsx:349
 msgid "Table with mount points"
 msgstr ""
 
@@ -1563,37 +1564,42 @@ msgstr ""
 msgid ", "
 msgstr ""
 
+#. TRANSLATORS: item which affects the final computed partition size
+#: src/components/storage/VolumeForm.jsx:315
+msgid "the amount of RAM in the system"
+msgstr ""
+
 #. TRANSLATORS: the %s is replaced by the items which affect the computed size
-#: src/components/storage/VolumeForm.jsx:314
+#: src/components/storage/VolumeForm.jsx:318
 #, c-format
 msgid "The final size depends on %s."
 msgstr ""
 
 #. TRANSLATORS: conjunction for merging two texts
-#: src/components/storage/VolumeForm.jsx:316
+#: src/components/storage/VolumeForm.jsx:320
 msgid " and "
 msgstr ""
 
 #. TRANSLATORS: the partition size is automatically computed
-#: src/components/storage/VolumeForm.jsx:321
+#: src/components/storage/VolumeForm.jsx:325
 msgid "Automatically calculated size according to the selected product."
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:341
+#: src/components/storage/VolumeForm.jsx:345
 msgid "Exact size for the file system."
 msgstr ""
 
 #. TRANSLATORS: requested partition size
-#: src/components/storage/VolumeForm.jsx:353
+#: src/components/storage/VolumeForm.jsx:357
 msgid "Exact size"
 msgstr ""
 
 #. TRANSLATORS: units selector (like KiB, MiB, GiB...)
-#: src/components/storage/VolumeForm.jsx:368
+#: src/components/storage/VolumeForm.jsx:372
 msgid "Size unit"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:396
+#: src/components/storage/VolumeForm.jsx:400
 msgid ""
 "Limits for the file system size. The final size will be a value between the "
 "given minimum and maximum. If no maximum is given then the file system will "
@@ -1601,57 +1607,57 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: the minimal partition size
-#: src/components/storage/VolumeForm.jsx:403
+#: src/components/storage/VolumeForm.jsx:407
 msgid "Minimum"
 msgstr ""
 
 #. TRANSLATORS: the minium partition size
-#: src/components/storage/VolumeForm.jsx:413
+#: src/components/storage/VolumeForm.jsx:417
 msgid "Minimum desired size"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:422
+#: src/components/storage/VolumeForm.jsx:426
 msgid "Unit for the minimum size"
 msgstr ""
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:433
+#: src/components/storage/VolumeForm.jsx:437
 msgid "Maximum"
 msgstr ""
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:444
+#: src/components/storage/VolumeForm.jsx:448
 msgid "Maximum desired size"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:452
+#: src/components/storage/VolumeForm.jsx:456
 msgid "Unit for the maximum size"
 msgstr ""
 
 #. TRANSLATORS: radio button label, fully automatically computed partition size, no user input
-#: src/components/storage/VolumeForm.jsx:469
+#: src/components/storage/VolumeForm.jsx:473
 msgid "Auto"
 msgstr ""
 
 #. TRANSLATORS: radio button label, exact partition size requested by user
-#: src/components/storage/VolumeForm.jsx:471
+#: src/components/storage/VolumeForm.jsx:475
 msgid "Fixed"
 msgstr ""
 
 #. TRANSLATORS: radio button label, automatically computed partition size within the user provided min and max limits
-#: src/components/storage/VolumeForm.jsx:473
+#: src/components/storage/VolumeForm.jsx:477
 msgid "Range"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:681
+#: src/components/storage/VolumeForm.jsx:685
 msgid "A size value is required"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:686
+#: src/components/storage/VolumeForm.jsx:690
 msgid "Minimum size is required"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:690
+#: src/components/storage/VolumeForm.jsx:694
 msgid "Maximum must be greater than minimum"
 msgstr ""
 
diff --git a/web/po/de.po b/web/po/de.po
index c3b1bb863..ebd3ab7a8 100644
--- a/web/po/de.po
+++ b/web/po/de.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-03 02:07+0000\n"
-"PO-Revision-Date: 2024-03-01 23:42+0000\n"
+"POT-Creation-Date: 2024-03-14 02:05+0000\n"
+"PO-Revision-Date: 2024-03-09 16:42+0000\n"
 "Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
 "Language-Team: German <https://l10n.opensuse.org/projects/agama/agama-web/de/"
 ">\n"
@@ -28,7 +28,7 @@ msgstr "Der Server unter %s ist nicht erreichbar."
 #. TRANSLATORS: error message
 #: src/DevServerWrapper.jsx:88
 msgid "Cannot connect to the Cockpit server"
-msgstr ""
+msgstr "Verbindung zum Cockpit-Server nicht möglich"
 
 #. TRANSLATORS: button label
 #: src/DevServerWrapper.jsx:104
@@ -47,6 +47,11 @@ msgid ""
 "want to give it a try, we recommend using a virtual machine to prevent any "
 "possible data loss."
 msgstr ""
+"Agama ist ein experimentelles Installationsprogramm für (open)SUSE-Systeme. "
+"Es befindet sich noch in der Entwicklung und sollte daher nicht in "
+"Produktionsumgebungen verwendet werden. Wenn Sie es ausprobieren möchten, "
+"empfehlen wir die Verwendung einer virtuellen Maschine, um einen möglichen "
+"Datenverlust zu vermeiden."
 
 #. TRANSLATORS: content of the "About" popup (2/2)
 #. %s is replaced by the project URL
@@ -54,6 +59,8 @@ msgstr ""
 #, c-format
 msgid "For more information, please visit the project's repository at %s."
 msgstr ""
+"Für weitere Informationen besuchen Sie bitte das Repositorium des Projekts "
+"unter %s."
 
 #. TRANSLATORS: button label
 #: src/components/core/About.jsx:71 src/components/core/FileViewer.jsx:80
@@ -71,12 +78,14 @@ msgstr "D-Bus-Fehler"
 
 #: src/components/core/DBusError.jsx:38
 msgid "Cannot connect to D-Bus"
-msgstr ""
+msgstr "Verbindung zum D-Bus nicht möglich"
 
 #: src/components/core/DBusError.jsx:43
 msgid ""
 "Could not connect to the D-Bus service. Please, check whether it is running."
 msgstr ""
+"Es konnte keine Verbindung mit dem D-Bus-Dienst hergestellt werden. Bitte "
+"prüfen Sie, ob er läuft."
 
 #. TRANSLATORS: button label
 #: src/components/core/DBusError.jsx:51
@@ -100,6 +109,8 @@ msgid ""
 "There are some reported issues. Please review them in the previous steps "
 "before proceeding with the installation."
 msgstr ""
+"Es gibt einige gemeldete Probleme. Bitte informieren Sie sich über diese in "
+"den vorherigen Schritten, bevor Sie mit der Installation fortfahren."
 
 #: src/components/core/InstallButton.jsx:49
 msgid "Confirm Installation"
@@ -110,10 +121,14 @@ msgid ""
 "If you continue, partitions on your hard disk will be modified according to "
 "the provided installation settings."
 msgstr ""
+"Wenn Sie fortfahren, werden die Partitionen auf Ihrer Festplatte "
+"entsprechend den vorgegebenen Installationseinstellungen geändert."
 
 #: src/components/core/InstallButton.jsx:59
 msgid "Please, cancel and check the settings if you are unsure."
 msgstr ""
+"Bitte brechen Sie den Vorgang ab und überprüfen Sie die Einstellungen, wenn "
+"Sie unsicher sind."
 
 #. TRANSLATORS: button label
 #: src/components/core/InstallButton.jsx:65 src/components/core/Popup.jsx:128
@@ -136,6 +151,9 @@ msgid ""
 "Some problems were found when trying to start the installation. Please, have "
 "a look to the reported errors and try again."
 msgstr ""
+"Beim Versuch, die Installation zu starten, wurden einige Probleme "
+"festgestellt. Bitte sehen Sie sich die gemeldeten Fehler an und versuchen "
+"Sie es erneut."
 
 #. TRANSLATORS: button label
 #: src/components/core/InstallButton.jsx:89 src/components/l10n/L10nPage.jsx:75
@@ -145,9 +163,9 @@ msgstr ""
 #: src/components/product/ProductPage.jsx:207
 #: src/components/storage/ProposalDeviceSection.jsx:169
 #: src/components/storage/ProposalDeviceSection.jsx:364
-#: src/components/storage/ProposalSettingsSection.jsx:275
-#: src/components/storage/ProposalVolumes.jsx:148
-#: src/components/storage/ProposalVolumes.jsx:283
+#: src/components/storage/ProposalSettingsSection.jsx:263
+#: src/components/storage/ProposalVolumes.jsx:152
+#: src/components/storage/ProposalVolumes.jsx:287
 #: src/components/storage/ZFCPPage.jsx:511
 msgid "Accept"
 msgstr "Annehmen"
@@ -159,13 +177,15 @@ msgstr "Installieren"
 
 #: src/components/core/InstallationFinished.jsx:41
 msgid "TPM sealing requires the new system to be booted directly."
-msgstr ""
+msgstr "Bei der TPM-Versiegelung muss das neue System direkt gebootet werden."
 
 #: src/components/core/InstallationFinished.jsx:46
 msgid ""
 "If a local media was used to run this installer, remove it before the next "
 "boot."
 msgstr ""
+"Wenn ein lokales Medium zur Ausführung dieses Installationsprogramms "
+"verwendet wurde, entfernen Sie es vor dem nächsten Start."
 
 #: src/components/core/InstallationFinished.jsx:50
 msgid "Hide details"
@@ -209,15 +229,15 @@ msgstr ""
 
 #: src/components/core/InstallationFinished.jsx:113
 msgid "Finish"
-msgstr ""
+msgstr "Fertigstellen"
 
 #: src/components/core/InstallationFinished.jsx:113
 msgid "Reboot"
-msgstr ""
+msgstr "Neustart"
 
 #: src/components/core/InstallationProgress.jsx:32
 msgid "Installing"
-msgstr ""
+msgstr "Wird installiert"
 
 #. TRANSLATORS: search field placeholder text
 #: src/components/core/ListSearch.jsx:50
@@ -239,10 +259,14 @@ msgid ""
 "The browser will run the logs download as soon as they are ready. Please, be "
 "patient."
 msgstr ""
+"Der Browser wird das Herunterladen der Protokolle starten, sobald sie bereit "
+"sind. Bitte haben Sie Geduld."
 
 #: src/components/core/LogsButton.jsx:114
 msgid "Something went wrong while collecting logs. Please, try again."
 msgstr ""
+"Beim Sammeln der Protokolle ist etwas schiefgelaufen. Bitte versuchen Sie es "
+"erneut."
 
 #: src/components/core/Page.jsx:93 src/components/users/UsersPage.jsx:30
 msgid "Back"
@@ -282,7 +306,7 @@ msgstr "Benutzerpasswort bestätigen"
 
 #: src/components/core/PasswordInput.jsx:59
 msgid "Password visibility button"
-msgstr ""
+msgstr "Schaltfläche für die Sichtbarkeit des Passworts"
 
 #: src/components/core/Popup.jsx:90
 msgid "Confirm"
@@ -290,14 +314,14 @@ msgstr "Bestätigen"
 
 #. TRANSLATORS: dropdown label
 #: src/components/core/RowActions.jsx:66
-#: src/components/storage/ProposalVolumes.jsx:119
-#: src/components/storage/ProposalVolumes.jsx:310
+#: src/components/storage/ProposalVolumes.jsx:123
+#: src/components/storage/ProposalVolumes.jsx:314
 msgid "Actions"
 msgstr "Aktionen"
 
 #: src/components/core/SectionSkeleton.jsx:29
 msgid "Waiting"
-msgstr ""
+msgstr "Warten"
 
 #. TRANSLATORS: button label
 #: src/components/core/ShowLogButton.jsx:47
@@ -377,6 +401,8 @@ msgid ""
 "The language used by the installer. The language for the installed system "
 "can be set in the %s page."
 msgstr ""
+"Die vom Installationsprogramm verwendete Sprache. Die Sprache für das "
+"installierte System kann auf der Seite %s eingestellt werden."
 
 #. TRANSLATORS: page section
 #. TRANSLATORS: page title
@@ -398,11 +424,11 @@ msgstr "Sprache"
 #. TRANSLATORS: placeholder text for search input in the keyboard selector.
 #: src/components/l10n/KeymapSelector.jsx:53
 msgid "Filter by description or keymap code"
-msgstr ""
+msgstr "Nach Beschreibung oder Tastenzuordnungscode filtern"
 
 #: src/components/l10n/KeymapSelector.jsx:64
 msgid "Available keymaps"
-msgstr ""
+msgstr "Verfügbare Tastenzuordnungen"
 
 #: src/components/l10n/L10nPage.jsx:66 src/components/l10n/L10nPage.jsx:140
 msgid "Select time zone"
@@ -461,7 +487,7 @@ msgstr "Tastatur ist noch nicht ausgewählt"
 
 #: src/components/l10n/LocaleSelector.jsx:53
 msgid "Filter by language, territory or locale code"
-msgstr ""
+msgstr "Nach Sprache, Gebiet oder Sprachumgebungscode filtern"
 
 #: src/components/l10n/LocaleSelector.jsx:64
 msgid "Available locales"
@@ -470,7 +496,7 @@ msgstr "Verfügbare Sprachumgebungen"
 #. TRANSLATORS: placeholder text for search input in the timezone selector.
 #: src/components/l10n/TimezoneSelector.jsx:75
 msgid "Filter by territory, time zone code or UTC offset"
-msgstr ""
+msgstr "Nach Gebiet, Zeitzonencode oder UTC-Abweichung filtern"
 
 #: src/components/l10n/TimezoneSelector.jsx:86
 msgid "Available time zones"
@@ -516,8 +542,8 @@ msgstr "Adressen"
 msgid "Addresses data list"
 msgstr "Adressdatenliste"
 
-#. TRANSLATORS: input field for the iSCSI initiator name
 #. TRANSLATORS: table header
+#. TRANSLATORS: input field for the iSCSI initiator name
 #: src/components/network/ConnectionsTable.jsx:57
 #: src/components/network/ConnectionsTable.jsx:86
 #: src/components/storage/ZFCPPage.jsx:360
@@ -536,7 +562,7 @@ msgid "IP addresses"
 msgstr "IP-Adressen"
 
 #: src/components/network/ConnectionsTable.jsx:67
-#: src/components/storage/ProposalVolumes.jsx:234
+#: src/components/storage/ProposalVolumes.jsx:238
 #: src/components/storage/iscsi/InitiatorPresenter.jsx:49
 #: src/components/storage/iscsi/NodesPresenter.jsx:73
 #: src/components/users/FirstUser.jsx:208
@@ -593,6 +619,7 @@ msgstr "IP-Präfix oder Netzmaske"
 #: src/components/network/IpSettingsForm.jsx:87
 msgid "At least one address must be provided for selected mode"
 msgstr ""
+"Für den ausgewählten Modus muss mindestens eine Adresse angegeben werden"
 
 #. TRANSLATORS: %s is replaced by the iSCSI target node name
 #: src/components/network/IpSettingsForm.jsx:133
@@ -637,10 +664,13 @@ msgstr ""
 "konfiguriert."
 
 #: src/components/network/NetworkPage.jsx:54
+#, fuzzy
 msgid ""
 "The system does not support WiFi connections, probably because of missing or "
 "disabled hardware."
 msgstr ""
+"Das System unterstützt keine WiFi-Verbindungen, wahrscheinlich wegen "
+"fehlender oder deaktivierter Hardware."
 
 #: src/components/network/NetworkPage.jsx:58
 #, fuzzy
@@ -741,8 +771,8 @@ msgstr "Verbunden"
 msgid "Disconnecting"
 msgstr "Wird getrennt"
 
-#. TRANSLATORS: iSCSI connection status
 #. TRANSLATORS: Wifi network status
+#. TRANSLATORS: iSCSI connection status
 #: src/components/network/WifiNetworkListItem.jsx:50
 #: src/components/storage/iscsi/NodesPresenter.jsx:63
 msgid "Disconnected"
@@ -752,7 +782,7 @@ msgstr "Getrennt"
 #: src/components/network/WifiNetworkListItem.jsx:97
 #, c-format
 msgid "%s connection is waiting for an state change"
-msgstr ""
+msgstr "Verbindung %s wartet auf eine Zustandsänderung"
 
 #. TRANSLATORS: menu label, remove the selected WiFi network settings
 #: src/components/network/WifiNetworkMenu.jsx:55
@@ -806,8 +836,8 @@ msgstr "Software-Repositorien werden gelesen"
 msgid "Refresh the repositories"
 msgstr "Repositorien auffrischen"
 
-#. TRANSLATORS: page title
 #. TRANSLATORS: page section
+#. TRANSLATORS: page title
 #: src/components/overview/SoftwareSection.jsx:143
 #: src/components/software/SoftwarePage.jsx:81
 msgid "Software"
@@ -853,7 +883,7 @@ msgstr ""
 #. TRANSLATORS: page title
 #. TRANSLATORS: page section title
 #: src/components/overview/StorageSection.jsx:208
-#: src/components/storage/ProposalPage.jsx:239
+#: src/components/storage/ProposalPage.jsx:243
 msgid "Storage"
 msgstr "Speicherung"
 
@@ -1265,7 +1295,7 @@ msgstr "iSCSI"
 #. TRANSLATORS: The word 'directly' is key here. For example, booting to the installer media and then choosing
 #. 'Boot from Hard Disk' from there will not work. Keep it sort (this is a hint in a form) but keep it clear.
 #. Do not translate 'abbr' and 'title', they are part of the HTML markup.
-#: src/components/storage/ProposalSettingsSection.jsx:89
+#: src/components/storage/ProposalSettingsSection.jsx:87
 msgid ""
 "The password will not be needed to boot and access the data if the <abbr "
 "title='Trusted Platform Module'>TPM</abbr> can verify the integrity of the "
@@ -1273,54 +1303,37 @@ msgid ""
 "first run."
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:107
+#: src/components/storage/ProposalSettingsSection.jsx:105
 msgid "Use the TPM to decrypt automatically on each boot"
 msgstr "TPM zur automatischen Entschlüsselung bei jedem Bootvorgang verwenden"
 
-#: src/components/storage/ProposalSettingsSection.jsx:152
+#: src/components/storage/ProposalSettingsSection.jsx:148
 msgid ""
 "Uses Btrfs for the root file system allowing to boot to a previous version "
 "of the system after configuration changes or software upgrades."
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:159
+#: src/components/storage/ProposalSettingsSection.jsx:155
 msgid "Use Btrfs Snapshots"
 msgstr "Btrfs-Schnappschüsse verwenden"
 
-#: src/components/storage/ProposalSettingsSection.jsx:173
-msgid "Btrfs snapshots required by product."
-msgstr "Btrfs-Schnappschüsse sind für das Produkt erforderlich."
-
-#: src/components/storage/ProposalSettingsSection.jsx:239
+#: src/components/storage/ProposalSettingsSection.jsx:227
 msgid "Change encryption settings"
 msgstr "Verschlüsselungseinstellungen ändern"
 
-#: src/components/storage/ProposalSettingsSection.jsx:244
-#: src/components/storage/ProposalSettingsSection.jsx:265
+#: src/components/storage/ProposalSettingsSection.jsx:232
+#: src/components/storage/ProposalSettingsSection.jsx:253
 msgid "Encryption settings"
 msgstr "Verschlüsselungseinstellungen"
 
-#: src/components/storage/ProposalSettingsSection.jsx:258
+#: src/components/storage/ProposalSettingsSection.jsx:246
 msgid "Use encryption"
 msgstr "Verschlüsselung verwenden"
 
-#: src/components/storage/ProposalSettingsSection.jsx:325
+#: src/components/storage/ProposalSettingsSection.jsx:309
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: src/components/storage/ProposalSettingsSection.jsx:330
-#, fuzzy
-msgid "Transactional system"
-msgstr "transaktional"
-
-#. TRANSLATORS: %s is replaced by a product name (e.g., openSUSE Tumbleweed)
-#: src/components/storage/ProposalSettingsSection.jsx:333
-#, c-format
-msgid ""
-"%s is an immutable system with atomic updates using a read-only Btrfs root "
-"file system."
-msgstr ""
-
 #: src/components/storage/ProposalSpacePolicySection.jsx:50
 msgid "Delete current content"
 msgstr "Aktuellen Inhalt löschen"
@@ -1369,13 +1382,13 @@ msgid "Current content"
 msgstr "Aktueller Inhalt"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:74
-#: src/components/storage/ProposalVolumes.jsx:309
-#: src/components/storage/VolumeForm.jsx:741
+#: src/components/storage/ProposalVolumes.jsx:313
+#: src/components/storage/VolumeForm.jsx:745
 msgid "Size"
 msgstr "Größe"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:75
-#: src/components/storage/ProposalVolumes.jsx:308
+#: src/components/storage/ProposalVolumes.jsx:312
 msgid "Details"
 msgstr "Details"
 
@@ -1434,7 +1447,7 @@ msgid "Space action selector for %s"
 msgstr ""
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:224
-#: src/components/storage/ProposalVolumes.jsx:229
+#: src/components/storage/ProposalVolumes.jsx:233
 #: src/components/storage/iscsi/NodesPresenter.jsx:77
 msgid "Delete"
 msgstr "Löschen"
@@ -1463,7 +1476,19 @@ msgid ""
 "listed below. Choose how to do it."
 msgstr ""
 
-#. TRANSLATORS: header for a list of items
+#: src/components/storage/ProposalTransactionalInfo.jsx:46
+#, fuzzy
+msgid "Transactional root file system"
+msgstr "transaktional"
+
+#: src/components/storage/ProposalTransactionalInfo.jsx:49
+#, c-format
+msgid ""
+"%s is an immutable system with atomic updates. It uses a read-only Btrfs "
+"file system updated via snapshots."
+msgstr ""
+
+#. TRANSLATORS: header for a list of items referring to size limits for file systems
 #: src/components/storage/ProposalVolumes.jsx:59
 msgid "These limits are affected by:"
 msgstr ""
@@ -1480,63 +1505,69 @@ msgstr "Die Konfiguration der Schnappschüsse"
 msgid "Presence of other volumes (%s)"
 msgstr ""
 
+#. TRANSLATORS: list item, describes a factor that affects the computed size of a
+#. file system; eg. adjusting the size of the swap
+#: src/components/storage/ProposalVolumes.jsx:71
+msgid "The amount of RAM in the system"
+msgstr ""
+
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:129
+#: src/components/storage/ProposalVolumes.jsx:133
 msgid "Reset to defaults"
 msgstr "Auf Standardeinstellungen zurücksetzen"
 
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:137
 #: src/components/storage/ProposalVolumes.jsx:141
+#: src/components/storage/ProposalVolumes.jsx:145
 msgid "Add file system"
 msgstr "Dateisystem hinzufügen"
 
 #. TRANSLATORS: minimum device size, %s is replaced by size string, e.g. "17.5 GiB"
-#: src/components/storage/ProposalVolumes.jsx:191
+#: src/components/storage/ProposalVolumes.jsx:195
 #, c-format
 msgid "At least %s"
 msgstr "Mindestens %s"
 
 #. TRANSLATORS: device flag, the partition size is automatically computed
-#: src/components/storage/ProposalVolumes.jsx:197
+#: src/components/storage/ProposalVolumes.jsx:201
 msgid "auto"
 msgstr "automatisch"
 
 #. TRANSLATORS: the filesystem uses a logical volume (LVM)
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "logical volume"
 msgstr ""
 
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "partition"
 msgstr "Partition"
 
 #. TRANSLATORS: filesystem flag, it uses an encryption
-#: src/components/storage/ProposalVolumes.jsx:216
+#: src/components/storage/ProposalVolumes.jsx:220
 msgid "encrypted"
 msgstr "verschlüsselt"
 
 #. TRANSLATORS: filesystem flag, it allows creating snapshots
-#: src/components/storage/ProposalVolumes.jsx:218
+#: src/components/storage/ProposalVolumes.jsx:222
 msgid "with snapshots"
 msgstr "mit Schnappschüssen"
 
 #. TRANSLATORS: flag for transactional file system
-#: src/components/storage/ProposalVolumes.jsx:220
+#: src/components/storage/ProposalVolumes.jsx:224
 msgid "transactional"
 msgstr "transaktional"
 
-#: src/components/storage/ProposalVolumes.jsx:275
+#: src/components/storage/ProposalVolumes.jsx:279
 msgid "Edit file system"
 msgstr "Dateisystem bearbeiten"
 
-#: src/components/storage/ProposalVolumes.jsx:307
-#: src/components/storage/VolumeForm.jsx:726
-#: src/components/storage/VolumeForm.jsx:731
+#: src/components/storage/ProposalVolumes.jsx:311
+#: src/components/storage/VolumeForm.jsx:730
+#: src/components/storage/VolumeForm.jsx:735
 msgid "Mount point"
 msgstr "Einhängepunkt"
 
-#: src/components/storage/ProposalVolumes.jsx:345
+#: src/components/storage/ProposalVolumes.jsx:349
 msgid "Table with mount points"
 msgstr "Tabelle mit Einhängepunkten"
 
@@ -1579,37 +1610,42 @@ msgstr ""
 msgid ", "
 msgstr ", "
 
+#. TRANSLATORS: item which affects the final computed partition size
+#: src/components/storage/VolumeForm.jsx:315
+msgid "the amount of RAM in the system"
+msgstr ""
+
 #. TRANSLATORS: the %s is replaced by the items which affect the computed size
-#: src/components/storage/VolumeForm.jsx:314
+#: src/components/storage/VolumeForm.jsx:318
 #, c-format
 msgid "The final size depends on %s."
 msgstr "Die endgültige Größe hängt von %s ab."
 
 #. TRANSLATORS: conjunction for merging two texts
-#: src/components/storage/VolumeForm.jsx:316
+#: src/components/storage/VolumeForm.jsx:320
 msgid " and "
 msgstr " und "
 
 #. TRANSLATORS: the partition size is automatically computed
-#: src/components/storage/VolumeForm.jsx:321
+#: src/components/storage/VolumeForm.jsx:325
 msgid "Automatically calculated size according to the selected product."
 msgstr "Automatisch berechnete Größe entsprechend dem ausgewählten Produkt."
 
-#: src/components/storage/VolumeForm.jsx:341
+#: src/components/storage/VolumeForm.jsx:345
 msgid "Exact size for the file system."
 msgstr "Exakte Größe des Dateisystems."
 
 #. TRANSLATORS: requested partition size
-#: src/components/storage/VolumeForm.jsx:353
+#: src/components/storage/VolumeForm.jsx:357
 msgid "Exact size"
 msgstr "Exakte Größe"
 
 #. TRANSLATORS: units selector (like KiB, MiB, GiB...)
-#: src/components/storage/VolumeForm.jsx:368
+#: src/components/storage/VolumeForm.jsx:372
 msgid "Size unit"
 msgstr "Größeneinheit"
 
-#: src/components/storage/VolumeForm.jsx:396
+#: src/components/storage/VolumeForm.jsx:400
 msgid ""
 "Limits for the file system size. The final size will be a value between the "
 "given minimum and maximum. If no maximum is given then the file system will "
@@ -1620,57 +1656,57 @@ msgstr ""
 "angegeben wird, wird das Dateisystem so groß wie möglich."
 
 #. TRANSLATORS: the minimal partition size
-#: src/components/storage/VolumeForm.jsx:403
+#: src/components/storage/VolumeForm.jsx:407
 msgid "Minimum"
 msgstr "Minimum"
 
 #. TRANSLATORS: the minium partition size
-#: src/components/storage/VolumeForm.jsx:413
+#: src/components/storage/VolumeForm.jsx:417
 msgid "Minimum desired size"
 msgstr "Gewünschte Mindestgröße"
 
-#: src/components/storage/VolumeForm.jsx:422
+#: src/components/storage/VolumeForm.jsx:426
 msgid "Unit for the minimum size"
 msgstr "Einheit für die Mindestgröße"
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:433
+#: src/components/storage/VolumeForm.jsx:437
 msgid "Maximum"
 msgstr "Maximum"
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:444
+#: src/components/storage/VolumeForm.jsx:448
 msgid "Maximum desired size"
 msgstr "Gewünschte Maximalgröße"
 
-#: src/components/storage/VolumeForm.jsx:452
+#: src/components/storage/VolumeForm.jsx:456
 msgid "Unit for the maximum size"
 msgstr "Einheit für die Maximalgröße"
 
 #. TRANSLATORS: radio button label, fully automatically computed partition size, no user input
-#: src/components/storage/VolumeForm.jsx:469
+#: src/components/storage/VolumeForm.jsx:473
 msgid "Auto"
 msgstr "Automatisch"
 
 #. TRANSLATORS: radio button label, exact partition size requested by user
-#: src/components/storage/VolumeForm.jsx:471
+#: src/components/storage/VolumeForm.jsx:475
 msgid "Fixed"
 msgstr ""
 
 #. TRANSLATORS: radio button label, automatically computed partition size within the user provided min and max limits
-#: src/components/storage/VolumeForm.jsx:473
+#: src/components/storage/VolumeForm.jsx:477
 msgid "Range"
 msgstr "Bereich"
 
-#: src/components/storage/VolumeForm.jsx:681
+#: src/components/storage/VolumeForm.jsx:685
 msgid "A size value is required"
 msgstr "Ein Größenwert ist erforderlich"
 
-#: src/components/storage/VolumeForm.jsx:686
+#: src/components/storage/VolumeForm.jsx:690
 msgid "Minimum size is required"
 msgstr "Mindestgröße ist erforderlich"
 
-#: src/components/storage/VolumeForm.jsx:690
+#: src/components/storage/VolumeForm.jsx:694
 msgid "Maximum must be greater than minimum"
 msgstr "Das Maximum muss größer sein als das Minimum"
 
@@ -2179,3 +2215,6 @@ msgstr ""
 #: src/components/users/UsersPage.jsx:34
 msgid "Root authentication"
 msgstr ""
+
+#~ msgid "Btrfs snapshots required by product."
+#~ msgstr "Btrfs-Schnappschüsse sind für das Produkt erforderlich."
diff --git a/web/po/es.po b/web/po/es.po
index 8eebd1aea..b10374dfd 100644
--- a/web/po/es.po
+++ b/web/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-03 02:07+0000\n"
+"POT-Creation-Date: 2024-03-14 02:05+0000\n"
 "PO-Revision-Date: 2024-02-25 20:42+0000\n"
 "Last-Translator: Victor hck <victorhck@opensuse.org>\n"
 "Language-Team: Spanish <https://l10n.opensuse.org/projects/agama/agama-web/"
@@ -158,9 +158,9 @@ msgstr ""
 #: src/components/product/ProductPage.jsx:207
 #: src/components/storage/ProposalDeviceSection.jsx:169
 #: src/components/storage/ProposalDeviceSection.jsx:364
-#: src/components/storage/ProposalSettingsSection.jsx:275
-#: src/components/storage/ProposalVolumes.jsx:148
-#: src/components/storage/ProposalVolumes.jsx:283
+#: src/components/storage/ProposalSettingsSection.jsx:263
+#: src/components/storage/ProposalVolumes.jsx:152
+#: src/components/storage/ProposalVolumes.jsx:287
 #: src/components/storage/ZFCPPage.jsx:511
 msgid "Accept"
 msgstr "Aceptar"
@@ -311,8 +311,8 @@ msgstr "Confirmar"
 
 #. TRANSLATORS: dropdown label
 #: src/components/core/RowActions.jsx:66
-#: src/components/storage/ProposalVolumes.jsx:119
-#: src/components/storage/ProposalVolumes.jsx:310
+#: src/components/storage/ProposalVolumes.jsx:123
+#: src/components/storage/ProposalVolumes.jsx:314
 msgid "Actions"
 msgstr "Acciones"
 
@@ -539,8 +539,8 @@ msgstr "Direcciones"
 msgid "Addresses data list"
 msgstr "Lista de datos de direcciones"
 
-#. TRANSLATORS: input field for the iSCSI initiator name
 #. TRANSLATORS: table header
+#. TRANSLATORS: input field for the iSCSI initiator name
 #: src/components/network/ConnectionsTable.jsx:57
 #: src/components/network/ConnectionsTable.jsx:86
 #: src/components/storage/ZFCPPage.jsx:360
@@ -559,7 +559,7 @@ msgid "IP addresses"
 msgstr "Direcciones IP"
 
 #: src/components/network/ConnectionsTable.jsx:67
-#: src/components/storage/ProposalVolumes.jsx:234
+#: src/components/storage/ProposalVolumes.jsx:238
 #: src/components/storage/iscsi/InitiatorPresenter.jsx:49
 #: src/components/storage/iscsi/NodesPresenter.jsx:73
 #: src/components/users/FirstUser.jsx:208
@@ -761,8 +761,8 @@ msgstr "Conectado"
 msgid "Disconnecting"
 msgstr "Desconectando"
 
-#. TRANSLATORS: iSCSI connection status
 #. TRANSLATORS: Wifi network status
+#. TRANSLATORS: iSCSI connection status
 #: src/components/network/WifiNetworkListItem.jsx:50
 #: src/components/storage/iscsi/NodesPresenter.jsx:63
 msgid "Disconnected"
@@ -826,8 +826,8 @@ msgstr "Leer repositorios de software"
 msgid "Refresh the repositories"
 msgstr "Refrescar los repositorios"
 
-#. TRANSLATORS: page title
 #. TRANSLATORS: page section
+#. TRANSLATORS: page title
 #: src/components/overview/SoftwareSection.jsx:143
 #: src/components/software/SoftwarePage.jsx:81
 msgid "Software"
@@ -877,7 +877,7 @@ msgstr "Explorando dispositivos de almacenamiento"
 #. TRANSLATORS: page title
 #. TRANSLATORS: page section title
 #: src/components/overview/StorageSection.jsx:208
-#: src/components/storage/ProposalPage.jsx:239
+#: src/components/storage/ProposalPage.jsx:243
 msgid "Storage"
 msgstr "Almacenamiento"
 
@@ -1295,7 +1295,7 @@ msgstr "iSCSI"
 #. TRANSLATORS: The word 'directly' is key here. For example, booting to the installer media and then choosing
 #. 'Boot from Hard Disk' from there will not work. Keep it sort (this is a hint in a form) but keep it clear.
 #. Do not translate 'abbr' and 'title', they are part of the HTML markup.
-#: src/components/storage/ProposalSettingsSection.jsx:89
+#: src/components/storage/ProposalSettingsSection.jsx:87
 msgid ""
 "The password will not be needed to boot and access the data if the <abbr "
 "title='Trusted Platform Module'>TPM</abbr> can verify the integrity of the "
@@ -1307,55 +1307,38 @@ msgstr ""
 "integridad del sistema. El sellado TPM requiere que el nuevo sistema se "
 "inicie directamente en su primera ejecución."
 
-#: src/components/storage/ProposalSettingsSection.jsx:107
+#: src/components/storage/ProposalSettingsSection.jsx:105
 msgid "Use the TPM to decrypt automatically on each boot"
 msgstr "Utilice el TPM para descifrar automáticamente en cada arranque"
 
-#: src/components/storage/ProposalSettingsSection.jsx:152
+#: src/components/storage/ProposalSettingsSection.jsx:148
 msgid ""
 "Uses Btrfs for the root file system allowing to boot to a previous version "
 "of the system after configuration changes or software upgrades."
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:159
+#: src/components/storage/ProposalSettingsSection.jsx:155
 #, fuzzy
 msgid "Use Btrfs Snapshots"
 msgstr "con instantáneas"
 
-#: src/components/storage/ProposalSettingsSection.jsx:173
-msgid "Btrfs snapshots required by product."
-msgstr ""
-
-#: src/components/storage/ProposalSettingsSection.jsx:239
+#: src/components/storage/ProposalSettingsSection.jsx:227
 msgid "Change encryption settings"
 msgstr "Cambiar las configuraciones de cifrado"
 
-#: src/components/storage/ProposalSettingsSection.jsx:244
-#: src/components/storage/ProposalSettingsSection.jsx:265
+#: src/components/storage/ProposalSettingsSection.jsx:232
+#: src/components/storage/ProposalSettingsSection.jsx:253
 msgid "Encryption settings"
 msgstr "Configuraciones del cifrado"
 
-#: src/components/storage/ProposalSettingsSection.jsx:258
+#: src/components/storage/ProposalSettingsSection.jsx:246
 msgid "Use encryption"
 msgstr "Usar cifrado"
 
-#: src/components/storage/ProposalSettingsSection.jsx:325
+#: src/components/storage/ProposalSettingsSection.jsx:309
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/components/storage/ProposalSettingsSection.jsx:330
-#, fuzzy
-msgid "Transactional system"
-msgstr "transaccional"
-
-#. TRANSLATORS: %s is replaced by a product name (e.g., openSUSE Tumbleweed)
-#: src/components/storage/ProposalSettingsSection.jsx:333
-#, c-format
-msgid ""
-"%s is an immutable system with atomic updates using a read-only Btrfs root "
-"file system."
-msgstr ""
-
 #: src/components/storage/ProposalSpacePolicySection.jsx:50
 msgid "Delete current content"
 msgstr "Eliminar el contenido actual"
@@ -1404,13 +1387,13 @@ msgid "Current content"
 msgstr "Contenido actual"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:74
-#: src/components/storage/ProposalVolumes.jsx:309
-#: src/components/storage/VolumeForm.jsx:741
+#: src/components/storage/ProposalVolumes.jsx:313
+#: src/components/storage/VolumeForm.jsx:745
 msgid "Size"
 msgstr "Tamaño"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:75
-#: src/components/storage/ProposalVolumes.jsx:308
+#: src/components/storage/ProposalVolumes.jsx:312
 msgid "Details"
 msgstr "Detalles"
 
@@ -1469,7 +1452,7 @@ msgid "Space action selector for %s"
 msgstr "Selector de acción en el espacio para %s"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:224
-#: src/components/storage/ProposalVolumes.jsx:229
+#: src/components/storage/ProposalVolumes.jsx:233
 #: src/components/storage/iscsi/NodesPresenter.jsx:77
 msgid "Delete"
 msgstr "Eliminar"
@@ -1501,7 +1484,19 @@ msgstr ""
 "espacio libre en los dispositivos que se enumeran a continuación. Elige cómo "
 "hacerlo."
 
-#. TRANSLATORS: header for a list of items
+#: src/components/storage/ProposalTransactionalInfo.jsx:46
+#, fuzzy
+msgid "Transactional root file system"
+msgstr "transaccional"
+
+#: src/components/storage/ProposalTransactionalInfo.jsx:49
+#, c-format
+msgid ""
+"%s is an immutable system with atomic updates. It uses a read-only Btrfs "
+"file system updated via snapshots."
+msgstr ""
+
+#. TRANSLATORS: header for a list of items referring to size limits for file systems
 #: src/components/storage/ProposalVolumes.jsx:59
 msgid "These limits are affected by:"
 msgstr "Estos límites se ven afectados por:"
@@ -1518,63 +1513,69 @@ msgstr "La configuración de instantáneas"
 msgid "Presence of other volumes (%s)"
 msgstr "Presencia de otros volúmenes (%s)"
 
+#. TRANSLATORS: list item, describes a factor that affects the computed size of a
+#. file system; eg. adjusting the size of the swap
+#: src/components/storage/ProposalVolumes.jsx:71
+msgid "The amount of RAM in the system"
+msgstr ""
+
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:129
+#: src/components/storage/ProposalVolumes.jsx:133
 msgid "Reset to defaults"
 msgstr "Restablecer los valores predeterminados"
 
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:137
 #: src/components/storage/ProposalVolumes.jsx:141
+#: src/components/storage/ProposalVolumes.jsx:145
 msgid "Add file system"
 msgstr "Agregar sistema de archivos"
 
 #. TRANSLATORS: minimum device size, %s is replaced by size string, e.g. "17.5 GiB"
-#: src/components/storage/ProposalVolumes.jsx:191
+#: src/components/storage/ProposalVolumes.jsx:195
 #, c-format
 msgid "At least %s"
 msgstr "Al menos %s"
 
 #. TRANSLATORS: device flag, the partition size is automatically computed
-#: src/components/storage/ProposalVolumes.jsx:197
+#: src/components/storage/ProposalVolumes.jsx:201
 msgid "auto"
 msgstr "automático"
 
 #. TRANSLATORS: the filesystem uses a logical volume (LVM)
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "logical volume"
 msgstr "volúmen lógico"
 
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "partition"
 msgstr "partición"
 
 #. TRANSLATORS: filesystem flag, it uses an encryption
-#: src/components/storage/ProposalVolumes.jsx:216
+#: src/components/storage/ProposalVolumes.jsx:220
 msgid "encrypted"
 msgstr "cifrado"
 
 #. TRANSLATORS: filesystem flag, it allows creating snapshots
-#: src/components/storage/ProposalVolumes.jsx:218
+#: src/components/storage/ProposalVolumes.jsx:222
 msgid "with snapshots"
 msgstr "con instantáneas"
 
 #. TRANSLATORS: flag for transactional file system
-#: src/components/storage/ProposalVolumes.jsx:220
+#: src/components/storage/ProposalVolumes.jsx:224
 msgid "transactional"
 msgstr "transaccional"
 
-#: src/components/storage/ProposalVolumes.jsx:275
+#: src/components/storage/ProposalVolumes.jsx:279
 msgid "Edit file system"
 msgstr "Editar sistema de archivos"
 
-#: src/components/storage/ProposalVolumes.jsx:307
-#: src/components/storage/VolumeForm.jsx:726
-#: src/components/storage/VolumeForm.jsx:731
+#: src/components/storage/ProposalVolumes.jsx:311
+#: src/components/storage/VolumeForm.jsx:730
+#: src/components/storage/VolumeForm.jsx:735
 msgid "Mount point"
 msgstr "Punto de montaje"
 
-#: src/components/storage/ProposalVolumes.jsx:345
+#: src/components/storage/ProposalVolumes.jsx:349
 msgid "Table with mount points"
 msgstr "Tabla con puntos de montaje"
 
@@ -1617,37 +1618,42 @@ msgstr "la presencia del sistema de archivos para %s"
 msgid ", "
 msgstr ", "
 
+#. TRANSLATORS: item which affects the final computed partition size
+#: src/components/storage/VolumeForm.jsx:315
+msgid "the amount of RAM in the system"
+msgstr ""
+
 #. TRANSLATORS: the %s is replaced by the items which affect the computed size
-#: src/components/storage/VolumeForm.jsx:314
+#: src/components/storage/VolumeForm.jsx:318
 #, c-format
 msgid "The final size depends on %s."
 msgstr "El tamaño final depende de %s."
 
 #. TRANSLATORS: conjunction for merging two texts
-#: src/components/storage/VolumeForm.jsx:316
+#: src/components/storage/VolumeForm.jsx:320
 msgid " and "
 msgstr " y "
 
 #. TRANSLATORS: the partition size is automatically computed
-#: src/components/storage/VolumeForm.jsx:321
+#: src/components/storage/VolumeForm.jsx:325
 msgid "Automatically calculated size according to the selected product."
 msgstr "Tamaño calculado automáticamente según el producto seleccionado."
 
-#: src/components/storage/VolumeForm.jsx:341
+#: src/components/storage/VolumeForm.jsx:345
 msgid "Exact size for the file system."
 msgstr "Tamaño exacto para el sistema de archivos."
 
 #. TRANSLATORS: requested partition size
-#: src/components/storage/VolumeForm.jsx:353
+#: src/components/storage/VolumeForm.jsx:357
 msgid "Exact size"
 msgstr "Tamaño exacto"
 
 #. TRANSLATORS: units selector (like KiB, MiB, GiB...)
-#: src/components/storage/VolumeForm.jsx:368
+#: src/components/storage/VolumeForm.jsx:372
 msgid "Size unit"
 msgstr "Unidad de tamaño"
 
-#: src/components/storage/VolumeForm.jsx:396
+#: src/components/storage/VolumeForm.jsx:400
 msgid ""
 "Limits for the file system size. The final size will be a value between the "
 "given minimum and maximum. If no maximum is given then the file system will "
@@ -1658,57 +1664,57 @@ msgstr ""
 "de archivos será lo más grande posible."
 
 #. TRANSLATORS: the minimal partition size
-#: src/components/storage/VolumeForm.jsx:403
+#: src/components/storage/VolumeForm.jsx:407
 msgid "Minimum"
 msgstr "Mínimo"
 
 #. TRANSLATORS: the minium partition size
-#: src/components/storage/VolumeForm.jsx:413
+#: src/components/storage/VolumeForm.jsx:417
 msgid "Minimum desired size"
 msgstr "Tamaño mínimo deseado"
 
-#: src/components/storage/VolumeForm.jsx:422
+#: src/components/storage/VolumeForm.jsx:426
 msgid "Unit for the minimum size"
 msgstr "Unidad para el tamaño mínimo"
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:433
+#: src/components/storage/VolumeForm.jsx:437
 msgid "Maximum"
 msgstr "Máximo"
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:444
+#: src/components/storage/VolumeForm.jsx:448
 msgid "Maximum desired size"
 msgstr "Tamaño máximo deseado"
 
-#: src/components/storage/VolumeForm.jsx:452
+#: src/components/storage/VolumeForm.jsx:456
 msgid "Unit for the maximum size"
 msgstr "Unidad para el tamaño máximo"
 
 #. TRANSLATORS: radio button label, fully automatically computed partition size, no user input
-#: src/components/storage/VolumeForm.jsx:469
+#: src/components/storage/VolumeForm.jsx:473
 msgid "Auto"
 msgstr "Automático"
 
 #. TRANSLATORS: radio button label, exact partition size requested by user
-#: src/components/storage/VolumeForm.jsx:471
+#: src/components/storage/VolumeForm.jsx:475
 msgid "Fixed"
 msgstr "Fijado"
 
 #. TRANSLATORS: radio button label, automatically computed partition size within the user provided min and max limits
-#: src/components/storage/VolumeForm.jsx:473
+#: src/components/storage/VolumeForm.jsx:477
 msgid "Range"
 msgstr "Rango"
 
-#: src/components/storage/VolumeForm.jsx:681
+#: src/components/storage/VolumeForm.jsx:685
 msgid "A size value is required"
 msgstr "Se requiere un valor de tamaño"
 
-#: src/components/storage/VolumeForm.jsx:686
+#: src/components/storage/VolumeForm.jsx:690
 msgid "Minimum size is required"
 msgstr "Se requiere un tamaño mínimo"
 
-#: src/components/storage/VolumeForm.jsx:690
+#: src/components/storage/VolumeForm.jsx:694
 msgid "Maximum must be greater than minimum"
 msgstr "El máximo debe ser mayor que el mínimo"
 
diff --git a/web/po/fr.po b/web/po/fr.po
index 3bcabedf7..960af7a15 100644
--- a/web/po/fr.po
+++ b/web/po/fr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-03 02:07+0000\n"
-"PO-Revision-Date: 2024-01-23 12:59+0000\n"
+"POT-Creation-Date: 2024-03-14 02:05+0000\n"
+"PO-Revision-Date: 2024-03-10 20:42+0000\n"
 "Last-Translator: faila fail <yassadmi@proton.me>\n"
 "Language-Team: French <https://l10n.opensuse.org/projects/agama/agama-web/fr/"
 ">\n"
@@ -41,7 +41,6 @@ msgstr "À propos d'Agama"
 
 #. TRANSLATORS: content of the "About" popup (1/2)
 #: src/components/core/About.jsx:53
-#, fuzzy
 msgid ""
 "Agama is an experimental installer for (open)SUSE systems. It is still under "
 "development so, please, do not use it in production environments. If you "
@@ -158,9 +157,9 @@ msgstr ""
 #: src/components/product/ProductPage.jsx:207
 #: src/components/storage/ProposalDeviceSection.jsx:169
 #: src/components/storage/ProposalDeviceSection.jsx:364
-#: src/components/storage/ProposalSettingsSection.jsx:275
-#: src/components/storage/ProposalVolumes.jsx:148
-#: src/components/storage/ProposalVolumes.jsx:283
+#: src/components/storage/ProposalSettingsSection.jsx:263
+#: src/components/storage/ProposalVolumes.jsx:152
+#: src/components/storage/ProposalVolumes.jsx:287
 #: src/components/storage/ZFCPPage.jsx:511
 msgid "Accept"
 msgstr "Accepter"
@@ -315,8 +314,8 @@ msgstr "Confirmer"
 
 #. TRANSLATORS: dropdown label
 #: src/components/core/RowActions.jsx:66
-#: src/components/storage/ProposalVolumes.jsx:119
-#: src/components/storage/ProposalVolumes.jsx:310
+#: src/components/storage/ProposalVolumes.jsx:123
+#: src/components/storage/ProposalVolumes.jsx:314
 msgid "Actions"
 msgstr "Actions"
 
@@ -544,8 +543,8 @@ msgstr "Adresses"
 msgid "Addresses data list"
 msgstr "Liste des données d'adresses"
 
-#. TRANSLATORS: input field for the iSCSI initiator name
 #. TRANSLATORS: table header
+#. TRANSLATORS: input field for the iSCSI initiator name
 #: src/components/network/ConnectionsTable.jsx:57
 #: src/components/network/ConnectionsTable.jsx:86
 #: src/components/storage/ZFCPPage.jsx:360
@@ -564,7 +563,7 @@ msgid "IP addresses"
 msgstr "Adresses IP"
 
 #: src/components/network/ConnectionsTable.jsx:67
-#: src/components/storage/ProposalVolumes.jsx:234
+#: src/components/storage/ProposalVolumes.jsx:238
 #: src/components/storage/iscsi/InitiatorPresenter.jsx:49
 #: src/components/storage/iscsi/NodesPresenter.jsx:73
 #: src/components/users/FirstUser.jsx:208
@@ -707,7 +706,7 @@ msgstr "Aucun"
 #. TRANSLATORS: WiFi authentication mode
 #: src/components/network/WifiConnectionForm.jsx:45
 msgid "WPA & WPA2 Personal"
-msgstr "WPA & WPA2 Personal"
+msgstr "WPA & WPA2 Personnel"
 
 #: src/components/network/WifiConnectionForm.jsx:91
 #: src/components/product/ProductPage.jsx:128
@@ -766,8 +765,8 @@ msgstr "Connecté"
 msgid "Disconnecting"
 msgstr "Déconnexion"
 
-#. TRANSLATORS: iSCSI connection status
 #. TRANSLATORS: Wifi network status
+#. TRANSLATORS: iSCSI connection status
 #: src/components/network/WifiNetworkListItem.jsx:50
 #: src/components/storage/iscsi/NodesPresenter.jsx:63
 msgid "Disconnected"
@@ -801,8 +800,8 @@ msgstr "Aucune connexion réseau détectée"
 #, c-format
 msgid "%d connection set:"
 msgid_plural "%d connections set:"
-msgstr[0] "Connexion %d établie:"
-msgstr[1] "Connexions %d établies:"
+msgstr[0] "%d Connexion établie:"
+msgstr[1] "%d Connexions établies:"
 
 #. TRANSLATORS: page title
 #: src/components/overview/OverviewPage.jsx:48
@@ -811,9 +810,9 @@ msgstr "Synthèse de l'installation"
 
 #. TRANSLATORS: %s is replaced by a product name (e.g., SUSE ALP-Dolomite)
 #: src/components/overview/ProductSection.jsx:48
-#, fuzzy, c-format
+#, c-format
 msgid "%s (registered)"
-msgstr "%s (inscrit)"
+msgstr "%s (enregistré)"
 
 #. TRANSLATORS: page title
 #. TRANSLATORS: page section
@@ -831,8 +830,8 @@ msgstr "Lecture des dépôts de logiciels"
 msgid "Refresh the repositories"
 msgstr "Rafraîchir les dépôts"
 
-#. TRANSLATORS: page title
 #. TRANSLATORS: page section
+#. TRANSLATORS: page title
 #: src/components/overview/SoftwareSection.jsx:143
 #: src/components/software/SoftwarePage.jsx:81
 msgid "Software"
@@ -883,7 +882,7 @@ msgstr "Sonde les périphériques de stockage"
 #. TRANSLATORS: page title
 #. TRANSLATORS: page section title
 #: src/components/overview/StorageSection.jsx:208
-#: src/components/storage/ProposalPage.jsx:239
+#: src/components/storage/ProposalPage.jsx:243
 msgid "Storage"
 msgstr "Stockage"
 
@@ -927,9 +926,9 @@ msgid "Choose a product"
 msgstr "Choisir un produit"
 
 #: src/components/product/ProductPage.jsx:122
-#, fuzzy, c-format
+#, c-format
 msgid "Register %s"
-msgstr "Inscription %s"
+msgstr "Enregistrer %s"
 
 #: src/components/product/ProductPage.jsx:188
 #, c-format
@@ -943,9 +942,8 @@ msgid "Do you want to deregister %s?"
 msgstr "Souhaitez-vous désinscrire %s ?"
 
 #: src/components/product/ProductPage.jsx:227
-#, fuzzy
 msgid "Registered warning"
-msgstr "Avertissement inscrit"
+msgstr "Avertissement enregistré"
 
 #. TRANSLATORS: %s is replaced by a product name (e.g., SUSE ALP-Dolomite)
 #: src/components/product/ProductPage.jsx:232
@@ -959,14 +957,12 @@ msgid "Change product"
 msgstr "Changer de produit"
 
 #: src/components/product/ProductPage.jsx:305
-#, fuzzy
 msgid "Register"
-msgstr "Registre"
+msgstr "Enregistrer"
 
 #: src/components/product/ProductPage.jsx:337
-#, fuzzy
 msgid "Deregister product"
-msgstr "Désinscrire le produit"
+msgstr "Radier le produit"
 
 #: src/components/product/ProductPage.jsx:370
 msgid "Code:"
@@ -978,19 +974,16 @@ msgstr "E-mail :"
 
 #. TRANSLATORS: section title.
 #: src/components/product/ProductPage.jsx:390
-#, fuzzy
 msgid "Registration"
-msgstr "Inscription"
+msgstr "Enregistrement"
 
 #: src/components/product/ProductPage.jsx:399
-#, fuzzy
 msgid "This product requires registration."
-msgstr "Ce produit nécessite une inscription."
+msgstr "Ce produit nécessite un enregistrement."
 
 #: src/components/product/ProductPage.jsx:405
-#, fuzzy
 msgid "This product does not require registration."
-msgstr "Ce produit nécessite pas d'inscription."
+msgstr "Ce produit ne nécessite pas d'enregistrement."
 
 #: src/components/product/ProductRegistrationForm.jsx:63
 msgid "Registration code"
@@ -1018,9 +1011,8 @@ msgid "No products available for selection"
 msgstr "Aucun produit disponible pour la sélection"
 
 #: src/components/product/ProductSelector.jsx:42
-#, fuzzy
 msgid "Available products"
-msgstr "Localités disponibles"
+msgstr "Produits disponibles"
 
 #: src/components/questions/GenericQuestion.jsx:35
 #: src/components/questions/LuksActivationQuestion.jsx:60
@@ -1065,7 +1057,7 @@ msgstr "Synthèse logiciel et options de filtrage"
 #: src/components/software/UsedSize.jsx:32
 #, c-format
 msgid "Installation will take %s"
-msgstr "L'installation durera %s"
+msgstr "L'installation utilisera %s"
 
 #: src/components/storage/DASDFormatProgress.jsx:61
 msgid "Waiting for progress report"
@@ -1212,15 +1204,14 @@ msgstr "Actions planifiées"
 
 #. TRANSLATORS: The storage "Planned Actions" section's description
 #: src/components/storage/ProposalActionsSection.jsx:126
-#, fuzzy
 msgid "Actions to create the file systems and to ensure the new system boots."
 msgstr ""
-"Actions visant à créer les systèmes de fichiers et à garantir le démarrage "
-"du système."
+"Actions visant à créer les systèmes de fichiers et à assurer le démarrage du "
+"système."
 
 #: src/components/storage/ProposalDeviceSection.jsx:135
 msgid "Waiting for information about selected device"
-msgstr ""
+msgstr "En attente d'informations sur le périphérique sélectionné"
 
 #: src/components/storage/ProposalDeviceSection.jsx:138
 msgid "Select the device for installing the system."
@@ -1263,7 +1254,7 @@ msgstr "Paramètres LVM"
 
 #: src/components/storage/ProposalDeviceSection.jsx:333
 msgid "Waiting for information about LVM"
-msgstr ""
+msgstr "En attente d'informations sur le LVM"
 
 #: src/components/storage/ProposalDeviceSection.jsx:339
 msgid "Use logical volume management (LVM)"
@@ -1280,11 +1271,12 @@ msgid ""
 "Select the main disk or <abbr title='Logical Volume Manager'>LVM</abbr> "
 "Volume Group for installation."
 msgstr ""
+"Sélectionnez le disque principal ou <abbr title='Logical Volume "
+"Manager'>LVM</abbr> Groupe de volume pour l'installation."
 
 #: src/components/storage/ProposalFileSystemsSection.jsx:70
-#, fuzzy
 msgid "File systems"
-msgstr "Type de système de fichiers"
+msgstr "Système de fichiers"
 
 #: src/components/storage/ProposalPageMenu.jsx:40
 msgid "Manage and format"
@@ -1309,7 +1301,7 @@ msgstr "iSCSI"
 #. TRANSLATORS: The word 'directly' is key here. For example, booting to the installer media and then choosing
 #. 'Boot from Hard Disk' from there will not work. Keep it sort (this is a hint in a form) but keep it clear.
 #. Do not translate 'abbr' and 'title', they are part of the HTML markup.
-#: src/components/storage/ProposalSettingsSection.jsx:89
+#: src/components/storage/ProposalSettingsSection.jsx:87
 msgid ""
 "The password will not be needed to boot and access the data if the <abbr "
 "title='Trusted Platform Module'>TPM</abbr> can verify the integrity of the "
@@ -1321,55 +1313,40 @@ msgstr ""
 "l'intégrité du système. Le scellement par TPM exige que le nouveau système "
 "soit démarré directement lors de sa première exécution."
 
-#: src/components/storage/ProposalSettingsSection.jsx:107
+#: src/components/storage/ProposalSettingsSection.jsx:105
 msgid "Use the TPM to decrypt automatically on each boot"
 msgstr "Utiliser le TPM pour décrypter automatiquement à chaque démarrage"
 
-#: src/components/storage/ProposalSettingsSection.jsx:152
+#: src/components/storage/ProposalSettingsSection.jsx:148
 msgid ""
 "Uses Btrfs for the root file system allowing to boot to a previous version "
 "of the system after configuration changes or software upgrades."
 msgstr ""
+"Utilise Btrfs comme système de fichiers racine, ce qui permet de démarrer "
+"sur une version précédente du système après des changements de configuration "
+"ou des mises à jour logicielles."
 
-#: src/components/storage/ProposalSettingsSection.jsx:159
-#, fuzzy
+#: src/components/storage/ProposalSettingsSection.jsx:155
 msgid "Use Btrfs Snapshots"
-msgstr "avec des clichés"
-
-#: src/components/storage/ProposalSettingsSection.jsx:173
-msgid "Btrfs snapshots required by product."
-msgstr ""
+msgstr "Utilise les clichés Btrfs"
 
-#: src/components/storage/ProposalSettingsSection.jsx:239
+#: src/components/storage/ProposalSettingsSection.jsx:227
 msgid "Change encryption settings"
 msgstr "Modifier les paramètres de chiffrement"
 
-#: src/components/storage/ProposalSettingsSection.jsx:244
-#: src/components/storage/ProposalSettingsSection.jsx:265
+#: src/components/storage/ProposalSettingsSection.jsx:232
+#: src/components/storage/ProposalSettingsSection.jsx:253
 msgid "Encryption settings"
 msgstr "Paramètres de chiffrement"
 
-#: src/components/storage/ProposalSettingsSection.jsx:258
+#: src/components/storage/ProposalSettingsSection.jsx:246
 msgid "Use encryption"
 msgstr "Utiliser le chiffrement"
 
-#: src/components/storage/ProposalSettingsSection.jsx:325
+#: src/components/storage/ProposalSettingsSection.jsx:309
 msgid "Settings"
 msgstr "Paramètres"
 
-#: src/components/storage/ProposalSettingsSection.jsx:330
-#, fuzzy
-msgid "Transactional system"
-msgstr "transactionnel"
-
-#. TRANSLATORS: %s is replaced by a product name (e.g., openSUSE Tumbleweed)
-#: src/components/storage/ProposalSettingsSection.jsx:333
-#, c-format
-msgid ""
-"%s is an immutable system with atomic updates using a read-only Btrfs root "
-"file system."
-msgstr ""
-
 #: src/components/storage/ProposalSpacePolicySection.jsx:50
 msgid "Delete current content"
 msgstr "Supprimer le contenu actuel"
@@ -1385,132 +1362,123 @@ msgid "Shrink existing partitions"
 msgstr "Réduire les partitions existantes"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:56
-#, fuzzy
 msgid "The data is kept, but the current partitions will be resized as needed."
 msgstr ""
 "Les données sont conservées, mais les partitions actuelles seront "
-"redimensionnées si nécessaire pour libérer de l'espace."
+"redimensionnées si nécessaire."
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:60
 msgid "Use available space"
 msgstr "Utiliser l'espace disponible"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:61
-#, fuzzy
 msgid ""
 "The data is kept. Only the space not assigned to any partition will be used."
 msgstr ""
-"Les données sont conservées et les partitions existantes ne seront pas "
-"modifiées. Seul l'espace qui n'est attribué à aucune partition sera utilisé."
+"Les données sont conservées. Seul l'espace qui n'est attribué à aucune "
+"partition sera utilisé."
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:65
-#, fuzzy
 msgid "Custom"
-msgstr "Périphériques personnalisés"
+msgstr "Personnalisé"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:66
 msgid "Select what to do with each partition."
-msgstr ""
+msgstr "Sélectionnez ce qu'il faut faire pour chaque partition."
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:72
-#, fuzzy
 msgid "Used device"
-msgstr "Lire les périphériques zFCP"
+msgstr "Périphérique utilisé"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:73
-#, fuzzy
 msgid "Current content"
-msgstr "Supprimer le contenu actuel"
+msgstr "Contenu actuel"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:74
-#: src/components/storage/ProposalVolumes.jsx:309
-#: src/components/storage/VolumeForm.jsx:741
+#: src/components/storage/ProposalVolumes.jsx:313
+#: src/components/storage/VolumeForm.jsx:745
 msgid "Size"
 msgstr "Taille"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:75
-#: src/components/storage/ProposalVolumes.jsx:308
+#: src/components/storage/ProposalVolumes.jsx:312
 msgid "Details"
 msgstr "Détails"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:76
-#, fuzzy
 msgid "Action"
-msgstr "Actions"
+msgstr "Action"
 
 #. TRANSLATORS: %s is replaced by partition table type (e.g., GPT)
 #: src/components/storage/ProposalSpacePolicySection.jsx:110
-#, fuzzy, c-format
+#, c-format
 msgid "%s partition table"
-msgstr "partition"
+msgstr "Table de partitionnement %s"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:121
-#, fuzzy
 msgid "EFI system partition"
-msgstr "partition"
+msgstr "Partition système EFI"
 
 #. TRANSLATORS: %s is replaced by a file system type (e.g., btrfs).
 #: src/components/storage/ProposalSpacePolicySection.jsx:124
-#, fuzzy, c-format
+#, c-format
 msgid "%s file system"
-msgstr "Ajouter un système de fichiers"
+msgstr "Système de fichiers %s"
 
 #. TRANSLATORS: %s is replaced by a LVM volume group name (e.g., /dev/vg0).
 #: src/components/storage/ProposalSpacePolicySection.jsx:131
 #, c-format
 msgid "LVM physical volume of %s"
-msgstr ""
+msgstr "Volume physique LVM de %s"
 
 #. TRANSLATORS: %s is replaced by a RAID name (e.g., /dev/md0).
 #: src/components/storage/ProposalSpacePolicySection.jsx:134
-#, fuzzy, c-format
+#, c-format
 msgid "Member of RAID %s"
-msgstr "Membres : %s"
+msgstr "Composition du RAID %s"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:136
 msgid "Not identified"
-msgstr ""
+msgstr "Non identifié"
 
 #. TRANSLATORS: %s is replaced by a disk size (e.g., 20 GiB)
 #: src/components/storage/ProposalSpacePolicySection.jsx:173
 #, c-format
 msgid "%s unused"
-msgstr ""
+msgstr "%s inutilisé"
 
 #. TRANSLATORS: %s is replaced by a disk size (e.g., 2 GiB)
 #: src/components/storage/ProposalSpacePolicySection.jsx:186
 #, c-format
 msgid "Shrinkable by %s"
-msgstr ""
+msgstr "Rétrécissable de %s"
 
 #. TRANSLATORS: %s is replaced by a device name (e.g., /dev/sda)
 #: src/components/storage/ProposalSpacePolicySection.jsx:221
 #, c-format
 msgid "Space action selector for %s"
-msgstr ""
+msgstr "Sélecteur d'allocation d'espace pour %s"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:224
-#: src/components/storage/ProposalVolumes.jsx:229
+#: src/components/storage/ProposalVolumes.jsx:233
 #: src/components/storage/iscsi/NodesPresenter.jsx:77
 msgid "Delete"
 msgstr "Supprimer"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:228
 msgid "Allow resize"
-msgstr ""
+msgstr "Permettre le redimensionnement"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:230
 msgid "Do not modify"
-msgstr ""
+msgstr "Ne pas modifier"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:382
-#, fuzzy
 msgid "Actions to find space"
-msgstr "Actions concernant la connexion %s"
+msgstr "Actions pour trouver de l'espace"
 
 #. TRANSLATORS: The storage "Find Space" section's title
 #: src/components/storage/ProposalSpacePolicySection.jsx:452
-#, fuzzy
 msgid "Find Space"
 msgstr "Trouver de l'espace"
 
@@ -1520,8 +1488,23 @@ msgid ""
 "Allocating the file systems might need to find free space in the devices "
 "listed below. Choose how to do it."
 msgstr ""
+"Allouer les systèmes de fichiers peut nécessiter de trouver de l'espace "
+"libre dans les périphériques listés ci-dessous. Choisissez comment procéder."
+
+#: src/components/storage/ProposalTransactionalInfo.jsx:46
+msgid "Transactional root file system"
+msgstr "Système de fichiers root transactionnel"
+
+#: src/components/storage/ProposalTransactionalInfo.jsx:49
+#, c-format
+msgid ""
+"%s is an immutable system with atomic updates. It uses a read-only Btrfs "
+"file system updated via snapshots."
+msgstr ""
+"%s est un système immuable avec des mises à jour atomiques. Il utilise un "
+"système de fichiers Btrfs en lecture seule mis à jour via des clichés."
 
-#. TRANSLATORS: header for a list of items
+#. TRANSLATORS: header for a list of items referring to size limits for file systems
 #: src/components/storage/ProposalVolumes.jsx:59
 msgid "These limits are affected by:"
 msgstr "Ces limites sont affectées par:"
@@ -1538,63 +1521,69 @@ msgstr "La configuration des clichés"
 msgid "Presence of other volumes (%s)"
 msgstr "Présence d'autres volumes (%s)"
 
+#. TRANSLATORS: list item, describes a factor that affects the computed size of a
+#. file system; eg. adjusting the size of the swap
+#: src/components/storage/ProposalVolumes.jsx:71
+msgid "The amount of RAM in the system"
+msgstr ""
+
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:129
+#: src/components/storage/ProposalVolumes.jsx:133
 msgid "Reset to defaults"
 msgstr "Rétablir les valeurs par défaut"
 
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:137
 #: src/components/storage/ProposalVolumes.jsx:141
+#: src/components/storage/ProposalVolumes.jsx:145
 msgid "Add file system"
 msgstr "Ajouter un système de fichiers"
 
 #. TRANSLATORS: minimum device size, %s is replaced by size string, e.g. "17.5 GiB"
-#: src/components/storage/ProposalVolumes.jsx:191
+#: src/components/storage/ProposalVolumes.jsx:195
 #, c-format
 msgid "At least %s"
 msgstr "Au moins %s"
 
 #. TRANSLATORS: device flag, the partition size is automatically computed
-#: src/components/storage/ProposalVolumes.jsx:197
+#: src/components/storage/ProposalVolumes.jsx:201
 msgid "auto"
 msgstr "auto"
 
 #. TRANSLATORS: the filesystem uses a logical volume (LVM)
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "logical volume"
 msgstr "volume logique"
 
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "partition"
 msgstr "partition"
 
 #. TRANSLATORS: filesystem flag, it uses an encryption
-#: src/components/storage/ProposalVolumes.jsx:216
+#: src/components/storage/ProposalVolumes.jsx:220
 msgid "encrypted"
 msgstr "chiffré"
 
 #. TRANSLATORS: filesystem flag, it allows creating snapshots
-#: src/components/storage/ProposalVolumes.jsx:218
+#: src/components/storage/ProposalVolumes.jsx:222
 msgid "with snapshots"
 msgstr "avec des clichés"
 
 #. TRANSLATORS: flag for transactional file system
-#: src/components/storage/ProposalVolumes.jsx:220
+#: src/components/storage/ProposalVolumes.jsx:224
 msgid "transactional"
 msgstr "transactionnel"
 
-#: src/components/storage/ProposalVolumes.jsx:275
+#: src/components/storage/ProposalVolumes.jsx:279
 msgid "Edit file system"
 msgstr "Modifier le système de fichiers"
 
-#: src/components/storage/ProposalVolumes.jsx:307
-#: src/components/storage/VolumeForm.jsx:726
-#: src/components/storage/VolumeForm.jsx:731
+#: src/components/storage/ProposalVolumes.jsx:311
+#: src/components/storage/VolumeForm.jsx:730
+#: src/components/storage/VolumeForm.jsx:735
 msgid "Mount point"
 msgstr "Point de montage"
 
-#: src/components/storage/ProposalVolumes.jsx:345
+#: src/components/storage/ProposalVolumes.jsx:349
 msgid "Table with mount points"
 msgstr "Table avec points de montage"
 
@@ -1637,38 +1626,43 @@ msgstr "la présence du système de fichiers pour %s"
 msgid ", "
 msgstr ", "
 
+#. TRANSLATORS: item which affects the final computed partition size
+#: src/components/storage/VolumeForm.jsx:315
+msgid "the amount of RAM in the system"
+msgstr ""
+
 #. TRANSLATORS: the %s is replaced by the items which affect the computed size
-#: src/components/storage/VolumeForm.jsx:314
+#: src/components/storage/VolumeForm.jsx:318
 #, c-format
 msgid "The final size depends on %s."
 msgstr "La taille définitive dépend de %s."
 
 #. TRANSLATORS: conjunction for merging two texts
-#: src/components/storage/VolumeForm.jsx:316
+#: src/components/storage/VolumeForm.jsx:320
 msgid " and "
 msgstr " et "
 
 #. TRANSLATORS: the partition size is automatically computed
-#: src/components/storage/VolumeForm.jsx:321
+#: src/components/storage/VolumeForm.jsx:325
 msgid "Automatically calculated size according to the selected product."
 msgstr ""
 "La taille est automatiquement calculée en fonction du produit sélectionné."
 
-#: src/components/storage/VolumeForm.jsx:341
+#: src/components/storage/VolumeForm.jsx:345
 msgid "Exact size for the file system."
 msgstr "Taille exacte du système de fichiers."
 
 #. TRANSLATORS: requested partition size
-#: src/components/storage/VolumeForm.jsx:353
+#: src/components/storage/VolumeForm.jsx:357
 msgid "Exact size"
 msgstr "Taille exacte"
 
 #. TRANSLATORS: units selector (like KiB, MiB, GiB...)
-#: src/components/storage/VolumeForm.jsx:368
+#: src/components/storage/VolumeForm.jsx:372
 msgid "Size unit"
 msgstr "Unité de mesure"
 
-#: src/components/storage/VolumeForm.jsx:396
+#: src/components/storage/VolumeForm.jsx:400
 msgid ""
 "Limits for the file system size. The final size will be a value between the "
 "given minimum and maximum. If no maximum is given then the file system will "
@@ -1679,57 +1673,57 @@ msgstr ""
 "n'est indiqué, le système de fichiers sera aussi grand que possible."
 
 #. TRANSLATORS: the minimal partition size
-#: src/components/storage/VolumeForm.jsx:403
+#: src/components/storage/VolumeForm.jsx:407
 msgid "Minimum"
 msgstr "Minimum"
 
 #. TRANSLATORS: the minium partition size
-#: src/components/storage/VolumeForm.jsx:413
+#: src/components/storage/VolumeForm.jsx:417
 msgid "Minimum desired size"
 msgstr "Taille minimale souhaitée"
 
-#: src/components/storage/VolumeForm.jsx:422
+#: src/components/storage/VolumeForm.jsx:426
 msgid "Unit for the minimum size"
 msgstr "Unité de la taille minimale"
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:433
+#: src/components/storage/VolumeForm.jsx:437
 msgid "Maximum"
 msgstr "Maximum"
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:444
+#: src/components/storage/VolumeForm.jsx:448
 msgid "Maximum desired size"
 msgstr "Taille maximale désirée"
 
-#: src/components/storage/VolumeForm.jsx:452
+#: src/components/storage/VolumeForm.jsx:456
 msgid "Unit for the maximum size"
 msgstr "Unité de la taille maximale"
 
 #. TRANSLATORS: radio button label, fully automatically computed partition size, no user input
-#: src/components/storage/VolumeForm.jsx:469
+#: src/components/storage/VolumeForm.jsx:473
 msgid "Auto"
 msgstr "Auto"
 
 #. TRANSLATORS: radio button label, exact partition size requested by user
-#: src/components/storage/VolumeForm.jsx:471
+#: src/components/storage/VolumeForm.jsx:475
 msgid "Fixed"
 msgstr "Fixe"
 
 #. TRANSLATORS: radio button label, automatically computed partition size within the user provided min and max limits
-#: src/components/storage/VolumeForm.jsx:473
+#: src/components/storage/VolumeForm.jsx:477
 msgid "Range"
 msgstr "Portée"
 
-#: src/components/storage/VolumeForm.jsx:681
+#: src/components/storage/VolumeForm.jsx:685
 msgid "A size value is required"
 msgstr "Une valeur de taille est requise"
 
-#: src/components/storage/VolumeForm.jsx:686
+#: src/components/storage/VolumeForm.jsx:690
 msgid "Minimum size is required"
 msgstr "Une taille minimale est requise"
 
-#: src/components/storage/VolumeForm.jsx:690
+#: src/components/storage/VolumeForm.jsx:694
 msgid "Maximum must be greater than minimum"
 msgstr "Le maximum doit être supérieur au minimum"
 
@@ -2107,12 +2101,12 @@ msgstr "Nom d'utilisateur"
 
 #: src/components/users/FirstUser.jsx:88
 msgid "Username suggestion dropdown"
-msgstr ""
+msgstr "menu déroulant de noms d'utilisateur suggérés"
 
 #. TRANSLATORS: dropdown username suggestions
 #: src/components/users/FirstUser.jsx:102
 msgid "Use suggested username"
-msgstr ""
+msgstr "Utiliser le nom d'utilisateur suggéré"
 
 #: src/components/users/FirstUser.jsx:212
 #: src/components/users/RootAuthMethods.jsx:99
@@ -2248,6 +2242,9 @@ msgstr "Utilisateur"
 msgid "Root authentication"
 msgstr "Authentification root"
 
+#~ msgid "Btrfs snapshots required by product."
+#~ msgstr "Clichés Btrfs requis par le produit."
+
 #~ msgid ""
 #~ "Allows rolling back any change done to the system and restoring its "
 #~ "previous state"
diff --git a/web/po/id.po b/web/po/id.po
index 9f8a56fb2..782c90d14 100644
--- a/web/po/id.po
+++ b/web/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-03 02:07+0000\n"
+"POT-Creation-Date: 2024-03-14 02:05+0000\n"
 "PO-Revision-Date: 2024-02-21 04:42+0000\n"
 "Last-Translator: Arif Budiman <arifpedia@gmail.com>\n"
 "Language-Team: Indonesian <https://l10n.opensuse.org/projects/agama/agama-"
@@ -158,9 +158,9 @@ msgstr ""
 #: src/components/product/ProductPage.jsx:207
 #: src/components/storage/ProposalDeviceSection.jsx:169
 #: src/components/storage/ProposalDeviceSection.jsx:364
-#: src/components/storage/ProposalSettingsSection.jsx:275
-#: src/components/storage/ProposalVolumes.jsx:148
-#: src/components/storage/ProposalVolumes.jsx:283
+#: src/components/storage/ProposalSettingsSection.jsx:263
+#: src/components/storage/ProposalVolumes.jsx:152
+#: src/components/storage/ProposalVolumes.jsx:287
 #: src/components/storage/ZFCPPage.jsx:511
 msgid "Accept"
 msgstr "Terima"
@@ -310,8 +310,8 @@ msgstr "Konfirmasi"
 
 #. TRANSLATORS: dropdown label
 #: src/components/core/RowActions.jsx:66
-#: src/components/storage/ProposalVolumes.jsx:119
-#: src/components/storage/ProposalVolumes.jsx:310
+#: src/components/storage/ProposalVolumes.jsx:123
+#: src/components/storage/ProposalVolumes.jsx:314
 msgid "Actions"
 msgstr "Tindakan"
 
@@ -536,8 +536,8 @@ msgstr "Alamat"
 msgid "Addresses data list"
 msgstr "Daftar data alamat"
 
-#. TRANSLATORS: input field for the iSCSI initiator name
 #. TRANSLATORS: table header
+#. TRANSLATORS: input field for the iSCSI initiator name
 #: src/components/network/ConnectionsTable.jsx:57
 #: src/components/network/ConnectionsTable.jsx:86
 #: src/components/storage/ZFCPPage.jsx:360
@@ -556,7 +556,7 @@ msgid "IP addresses"
 msgstr "Alamat IP"
 
 #: src/components/network/ConnectionsTable.jsx:67
-#: src/components/storage/ProposalVolumes.jsx:234
+#: src/components/storage/ProposalVolumes.jsx:238
 #: src/components/storage/iscsi/InitiatorPresenter.jsx:49
 #: src/components/storage/iscsi/NodesPresenter.jsx:73
 #: src/components/users/FirstUser.jsx:208
@@ -757,8 +757,8 @@ msgstr "Tersambung"
 msgid "Disconnecting"
 msgstr "Memutuskan sambungan"
 
-#. TRANSLATORS: iSCSI connection status
 #. TRANSLATORS: Wifi network status
+#. TRANSLATORS: iSCSI connection status
 #: src/components/network/WifiNetworkListItem.jsx:50
 #: src/components/storage/iscsi/NodesPresenter.jsx:63
 msgid "Disconnected"
@@ -821,8 +821,8 @@ msgstr "Membaca repositori perangkat lunak"
 msgid "Refresh the repositories"
 msgstr "Menyegarkan repositori"
 
-#. TRANSLATORS: page title
 #. TRANSLATORS: page section
+#. TRANSLATORS: page title
 #: src/components/overview/SoftwareSection.jsx:143
 #: src/components/software/SoftwarePage.jsx:81
 msgid "Software"
@@ -869,7 +869,7 @@ msgstr "Memeriksa perangkat penyimpanan"
 #. TRANSLATORS: page title
 #. TRANSLATORS: page section title
 #: src/components/overview/StorageSection.jsx:208
-#: src/components/storage/ProposalPage.jsx:239
+#: src/components/storage/ProposalPage.jsx:243
 msgid "Storage"
 msgstr "Penyimpanan"
 
@@ -1284,7 +1284,7 @@ msgstr "iSCSI"
 #. TRANSLATORS: The word 'directly' is key here. For example, booting to the installer media and then choosing
 #. 'Boot from Hard Disk' from there will not work. Keep it sort (this is a hint in a form) but keep it clear.
 #. Do not translate 'abbr' and 'title', they are part of the HTML markup.
-#: src/components/storage/ProposalSettingsSection.jsx:89
+#: src/components/storage/ProposalSettingsSection.jsx:87
 msgid ""
 "The password will not be needed to boot and access the data if the <abbr "
 "title='Trusted Platform Module'>TPM</abbr> can verify the integrity of the "
@@ -1292,56 +1292,39 @@ msgid ""
 "first run."
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:107
+#: src/components/storage/ProposalSettingsSection.jsx:105
 msgid "Use the TPM to decrypt automatically on each boot"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:152
+#: src/components/storage/ProposalSettingsSection.jsx:148
 msgid ""
 "Uses Btrfs for the root file system allowing to boot to a previous version "
 "of the system after configuration changes or software upgrades."
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:159
+#: src/components/storage/ProposalSettingsSection.jsx:155
 #, fuzzy
 msgid "Use Btrfs Snapshots"
 msgstr "dengan snapshot"
 
-#: src/components/storage/ProposalSettingsSection.jsx:173
-msgid "Btrfs snapshots required by product."
-msgstr ""
-
-#: src/components/storage/ProposalSettingsSection.jsx:239
+#: src/components/storage/ProposalSettingsSection.jsx:227
 #, fuzzy
 msgid "Change encryption settings"
 msgstr "Pengaturan enkripsi"
 
-#: src/components/storage/ProposalSettingsSection.jsx:244
-#: src/components/storage/ProposalSettingsSection.jsx:265
+#: src/components/storage/ProposalSettingsSection.jsx:232
+#: src/components/storage/ProposalSettingsSection.jsx:253
 msgid "Encryption settings"
 msgstr "Pengaturan enkripsi"
 
-#: src/components/storage/ProposalSettingsSection.jsx:258
+#: src/components/storage/ProposalSettingsSection.jsx:246
 msgid "Use encryption"
 msgstr "Gunakan enkripsi"
 
-#: src/components/storage/ProposalSettingsSection.jsx:325
+#: src/components/storage/ProposalSettingsSection.jsx:309
 msgid "Settings"
 msgstr "Pengaturan"
 
-#: src/components/storage/ProposalSettingsSection.jsx:330
-#, fuzzy
-msgid "Transactional system"
-msgstr "transaksional"
-
-#. TRANSLATORS: %s is replaced by a product name (e.g., openSUSE Tumbleweed)
-#: src/components/storage/ProposalSettingsSection.jsx:333
-#, c-format
-msgid ""
-"%s is an immutable system with atomic updates using a read-only Btrfs root "
-"file system."
-msgstr ""
-
 #: src/components/storage/ProposalSpacePolicySection.jsx:50
 msgid "Delete current content"
 msgstr "Hapus konten saat ini"
@@ -1393,13 +1376,13 @@ msgid "Current content"
 msgstr "Hapus konten saat ini"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:74
-#: src/components/storage/ProposalVolumes.jsx:309
-#: src/components/storage/VolumeForm.jsx:741
+#: src/components/storage/ProposalVolumes.jsx:313
+#: src/components/storage/VolumeForm.jsx:745
 msgid "Size"
 msgstr "Ukuran"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:75
-#: src/components/storage/ProposalVolumes.jsx:308
+#: src/components/storage/ProposalVolumes.jsx:312
 msgid "Details"
 msgstr "Detail"
 
@@ -1460,7 +1443,7 @@ msgid "Space action selector for %s"
 msgstr ""
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:224
-#: src/components/storage/ProposalVolumes.jsx:229
+#: src/components/storage/ProposalVolumes.jsx:233
 #: src/components/storage/iscsi/NodesPresenter.jsx:77
 msgid "Delete"
 msgstr "Menghapus"
@@ -1491,7 +1474,19 @@ msgid ""
 "listed below. Choose how to do it."
 msgstr ""
 
-#. TRANSLATORS: header for a list of items
+#: src/components/storage/ProposalTransactionalInfo.jsx:46
+#, fuzzy
+msgid "Transactional root file system"
+msgstr "transaksional"
+
+#: src/components/storage/ProposalTransactionalInfo.jsx:49
+#, c-format
+msgid ""
+"%s is an immutable system with atomic updates. It uses a read-only Btrfs "
+"file system updated via snapshots."
+msgstr ""
+
+#. TRANSLATORS: header for a list of items referring to size limits for file systems
 #: src/components/storage/ProposalVolumes.jsx:59
 msgid "These limits are affected by:"
 msgstr "Batasan ini dipengaruhi oleh:"
@@ -1508,63 +1503,69 @@ msgstr "Konfigurasi snapshot"
 msgid "Presence of other volumes (%s)"
 msgstr "Keberadaan volume lain (%s)"
 
+#. TRANSLATORS: list item, describes a factor that affects the computed size of a
+#. file system; eg. adjusting the size of the swap
+#: src/components/storage/ProposalVolumes.jsx:71
+msgid "The amount of RAM in the system"
+msgstr ""
+
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:129
+#: src/components/storage/ProposalVolumes.jsx:133
 msgid "Reset to defaults"
 msgstr "Mengatur ulang ke default"
 
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:137
 #: src/components/storage/ProposalVolumes.jsx:141
+#: src/components/storage/ProposalVolumes.jsx:145
 msgid "Add file system"
 msgstr "Tambahkan sistem berkas"
 
 #. TRANSLATORS: minimum device size, %s is replaced by size string, e.g. "17.5 GiB"
-#: src/components/storage/ProposalVolumes.jsx:191
+#: src/components/storage/ProposalVolumes.jsx:195
 #, c-format
 msgid "At least %s"
 msgstr "Setidaknya %s"
 
 #. TRANSLATORS: device flag, the partition size is automatically computed
-#: src/components/storage/ProposalVolumes.jsx:197
+#: src/components/storage/ProposalVolumes.jsx:201
 msgid "auto"
 msgstr "otomatis"
 
 #. TRANSLATORS: the filesystem uses a logical volume (LVM)
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "logical volume"
 msgstr "volume logis"
 
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "partition"
 msgstr "partisi"
 
 #. TRANSLATORS: filesystem flag, it uses an encryption
-#: src/components/storage/ProposalVolumes.jsx:216
+#: src/components/storage/ProposalVolumes.jsx:220
 msgid "encrypted"
 msgstr "dienkripsi"
 
 #. TRANSLATORS: filesystem flag, it allows creating snapshots
-#: src/components/storage/ProposalVolumes.jsx:218
+#: src/components/storage/ProposalVolumes.jsx:222
 msgid "with snapshots"
 msgstr "dengan snapshot"
 
 #. TRANSLATORS: flag for transactional file system
-#: src/components/storage/ProposalVolumes.jsx:220
+#: src/components/storage/ProposalVolumes.jsx:224
 msgid "transactional"
 msgstr "transaksional"
 
-#: src/components/storage/ProposalVolumes.jsx:275
+#: src/components/storage/ProposalVolumes.jsx:279
 msgid "Edit file system"
 msgstr "Edit sistem berkas"
 
-#: src/components/storage/ProposalVolumes.jsx:307
-#: src/components/storage/VolumeForm.jsx:726
-#: src/components/storage/VolumeForm.jsx:731
+#: src/components/storage/ProposalVolumes.jsx:311
+#: src/components/storage/VolumeForm.jsx:730
+#: src/components/storage/VolumeForm.jsx:735
 msgid "Mount point"
 msgstr "Titik pemasangan"
 
-#: src/components/storage/ProposalVolumes.jsx:345
+#: src/components/storage/ProposalVolumes.jsx:349
 msgid "Table with mount points"
 msgstr "Tabel dengan titik pemasangan"
 
@@ -1606,37 +1607,42 @@ msgstr "keberadaan sistem berkas untuk %s"
 msgid ", "
 msgstr ", "
 
+#. TRANSLATORS: item which affects the final computed partition size
+#: src/components/storage/VolumeForm.jsx:315
+msgid "the amount of RAM in the system"
+msgstr ""
+
 #. TRANSLATORS: the %s is replaced by the items which affect the computed size
-#: src/components/storage/VolumeForm.jsx:314
+#: src/components/storage/VolumeForm.jsx:318
 #, c-format
 msgid "The final size depends on %s."
 msgstr "Ukuran akhir tergantung pada %s."
 
 #. TRANSLATORS: conjunction for merging two texts
-#: src/components/storage/VolumeForm.jsx:316
+#: src/components/storage/VolumeForm.jsx:320
 msgid " and "
 msgstr " dan "
 
 #. TRANSLATORS: the partition size is automatically computed
-#: src/components/storage/VolumeForm.jsx:321
+#: src/components/storage/VolumeForm.jsx:325
 msgid "Automatically calculated size according to the selected product."
 msgstr "Ukuran yang dihitung secara otomatis menurut produk yang dipilih."
 
-#: src/components/storage/VolumeForm.jsx:341
+#: src/components/storage/VolumeForm.jsx:345
 msgid "Exact size for the file system."
 msgstr "Ukuran yang tepat untuk sistem berkas."
 
 #. TRANSLATORS: requested partition size
-#: src/components/storage/VolumeForm.jsx:353
+#: src/components/storage/VolumeForm.jsx:357
 msgid "Exact size"
 msgstr "Ukuran yang tepat"
 
 #. TRANSLATORS: units selector (like KiB, MiB, GiB...)
-#: src/components/storage/VolumeForm.jsx:368
+#: src/components/storage/VolumeForm.jsx:372
 msgid "Size unit"
 msgstr "Satuan ukuran"
 
-#: src/components/storage/VolumeForm.jsx:396
+#: src/components/storage/VolumeForm.jsx:400
 msgid ""
 "Limits for the file system size. The final size will be a value between the "
 "given minimum and maximum. If no maximum is given then the file system will "
@@ -1647,57 +1653,57 @@ msgstr ""
 "diberikan, maka sistem berkas akan sebesar mungkin."
 
 #. TRANSLATORS: the minimal partition size
-#: src/components/storage/VolumeForm.jsx:403
+#: src/components/storage/VolumeForm.jsx:407
 msgid "Minimum"
 msgstr "Minimum"
 
 #. TRANSLATORS: the minium partition size
-#: src/components/storage/VolumeForm.jsx:413
+#: src/components/storage/VolumeForm.jsx:417
 msgid "Minimum desired size"
 msgstr "Ukuran minimum yang diinginkan"
 
-#: src/components/storage/VolumeForm.jsx:422
+#: src/components/storage/VolumeForm.jsx:426
 msgid "Unit for the minimum size"
 msgstr "Satuan untuk ukuran minimum"
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:433
+#: src/components/storage/VolumeForm.jsx:437
 msgid "Maximum"
 msgstr "Maksimum"
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:444
+#: src/components/storage/VolumeForm.jsx:448
 msgid "Maximum desired size"
 msgstr "Ukuran maksimum yang diinginkan"
 
-#: src/components/storage/VolumeForm.jsx:452
+#: src/components/storage/VolumeForm.jsx:456
 msgid "Unit for the maximum size"
 msgstr "Satuan untuk ukuran maksimum"
 
 #. TRANSLATORS: radio button label, fully automatically computed partition size, no user input
-#: src/components/storage/VolumeForm.jsx:469
+#: src/components/storage/VolumeForm.jsx:473
 msgid "Auto"
 msgstr "Otomatis"
 
 #. TRANSLATORS: radio button label, exact partition size requested by user
-#: src/components/storage/VolumeForm.jsx:471
+#: src/components/storage/VolumeForm.jsx:475
 msgid "Fixed"
 msgstr "Tetap"
 
 #. TRANSLATORS: radio button label, automatically computed partition size within the user provided min and max limits
-#: src/components/storage/VolumeForm.jsx:473
+#: src/components/storage/VolumeForm.jsx:477
 msgid "Range"
 msgstr "Rentang"
 
-#: src/components/storage/VolumeForm.jsx:681
+#: src/components/storage/VolumeForm.jsx:685
 msgid "A size value is required"
 msgstr "Diperlukan nilai ukuran"
 
-#: src/components/storage/VolumeForm.jsx:686
+#: src/components/storage/VolumeForm.jsx:690
 msgid "Minimum size is required"
 msgstr "Diperlukan ukuran minimum"
 
-#: src/components/storage/VolumeForm.jsx:690
+#: src/components/storage/VolumeForm.jsx:694
 msgid "Maximum must be greater than minimum"
 msgstr "Maksimum harus lebih besar dari minimum"
 
diff --git a/web/po/ja.po b/web/po/ja.po
index b9d7c9277..75222ea35 100644
--- a/web/po/ja.po
+++ b/web/po/ja.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-03 02:07+0000\n"
-"PO-Revision-Date: 2024-02-29 04:42+0000\n"
+"POT-Creation-Date: 2024-03-14 02:05+0000\n"
+"PO-Revision-Date: 2024-03-12 11:42+0000\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <https://l10n.opensuse.org/projects/agama/agama-web/"
 "ja/>\n"
@@ -156,9 +156,9 @@ msgstr ""
 #: src/components/product/ProductPage.jsx:207
 #: src/components/storage/ProposalDeviceSection.jsx:169
 #: src/components/storage/ProposalDeviceSection.jsx:364
-#: src/components/storage/ProposalSettingsSection.jsx:275
-#: src/components/storage/ProposalVolumes.jsx:148
-#: src/components/storage/ProposalVolumes.jsx:283
+#: src/components/storage/ProposalSettingsSection.jsx:263
+#: src/components/storage/ProposalVolumes.jsx:152
+#: src/components/storage/ProposalVolumes.jsx:287
 #: src/components/storage/ZFCPPage.jsx:511
 msgid "Accept"
 msgstr "受け入れる"
@@ -308,8 +308,8 @@ msgstr "確認"
 
 #. TRANSLATORS: dropdown label
 #: src/components/core/RowActions.jsx:66
-#: src/components/storage/ProposalVolumes.jsx:119
-#: src/components/storage/ProposalVolumes.jsx:310
+#: src/components/storage/ProposalVolumes.jsx:123
+#: src/components/storage/ProposalVolumes.jsx:314
 msgid "Actions"
 msgstr "処理"
 
@@ -534,8 +534,8 @@ msgstr "アドレス"
 msgid "Addresses data list"
 msgstr "アドレスデータの一覧"
 
-#. TRANSLATORS: input field for the iSCSI initiator name
 #. TRANSLATORS: table header
+#. TRANSLATORS: input field for the iSCSI initiator name
 #: src/components/network/ConnectionsTable.jsx:57
 #: src/components/network/ConnectionsTable.jsx:86
 #: src/components/storage/ZFCPPage.jsx:360
@@ -554,7 +554,7 @@ msgid "IP addresses"
 msgstr "IP アドレス"
 
 #: src/components/network/ConnectionsTable.jsx:67
-#: src/components/storage/ProposalVolumes.jsx:234
+#: src/components/storage/ProposalVolumes.jsx:238
 #: src/components/storage/iscsi/InitiatorPresenter.jsx:49
 #: src/components/storage/iscsi/NodesPresenter.jsx:73
 #: src/components/users/FirstUser.jsx:208
@@ -757,8 +757,8 @@ msgstr "接続済み"
 msgid "Disconnecting"
 msgstr "切断中"
 
-#. TRANSLATORS: iSCSI connection status
 #. TRANSLATORS: Wifi network status
+#. TRANSLATORS: iSCSI connection status
 #: src/components/network/WifiNetworkListItem.jsx:50
 #: src/components/storage/iscsi/NodesPresenter.jsx:63
 msgid "Disconnected"
@@ -821,8 +821,8 @@ msgstr "ソフトウエアリポジトリを読み込んでいます"
 msgid "Refresh the repositories"
 msgstr "リポジトリの更新"
 
-#. TRANSLATORS: page title
 #. TRANSLATORS: page section
+#. TRANSLATORS: page title
 #: src/components/overview/SoftwareSection.jsx:143
 #: src/components/software/SoftwarePage.jsx:81
 msgid "Software"
@@ -869,7 +869,7 @@ msgstr "ストレージデバイスを検出しています"
 #. TRANSLATORS: page title
 #. TRANSLATORS: page section title
 #: src/components/overview/StorageSection.jsx:208
-#: src/components/storage/ProposalPage.jsx:239
+#: src/components/storage/ProposalPage.jsx:243
 msgid "Storage"
 msgstr "ストレージ"
 
@@ -1283,7 +1283,7 @@ msgstr "iSCSI"
 #. TRANSLATORS: The word 'directly' is key here. For example, booting to the installer media and then choosing
 #. 'Boot from Hard Disk' from there will not work. Keep it sort (this is a hint in a form) but keep it clear.
 #. Do not translate 'abbr' and 'title', they are part of the HTML markup.
-#: src/components/storage/ProposalSettingsSection.jsx:89
+#: src/components/storage/ProposalSettingsSection.jsx:87
 msgid ""
 "The password will not be needed to boot and access the data if the <abbr "
 "title='Trusted Platform Module'>TPM</abbr> can verify the integrity of the "
@@ -1295,11 +1295,11 @@ msgstr ""
 "シーリングを使用するには、新しいシステムの初回起動時に直接起動を行う必要があ"
 "ります。"
 
-#: src/components/storage/ProposalSettingsSection.jsx:107
+#: src/components/storage/ProposalSettingsSection.jsx:105
 msgid "Use the TPM to decrypt automatically on each boot"
 msgstr "毎回の起動時に TPM を利用して自動的に暗号化解除する"
 
-#: src/components/storage/ProposalSettingsSection.jsx:152
+#: src/components/storage/ProposalSettingsSection.jsx:148
 msgid ""
 "Uses Btrfs for the root file system allowing to boot to a previous version "
 "of the system after configuration changes or software upgrades."
@@ -1307,44 +1307,27 @@ msgstr ""
 "ルートファイルシステムに btrfs を使用することで、設定変更前やソフトウエアの"
 "アップグレード前に戻して起動し直すことができるようになります。"
 
-#: src/components/storage/ProposalSettingsSection.jsx:159
+#: src/components/storage/ProposalSettingsSection.jsx:155
 msgid "Use Btrfs Snapshots"
 msgstr "btrfs スナップショットを使用する"
 
-#: src/components/storage/ProposalSettingsSection.jsx:173
-msgid "Btrfs snapshots required by product."
-msgstr "btrfs のスナップショットは製品側の要件で必須となっています。"
-
-#: src/components/storage/ProposalSettingsSection.jsx:239
+#: src/components/storage/ProposalSettingsSection.jsx:227
 msgid "Change encryption settings"
 msgstr "暗号化設定の変更"
 
-#: src/components/storage/ProposalSettingsSection.jsx:244
-#: src/components/storage/ProposalSettingsSection.jsx:265
+#: src/components/storage/ProposalSettingsSection.jsx:232
+#: src/components/storage/ProposalSettingsSection.jsx:253
 msgid "Encryption settings"
 msgstr "暗号化の設定"
 
-#: src/components/storage/ProposalSettingsSection.jsx:258
+#: src/components/storage/ProposalSettingsSection.jsx:246
 msgid "Use encryption"
 msgstr "暗号化を使用する"
 
-#: src/components/storage/ProposalSettingsSection.jsx:325
+#: src/components/storage/ProposalSettingsSection.jsx:309
 msgid "Settings"
 msgstr "設定"
 
-#: src/components/storage/ProposalSettingsSection.jsx:330
-#, fuzzy
-msgid "Transactional system"
-msgstr "トランザクション型"
-
-#. TRANSLATORS: %s is replaced by a product name (e.g., openSUSE Tumbleweed)
-#: src/components/storage/ProposalSettingsSection.jsx:333
-#, c-format
-msgid ""
-"%s is an immutable system with atomic updates using a read-only Btrfs root "
-"file system."
-msgstr ""
-
 #: src/components/storage/ProposalSpacePolicySection.jsx:50
 msgid "Delete current content"
 msgstr "現在の内容を全て削除"
@@ -1393,13 +1376,13 @@ msgid "Current content"
 msgstr "現在の内容"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:74
-#: src/components/storage/ProposalVolumes.jsx:309
-#: src/components/storage/VolumeForm.jsx:741
+#: src/components/storage/ProposalVolumes.jsx:313
+#: src/components/storage/VolumeForm.jsx:745
 msgid "Size"
 msgstr "サイズ"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:75
-#: src/components/storage/ProposalVolumes.jsx:308
+#: src/components/storage/ProposalVolumes.jsx:312
 msgid "Details"
 msgstr "詳細"
 
@@ -1458,7 +1441,7 @@ msgid "Space action selector for %s"
 msgstr "%s に対する領域処理の選択"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:224
-#: src/components/storage/ProposalVolumes.jsx:229
+#: src/components/storage/ProposalVolumes.jsx:233
 #: src/components/storage/iscsi/NodesPresenter.jsx:77
 msgid "Delete"
 msgstr "削除"
@@ -1489,7 +1472,20 @@ msgstr ""
 "ファイルシステムを割り当てるには、下記のデバイス内に空き領域を確保する必要が"
 "あるかもしれません。ここではその方法を選択します。"
 
-#. TRANSLATORS: header for a list of items
+#: src/components/storage/ProposalTransactionalInfo.jsx:46
+msgid "Transactional root file system"
+msgstr "トランザクション型のルートファイルシステム"
+
+#: src/components/storage/ProposalTransactionalInfo.jsx:49
+#, c-format
+msgid ""
+"%s is an immutable system with atomic updates. It uses a read-only Btrfs "
+"file system updated via snapshots."
+msgstr ""
+"%s は一括更新のできる不可変なシステムです。読み込み専用の btrfs ルートファイ"
+"ルシステムを利用して更新を適用します。"
+
+#. TRANSLATORS: header for a list of items referring to size limits for file systems
 #: src/components/storage/ProposalVolumes.jsx:59
 msgid "These limits are affected by:"
 msgstr "これらの制限は下記による影響を受けます:"
@@ -1506,63 +1502,69 @@ msgstr "スナップショットの設定"
 msgid "Presence of other volumes (%s)"
 msgstr "その他のボリューム (%s) の存在"
 
+#. TRANSLATORS: list item, describes a factor that affects the computed size of a
+#. file system; eg. adjusting the size of the swap
+#: src/components/storage/ProposalVolumes.jsx:71
+msgid "The amount of RAM in the system"
+msgstr "システムに搭載された RAM の量"
+
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:129
+#: src/components/storage/ProposalVolumes.jsx:133
 msgid "Reset to defaults"
 msgstr "既定値に戻す"
 
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:137
 #: src/components/storage/ProposalVolumes.jsx:141
+#: src/components/storage/ProposalVolumes.jsx:145
 msgid "Add file system"
 msgstr "ファイルシステムの追加"
 
 #. TRANSLATORS: minimum device size, %s is replaced by size string, e.g. "17.5 GiB"
-#: src/components/storage/ProposalVolumes.jsx:191
+#: src/components/storage/ProposalVolumes.jsx:195
 #, c-format
 msgid "At least %s"
 msgstr "少なくとも %s"
 
 #. TRANSLATORS: device flag, the partition size is automatically computed
-#: src/components/storage/ProposalVolumes.jsx:197
+#: src/components/storage/ProposalVolumes.jsx:201
 msgid "auto"
 msgstr "自動"
 
 #. TRANSLATORS: the filesystem uses a logical volume (LVM)
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "logical volume"
 msgstr "論理ボリューム"
 
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "partition"
 msgstr "パーティション"
 
 #. TRANSLATORS: filesystem flag, it uses an encryption
-#: src/components/storage/ProposalVolumes.jsx:216
+#: src/components/storage/ProposalVolumes.jsx:220
 msgid "encrypted"
 msgstr "暗号化"
 
 #. TRANSLATORS: filesystem flag, it allows creating snapshots
-#: src/components/storage/ProposalVolumes.jsx:218
+#: src/components/storage/ProposalVolumes.jsx:222
 msgid "with snapshots"
 msgstr "スナップショット有り"
 
 #. TRANSLATORS: flag for transactional file system
-#: src/components/storage/ProposalVolumes.jsx:220
+#: src/components/storage/ProposalVolumes.jsx:224
 msgid "transactional"
 msgstr "トランザクション型"
 
-#: src/components/storage/ProposalVolumes.jsx:275
+#: src/components/storage/ProposalVolumes.jsx:279
 msgid "Edit file system"
 msgstr "ファイルシステムの編集"
 
-#: src/components/storage/ProposalVolumes.jsx:307
-#: src/components/storage/VolumeForm.jsx:726
-#: src/components/storage/VolumeForm.jsx:731
+#: src/components/storage/ProposalVolumes.jsx:311
+#: src/components/storage/VolumeForm.jsx:730
+#: src/components/storage/VolumeForm.jsx:735
 msgid "Mount point"
 msgstr "マウントポイント"
 
-#: src/components/storage/ProposalVolumes.jsx:345
+#: src/components/storage/ProposalVolumes.jsx:349
 msgid "Table with mount points"
 msgstr "マウントポイントの一覧"
 
@@ -1604,37 +1606,42 @@ msgstr "%s に対するファイルシステムの存在"
 msgid ", "
 msgstr ", "
 
+#. TRANSLATORS: item which affects the final computed partition size
+#: src/components/storage/VolumeForm.jsx:315
+msgid "the amount of RAM in the system"
+msgstr "システムに搭載された RAM の量"
+
 #. TRANSLATORS: the %s is replaced by the items which affect the computed size
-#: src/components/storage/VolumeForm.jsx:314
+#: src/components/storage/VolumeForm.jsx:318
 #, c-format
 msgid "The final size depends on %s."
 msgstr "最終的なサイズは %s に依存します。"
 
 #. TRANSLATORS: conjunction for merging two texts
-#: src/components/storage/VolumeForm.jsx:316
+#: src/components/storage/VolumeForm.jsx:320
 msgid " and "
 msgstr " および "
 
 #. TRANSLATORS: the partition size is automatically computed
-#: src/components/storage/VolumeForm.jsx:321
+#: src/components/storage/VolumeForm.jsx:325
 msgid "Automatically calculated size according to the selected product."
 msgstr "選択した製品に合わせてサイズを自動計算します。"
 
-#: src/components/storage/VolumeForm.jsx:341
+#: src/components/storage/VolumeForm.jsx:345
 msgid "Exact size for the file system."
 msgstr "ファイルシステムに対して正確なサイズを設定します。"
 
 #. TRANSLATORS: requested partition size
-#: src/components/storage/VolumeForm.jsx:353
+#: src/components/storage/VolumeForm.jsx:357
 msgid "Exact size"
 msgstr "正確なサイズ"
 
 #. TRANSLATORS: units selector (like KiB, MiB, GiB...)
-#: src/components/storage/VolumeForm.jsx:368
+#: src/components/storage/VolumeForm.jsx:372
 msgid "Size unit"
 msgstr "サイズの単位"
 
-#: src/components/storage/VolumeForm.jsx:396
+#: src/components/storage/VolumeForm.jsx:400
 msgid ""
 "Limits for the file system size. The final size will be a value between the "
 "given minimum and maximum. If no maximum is given then the file system will "
@@ -1645,57 +1652,57 @@ msgstr ""
 "きくなるように設定されます。"
 
 #. TRANSLATORS: the minimal partition size
-#: src/components/storage/VolumeForm.jsx:403
+#: src/components/storage/VolumeForm.jsx:407
 msgid "Minimum"
 msgstr "最小"
 
 #. TRANSLATORS: the minium partition size
-#: src/components/storage/VolumeForm.jsx:413
+#: src/components/storage/VolumeForm.jsx:417
 msgid "Minimum desired size"
 msgstr "最小必須サイズ"
 
-#: src/components/storage/VolumeForm.jsx:422
+#: src/components/storage/VolumeForm.jsx:426
 msgid "Unit for the minimum size"
 msgstr "最小サイズの単位"
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:433
+#: src/components/storage/VolumeForm.jsx:437
 msgid "Maximum"
 msgstr "最大"
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:444
+#: src/components/storage/VolumeForm.jsx:448
 msgid "Maximum desired size"
 msgstr "最大要求サイズ"
 
-#: src/components/storage/VolumeForm.jsx:452
+#: src/components/storage/VolumeForm.jsx:456
 msgid "Unit for the maximum size"
 msgstr "最大サイズの単位"
 
 #. TRANSLATORS: radio button label, fully automatically computed partition size, no user input
-#: src/components/storage/VolumeForm.jsx:469
+#: src/components/storage/VolumeForm.jsx:473
 msgid "Auto"
 msgstr "自動"
 
 #. TRANSLATORS: radio button label, exact partition size requested by user
-#: src/components/storage/VolumeForm.jsx:471
+#: src/components/storage/VolumeForm.jsx:475
 msgid "Fixed"
 msgstr "固定値"
 
 #. TRANSLATORS: radio button label, automatically computed partition size within the user provided min and max limits
-#: src/components/storage/VolumeForm.jsx:473
+#: src/components/storage/VolumeForm.jsx:477
 msgid "Range"
 msgstr "範囲"
 
-#: src/components/storage/VolumeForm.jsx:681
+#: src/components/storage/VolumeForm.jsx:685
 msgid "A size value is required"
 msgstr "サイズを指定する必要があります"
 
-#: src/components/storage/VolumeForm.jsx:686
+#: src/components/storage/VolumeForm.jsx:690
 msgid "Minimum size is required"
 msgstr "最小サイズを指定する必要があります"
 
-#: src/components/storage/VolumeForm.jsx:690
+#: src/components/storage/VolumeForm.jsx:694
 msgid "Maximum must be greater than minimum"
 msgstr "最大サイズは最小サイズより大きくなければなりません"
 
@@ -2072,12 +2079,12 @@ msgstr "ユーザ名"
 
 #: src/components/users/FirstUser.jsx:88
 msgid "Username suggestion dropdown"
-msgstr ""
+msgstr "ユーザ名の提案ドロップダウン"
 
 #. TRANSLATORS: dropdown username suggestions
 #: src/components/users/FirstUser.jsx:102
 msgid "Use suggested username"
-msgstr ""
+msgstr "提案されたユーザ名を使用する"
 
 #: src/components/users/FirstUser.jsx:212
 #: src/components/users/RootAuthMethods.jsx:99
@@ -2211,6 +2218,9 @@ msgstr "ユーザ"
 msgid "Root authentication"
 msgstr "root の認証"
 
+#~ msgid "Btrfs snapshots required by product."
+#~ msgstr "btrfs のスナップショットは製品側の要件で必須となっています。"
+
 #~ msgid ""
 #~ "Allows rolling back any change done to the system and restoring its "
 #~ "previous state"
diff --git a/web/po/ka.po b/web/po/ka.po
index c5e8a088f..c494aebe7 100644
--- a/web/po/ka.po
+++ b/web/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-03 02:07+0000\n"
+"POT-Creation-Date: 2024-03-14 02:05+0000\n"
 "PO-Revision-Date: 2024-02-17 05:42+0000\n"
 "Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
 "Language-Team: Georgian <https://l10n.opensuse.org/projects/agama/agama-web/"
@@ -144,9 +144,9 @@ msgstr ""
 #: src/components/product/ProductPage.jsx:207
 #: src/components/storage/ProposalDeviceSection.jsx:169
 #: src/components/storage/ProposalDeviceSection.jsx:364
-#: src/components/storage/ProposalSettingsSection.jsx:275
-#: src/components/storage/ProposalVolumes.jsx:148
-#: src/components/storage/ProposalVolumes.jsx:283
+#: src/components/storage/ProposalSettingsSection.jsx:263
+#: src/components/storage/ProposalVolumes.jsx:152
+#: src/components/storage/ProposalVolumes.jsx:287
 #: src/components/storage/ZFCPPage.jsx:511
 msgid "Accept"
 msgstr "დასტური"
@@ -287,8 +287,8 @@ msgstr "დადასტურება"
 
 #. TRANSLATORS: dropdown label
 #: src/components/core/RowActions.jsx:66
-#: src/components/storage/ProposalVolumes.jsx:119
-#: src/components/storage/ProposalVolumes.jsx:310
+#: src/components/storage/ProposalVolumes.jsx:123
+#: src/components/storage/ProposalVolumes.jsx:314
 msgid "Actions"
 msgstr "ქმედებები"
 
@@ -512,8 +512,8 @@ msgstr "მისამართები"
 msgid "Addresses data list"
 msgstr "მისამართის მონაცემების სია"
 
-#. TRANSLATORS: input field for the iSCSI initiator name
 #. TRANSLATORS: table header
+#. TRANSLATORS: input field for the iSCSI initiator name
 #: src/components/network/ConnectionsTable.jsx:57
 #: src/components/network/ConnectionsTable.jsx:86
 #: src/components/storage/ZFCPPage.jsx:360
@@ -532,7 +532,7 @@ msgid "IP addresses"
 msgstr "IP მისამართები"
 
 #: src/components/network/ConnectionsTable.jsx:67
-#: src/components/storage/ProposalVolumes.jsx:234
+#: src/components/storage/ProposalVolumes.jsx:238
 #: src/components/storage/iscsi/InitiatorPresenter.jsx:49
 #: src/components/storage/iscsi/NodesPresenter.jsx:73
 #: src/components/users/FirstUser.jsx:208
@@ -731,8 +731,8 @@ msgstr "დაკავშირებულია"
 msgid "Disconnecting"
 msgstr "გათიშვა"
 
-#. TRANSLATORS: iSCSI connection status
 #. TRANSLATORS: Wifi network status
+#. TRANSLATORS: iSCSI connection status
 #: src/components/network/WifiNetworkListItem.jsx:50
 #: src/components/storage/iscsi/NodesPresenter.jsx:63
 msgid "Disconnected"
@@ -796,8 +796,8 @@ msgstr "პროგრამის რეპოზიტორიების 
 msgid "Refresh the repositories"
 msgstr "რეპოზიტორიების განახლება"
 
-#. TRANSLATORS: page title
 #. TRANSLATORS: page section
+#. TRANSLATORS: page title
 #: src/components/overview/SoftwareSection.jsx:143
 #: src/components/software/SoftwarePage.jsx:81
 msgid "Software"
@@ -843,7 +843,7 @@ msgstr "საცავის მოწყობილობების ზო
 #. TRANSLATORS: page title
 #. TRANSLATORS: page section title
 #: src/components/overview/StorageSection.jsx:208
-#: src/components/storage/ProposalPage.jsx:239
+#: src/components/storage/ProposalPage.jsx:243
 msgid "Storage"
 msgstr "საცავი"
 
@@ -1254,7 +1254,7 @@ msgstr "iSCSI"
 #. TRANSLATORS: The word 'directly' is key here. For example, booting to the installer media and then choosing
 #. 'Boot from Hard Disk' from there will not work. Keep it sort (this is a hint in a form) but keep it clear.
 #. Do not translate 'abbr' and 'title', they are part of the HTML markup.
-#: src/components/storage/ProposalSettingsSection.jsx:89
+#: src/components/storage/ProposalSettingsSection.jsx:87
 msgid ""
 "The password will not be needed to boot and access the data if the <abbr "
 "title='Trusted Platform Module'>TPM</abbr> can verify the integrity of the "
@@ -1262,55 +1262,38 @@ msgid ""
 "first run."
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:107
+#: src/components/storage/ProposalSettingsSection.jsx:105
 msgid "Use the TPM to decrypt automatically on each boot"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:152
+#: src/components/storage/ProposalSettingsSection.jsx:148
 msgid ""
 "Uses Btrfs for the root file system allowing to boot to a previous version "
 "of the system after configuration changes or software upgrades."
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:159
+#: src/components/storage/ProposalSettingsSection.jsx:155
 #, fuzzy
 msgid "Use Btrfs Snapshots"
 msgstr "სწრაფი ასლებით"
 
-#: src/components/storage/ProposalSettingsSection.jsx:173
-msgid "Btrfs snapshots required by product."
-msgstr ""
-
-#: src/components/storage/ProposalSettingsSection.jsx:239
+#: src/components/storage/ProposalSettingsSection.jsx:227
 msgid "Change encryption settings"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:244
-#: src/components/storage/ProposalSettingsSection.jsx:265
+#: src/components/storage/ProposalSettingsSection.jsx:232
+#: src/components/storage/ProposalSettingsSection.jsx:253
 msgid "Encryption settings"
 msgstr "დაშიფვრის პარამეტრები"
 
-#: src/components/storage/ProposalSettingsSection.jsx:258
+#: src/components/storage/ProposalSettingsSection.jsx:246
 msgid "Use encryption"
 msgstr "დაშიფვრის გამოყენება"
 
-#: src/components/storage/ProposalSettingsSection.jsx:325
+#: src/components/storage/ProposalSettingsSection.jsx:309
 msgid "Settings"
 msgstr "მორგება"
 
-#: src/components/storage/ProposalSettingsSection.jsx:330
-#, fuzzy
-msgid "Transactional system"
-msgstr "ტრანზაქციული"
-
-#. TRANSLATORS: %s is replaced by a product name (e.g., openSUSE Tumbleweed)
-#: src/components/storage/ProposalSettingsSection.jsx:333
-#, c-format
-msgid ""
-"%s is an immutable system with atomic updates using a read-only Btrfs root "
-"file system."
-msgstr ""
-
 #: src/components/storage/ProposalSpacePolicySection.jsx:50
 msgid "Delete current content"
 msgstr ""
@@ -1355,13 +1338,13 @@ msgid "Current content"
 msgstr ""
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:74
-#: src/components/storage/ProposalVolumes.jsx:309
-#: src/components/storage/VolumeForm.jsx:741
+#: src/components/storage/ProposalVolumes.jsx:313
+#: src/components/storage/VolumeForm.jsx:745
 msgid "Size"
 msgstr "ზომა"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:75
-#: src/components/storage/ProposalVolumes.jsx:308
+#: src/components/storage/ProposalVolumes.jsx:312
 msgid "Details"
 msgstr "დეტალები"
 
@@ -1422,7 +1405,7 @@ msgid "Space action selector for %s"
 msgstr ""
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:224
-#: src/components/storage/ProposalVolumes.jsx:229
+#: src/components/storage/ProposalVolumes.jsx:233
 #: src/components/storage/iscsi/NodesPresenter.jsx:77
 msgid "Delete"
 msgstr "წაშლა"
@@ -1452,7 +1435,19 @@ msgid ""
 "listed below. Choose how to do it."
 msgstr ""
 
-#. TRANSLATORS: header for a list of items
+#: src/components/storage/ProposalTransactionalInfo.jsx:46
+#, fuzzy
+msgid "Transactional root file system"
+msgstr "ტრანზაქციული"
+
+#: src/components/storage/ProposalTransactionalInfo.jsx:49
+#, c-format
+msgid ""
+"%s is an immutable system with atomic updates. It uses a read-only Btrfs "
+"file system updated via snapshots."
+msgstr ""
+
+#. TRANSLATORS: header for a list of items referring to size limits for file systems
 #: src/components/storage/ProposalVolumes.jsx:59
 msgid "These limits are affected by:"
 msgstr ""
@@ -1469,63 +1464,69 @@ msgstr ""
 msgid "Presence of other volumes (%s)"
 msgstr ""
 
+#. TRANSLATORS: list item, describes a factor that affects the computed size of a
+#. file system; eg. adjusting the size of the swap
+#: src/components/storage/ProposalVolumes.jsx:71
+msgid "The amount of RAM in the system"
+msgstr ""
+
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:129
+#: src/components/storage/ProposalVolumes.jsx:133
 msgid "Reset to defaults"
 msgstr "ნაგულისხმები პარამეტრების დაყენება"
 
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:137
 #: src/components/storage/ProposalVolumes.jsx:141
+#: src/components/storage/ProposalVolumes.jsx:145
 msgid "Add file system"
 msgstr ""
 
 #. TRANSLATORS: minimum device size, %s is replaced by size string, e.g. "17.5 GiB"
-#: src/components/storage/ProposalVolumes.jsx:191
+#: src/components/storage/ProposalVolumes.jsx:195
 #, c-format
 msgid "At least %s"
 msgstr "%s მაინც"
 
 #. TRANSLATORS: device flag, the partition size is automatically computed
-#: src/components/storage/ProposalVolumes.jsx:197
+#: src/components/storage/ProposalVolumes.jsx:201
 msgid "auto"
 msgstr "ავტომატური"
 
 #. TRANSLATORS: the filesystem uses a logical volume (LVM)
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "logical volume"
 msgstr "ლოგიკური ტომი"
 
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "partition"
 msgstr "დანაყოფი"
 
 #. TRANSLATORS: filesystem flag, it uses an encryption
-#: src/components/storage/ProposalVolumes.jsx:216
+#: src/components/storage/ProposalVolumes.jsx:220
 msgid "encrypted"
 msgstr "დაშიფრულია"
 
 #. TRANSLATORS: filesystem flag, it allows creating snapshots
-#: src/components/storage/ProposalVolumes.jsx:218
+#: src/components/storage/ProposalVolumes.jsx:222
 msgid "with snapshots"
 msgstr "სწრაფი ასლებით"
 
 #. TRANSLATORS: flag for transactional file system
-#: src/components/storage/ProposalVolumes.jsx:220
+#: src/components/storage/ProposalVolumes.jsx:224
 msgid "transactional"
 msgstr "ტრანზაქციული"
 
-#: src/components/storage/ProposalVolumes.jsx:275
+#: src/components/storage/ProposalVolumes.jsx:279
 msgid "Edit file system"
 msgstr ""
 
-#: src/components/storage/ProposalVolumes.jsx:307
-#: src/components/storage/VolumeForm.jsx:726
-#: src/components/storage/VolumeForm.jsx:731
+#: src/components/storage/ProposalVolumes.jsx:311
+#: src/components/storage/VolumeForm.jsx:730
+#: src/components/storage/VolumeForm.jsx:735
 msgid "Mount point"
 msgstr "მიმაგრების წერტილი"
 
-#: src/components/storage/ProposalVolumes.jsx:345
+#: src/components/storage/ProposalVolumes.jsx:349
 msgid "Table with mount points"
 msgstr ""
 
@@ -1566,37 +1567,42 @@ msgstr ""
 msgid ", "
 msgstr ", "
 
+#. TRANSLATORS: item which affects the final computed partition size
+#: src/components/storage/VolumeForm.jsx:315
+msgid "the amount of RAM in the system"
+msgstr ""
+
 #. TRANSLATORS: the %s is replaced by the items which affect the computed size
-#: src/components/storage/VolumeForm.jsx:314
+#: src/components/storage/VolumeForm.jsx:318
 #, c-format
 msgid "The final size depends on %s."
 msgstr ""
 
 #. TRANSLATORS: conjunction for merging two texts
-#: src/components/storage/VolumeForm.jsx:316
+#: src/components/storage/VolumeForm.jsx:320
 msgid " and "
 msgstr " და "
 
 #. TRANSLATORS: the partition size is automatically computed
-#: src/components/storage/VolumeForm.jsx:321
+#: src/components/storage/VolumeForm.jsx:325
 msgid "Automatically calculated size according to the selected product."
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:341
+#: src/components/storage/VolumeForm.jsx:345
 msgid "Exact size for the file system."
 msgstr ""
 
 #. TRANSLATORS: requested partition size
-#: src/components/storage/VolumeForm.jsx:353
+#: src/components/storage/VolumeForm.jsx:357
 msgid "Exact size"
 msgstr "ზუსტი ზომა"
 
 #. TRANSLATORS: units selector (like KiB, MiB, GiB...)
-#: src/components/storage/VolumeForm.jsx:368
+#: src/components/storage/VolumeForm.jsx:372
 msgid "Size unit"
 msgstr "ზომის ერთეული"
 
-#: src/components/storage/VolumeForm.jsx:396
+#: src/components/storage/VolumeForm.jsx:400
 msgid ""
 "Limits for the file system size. The final size will be a value between the "
 "given minimum and maximum. If no maximum is given then the file system will "
@@ -1604,57 +1610,57 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: the minimal partition size
-#: src/components/storage/VolumeForm.jsx:403
+#: src/components/storage/VolumeForm.jsx:407
 msgid "Minimum"
 msgstr "მინიმუმი"
 
 #. TRANSLATORS: the minium partition size
-#: src/components/storage/VolumeForm.jsx:413
+#: src/components/storage/VolumeForm.jsx:417
 msgid "Minimum desired size"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:422
+#: src/components/storage/VolumeForm.jsx:426
 msgid "Unit for the minimum size"
 msgstr ""
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:433
+#: src/components/storage/VolumeForm.jsx:437
 msgid "Maximum"
 msgstr "მაქსიმუმი"
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:444
+#: src/components/storage/VolumeForm.jsx:448
 msgid "Maximum desired size"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:452
+#: src/components/storage/VolumeForm.jsx:456
 msgid "Unit for the maximum size"
 msgstr ""
 
 #. TRANSLATORS: radio button label, fully automatically computed partition size, no user input
-#: src/components/storage/VolumeForm.jsx:469
+#: src/components/storage/VolumeForm.jsx:473
 msgid "Auto"
 msgstr "ავტო"
 
 #. TRANSLATORS: radio button label, exact partition size requested by user
-#: src/components/storage/VolumeForm.jsx:471
+#: src/components/storage/VolumeForm.jsx:475
 msgid "Fixed"
 msgstr "ფიქსირებული"
 
 #. TRANSLATORS: radio button label, automatically computed partition size within the user provided min and max limits
-#: src/components/storage/VolumeForm.jsx:473
+#: src/components/storage/VolumeForm.jsx:477
 msgid "Range"
 msgstr "დიაპაზონი"
 
-#: src/components/storage/VolumeForm.jsx:681
+#: src/components/storage/VolumeForm.jsx:685
 msgid "A size value is required"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:686
+#: src/components/storage/VolumeForm.jsx:690
 msgid "Minimum size is required"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:690
+#: src/components/storage/VolumeForm.jsx:694
 msgid "Maximum must be greater than minimum"
 msgstr ""
 
diff --git a/web/po/mk.po b/web/po/mk.po
index c2b907179..5216187df 100644
--- a/web/po/mk.po
+++ b/web/po/mk.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-03 02:07+0000\n"
-"PO-Revision-Date: 2023-12-31 20:39+0000\n"
+"POT-Creation-Date: 2024-03-14 02:05+0000\n"
+"PO-Revision-Date: 2024-03-05 08:42+0000\n"
 "Last-Translator: Kristijan Fremen Velkovski <me@krisfremen.com>\n"
 "Language-Team: Macedonian <https://l10n.opensuse.org/projects/agama/agama-"
 "web/mk/>\n"
@@ -73,16 +73,17 @@ msgstr "Затвори"
 #. TRANSLATORS: page title
 #: src/components/core/DBusError.jsx:34
 msgid "D-Bus Error"
-msgstr ""
+msgstr "Грешка во D-Bus"
 
 #: src/components/core/DBusError.jsx:38
 msgid "Cannot connect to D-Bus"
-msgstr ""
+msgstr "Не може да се поврзе со D-Bus"
 
 #: src/components/core/DBusError.jsx:43
 msgid ""
 "Could not connect to the D-Bus service. Please, check whether it is running."
 msgstr ""
+"Не може да се поврзе со услугата D-Bus. Ве молиме, проверете дали работи."
 
 #. TRANSLATORS: button label
 #: src/components/core/DBusError.jsx:51
@@ -150,9 +151,9 @@ msgstr ""
 #: src/components/product/ProductPage.jsx:207
 #: src/components/storage/ProposalDeviceSection.jsx:169
 #: src/components/storage/ProposalDeviceSection.jsx:364
-#: src/components/storage/ProposalSettingsSection.jsx:275
-#: src/components/storage/ProposalVolumes.jsx:148
-#: src/components/storage/ProposalVolumes.jsx:283
+#: src/components/storage/ProposalSettingsSection.jsx:263
+#: src/components/storage/ProposalVolumes.jsx:152
+#: src/components/storage/ProposalVolumes.jsx:287
 #: src/components/storage/ZFCPPage.jsx:511
 msgid "Accept"
 msgstr ""
@@ -293,8 +294,8 @@ msgstr ""
 
 #. TRANSLATORS: dropdown label
 #: src/components/core/RowActions.jsx:66
-#: src/components/storage/ProposalVolumes.jsx:119
-#: src/components/storage/ProposalVolumes.jsx:310
+#: src/components/storage/ProposalVolumes.jsx:123
+#: src/components/storage/ProposalVolumes.jsx:314
 msgid "Actions"
 msgstr ""
 
@@ -518,8 +519,8 @@ msgstr ""
 msgid "Addresses data list"
 msgstr ""
 
-#. TRANSLATORS: input field for the iSCSI initiator name
 #. TRANSLATORS: table header
+#. TRANSLATORS: input field for the iSCSI initiator name
 #: src/components/network/ConnectionsTable.jsx:57
 #: src/components/network/ConnectionsTable.jsx:86
 #: src/components/storage/ZFCPPage.jsx:360
@@ -538,7 +539,7 @@ msgid "IP addresses"
 msgstr ""
 
 #: src/components/network/ConnectionsTable.jsx:67
-#: src/components/storage/ProposalVolumes.jsx:234
+#: src/components/storage/ProposalVolumes.jsx:238
 #: src/components/storage/iscsi/InitiatorPresenter.jsx:49
 #: src/components/storage/iscsi/NodesPresenter.jsx:73
 #: src/components/users/FirstUser.jsx:208
@@ -737,8 +738,8 @@ msgstr ""
 msgid "Disconnecting"
 msgstr ""
 
-#. TRANSLATORS: iSCSI connection status
 #. TRANSLATORS: Wifi network status
+#. TRANSLATORS: iSCSI connection status
 #: src/components/network/WifiNetworkListItem.jsx:50
 #: src/components/storage/iscsi/NodesPresenter.jsx:63
 msgid "Disconnected"
@@ -802,8 +803,8 @@ msgstr ""
 msgid "Refresh the repositories"
 msgstr ""
 
-#. TRANSLATORS: page title
 #. TRANSLATORS: page section
+#. TRANSLATORS: page title
 #: src/components/overview/SoftwareSection.jsx:143
 #: src/components/software/SoftwarePage.jsx:81
 msgid "Software"
@@ -849,7 +850,7 @@ msgstr ""
 #. TRANSLATORS: page title
 #. TRANSLATORS: page section title
 #: src/components/overview/StorageSection.jsx:208
-#: src/components/storage/ProposalPage.jsx:239
+#: src/components/storage/ProposalPage.jsx:243
 msgid "Storage"
 msgstr ""
 
@@ -1259,7 +1260,7 @@ msgstr ""
 #. TRANSLATORS: The word 'directly' is key here. For example, booting to the installer media and then choosing
 #. 'Boot from Hard Disk' from there will not work. Keep it sort (this is a hint in a form) but keep it clear.
 #. Do not translate 'abbr' and 'title', they are part of the HTML markup.
-#: src/components/storage/ProposalSettingsSection.jsx:89
+#: src/components/storage/ProposalSettingsSection.jsx:87
 msgid ""
 "The password will not be needed to boot and access the data if the <abbr "
 "title='Trusted Platform Module'>TPM</abbr> can verify the integrity of the "
@@ -1267,53 +1268,37 @@ msgid ""
 "first run."
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:107
+#: src/components/storage/ProposalSettingsSection.jsx:105
 msgid "Use the TPM to decrypt automatically on each boot"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:152
+#: src/components/storage/ProposalSettingsSection.jsx:148
 msgid ""
 "Uses Btrfs for the root file system allowing to boot to a previous version "
 "of the system after configuration changes or software upgrades."
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:159
+#: src/components/storage/ProposalSettingsSection.jsx:155
 msgid "Use Btrfs Snapshots"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:173
-msgid "Btrfs snapshots required by product."
-msgstr ""
-
-#: src/components/storage/ProposalSettingsSection.jsx:239
+#: src/components/storage/ProposalSettingsSection.jsx:227
 msgid "Change encryption settings"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:244
-#: src/components/storage/ProposalSettingsSection.jsx:265
+#: src/components/storage/ProposalSettingsSection.jsx:232
+#: src/components/storage/ProposalSettingsSection.jsx:253
 msgid "Encryption settings"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:258
+#: src/components/storage/ProposalSettingsSection.jsx:246
 msgid "Use encryption"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:325
+#: src/components/storage/ProposalSettingsSection.jsx:309
 msgid "Settings"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:330
-msgid "Transactional system"
-msgstr ""
-
-#. TRANSLATORS: %s is replaced by a product name (e.g., openSUSE Tumbleweed)
-#: src/components/storage/ProposalSettingsSection.jsx:333
-#, c-format
-msgid ""
-"%s is an immutable system with atomic updates using a read-only Btrfs root "
-"file system."
-msgstr ""
-
 #: src/components/storage/ProposalSpacePolicySection.jsx:50
 msgid "Delete current content"
 msgstr ""
@@ -1356,13 +1341,13 @@ msgid "Current content"
 msgstr ""
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:74
-#: src/components/storage/ProposalVolumes.jsx:309
-#: src/components/storage/VolumeForm.jsx:741
+#: src/components/storage/ProposalVolumes.jsx:313
+#: src/components/storage/VolumeForm.jsx:745
 msgid "Size"
 msgstr ""
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:75
-#: src/components/storage/ProposalVolumes.jsx:308
+#: src/components/storage/ProposalVolumes.jsx:312
 msgid "Details"
 msgstr ""
 
@@ -1421,7 +1406,7 @@ msgid "Space action selector for %s"
 msgstr ""
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:224
-#: src/components/storage/ProposalVolumes.jsx:229
+#: src/components/storage/ProposalVolumes.jsx:233
 #: src/components/storage/iscsi/NodesPresenter.jsx:77
 msgid "Delete"
 msgstr ""
@@ -1450,7 +1435,18 @@ msgid ""
 "listed below. Choose how to do it."
 msgstr ""
 
-#. TRANSLATORS: header for a list of items
+#: src/components/storage/ProposalTransactionalInfo.jsx:46
+msgid "Transactional root file system"
+msgstr ""
+
+#: src/components/storage/ProposalTransactionalInfo.jsx:49
+#, c-format
+msgid ""
+"%s is an immutable system with atomic updates. It uses a read-only Btrfs "
+"file system updated via snapshots."
+msgstr ""
+
+#. TRANSLATORS: header for a list of items referring to size limits for file systems
 #: src/components/storage/ProposalVolumes.jsx:59
 msgid "These limits are affected by:"
 msgstr ""
@@ -1467,63 +1463,69 @@ msgstr ""
 msgid "Presence of other volumes (%s)"
 msgstr ""
 
+#. TRANSLATORS: list item, describes a factor that affects the computed size of a
+#. file system; eg. adjusting the size of the swap
+#: src/components/storage/ProposalVolumes.jsx:71
+msgid "The amount of RAM in the system"
+msgstr ""
+
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:129
+#: src/components/storage/ProposalVolumes.jsx:133
 msgid "Reset to defaults"
 msgstr ""
 
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:137
 #: src/components/storage/ProposalVolumes.jsx:141
+#: src/components/storage/ProposalVolumes.jsx:145
 msgid "Add file system"
 msgstr ""
 
 #. TRANSLATORS: minimum device size, %s is replaced by size string, e.g. "17.5 GiB"
-#: src/components/storage/ProposalVolumes.jsx:191
+#: src/components/storage/ProposalVolumes.jsx:195
 #, c-format
 msgid "At least %s"
 msgstr ""
 
 #. TRANSLATORS: device flag, the partition size is automatically computed
-#: src/components/storage/ProposalVolumes.jsx:197
+#: src/components/storage/ProposalVolumes.jsx:201
 msgid "auto"
 msgstr ""
 
 #. TRANSLATORS: the filesystem uses a logical volume (LVM)
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "logical volume"
 msgstr ""
 
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "partition"
 msgstr ""
 
 #. TRANSLATORS: filesystem flag, it uses an encryption
-#: src/components/storage/ProposalVolumes.jsx:216
+#: src/components/storage/ProposalVolumes.jsx:220
 msgid "encrypted"
 msgstr ""
 
 #. TRANSLATORS: filesystem flag, it allows creating snapshots
-#: src/components/storage/ProposalVolumes.jsx:218
+#: src/components/storage/ProposalVolumes.jsx:222
 msgid "with snapshots"
 msgstr ""
 
 #. TRANSLATORS: flag for transactional file system
-#: src/components/storage/ProposalVolumes.jsx:220
+#: src/components/storage/ProposalVolumes.jsx:224
 msgid "transactional"
 msgstr ""
 
-#: src/components/storage/ProposalVolumes.jsx:275
+#: src/components/storage/ProposalVolumes.jsx:279
 msgid "Edit file system"
 msgstr ""
 
-#: src/components/storage/ProposalVolumes.jsx:307
-#: src/components/storage/VolumeForm.jsx:726
-#: src/components/storage/VolumeForm.jsx:731
+#: src/components/storage/ProposalVolumes.jsx:311
+#: src/components/storage/VolumeForm.jsx:730
+#: src/components/storage/VolumeForm.jsx:735
 msgid "Mount point"
 msgstr ""
 
-#: src/components/storage/ProposalVolumes.jsx:345
+#: src/components/storage/ProposalVolumes.jsx:349
 msgid "Table with mount points"
 msgstr ""
 
@@ -1564,37 +1566,42 @@ msgstr ""
 msgid ", "
 msgstr ""
 
+#. TRANSLATORS: item which affects the final computed partition size
+#: src/components/storage/VolumeForm.jsx:315
+msgid "the amount of RAM in the system"
+msgstr ""
+
 #. TRANSLATORS: the %s is replaced by the items which affect the computed size
-#: src/components/storage/VolumeForm.jsx:314
+#: src/components/storage/VolumeForm.jsx:318
 #, c-format
 msgid "The final size depends on %s."
 msgstr ""
 
 #. TRANSLATORS: conjunction for merging two texts
-#: src/components/storage/VolumeForm.jsx:316
+#: src/components/storage/VolumeForm.jsx:320
 msgid " and "
 msgstr ""
 
 #. TRANSLATORS: the partition size is automatically computed
-#: src/components/storage/VolumeForm.jsx:321
+#: src/components/storage/VolumeForm.jsx:325
 msgid "Automatically calculated size according to the selected product."
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:341
+#: src/components/storage/VolumeForm.jsx:345
 msgid "Exact size for the file system."
 msgstr ""
 
 #. TRANSLATORS: requested partition size
-#: src/components/storage/VolumeForm.jsx:353
+#: src/components/storage/VolumeForm.jsx:357
 msgid "Exact size"
 msgstr ""
 
 #. TRANSLATORS: units selector (like KiB, MiB, GiB...)
-#: src/components/storage/VolumeForm.jsx:368
+#: src/components/storage/VolumeForm.jsx:372
 msgid "Size unit"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:396
+#: src/components/storage/VolumeForm.jsx:400
 msgid ""
 "Limits for the file system size. The final size will be a value between the "
 "given minimum and maximum. If no maximum is given then the file system will "
@@ -1602,57 +1609,57 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: the minimal partition size
-#: src/components/storage/VolumeForm.jsx:403
+#: src/components/storage/VolumeForm.jsx:407
 msgid "Minimum"
 msgstr ""
 
 #. TRANSLATORS: the minium partition size
-#: src/components/storage/VolumeForm.jsx:413
+#: src/components/storage/VolumeForm.jsx:417
 msgid "Minimum desired size"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:422
+#: src/components/storage/VolumeForm.jsx:426
 msgid "Unit for the minimum size"
 msgstr ""
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:433
+#: src/components/storage/VolumeForm.jsx:437
 msgid "Maximum"
 msgstr ""
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:444
+#: src/components/storage/VolumeForm.jsx:448
 msgid "Maximum desired size"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:452
+#: src/components/storage/VolumeForm.jsx:456
 msgid "Unit for the maximum size"
 msgstr ""
 
 #. TRANSLATORS: radio button label, fully automatically computed partition size, no user input
-#: src/components/storage/VolumeForm.jsx:469
+#: src/components/storage/VolumeForm.jsx:473
 msgid "Auto"
 msgstr ""
 
 #. TRANSLATORS: radio button label, exact partition size requested by user
-#: src/components/storage/VolumeForm.jsx:471
+#: src/components/storage/VolumeForm.jsx:475
 msgid "Fixed"
 msgstr ""
 
 #. TRANSLATORS: radio button label, automatically computed partition size within the user provided min and max limits
-#: src/components/storage/VolumeForm.jsx:473
+#: src/components/storage/VolumeForm.jsx:477
 msgid "Range"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:681
+#: src/components/storage/VolumeForm.jsx:685
 msgid "A size value is required"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:686
+#: src/components/storage/VolumeForm.jsx:690
 msgid "Minimum size is required"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:690
+#: src/components/storage/VolumeForm.jsx:694
 msgid "Maximum must be greater than minimum"
 msgstr ""
 
diff --git a/web/po/nl.po b/web/po/nl.po
index 66740ce15..06a477fb3 100644
--- a/web/po/nl.po
+++ b/web/po/nl.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-03 02:07+0000\n"
-"PO-Revision-Date: 2023-12-31 20:39+0000\n"
-"Last-Translator: anonymous <noreply@weblate.org>\n"
+"POT-Creation-Date: 2024-03-14 02:05+0000\n"
+"PO-Revision-Date: 2024-03-13 09:42+0000\n"
+"Last-Translator: Natasha Ament <stacheldrahtje@gmail.com>\n"
 "Language-Team: Dutch <https://l10n.opensuse.org/projects/agama/agama-web/nl/"
 ">\n"
 "Language: nl\n"
@@ -23,18 +23,17 @@ msgstr ""
 #: src/DevServerWrapper.jsx:82
 #, c-format
 msgid "The server at %s is not reachable."
-msgstr ""
+msgstr "De server op %s is niet bereikbaar."
 
 #. TRANSLATORS: error message
 #: src/DevServerWrapper.jsx:88
-#, fuzzy
 msgid "Cannot connect to the Cockpit server"
-msgstr "Kan niet verbinden met D-Bus"
+msgstr "Kan niet verbinden met de Cockpit server"
 
 #. TRANSLATORS: button label
 #: src/DevServerWrapper.jsx:104
 msgid "Try Again"
-msgstr ""
+msgstr "Probeer opnieuw"
 
 #: src/components/core/About.jsx:43 src/components/core/About.jsx:48
 msgid "About Agama"
@@ -93,7 +92,7 @@ msgstr "Herladen"
 
 #: src/components/core/DevelopmentInfo.jsx:55
 msgid "Cockpit server"
-msgstr ""
+msgstr "Cockpit server"
 
 #: src/components/core/FileViewer.jsx:65
 msgid "Reading file..."
@@ -104,13 +103,12 @@ msgid "Cannot read the file"
 msgstr "Kan het bestand niet lezen"
 
 #: src/components/core/InstallButton.jsx:37
-#, fuzzy
 msgid ""
 "There are some reported issues. Please review them in the previous steps "
 "before proceeding with the installation."
 msgstr ""
-"Er zijn enkele geraporteerde issues. Check alstublieft [de lijst met issues] "
-"voor het doorgaan met de installatie."
+"Er zijn enkele geraporteerde issues. Check ze alstublieft in de voorgaande "
+"stappen voordat u doorgaat met de installatie."
 
 #: src/components/core/InstallButton.jsx:49
 msgid "Confirm Installation"
@@ -121,6 +119,8 @@ msgid ""
 "If you continue, partitions on your hard disk will be modified according to "
 "the provided installation settings."
 msgstr ""
+"Indien u doorgaat zullen de partities op de harde schijf worden gewijzigd op "
+"basis van de opgegeven installatie instellingen."
 
 #: src/components/core/InstallButton.jsx:59
 msgid "Please, cancel and check the settings if you are unsure."
@@ -147,6 +147,8 @@ msgid ""
 "Some problems were found when trying to start the installation. Please, have "
 "a look to the reported errors and try again."
 msgstr ""
+"Enkele problemen zijn geconstateerd tijdens het starten van de instalatie. "
+"Check alstublieft de gemelde fouten en probeer opnieuw."
 
 #. TRANSLATORS: button label
 #: src/components/core/InstallButton.jsx:89 src/components/l10n/L10nPage.jsx:75
@@ -156,9 +158,9 @@ msgstr ""
 #: src/components/product/ProductPage.jsx:207
 #: src/components/storage/ProposalDeviceSection.jsx:169
 #: src/components/storage/ProposalDeviceSection.jsx:364
-#: src/components/storage/ProposalSettingsSection.jsx:275
-#: src/components/storage/ProposalVolumes.jsx:148
-#: src/components/storage/ProposalVolumes.jsx:283
+#: src/components/storage/ProposalSettingsSection.jsx:263
+#: src/components/storage/ProposalVolumes.jsx:152
+#: src/components/storage/ProposalVolumes.jsx:287
 #: src/components/storage/ZFCPPage.jsx:511
 msgid "Accept"
 msgstr "Accepteren"
@@ -170,22 +172,23 @@ msgstr "Installeren"
 
 #: src/components/core/InstallationFinished.jsx:41
 msgid "TPM sealing requires the new system to be booted directly."
-msgstr ""
+msgstr "TPM verzegeling vereist dat het nieuwe systeem direct wordt gestart."
 
 #: src/components/core/InstallationFinished.jsx:46
 msgid ""
 "If a local media was used to run this installer, remove it before the next "
 "boot."
 msgstr ""
+"Wanneer u gebruik maakt van lokale media om de installer te starten, "
+"verwijder deze voor de volgende herstart."
 
 #: src/components/core/InstallationFinished.jsx:50
-#, fuzzy
 msgid "Hide details"
-msgstr "Details"
+msgstr "Verberg details"
 
 #: src/components/core/InstallationFinished.jsx:50
 msgid "See more details"
-msgstr ""
+msgstr "Meer details"
 
 #. TRANSLATORS: Do not translate 'abbr' and 'title', they are part of the HTML markup
 #: src/components/core/InstallationFinished.jsx:55
@@ -195,6 +198,11 @@ msgid ""
 "first boot of the new system. For that to work, the machine needs to boot "
 "directly to the new boot loader."
 msgstr ""
+"De laatste stap om <abbr title='Trusted Platform Module'>TPM</abbr> te "
+"configureren zodat versleutelde apparaten automatisch worden geopend zal "
+"plaatsvinden bij de eerste opstart van het nieuwe systeem. Om dat te laten "
+"werken is het nodig om de machine direct te laten starten naar de nieuwe "
+"boot loader."
 
 #. TRANSLATORS: page title
 #: src/components/core/InstallationFinished.jsx:88
@@ -234,7 +242,7 @@ msgstr "Installeren"
 #: src/components/software/PatternSelector.jsx:215
 #: src/components/software/PatternSelector.jsx:216
 msgid "Search"
-msgstr ""
+msgstr "Zoeken"
 
 #: src/components/core/LogsButton.jsx:98
 msgid "Collecting logs..."
@@ -266,9 +274,8 @@ msgid "Show global options"
 msgstr "Toon algemene opties"
 
 #: src/components/core/Page.jsx:215
-#, fuzzy
 msgid "Page Actions"
-msgstr "Geplande acties"
+msgstr "Pagina acties"
 
 #: src/components/core/PasswordAndConfirmationInput.jsx:35
 msgid "Passwords do not match"
@@ -296,7 +303,7 @@ msgstr "Gebruikers wachtwoord bevestiging"
 
 #: src/components/core/PasswordInput.jsx:59
 msgid "Password visibility button"
-msgstr ""
+msgstr "Wachtwoord zichtbaarheidsknop"
 
 #: src/components/core/Popup.jsx:90
 msgid "Confirm"
@@ -304,8 +311,8 @@ msgstr "Bevestigen"
 
 #. TRANSLATORS: dropdown label
 #: src/components/core/RowActions.jsx:66
-#: src/components/storage/ProposalVolumes.jsx:119
-#: src/components/storage/ProposalVolumes.jsx:310
+#: src/components/storage/ProposalVolumes.jsx:123
+#: src/components/storage/ProposalVolumes.jsx:314
 msgid "Actions"
 msgstr "Acties"
 
@@ -330,14 +337,12 @@ msgstr "Open terminal"
 
 #. TRANSLATORS: sidebar header
 #: src/components/core/Sidebar.jsx:113 src/components/core/Sidebar.jsx:121
-#, fuzzy
 msgid "Installer Options"
-msgstr "Installeren"
+msgstr "Installatie opties"
 
 #: src/components/core/Sidebar.jsx:128
-#, fuzzy
 msgid "Hide installer options"
-msgstr "Installeren"
+msgstr "Verberg installer opties"
 
 #: src/components/core/Sidebar.jsx:136
 msgid "Diagnostic tools"
@@ -345,24 +350,20 @@ msgstr "Diagnostische hulpmiddelen"
 
 #. TRANSLATORS: Titles used for the popup displaying found section issues
 #: src/components/core/ValidationErrors.jsx:53
-#, fuzzy
 msgid "Software issues"
-msgstr "Software %s"
+msgstr "Software problemen"
 
 #: src/components/core/ValidationErrors.jsx:54
-#, fuzzy
 msgid "Product issues"
-msgstr "Product selectie"
+msgstr "Problemen van het product"
 
 #: src/components/core/ValidationErrors.jsx:55
-#, fuzzy
 msgid "Storage issues"
-msgstr "Toon issues"
+msgstr "Opslag problemen"
 
 #: src/components/core/ValidationErrors.jsx:57
-#, fuzzy
 msgid "Found Issues"
-msgstr "Toon issues"
+msgstr "Gevonden problemen"
 
 #. TRANSLATORS: %d is replaced with the number of errors found
 #: src/components/core/ValidationErrors.jsx:77
@@ -376,18 +377,18 @@ msgstr[1] "%d fouten gevonden"
 #: src/components/l10n/InstallerKeymapSwitcher.jsx:53
 #: src/components/l10n/L10nPage.jsx:357
 msgid "Keyboard"
-msgstr ""
+msgstr "Toetsenbord"
 
 #. TRANSLATORS: label for keyboard layout selection
 #: src/components/l10n/InstallerKeymapSwitcher.jsx:61
-#, fuzzy
 msgid "keyboard"
-msgstr "Selecteer"
+msgstr "toetsenbord"
 
 #. TRANSLATORS:
 #: src/components/l10n/InstallerKeymapSwitcher.jsx:70
 msgid "Keyboard layout cannot be changed in remote installation"
 msgstr ""
+"Toetsenbordindeling kan niet worden gewijzigd in een installatie op afstand"
 
 #. TRANSLATORS: help text for the language selector in the sidebar,
 #. %s will be replaced by the "Localization" page link
@@ -397,6 +398,8 @@ msgid ""
 "The language used by the installer. The language for the installed system "
 "can be set in the %s page."
 msgstr ""
+"De taal gebruikt door de installer. De taal voor het geïnstalleerde systeem "
+"kan worden ingesteld in de %s pagina."
 
 #. TRANSLATORS: page section
 #. TRANSLATORS: page title
@@ -408,9 +411,8 @@ msgstr "Lokalisatie"
 
 #: src/components/l10n/InstallerLocaleSwitcher.jsx:66
 #: src/components/l10n/L10nPage.jsx:246
-#, fuzzy
 msgid "Language"
-msgstr "taal"
+msgstr "Taal"
 
 #: src/components/l10n/InstallerLocaleSwitcher.jsx:74
 msgid "language"
@@ -547,8 +549,8 @@ msgstr "Adressen"
 msgid "Addresses data list"
 msgstr "Adressen data lijst"
 
-#. TRANSLATORS: input field for the iSCSI initiator name
 #. TRANSLATORS: table header
+#. TRANSLATORS: input field for the iSCSI initiator name
 #: src/components/network/ConnectionsTable.jsx:57
 #: src/components/network/ConnectionsTable.jsx:86
 #: src/components/storage/ZFCPPage.jsx:360
@@ -567,7 +569,7 @@ msgid "IP addresses"
 msgstr "IP adressen"
 
 #: src/components/network/ConnectionsTable.jsx:67
-#: src/components/storage/ProposalVolumes.jsx:234
+#: src/components/storage/ProposalVolumes.jsx:238
 #: src/components/storage/iscsi/InitiatorPresenter.jsx:49
 #: src/components/storage/iscsi/NodesPresenter.jsx:73
 #: src/components/users/FirstUser.jsx:208
@@ -772,8 +774,8 @@ msgstr "Verbonden"
 msgid "Disconnecting"
 msgstr "Verbinding verbreken"
 
-#. TRANSLATORS: iSCSI connection status
 #. TRANSLATORS: Wifi network status
+#. TRANSLATORS: iSCSI connection status
 #: src/components/network/WifiNetworkListItem.jsx:50
 #: src/components/storage/iscsi/NodesPresenter.jsx:63
 msgid "Disconnected"
@@ -838,8 +840,8 @@ msgstr "Lezen van software opslagruimtes"
 msgid "Refresh the repositories"
 msgstr "Ververs de opslagruimtes"
 
-#. TRANSLATORS: page title
 #. TRANSLATORS: page section
+#. TRANSLATORS: page title
 #: src/components/overview/SoftwareSection.jsx:143
 #: src/components/software/SoftwarePage.jsx:81
 msgid "Software"
@@ -885,7 +887,7 @@ msgstr "Onderzoeken van opslagapparaten"
 #. TRANSLATORS: page title
 #. TRANSLATORS: page section title
 #: src/components/overview/StorageSection.jsx:208
-#: src/components/storage/ProposalPage.jsx:239
+#: src/components/storage/ProposalPage.jsx:243
 msgid "Storage"
 msgstr "Opslag"
 
@@ -1309,7 +1311,7 @@ msgstr "iSCSI"
 #. TRANSLATORS: The word 'directly' is key here. For example, booting to the installer media and then choosing
 #. 'Boot from Hard Disk' from there will not work. Keep it sort (this is a hint in a form) but keep it clear.
 #. Do not translate 'abbr' and 'title', they are part of the HTML markup.
-#: src/components/storage/ProposalSettingsSection.jsx:89
+#: src/components/storage/ProposalSettingsSection.jsx:87
 msgid ""
 "The password will not be needed to boot and access the data if the <abbr "
 "title='Trusted Platform Module'>TPM</abbr> can verify the integrity of the "
@@ -1317,56 +1319,39 @@ msgid ""
 "first run."
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:107
+#: src/components/storage/ProposalSettingsSection.jsx:105
 msgid "Use the TPM to decrypt automatically on each boot"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:152
+#: src/components/storage/ProposalSettingsSection.jsx:148
 msgid ""
 "Uses Btrfs for the root file system allowing to boot to a previous version "
 "of the system after configuration changes or software upgrades."
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:159
+#: src/components/storage/ProposalSettingsSection.jsx:155
 #, fuzzy
 msgid "Use Btrfs Snapshots"
 msgstr "met snapshots"
 
-#: src/components/storage/ProposalSettingsSection.jsx:173
-msgid "Btrfs snapshots required by product."
-msgstr ""
-
-#: src/components/storage/ProposalSettingsSection.jsx:239
+#: src/components/storage/ProposalSettingsSection.jsx:227
 #, fuzzy
 msgid "Change encryption settings"
 msgstr "Encryptie instellingen"
 
-#: src/components/storage/ProposalSettingsSection.jsx:244
-#: src/components/storage/ProposalSettingsSection.jsx:265
+#: src/components/storage/ProposalSettingsSection.jsx:232
+#: src/components/storage/ProposalSettingsSection.jsx:253
 msgid "Encryption settings"
 msgstr "Encryptie instellingen"
 
-#: src/components/storage/ProposalSettingsSection.jsx:258
+#: src/components/storage/ProposalSettingsSection.jsx:246
 msgid "Use encryption"
 msgstr "Gebruik encryptie"
 
-#: src/components/storage/ProposalSettingsSection.jsx:325
+#: src/components/storage/ProposalSettingsSection.jsx:309
 msgid "Settings"
 msgstr "Instellingen"
 
-#: src/components/storage/ProposalSettingsSection.jsx:330
-#, fuzzy
-msgid "Transactional system"
-msgstr "Voer een actie uit"
-
-#. TRANSLATORS: %s is replaced by a product name (e.g., openSUSE Tumbleweed)
-#: src/components/storage/ProposalSettingsSection.jsx:333
-#, c-format
-msgid ""
-"%s is an immutable system with atomic updates using a read-only Btrfs root "
-"file system."
-msgstr ""
-
 #: src/components/storage/ProposalSpacePolicySection.jsx:50
 msgid "Delete current content"
 msgstr ""
@@ -1412,13 +1397,13 @@ msgid "Current content"
 msgstr ""
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:74
-#: src/components/storage/ProposalVolumes.jsx:309
-#: src/components/storage/VolumeForm.jsx:741
+#: src/components/storage/ProposalVolumes.jsx:313
+#: src/components/storage/VolumeForm.jsx:745
 msgid "Size"
 msgstr "Grootte"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:75
-#: src/components/storage/ProposalVolumes.jsx:308
+#: src/components/storage/ProposalVolumes.jsx:312
 msgid "Details"
 msgstr "Details"
 
@@ -1479,7 +1464,7 @@ msgid "Space action selector for %s"
 msgstr ""
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:224
-#: src/components/storage/ProposalVolumes.jsx:229
+#: src/components/storage/ProposalVolumes.jsx:233
 #: src/components/storage/iscsi/NodesPresenter.jsx:77
 msgid "Delete"
 msgstr "Verwijderen"
@@ -1509,7 +1494,19 @@ msgid ""
 "listed below. Choose how to do it."
 msgstr ""
 
-#. TRANSLATORS: header for a list of items
+#: src/components/storage/ProposalTransactionalInfo.jsx:46
+#, fuzzy
+msgid "Transactional root file system"
+msgstr "Voer een actie uit"
+
+#: src/components/storage/ProposalTransactionalInfo.jsx:49
+#, c-format
+msgid ""
+"%s is an immutable system with atomic updates. It uses a read-only Btrfs "
+"file system updated via snapshots."
+msgstr ""
+
+#. TRANSLATORS: header for a list of items referring to size limits for file systems
 #: src/components/storage/ProposalVolumes.jsx:59
 msgid "These limits are affected by:"
 msgstr "Deze limieten worden beïnvloed door:"
@@ -1526,64 +1523,70 @@ msgstr "De configuratie van snapshots"
 msgid "Presence of other volumes (%s)"
 msgstr "Aanwezigheid van andere volumes (%s)"
 
+#. TRANSLATORS: list item, describes a factor that affects the computed size of a
+#. file system; eg. adjusting the size of the swap
+#: src/components/storage/ProposalVolumes.jsx:71
+msgid "The amount of RAM in the system"
+msgstr ""
+
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:129
+#: src/components/storage/ProposalVolumes.jsx:133
 msgid "Reset to defaults"
 msgstr "Reset naar standaard"
 
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:137
 #: src/components/storage/ProposalVolumes.jsx:141
+#: src/components/storage/ProposalVolumes.jsx:145
 msgid "Add file system"
 msgstr "Voeg bestandssysteem toe"
 
 #. TRANSLATORS: minimum device size, %s is replaced by size string, e.g. "17.5 GiB"
-#: src/components/storage/ProposalVolumes.jsx:191
+#: src/components/storage/ProposalVolumes.jsx:195
 #, c-format
 msgid "At least %s"
 msgstr "Tenminste %s"
 
 #. TRANSLATORS: device flag, the partition size is automatically computed
-#: src/components/storage/ProposalVolumes.jsx:197
+#: src/components/storage/ProposalVolumes.jsx:201
 msgid "auto"
 msgstr "auto"
 
 #. TRANSLATORS: the filesystem uses a logical volume (LVM)
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "logical volume"
 msgstr "logisch volume"
 
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "partition"
 msgstr "partitie"
 
 #. TRANSLATORS: filesystem flag, it uses an encryption
-#: src/components/storage/ProposalVolumes.jsx:216
+#: src/components/storage/ProposalVolumes.jsx:220
 msgid "encrypted"
 msgstr "versleuteld"
 
 #. TRANSLATORS: filesystem flag, it allows creating snapshots
-#: src/components/storage/ProposalVolumes.jsx:218
+#: src/components/storage/ProposalVolumes.jsx:222
 msgid "with snapshots"
 msgstr "met snapshots"
 
 #. TRANSLATORS: flag for transactional file system
-#: src/components/storage/ProposalVolumes.jsx:220
+#: src/components/storage/ProposalVolumes.jsx:224
 #, fuzzy
 msgid "transactional"
 msgstr "Voer een actie uit"
 
-#: src/components/storage/ProposalVolumes.jsx:275
+#: src/components/storage/ProposalVolumes.jsx:279
 msgid "Edit file system"
 msgstr "Wijzig bestandssysteem"
 
-#: src/components/storage/ProposalVolumes.jsx:307
-#: src/components/storage/VolumeForm.jsx:726
-#: src/components/storage/VolumeForm.jsx:731
+#: src/components/storage/ProposalVolumes.jsx:311
+#: src/components/storage/VolumeForm.jsx:730
+#: src/components/storage/VolumeForm.jsx:735
 msgid "Mount point"
 msgstr "Koppelpunt"
 
-#: src/components/storage/ProposalVolumes.jsx:345
+#: src/components/storage/ProposalVolumes.jsx:349
 msgid "Table with mount points"
 msgstr "Tabel met koppelpunten"
 
@@ -1626,37 +1629,42 @@ msgstr "de aanwezigheid van het bestandssysteem voor %s"
 msgid ", "
 msgstr ", "
 
+#. TRANSLATORS: item which affects the final computed partition size
+#: src/components/storage/VolumeForm.jsx:315
+msgid "the amount of RAM in the system"
+msgstr ""
+
 #. TRANSLATORS: the %s is replaced by the items which affect the computed size
-#: src/components/storage/VolumeForm.jsx:314
+#: src/components/storage/VolumeForm.jsx:318
 #, c-format
 msgid "The final size depends on %s."
 msgstr "De uiteindelijke grootte hangt af van %s."
 
 #. TRANSLATORS: conjunction for merging two texts
-#: src/components/storage/VolumeForm.jsx:316
+#: src/components/storage/VolumeForm.jsx:320
 msgid " and "
 msgstr " en "
 
 #. TRANSLATORS: the partition size is automatically computed
-#: src/components/storage/VolumeForm.jsx:321
+#: src/components/storage/VolumeForm.jsx:325
 msgid "Automatically calculated size according to the selected product."
 msgstr "Automatisch berekend aan de hand van het geselecteerde product."
 
-#: src/components/storage/VolumeForm.jsx:341
+#: src/components/storage/VolumeForm.jsx:345
 msgid "Exact size for the file system."
 msgstr "Exacte grootte voor het bestandssysteem."
 
 #. TRANSLATORS: requested partition size
-#: src/components/storage/VolumeForm.jsx:353
+#: src/components/storage/VolumeForm.jsx:357
 msgid "Exact size"
 msgstr "Exacte grootte"
 
 #. TRANSLATORS: units selector (like KiB, MiB, GiB...)
-#: src/components/storage/VolumeForm.jsx:368
+#: src/components/storage/VolumeForm.jsx:372
 msgid "Size unit"
 msgstr "Grootte eenheid"
 
-#: src/components/storage/VolumeForm.jsx:396
+#: src/components/storage/VolumeForm.jsx:400
 msgid ""
 "Limits for the file system size. The final size will be a value between the "
 "given minimum and maximum. If no maximum is given then the file system will "
@@ -1667,57 +1675,57 @@ msgstr ""
 "geen maximum is gegeven dan zal het bestandssysteem zo groot mogelijk zijn."
 
 #. TRANSLATORS: the minimal partition size
-#: src/components/storage/VolumeForm.jsx:403
+#: src/components/storage/VolumeForm.jsx:407
 msgid "Minimum"
 msgstr "Minimum"
 
 #. TRANSLATORS: the minium partition size
-#: src/components/storage/VolumeForm.jsx:413
+#: src/components/storage/VolumeForm.jsx:417
 msgid "Minimum desired size"
 msgstr "Minimum gewenste grootte"
 
-#: src/components/storage/VolumeForm.jsx:422
+#: src/components/storage/VolumeForm.jsx:426
 msgid "Unit for the minimum size"
 msgstr "Eenheid voor gewenste grootte"
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:433
+#: src/components/storage/VolumeForm.jsx:437
 msgid "Maximum"
 msgstr "Maximum"
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:444
+#: src/components/storage/VolumeForm.jsx:448
 msgid "Maximum desired size"
 msgstr "Maximaal gewenste grootte"
 
-#: src/components/storage/VolumeForm.jsx:452
+#: src/components/storage/VolumeForm.jsx:456
 msgid "Unit for the maximum size"
 msgstr "Eenheid voor maximale grootte"
 
 #. TRANSLATORS: radio button label, fully automatically computed partition size, no user input
-#: src/components/storage/VolumeForm.jsx:469
+#: src/components/storage/VolumeForm.jsx:473
 msgid "Auto"
 msgstr "Auto"
 
 #. TRANSLATORS: radio button label, exact partition size requested by user
-#: src/components/storage/VolumeForm.jsx:471
+#: src/components/storage/VolumeForm.jsx:475
 msgid "Fixed"
 msgstr "Vast"
 
 #. TRANSLATORS: radio button label, automatically computed partition size within the user provided min and max limits
-#: src/components/storage/VolumeForm.jsx:473
+#: src/components/storage/VolumeForm.jsx:477
 msgid "Range"
 msgstr "Reikwijdte"
 
-#: src/components/storage/VolumeForm.jsx:681
+#: src/components/storage/VolumeForm.jsx:685
 msgid "A size value is required"
 msgstr "Een grootheids waarde is nodig"
 
-#: src/components/storage/VolumeForm.jsx:686
+#: src/components/storage/VolumeForm.jsx:690
 msgid "Minimum size is required"
 msgstr "Minimum grootte is vereist"
 
-#: src/components/storage/VolumeForm.jsx:690
+#: src/components/storage/VolumeForm.jsx:694
 msgid "Maximum must be greater than minimum"
 msgstr "Maximum moet groter zijn dan het minimum"
 
diff --git a/web/po/pt_BR.po b/web/po/pt_BR.po
index efa789e20..bd9e2ab1c 100644
--- a/web/po/pt_BR.po
+++ b/web/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-03 02:07+0000\n"
+"POT-Creation-Date: 2024-03-14 02:05+0000\n"
 "PO-Revision-Date: 2023-12-31 20:39+0000\n"
 "Last-Translator: anonymous <noreply@weblate.org>\n"
 "Language-Team: Portuguese (Brazil) <https://l10n.opensuse.org/projects/agama/"
@@ -158,9 +158,9 @@ msgstr ""
 #: src/components/product/ProductPage.jsx:207
 #: src/components/storage/ProposalDeviceSection.jsx:169
 #: src/components/storage/ProposalDeviceSection.jsx:364
-#: src/components/storage/ProposalSettingsSection.jsx:275
-#: src/components/storage/ProposalVolumes.jsx:148
-#: src/components/storage/ProposalVolumes.jsx:283
+#: src/components/storage/ProposalSettingsSection.jsx:263
+#: src/components/storage/ProposalVolumes.jsx:152
+#: src/components/storage/ProposalVolumes.jsx:287
 #: src/components/storage/ZFCPPage.jsx:511
 msgid "Accept"
 msgstr "Aceitar"
@@ -304,8 +304,8 @@ msgstr "Confirmar"
 
 #. TRANSLATORS: dropdown label
 #: src/components/core/RowActions.jsx:66
-#: src/components/storage/ProposalVolumes.jsx:119
-#: src/components/storage/ProposalVolumes.jsx:310
+#: src/components/storage/ProposalVolumes.jsx:123
+#: src/components/storage/ProposalVolumes.jsx:314
 msgid "Actions"
 msgstr "Ações"
 
@@ -536,8 +536,8 @@ msgstr "Endereços"
 msgid "Addresses data list"
 msgstr "Lista de dados de endereços"
 
-#. TRANSLATORS: input field for the iSCSI initiator name
 #. TRANSLATORS: table header
+#. TRANSLATORS: input field for the iSCSI initiator name
 #: src/components/network/ConnectionsTable.jsx:57
 #: src/components/network/ConnectionsTable.jsx:86
 #: src/components/storage/ZFCPPage.jsx:360
@@ -556,7 +556,7 @@ msgid "IP addresses"
 msgstr "Endereços IP"
 
 #: src/components/network/ConnectionsTable.jsx:67
-#: src/components/storage/ProposalVolumes.jsx:234
+#: src/components/storage/ProposalVolumes.jsx:238
 #: src/components/storage/iscsi/InitiatorPresenter.jsx:49
 #: src/components/storage/iscsi/NodesPresenter.jsx:73
 #: src/components/users/FirstUser.jsx:208
@@ -759,8 +759,8 @@ msgstr "Conectado"
 msgid "Disconnecting"
 msgstr "Desconectando"
 
-#. TRANSLATORS: iSCSI connection status
 #. TRANSLATORS: Wifi network status
+#. TRANSLATORS: iSCSI connection status
 #: src/components/network/WifiNetworkListItem.jsx:50
 #: src/components/storage/iscsi/NodesPresenter.jsx:63
 msgid "Disconnected"
@@ -824,8 +824,8 @@ msgstr "Lendo repositórios de software"
 msgid "Refresh the repositories"
 msgstr "Atualizar os repositórios"
 
-#. TRANSLATORS: page title
 #. TRANSLATORS: page section
+#. TRANSLATORS: page title
 #: src/components/overview/SoftwareSection.jsx:143
 #: src/components/software/SoftwarePage.jsx:81
 msgid "Software"
@@ -871,7 +871,7 @@ msgstr ""
 #. TRANSLATORS: page title
 #. TRANSLATORS: page section title
 #: src/components/overview/StorageSection.jsx:208
-#: src/components/storage/ProposalPage.jsx:239
+#: src/components/storage/ProposalPage.jsx:243
 msgid "Storage"
 msgstr "Armazenamento"
 
@@ -1286,7 +1286,7 @@ msgstr "iSCSI"
 #. TRANSLATORS: The word 'directly' is key here. For example, booting to the installer media and then choosing
 #. 'Boot from Hard Disk' from there will not work. Keep it sort (this is a hint in a form) but keep it clear.
 #. Do not translate 'abbr' and 'title', they are part of the HTML markup.
-#: src/components/storage/ProposalSettingsSection.jsx:89
+#: src/components/storage/ProposalSettingsSection.jsx:87
 msgid ""
 "The password will not be needed to boot and access the data if the <abbr "
 "title='Trusted Platform Module'>TPM</abbr> can verify the integrity of the "
@@ -1294,56 +1294,39 @@ msgid ""
 "first run."
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:107
+#: src/components/storage/ProposalSettingsSection.jsx:105
 msgid "Use the TPM to decrypt automatically on each boot"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:152
+#: src/components/storage/ProposalSettingsSection.jsx:148
 msgid ""
 "Uses Btrfs for the root file system allowing to boot to a previous version "
 "of the system after configuration changes or software upgrades."
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:159
+#: src/components/storage/ProposalSettingsSection.jsx:155
 #, fuzzy
 msgid "Use Btrfs Snapshots"
 msgstr "com instantâneos"
 
-#: src/components/storage/ProposalSettingsSection.jsx:173
-msgid "Btrfs snapshots required by product."
-msgstr ""
-
-#: src/components/storage/ProposalSettingsSection.jsx:239
+#: src/components/storage/ProposalSettingsSection.jsx:227
 #, fuzzy
 msgid "Change encryption settings"
 msgstr "Usar criptografia"
 
-#: src/components/storage/ProposalSettingsSection.jsx:244
-#: src/components/storage/ProposalSettingsSection.jsx:265
+#: src/components/storage/ProposalSettingsSection.jsx:232
+#: src/components/storage/ProposalSettingsSection.jsx:253
 msgid "Encryption settings"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:258
+#: src/components/storage/ProposalSettingsSection.jsx:246
 msgid "Use encryption"
 msgstr "Usar criptografia"
 
-#: src/components/storage/ProposalSettingsSection.jsx:325
+#: src/components/storage/ProposalSettingsSection.jsx:309
 msgid "Settings"
 msgstr "Configurações"
 
-#: src/components/storage/ProposalSettingsSection.jsx:330
-#, fuzzy
-msgid "Transactional system"
-msgstr "transacional"
-
-#. TRANSLATORS: %s is replaced by a product name (e.g., openSUSE Tumbleweed)
-#: src/components/storage/ProposalSettingsSection.jsx:333
-#, c-format
-msgid ""
-"%s is an immutable system with atomic updates using a read-only Btrfs root "
-"file system."
-msgstr ""
-
 #: src/components/storage/ProposalSpacePolicySection.jsx:50
 msgid "Delete current content"
 msgstr ""
@@ -1386,13 +1369,13 @@ msgid "Current content"
 msgstr ""
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:74
-#: src/components/storage/ProposalVolumes.jsx:309
-#: src/components/storage/VolumeForm.jsx:741
+#: src/components/storage/ProposalVolumes.jsx:313
+#: src/components/storage/VolumeForm.jsx:745
 msgid "Size"
 msgstr "Tamanho"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:75
-#: src/components/storage/ProposalVolumes.jsx:308
+#: src/components/storage/ProposalVolumes.jsx:312
 msgid "Details"
 msgstr "Detalhes"
 
@@ -1453,7 +1436,7 @@ msgid "Space action selector for %s"
 msgstr ""
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:224
-#: src/components/storage/ProposalVolumes.jsx:229
+#: src/components/storage/ProposalVolumes.jsx:233
 #: src/components/storage/iscsi/NodesPresenter.jsx:77
 msgid "Delete"
 msgstr "Excluir"
@@ -1483,7 +1466,19 @@ msgid ""
 "listed below. Choose how to do it."
 msgstr ""
 
-#. TRANSLATORS: header for a list of items
+#: src/components/storage/ProposalTransactionalInfo.jsx:46
+#, fuzzy
+msgid "Transactional root file system"
+msgstr "transacional"
+
+#: src/components/storage/ProposalTransactionalInfo.jsx:49
+#, c-format
+msgid ""
+"%s is an immutable system with atomic updates. It uses a read-only Btrfs "
+"file system updated via snapshots."
+msgstr ""
+
+#. TRANSLATORS: header for a list of items referring to size limits for file systems
 #: src/components/storage/ProposalVolumes.jsx:59
 msgid "These limits are affected by:"
 msgstr ""
@@ -1500,63 +1495,69 @@ msgstr ""
 msgid "Presence of other volumes (%s)"
 msgstr "Presença de outros volumes (%s)"
 
+#. TRANSLATORS: list item, describes a factor that affects the computed size of a
+#. file system; eg. adjusting the size of the swap
+#: src/components/storage/ProposalVolumes.jsx:71
+msgid "The amount of RAM in the system"
+msgstr ""
+
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:129
+#: src/components/storage/ProposalVolumes.jsx:133
 msgid "Reset to defaults"
 msgstr "Restaurar padrões"
 
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:137
 #: src/components/storage/ProposalVolumes.jsx:141
+#: src/components/storage/ProposalVolumes.jsx:145
 msgid "Add file system"
 msgstr "Adicionar sistema de arquivos"
 
 #. TRANSLATORS: minimum device size, %s is replaced by size string, e.g. "17.5 GiB"
-#: src/components/storage/ProposalVolumes.jsx:191
+#: src/components/storage/ProposalVolumes.jsx:195
 #, c-format
 msgid "At least %s"
 msgstr "Pelo menos %s"
 
 #. TRANSLATORS: device flag, the partition size is automatically computed
-#: src/components/storage/ProposalVolumes.jsx:197
+#: src/components/storage/ProposalVolumes.jsx:201
 msgid "auto"
 msgstr "automático"
 
 #. TRANSLATORS: the filesystem uses a logical volume (LVM)
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "logical volume"
 msgstr "volume lógico"
 
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "partition"
 msgstr "partição"
 
 #. TRANSLATORS: filesystem flag, it uses an encryption
-#: src/components/storage/ProposalVolumes.jsx:216
+#: src/components/storage/ProposalVolumes.jsx:220
 msgid "encrypted"
 msgstr "criptografado"
 
 #. TRANSLATORS: filesystem flag, it allows creating snapshots
-#: src/components/storage/ProposalVolumes.jsx:218
+#: src/components/storage/ProposalVolumes.jsx:222
 msgid "with snapshots"
 msgstr "com instantâneos"
 
 #. TRANSLATORS: flag for transactional file system
-#: src/components/storage/ProposalVolumes.jsx:220
+#: src/components/storage/ProposalVolumes.jsx:224
 msgid "transactional"
 msgstr "transacional"
 
-#: src/components/storage/ProposalVolumes.jsx:275
+#: src/components/storage/ProposalVolumes.jsx:279
 msgid "Edit file system"
 msgstr "Editar sistema de arquivos"
 
-#: src/components/storage/ProposalVolumes.jsx:307
-#: src/components/storage/VolumeForm.jsx:726
-#: src/components/storage/VolumeForm.jsx:731
+#: src/components/storage/ProposalVolumes.jsx:311
+#: src/components/storage/VolumeForm.jsx:730
+#: src/components/storage/VolumeForm.jsx:735
 msgid "Mount point"
 msgstr "Ponto de montagem"
 
-#: src/components/storage/ProposalVolumes.jsx:345
+#: src/components/storage/ProposalVolumes.jsx:349
 msgid "Table with mount points"
 msgstr "Tabela com pontos de montagem"
 
@@ -1599,37 +1600,42 @@ msgstr "a presença do sistema de arquivos para %s"
 msgid ", "
 msgstr ", "
 
+#. TRANSLATORS: item which affects the final computed partition size
+#: src/components/storage/VolumeForm.jsx:315
+msgid "the amount of RAM in the system"
+msgstr ""
+
 #. TRANSLATORS: the %s is replaced by the items which affect the computed size
-#: src/components/storage/VolumeForm.jsx:314
+#: src/components/storage/VolumeForm.jsx:318
 #, c-format
 msgid "The final size depends on %s."
 msgstr "O tamanho final depende de %s."
 
 #. TRANSLATORS: conjunction for merging two texts
-#: src/components/storage/VolumeForm.jsx:316
+#: src/components/storage/VolumeForm.jsx:320
 msgid " and "
 msgstr " e "
 
 #. TRANSLATORS: the partition size is automatically computed
-#: src/components/storage/VolumeForm.jsx:321
+#: src/components/storage/VolumeForm.jsx:325
 msgid "Automatically calculated size according to the selected product."
 msgstr "Tamanho calculado automaticamente de acordo com o produto selecionado."
 
-#: src/components/storage/VolumeForm.jsx:341
+#: src/components/storage/VolumeForm.jsx:345
 msgid "Exact size for the file system."
 msgstr "Tamanho exato do sistema de arquivos."
 
 #. TRANSLATORS: requested partition size
-#: src/components/storage/VolumeForm.jsx:353
+#: src/components/storage/VolumeForm.jsx:357
 msgid "Exact size"
 msgstr ""
 
 #. TRANSLATORS: units selector (like KiB, MiB, GiB...)
-#: src/components/storage/VolumeForm.jsx:368
+#: src/components/storage/VolumeForm.jsx:372
 msgid "Size unit"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:396
+#: src/components/storage/VolumeForm.jsx:400
 msgid ""
 "Limits for the file system size. The final size will be a value between the "
 "given minimum and maximum. If no maximum is given then the file system will "
@@ -1637,57 +1643,57 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: the minimal partition size
-#: src/components/storage/VolumeForm.jsx:403
+#: src/components/storage/VolumeForm.jsx:407
 msgid "Minimum"
 msgstr "Mínimo"
 
 #. TRANSLATORS: the minium partition size
-#: src/components/storage/VolumeForm.jsx:413
+#: src/components/storage/VolumeForm.jsx:417
 msgid "Minimum desired size"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:422
+#: src/components/storage/VolumeForm.jsx:426
 msgid "Unit for the minimum size"
 msgstr ""
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:433
+#: src/components/storage/VolumeForm.jsx:437
 msgid "Maximum"
 msgstr "Máximo"
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:444
+#: src/components/storage/VolumeForm.jsx:448
 msgid "Maximum desired size"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:452
+#: src/components/storage/VolumeForm.jsx:456
 msgid "Unit for the maximum size"
 msgstr ""
 
 #. TRANSLATORS: radio button label, fully automatically computed partition size, no user input
-#: src/components/storage/VolumeForm.jsx:469
+#: src/components/storage/VolumeForm.jsx:473
 msgid "Auto"
 msgstr "Automático"
 
 #. TRANSLATORS: radio button label, exact partition size requested by user
-#: src/components/storage/VolumeForm.jsx:471
+#: src/components/storage/VolumeForm.jsx:475
 msgid "Fixed"
 msgstr "Fixo"
 
 #. TRANSLATORS: radio button label, automatically computed partition size within the user provided min and max limits
-#: src/components/storage/VolumeForm.jsx:473
+#: src/components/storage/VolumeForm.jsx:477
 msgid "Range"
 msgstr "Intervalo"
 
-#: src/components/storage/VolumeForm.jsx:681
+#: src/components/storage/VolumeForm.jsx:685
 msgid "A size value is required"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:686
+#: src/components/storage/VolumeForm.jsx:690
 msgid "Minimum size is required"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:690
+#: src/components/storage/VolumeForm.jsx:694
 msgid "Maximum must be greater than minimum"
 msgstr ""
 
diff --git a/web/po/ru.po b/web/po/ru.po
index 4b40ce460..4787a5a50 100644
--- a/web/po/ru.po
+++ b/web/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-03 02:07+0000\n"
+"POT-Creation-Date: 2024-03-14 02:05+0000\n"
 "PO-Revision-Date: 2023-12-31 20:39+0000\n"
 "Last-Translator: Milachew <milachew@mail.lv>\n"
 "Language-Team: Russian <https://l10n.opensuse.org/projects/agama/agama-web/"
@@ -158,9 +158,9 @@ msgstr ""
 #: src/components/product/ProductPage.jsx:207
 #: src/components/storage/ProposalDeviceSection.jsx:169
 #: src/components/storage/ProposalDeviceSection.jsx:364
-#: src/components/storage/ProposalSettingsSection.jsx:275
-#: src/components/storage/ProposalVolumes.jsx:148
-#: src/components/storage/ProposalVolumes.jsx:283
+#: src/components/storage/ProposalSettingsSection.jsx:263
+#: src/components/storage/ProposalVolumes.jsx:152
+#: src/components/storage/ProposalVolumes.jsx:287
 #: src/components/storage/ZFCPPage.jsx:511
 msgid "Accept"
 msgstr "Подтвердить"
@@ -307,8 +307,8 @@ msgstr "Подтвердить"
 
 #. TRANSLATORS: dropdown label
 #: src/components/core/RowActions.jsx:66
-#: src/components/storage/ProposalVolumes.jsx:119
-#: src/components/storage/ProposalVolumes.jsx:310
+#: src/components/storage/ProposalVolumes.jsx:123
+#: src/components/storage/ProposalVolumes.jsx:314
 msgid "Actions"
 msgstr "Действия"
 
@@ -546,8 +546,8 @@ msgstr "Адреса"
 msgid "Addresses data list"
 msgstr "Список данных адресов"
 
-#. TRANSLATORS: input field for the iSCSI initiator name
 #. TRANSLATORS: table header
+#. TRANSLATORS: input field for the iSCSI initiator name
 #: src/components/network/ConnectionsTable.jsx:57
 #: src/components/network/ConnectionsTable.jsx:86
 #: src/components/storage/ZFCPPage.jsx:360
@@ -566,7 +566,7 @@ msgid "IP addresses"
 msgstr "IP-адреса"
 
 #: src/components/network/ConnectionsTable.jsx:67
-#: src/components/storage/ProposalVolumes.jsx:234
+#: src/components/storage/ProposalVolumes.jsx:238
 #: src/components/storage/iscsi/InitiatorPresenter.jsx:49
 #: src/components/storage/iscsi/NodesPresenter.jsx:73
 #: src/components/users/FirstUser.jsx:208
@@ -769,8 +769,8 @@ msgstr "Подключено"
 msgid "Disconnecting"
 msgstr "Отключение"
 
-#. TRANSLATORS: iSCSI connection status
 #. TRANSLATORS: Wifi network status
+#. TRANSLATORS: iSCSI connection status
 #: src/components/network/WifiNetworkListItem.jsx:50
 #: src/components/storage/iscsi/NodesPresenter.jsx:63
 msgid "Disconnected"
@@ -836,8 +836,8 @@ msgstr "Чтение репозиториев"
 msgid "Refresh the repositories"
 msgstr "Обновить репозитории"
 
-#. TRANSLATORS: page title
 #. TRANSLATORS: page section
+#. TRANSLATORS: page title
 #: src/components/overview/SoftwareSection.jsx:143
 #: src/components/software/SoftwarePage.jsx:81
 msgid "Software"
@@ -883,7 +883,7 @@ msgstr ""
 #. TRANSLATORS: page title
 #. TRANSLATORS: page section title
 #: src/components/overview/StorageSection.jsx:208
-#: src/components/storage/ProposalPage.jsx:239
+#: src/components/storage/ProposalPage.jsx:243
 msgid "Storage"
 msgstr ""
 
@@ -1300,7 +1300,7 @@ msgstr ""
 #. TRANSLATORS: The word 'directly' is key here. For example, booting to the installer media and then choosing
 #. 'Boot from Hard Disk' from there will not work. Keep it sort (this is a hint in a form) but keep it clear.
 #. Do not translate 'abbr' and 'title', they are part of the HTML markup.
-#: src/components/storage/ProposalSettingsSection.jsx:89
+#: src/components/storage/ProposalSettingsSection.jsx:87
 msgid ""
 "The password will not be needed to boot and access the data if the <abbr "
 "title='Trusted Platform Module'>TPM</abbr> can verify the integrity of the "
@@ -1308,53 +1308,37 @@ msgid ""
 "first run."
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:107
+#: src/components/storage/ProposalSettingsSection.jsx:105
 msgid "Use the TPM to decrypt automatically on each boot"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:152
+#: src/components/storage/ProposalSettingsSection.jsx:148
 msgid ""
 "Uses Btrfs for the root file system allowing to boot to a previous version "
 "of the system after configuration changes or software upgrades."
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:159
+#: src/components/storage/ProposalSettingsSection.jsx:155
 msgid "Use Btrfs Snapshots"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:173
-msgid "Btrfs snapshots required by product."
-msgstr ""
-
-#: src/components/storage/ProposalSettingsSection.jsx:239
+#: src/components/storage/ProposalSettingsSection.jsx:227
 msgid "Change encryption settings"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:244
-#: src/components/storage/ProposalSettingsSection.jsx:265
+#: src/components/storage/ProposalSettingsSection.jsx:232
+#: src/components/storage/ProposalSettingsSection.jsx:253
 msgid "Encryption settings"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:258
+#: src/components/storage/ProposalSettingsSection.jsx:246
 msgid "Use encryption"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:325
+#: src/components/storage/ProposalSettingsSection.jsx:309
 msgid "Settings"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:330
-msgid "Transactional system"
-msgstr ""
-
-#. TRANSLATORS: %s is replaced by a product name (e.g., openSUSE Tumbleweed)
-#: src/components/storage/ProposalSettingsSection.jsx:333
-#, c-format
-msgid ""
-"%s is an immutable system with atomic updates using a read-only Btrfs root "
-"file system."
-msgstr ""
-
 #: src/components/storage/ProposalSpacePolicySection.jsx:50
 msgid "Delete current content"
 msgstr ""
@@ -1397,13 +1381,13 @@ msgid "Current content"
 msgstr ""
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:74
-#: src/components/storage/ProposalVolumes.jsx:309
-#: src/components/storage/VolumeForm.jsx:741
+#: src/components/storage/ProposalVolumes.jsx:313
+#: src/components/storage/VolumeForm.jsx:745
 msgid "Size"
 msgstr ""
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:75
-#: src/components/storage/ProposalVolumes.jsx:308
+#: src/components/storage/ProposalVolumes.jsx:312
 msgid "Details"
 msgstr ""
 
@@ -1463,7 +1447,7 @@ msgid "Space action selector for %s"
 msgstr ""
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:224
-#: src/components/storage/ProposalVolumes.jsx:229
+#: src/components/storage/ProposalVolumes.jsx:233
 #: src/components/storage/iscsi/NodesPresenter.jsx:77
 msgid "Delete"
 msgstr ""
@@ -1493,7 +1477,18 @@ msgid ""
 "listed below. Choose how to do it."
 msgstr ""
 
-#. TRANSLATORS: header for a list of items
+#: src/components/storage/ProposalTransactionalInfo.jsx:46
+msgid "Transactional root file system"
+msgstr ""
+
+#: src/components/storage/ProposalTransactionalInfo.jsx:49
+#, c-format
+msgid ""
+"%s is an immutable system with atomic updates. It uses a read-only Btrfs "
+"file system updated via snapshots."
+msgstr ""
+
+#. TRANSLATORS: header for a list of items referring to size limits for file systems
 #: src/components/storage/ProposalVolumes.jsx:59
 msgid "These limits are affected by:"
 msgstr ""
@@ -1510,63 +1505,69 @@ msgstr ""
 msgid "Presence of other volumes (%s)"
 msgstr ""
 
+#. TRANSLATORS: list item, describes a factor that affects the computed size of a
+#. file system; eg. adjusting the size of the swap
+#: src/components/storage/ProposalVolumes.jsx:71
+msgid "The amount of RAM in the system"
+msgstr ""
+
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:129
+#: src/components/storage/ProposalVolumes.jsx:133
 msgid "Reset to defaults"
 msgstr ""
 
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:137
 #: src/components/storage/ProposalVolumes.jsx:141
+#: src/components/storage/ProposalVolumes.jsx:145
 msgid "Add file system"
 msgstr ""
 
 #. TRANSLATORS: minimum device size, %s is replaced by size string, e.g. "17.5 GiB"
-#: src/components/storage/ProposalVolumes.jsx:191
+#: src/components/storage/ProposalVolumes.jsx:195
 #, c-format
 msgid "At least %s"
 msgstr ""
 
 #. TRANSLATORS: device flag, the partition size is automatically computed
-#: src/components/storage/ProposalVolumes.jsx:197
+#: src/components/storage/ProposalVolumes.jsx:201
 msgid "auto"
 msgstr ""
 
 #. TRANSLATORS: the filesystem uses a logical volume (LVM)
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "logical volume"
 msgstr ""
 
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "partition"
 msgstr ""
 
 #. TRANSLATORS: filesystem flag, it uses an encryption
-#: src/components/storage/ProposalVolumes.jsx:216
+#: src/components/storage/ProposalVolumes.jsx:220
 msgid "encrypted"
 msgstr ""
 
 #. TRANSLATORS: filesystem flag, it allows creating snapshots
-#: src/components/storage/ProposalVolumes.jsx:218
+#: src/components/storage/ProposalVolumes.jsx:222
 msgid "with snapshots"
 msgstr ""
 
 #. TRANSLATORS: flag for transactional file system
-#: src/components/storage/ProposalVolumes.jsx:220
+#: src/components/storage/ProposalVolumes.jsx:224
 msgid "transactional"
 msgstr ""
 
-#: src/components/storage/ProposalVolumes.jsx:275
+#: src/components/storage/ProposalVolumes.jsx:279
 msgid "Edit file system"
 msgstr ""
 
-#: src/components/storage/ProposalVolumes.jsx:307
-#: src/components/storage/VolumeForm.jsx:726
-#: src/components/storage/VolumeForm.jsx:731
+#: src/components/storage/ProposalVolumes.jsx:311
+#: src/components/storage/VolumeForm.jsx:730
+#: src/components/storage/VolumeForm.jsx:735
 msgid "Mount point"
 msgstr ""
 
-#: src/components/storage/ProposalVolumes.jsx:345
+#: src/components/storage/ProposalVolumes.jsx:349
 msgid "Table with mount points"
 msgstr ""
 
@@ -1608,37 +1609,42 @@ msgstr ""
 msgid ", "
 msgstr ""
 
+#. TRANSLATORS: item which affects the final computed partition size
+#: src/components/storage/VolumeForm.jsx:315
+msgid "the amount of RAM in the system"
+msgstr ""
+
 #. TRANSLATORS: the %s is replaced by the items which affect the computed size
-#: src/components/storage/VolumeForm.jsx:314
+#: src/components/storage/VolumeForm.jsx:318
 #, c-format
 msgid "The final size depends on %s."
 msgstr ""
 
 #. TRANSLATORS: conjunction for merging two texts
-#: src/components/storage/VolumeForm.jsx:316
+#: src/components/storage/VolumeForm.jsx:320
 msgid " and "
 msgstr ""
 
 #. TRANSLATORS: the partition size is automatically computed
-#: src/components/storage/VolumeForm.jsx:321
+#: src/components/storage/VolumeForm.jsx:325
 msgid "Automatically calculated size according to the selected product."
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:341
+#: src/components/storage/VolumeForm.jsx:345
 msgid "Exact size for the file system."
 msgstr ""
 
 #. TRANSLATORS: requested partition size
-#: src/components/storage/VolumeForm.jsx:353
+#: src/components/storage/VolumeForm.jsx:357
 msgid "Exact size"
 msgstr ""
 
 #. TRANSLATORS: units selector (like KiB, MiB, GiB...)
-#: src/components/storage/VolumeForm.jsx:368
+#: src/components/storage/VolumeForm.jsx:372
 msgid "Size unit"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:396
+#: src/components/storage/VolumeForm.jsx:400
 msgid ""
 "Limits for the file system size. The final size will be a value between the "
 "given minimum and maximum. If no maximum is given then the file system will "
@@ -1646,57 +1652,57 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: the minimal partition size
-#: src/components/storage/VolumeForm.jsx:403
+#: src/components/storage/VolumeForm.jsx:407
 msgid "Minimum"
 msgstr ""
 
 #. TRANSLATORS: the minium partition size
-#: src/components/storage/VolumeForm.jsx:413
+#: src/components/storage/VolumeForm.jsx:417
 msgid "Minimum desired size"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:422
+#: src/components/storage/VolumeForm.jsx:426
 msgid "Unit for the minimum size"
 msgstr ""
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:433
+#: src/components/storage/VolumeForm.jsx:437
 msgid "Maximum"
 msgstr ""
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:444
+#: src/components/storage/VolumeForm.jsx:448
 msgid "Maximum desired size"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:452
+#: src/components/storage/VolumeForm.jsx:456
 msgid "Unit for the maximum size"
 msgstr ""
 
 #. TRANSLATORS: radio button label, fully automatically computed partition size, no user input
-#: src/components/storage/VolumeForm.jsx:469
+#: src/components/storage/VolumeForm.jsx:473
 msgid "Auto"
 msgstr ""
 
 #. TRANSLATORS: radio button label, exact partition size requested by user
-#: src/components/storage/VolumeForm.jsx:471
+#: src/components/storage/VolumeForm.jsx:475
 msgid "Fixed"
 msgstr ""
 
 #. TRANSLATORS: radio button label, automatically computed partition size within the user provided min and max limits
-#: src/components/storage/VolumeForm.jsx:473
+#: src/components/storage/VolumeForm.jsx:477
 msgid "Range"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:681
+#: src/components/storage/VolumeForm.jsx:685
 msgid "A size value is required"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:686
+#: src/components/storage/VolumeForm.jsx:690
 msgid "Minimum size is required"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:690
+#: src/components/storage/VolumeForm.jsx:694
 msgid "Maximum must be greater than minimum"
 msgstr ""
 
diff --git a/web/po/sv.po b/web/po/sv.po
index ccba7c776..1e185c1f4 100644
--- a/web/po/sv.po
+++ b/web/po/sv.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-03 02:07+0000\n"
-"PO-Revision-Date: 2024-02-29 07:42+0000\n"
+"POT-Creation-Date: 2024-03-14 02:05+0000\n"
+"PO-Revision-Date: 2024-03-13 13:42+0000\n"
 "Last-Translator: Luna  Jernberg <bittin@opensuse.org>\n"
 "Language-Team: Swedish <https://l10n.opensuse.org/projects/agama/agama-web/"
 "sv/>\n"
@@ -155,9 +155,9 @@ msgstr ""
 #: src/components/product/ProductPage.jsx:207
 #: src/components/storage/ProposalDeviceSection.jsx:169
 #: src/components/storage/ProposalDeviceSection.jsx:364
-#: src/components/storage/ProposalSettingsSection.jsx:275
-#: src/components/storage/ProposalVolumes.jsx:148
-#: src/components/storage/ProposalVolumes.jsx:283
+#: src/components/storage/ProposalSettingsSection.jsx:263
+#: src/components/storage/ProposalVolumes.jsx:152
+#: src/components/storage/ProposalVolumes.jsx:287
 #: src/components/storage/ZFCPPage.jsx:511
 msgid "Accept"
 msgstr "Acceptera"
@@ -308,8 +308,8 @@ msgstr "Bekräfta"
 
 #. TRANSLATORS: dropdown label
 #: src/components/core/RowActions.jsx:66
-#: src/components/storage/ProposalVolumes.jsx:119
-#: src/components/storage/ProposalVolumes.jsx:310
+#: src/components/storage/ProposalVolumes.jsx:123
+#: src/components/storage/ProposalVolumes.jsx:314
 msgid "Actions"
 msgstr "Åtgärder"
 
@@ -535,8 +535,8 @@ msgstr "Adresser"
 msgid "Addresses data list"
 msgstr "Adresser data lista"
 
-#. TRANSLATORS: input field for the iSCSI initiator name
 #. TRANSLATORS: table header
+#. TRANSLATORS: input field for the iSCSI initiator name
 #: src/components/network/ConnectionsTable.jsx:57
 #: src/components/network/ConnectionsTable.jsx:86
 #: src/components/storage/ZFCPPage.jsx:360
@@ -555,7 +555,7 @@ msgid "IP addresses"
 msgstr "IP adresser"
 
 #: src/components/network/ConnectionsTable.jsx:67
-#: src/components/storage/ProposalVolumes.jsx:234
+#: src/components/storage/ProposalVolumes.jsx:238
 #: src/components/storage/iscsi/InitiatorPresenter.jsx:49
 #: src/components/storage/iscsi/NodesPresenter.jsx:73
 #: src/components/users/FirstUser.jsx:208
@@ -757,8 +757,8 @@ msgstr "Ansluten"
 msgid "Disconnecting"
 msgstr "Kopplar från"
 
-#. TRANSLATORS: iSCSI connection status
 #. TRANSLATORS: Wifi network status
+#. TRANSLATORS: iSCSI connection status
 #: src/components/network/WifiNetworkListItem.jsx:50
 #: src/components/storage/iscsi/NodesPresenter.jsx:63
 msgid "Disconnected"
@@ -822,8 +822,8 @@ msgstr "Läser programvaruförråd"
 msgid "Refresh the repositories"
 msgstr "Uppdatera förråden"
 
-#. TRANSLATORS: page title
 #. TRANSLATORS: page section
+#. TRANSLATORS: page title
 #: src/components/overview/SoftwareSection.jsx:143
 #: src/components/software/SoftwarePage.jsx:81
 msgid "Software"
@@ -869,7 +869,7 @@ msgstr "Undersöker lagringsenheter"
 #. TRANSLATORS: page title
 #. TRANSLATORS: page section title
 #: src/components/overview/StorageSection.jsx:208
-#: src/components/storage/ProposalPage.jsx:239
+#: src/components/storage/ProposalPage.jsx:243
 msgid "Storage"
 msgstr "Lagring"
 
@@ -1286,7 +1286,7 @@ msgstr "iSCSI"
 #. TRANSLATORS: The word 'directly' is key here. For example, booting to the installer media and then choosing
 #. 'Boot from Hard Disk' from there will not work. Keep it sort (this is a hint in a form) but keep it clear.
 #. Do not translate 'abbr' and 'title', they are part of the HTML markup.
-#: src/components/storage/ProposalSettingsSection.jsx:89
+#: src/components/storage/ProposalSettingsSection.jsx:87
 msgid ""
 "The password will not be needed to boot and access the data if the <abbr "
 "title='Trusted Platform Module'>TPM</abbr> can verify the integrity of the "
@@ -1298,11 +1298,11 @@ msgstr ""
 "integritet. TPM-försegling kräver att det nya systemet startas upp direkt "
 "vid första körningen."
 
-#: src/components/storage/ProposalSettingsSection.jsx:107
+#: src/components/storage/ProposalSettingsSection.jsx:105
 msgid "Use the TPM to decrypt automatically on each boot"
 msgstr "Använd TPM för att dekryptera automatiskt vid varje uppstart"
 
-#: src/components/storage/ProposalSettingsSection.jsx:152
+#: src/components/storage/ProposalSettingsSection.jsx:148
 msgid ""
 "Uses Btrfs for the root file system allowing to boot to a previous version "
 "of the system after configuration changes or software upgrades."
@@ -1311,44 +1311,27 @@ msgstr ""
 "tidigare version av systemet före konfigurationsändringar eller "
 "programvaruuppgraderingar."
 
-#: src/components/storage/ProposalSettingsSection.jsx:159
+#: src/components/storage/ProposalSettingsSection.jsx:155
 msgid "Use Btrfs Snapshots"
 msgstr "Använd Btrfs ögonblicksavbilder"
 
-#: src/components/storage/ProposalSettingsSection.jsx:173
-msgid "Btrfs snapshots required by product."
-msgstr "Btrfs ögonblicksavbilder krävs för produkt."
-
-#: src/components/storage/ProposalSettingsSection.jsx:239
+#: src/components/storage/ProposalSettingsSection.jsx:227
 msgid "Change encryption settings"
 msgstr "Ändra krypteringsinställningar"
 
-#: src/components/storage/ProposalSettingsSection.jsx:244
-#: src/components/storage/ProposalSettingsSection.jsx:265
+#: src/components/storage/ProposalSettingsSection.jsx:232
+#: src/components/storage/ProposalSettingsSection.jsx:253
 msgid "Encryption settings"
 msgstr "Krypteringsinställningar"
 
-#: src/components/storage/ProposalSettingsSection.jsx:258
+#: src/components/storage/ProposalSettingsSection.jsx:246
 msgid "Use encryption"
 msgstr "Använd kryptering"
 
-#: src/components/storage/ProposalSettingsSection.jsx:325
+#: src/components/storage/ProposalSettingsSection.jsx:309
 msgid "Settings"
 msgstr "Inställningar"
 
-#: src/components/storage/ProposalSettingsSection.jsx:330
-#, fuzzy
-msgid "Transactional system"
-msgstr "transaktionell"
-
-#. TRANSLATORS: %s is replaced by a product name (e.g., openSUSE Tumbleweed)
-#: src/components/storage/ProposalSettingsSection.jsx:333
-#, c-format
-msgid ""
-"%s is an immutable system with atomic updates using a read-only Btrfs root "
-"file system."
-msgstr ""
-
 #: src/components/storage/ProposalSpacePolicySection.jsx:50
 msgid "Delete current content"
 msgstr "Radera nuvarande innehåll"
@@ -1397,13 +1380,13 @@ msgid "Current content"
 msgstr "Nuvarande innehåll"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:74
-#: src/components/storage/ProposalVolumes.jsx:309
-#: src/components/storage/VolumeForm.jsx:741
+#: src/components/storage/ProposalVolumes.jsx:313
+#: src/components/storage/VolumeForm.jsx:745
 msgid "Size"
 msgstr "Storlek"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:75
-#: src/components/storage/ProposalVolumes.jsx:308
+#: src/components/storage/ProposalVolumes.jsx:312
 msgid "Details"
 msgstr "Detaljer"
 
@@ -1462,7 +1445,7 @@ msgid "Space action selector for %s"
 msgstr "Platsåtgärdsväljare för %s"
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:224
-#: src/components/storage/ProposalVolumes.jsx:229
+#: src/components/storage/ProposalVolumes.jsx:233
 #: src/components/storage/iscsi/NodesPresenter.jsx:77
 msgid "Delete"
 msgstr "Ta bort"
@@ -1493,7 +1476,20 @@ msgstr ""
 "Att allokera filsystemen kan behöva hitta ledigt utrymme i enheterna som "
 "anges nedan. Välj hur du vill göra det."
 
-#. TRANSLATORS: header for a list of items
+#: src/components/storage/ProposalTransactionalInfo.jsx:46
+msgid "Transactional root file system"
+msgstr "Transaktionellt root filsystem"
+
+#: src/components/storage/ProposalTransactionalInfo.jsx:49
+#, c-format
+msgid ""
+"%s is an immutable system with atomic updates. It uses a read-only Btrfs "
+"file system updated via snapshots."
+msgstr ""
+"%s är ett oföränderligt system med atomära uppdateringar. Det använder ett "
+"skrivskyddat Btrfs filsystem som uppdateras via ögonblicksavbilder."
+
+#. TRANSLATORS: header for a list of items referring to size limits for file systems
 #: src/components/storage/ProposalVolumes.jsx:59
 msgid "These limits are affected by:"
 msgstr "Dessa gränser påverkas av:"
@@ -1510,63 +1506,69 @@ msgstr "Konfigurationen för ögonblicksavbilder"
 msgid "Presence of other volumes (%s)"
 msgstr "Närvaro av andra volymer (%s)"
 
+#. TRANSLATORS: list item, describes a factor that affects the computed size of a
+#. file system; eg. adjusting the size of the swap
+#: src/components/storage/ProposalVolumes.jsx:71
+msgid "The amount of RAM in the system"
+msgstr "Mängden RAM i systemet"
+
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:129
+#: src/components/storage/ProposalVolumes.jsx:133
 msgid "Reset to defaults"
 msgstr "Återställ till standard"
 
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:137
 #: src/components/storage/ProposalVolumes.jsx:141
+#: src/components/storage/ProposalVolumes.jsx:145
 msgid "Add file system"
 msgstr "Lägg till filsystem"
 
 #. TRANSLATORS: minimum device size, %s is replaced by size string, e.g. "17.5 GiB"
-#: src/components/storage/ProposalVolumes.jsx:191
+#: src/components/storage/ProposalVolumes.jsx:195
 #, c-format
 msgid "At least %s"
 msgstr "Åtminstone %s"
 
 #. TRANSLATORS: device flag, the partition size is automatically computed
-#: src/components/storage/ProposalVolumes.jsx:197
+#: src/components/storage/ProposalVolumes.jsx:201
 msgid "auto"
 msgstr "auto"
 
 #. TRANSLATORS: the filesystem uses a logical volume (LVM)
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "logical volume"
 msgstr "logisk volym"
 
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "partition"
 msgstr "partition"
 
 #. TRANSLATORS: filesystem flag, it uses an encryption
-#: src/components/storage/ProposalVolumes.jsx:216
+#: src/components/storage/ProposalVolumes.jsx:220
 msgid "encrypted"
 msgstr "krypterad"
 
 #. TRANSLATORS: filesystem flag, it allows creating snapshots
-#: src/components/storage/ProposalVolumes.jsx:218
+#: src/components/storage/ProposalVolumes.jsx:222
 msgid "with snapshots"
 msgstr "med ögonblicksavbilder"
 
 #. TRANSLATORS: flag for transactional file system
-#: src/components/storage/ProposalVolumes.jsx:220
+#: src/components/storage/ProposalVolumes.jsx:224
 msgid "transactional"
 msgstr "transaktionell"
 
-#: src/components/storage/ProposalVolumes.jsx:275
+#: src/components/storage/ProposalVolumes.jsx:279
 msgid "Edit file system"
 msgstr "Redigera filsystem"
 
-#: src/components/storage/ProposalVolumes.jsx:307
-#: src/components/storage/VolumeForm.jsx:726
-#: src/components/storage/VolumeForm.jsx:731
+#: src/components/storage/ProposalVolumes.jsx:311
+#: src/components/storage/VolumeForm.jsx:730
+#: src/components/storage/VolumeForm.jsx:735
 msgid "Mount point"
 msgstr "Monteringspunkt"
 
-#: src/components/storage/ProposalVolumes.jsx:345
+#: src/components/storage/ProposalVolumes.jsx:349
 msgid "Table with mount points"
 msgstr "Tabell med monteringspunkter"
 
@@ -1608,37 +1610,42 @@ msgstr "närvaron av filsystemet för %s"
 msgid ", "
 msgstr ", "
 
+#. TRANSLATORS: item which affects the final computed partition size
+#: src/components/storage/VolumeForm.jsx:315
+msgid "the amount of RAM in the system"
+msgstr "mängden RAM i systemet"
+
 #. TRANSLATORS: the %s is replaced by the items which affect the computed size
-#: src/components/storage/VolumeForm.jsx:314
+#: src/components/storage/VolumeForm.jsx:318
 #, c-format
 msgid "The final size depends on %s."
 msgstr "Den slutliga storleken beror på %s."
 
 #. TRANSLATORS: conjunction for merging two texts
-#: src/components/storage/VolumeForm.jsx:316
+#: src/components/storage/VolumeForm.jsx:320
 msgid " and "
 msgstr " och "
 
 #. TRANSLATORS: the partition size is automatically computed
-#: src/components/storage/VolumeForm.jsx:321
+#: src/components/storage/VolumeForm.jsx:325
 msgid "Automatically calculated size according to the selected product."
 msgstr "Automatiskt beräknad storlek enligt vald produkt."
 
-#: src/components/storage/VolumeForm.jsx:341
+#: src/components/storage/VolumeForm.jsx:345
 msgid "Exact size for the file system."
 msgstr "Exakt storlek för filsystemet."
 
 #. TRANSLATORS: requested partition size
-#: src/components/storage/VolumeForm.jsx:353
+#: src/components/storage/VolumeForm.jsx:357
 msgid "Exact size"
 msgstr "Exakt storlek"
 
 #. TRANSLATORS: units selector (like KiB, MiB, GiB...)
-#: src/components/storage/VolumeForm.jsx:368
+#: src/components/storage/VolumeForm.jsx:372
 msgid "Size unit"
 msgstr "Storleksenhet"
 
-#: src/components/storage/VolumeForm.jsx:396
+#: src/components/storage/VolumeForm.jsx:400
 msgid ""
 "Limits for the file system size. The final size will be a value between the "
 "given minimum and maximum. If no maximum is given then the file system will "
@@ -1649,57 +1656,57 @@ msgstr ""
 "filsystemet att vara så stort som möjligt."
 
 #. TRANSLATORS: the minimal partition size
-#: src/components/storage/VolumeForm.jsx:403
+#: src/components/storage/VolumeForm.jsx:407
 msgid "Minimum"
 msgstr "Minst"
 
 #. TRANSLATORS: the minium partition size
-#: src/components/storage/VolumeForm.jsx:413
+#: src/components/storage/VolumeForm.jsx:417
 msgid "Minimum desired size"
 msgstr "Minsta önskade storlek"
 
-#: src/components/storage/VolumeForm.jsx:422
+#: src/components/storage/VolumeForm.jsx:426
 msgid "Unit for the minimum size"
 msgstr "Enhet för minsta storlek"
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:433
+#: src/components/storage/VolumeForm.jsx:437
 msgid "Maximum"
 msgstr "Maximal"
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:444
+#: src/components/storage/VolumeForm.jsx:448
 msgid "Maximum desired size"
 msgstr "Maximal önskad storlek"
 
-#: src/components/storage/VolumeForm.jsx:452
+#: src/components/storage/VolumeForm.jsx:456
 msgid "Unit for the maximum size"
 msgstr "Enhet för maximal storlek"
 
 #. TRANSLATORS: radio button label, fully automatically computed partition size, no user input
-#: src/components/storage/VolumeForm.jsx:469
+#: src/components/storage/VolumeForm.jsx:473
 msgid "Auto"
 msgstr "Auto"
 
 #. TRANSLATORS: radio button label, exact partition size requested by user
-#: src/components/storage/VolumeForm.jsx:471
+#: src/components/storage/VolumeForm.jsx:475
 msgid "Fixed"
 msgstr "Fast"
 
 #. TRANSLATORS: radio button label, automatically computed partition size within the user provided min and max limits
-#: src/components/storage/VolumeForm.jsx:473
+#: src/components/storage/VolumeForm.jsx:477
 msgid "Range"
 msgstr "Räckvidd"
 
-#: src/components/storage/VolumeForm.jsx:681
+#: src/components/storage/VolumeForm.jsx:685
 msgid "A size value is required"
 msgstr "Ett storleksvärde krävs"
 
-#: src/components/storage/VolumeForm.jsx:686
+#: src/components/storage/VolumeForm.jsx:690
 msgid "Minimum size is required"
 msgstr "Minsta storlek krävs"
 
-#: src/components/storage/VolumeForm.jsx:690
+#: src/components/storage/VolumeForm.jsx:694
 msgid "Maximum must be greater than minimum"
 msgstr "Maximalt måste vara större än minimalt"
 
@@ -2075,12 +2082,12 @@ msgstr "Användarnamn"
 
 #: src/components/users/FirstUser.jsx:88
 msgid "Username suggestion dropdown"
-msgstr ""
+msgstr "Rullgardinsmeny för användarnamnsförslag"
 
 #. TRANSLATORS: dropdown username suggestions
 #: src/components/users/FirstUser.jsx:102
 msgid "Use suggested username"
-msgstr ""
+msgstr "Använd föreslaget användarnamn"
 
 #: src/components/users/FirstUser.jsx:212
 #: src/components/users/RootAuthMethods.jsx:99
@@ -2216,6 +2223,9 @@ msgstr "Användare"
 msgid "Root authentication"
 msgstr "Rootautentisering"
 
+#~ msgid "Btrfs snapshots required by product."
+#~ msgstr "Btrfs ögonblicksavbilder krävs för produkt."
+
 #~ msgid ""
 #~ "Allows rolling back any change done to the system and restoring its "
 #~ "previous state"
diff --git a/web/po/uk.po b/web/po/uk.po
index 7325ccf84..a1c3d0c55 100644
--- a/web/po/uk.po
+++ b/web/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-03 02:07+0000\n"
+"POT-Creation-Date: 2024-03-14 02:05+0000\n"
 "PO-Revision-Date: 2023-12-31 20:39+0000\n"
 "Last-Translator: Milachew <milachew@mail.lv>\n"
 "Language-Team: Ukrainian <https://l10n.opensuse.org/projects/agama/agama-web/"
@@ -145,9 +145,9 @@ msgstr ""
 #: src/components/product/ProductPage.jsx:207
 #: src/components/storage/ProposalDeviceSection.jsx:169
 #: src/components/storage/ProposalDeviceSection.jsx:364
-#: src/components/storage/ProposalSettingsSection.jsx:275
-#: src/components/storage/ProposalVolumes.jsx:148
-#: src/components/storage/ProposalVolumes.jsx:283
+#: src/components/storage/ProposalSettingsSection.jsx:263
+#: src/components/storage/ProposalVolumes.jsx:152
+#: src/components/storage/ProposalVolumes.jsx:287
 #: src/components/storage/ZFCPPage.jsx:511
 msgid "Accept"
 msgstr ""
@@ -288,8 +288,8 @@ msgstr ""
 
 #. TRANSLATORS: dropdown label
 #: src/components/core/RowActions.jsx:66
-#: src/components/storage/ProposalVolumes.jsx:119
-#: src/components/storage/ProposalVolumes.jsx:310
+#: src/components/storage/ProposalVolumes.jsx:123
+#: src/components/storage/ProposalVolumes.jsx:314
 msgid "Actions"
 msgstr ""
 
@@ -514,8 +514,8 @@ msgstr ""
 msgid "Addresses data list"
 msgstr ""
 
-#. TRANSLATORS: input field for the iSCSI initiator name
 #. TRANSLATORS: table header
+#. TRANSLATORS: input field for the iSCSI initiator name
 #: src/components/network/ConnectionsTable.jsx:57
 #: src/components/network/ConnectionsTable.jsx:86
 #: src/components/storage/ZFCPPage.jsx:360
@@ -534,7 +534,7 @@ msgid "IP addresses"
 msgstr ""
 
 #: src/components/network/ConnectionsTable.jsx:67
-#: src/components/storage/ProposalVolumes.jsx:234
+#: src/components/storage/ProposalVolumes.jsx:238
 #: src/components/storage/iscsi/InitiatorPresenter.jsx:49
 #: src/components/storage/iscsi/NodesPresenter.jsx:73
 #: src/components/users/FirstUser.jsx:208
@@ -733,8 +733,8 @@ msgstr ""
 msgid "Disconnecting"
 msgstr ""
 
-#. TRANSLATORS: iSCSI connection status
 #. TRANSLATORS: Wifi network status
+#. TRANSLATORS: iSCSI connection status
 #: src/components/network/WifiNetworkListItem.jsx:50
 #: src/components/storage/iscsi/NodesPresenter.jsx:63
 msgid "Disconnected"
@@ -799,8 +799,8 @@ msgstr ""
 msgid "Refresh the repositories"
 msgstr ""
 
-#. TRANSLATORS: page title
 #. TRANSLATORS: page section
+#. TRANSLATORS: page title
 #: src/components/overview/SoftwareSection.jsx:143
 #: src/components/software/SoftwarePage.jsx:81
 msgid "Software"
@@ -846,7 +846,7 @@ msgstr ""
 #. TRANSLATORS: page title
 #. TRANSLATORS: page section title
 #: src/components/overview/StorageSection.jsx:208
-#: src/components/storage/ProposalPage.jsx:239
+#: src/components/storage/ProposalPage.jsx:243
 msgid "Storage"
 msgstr ""
 
@@ -1258,7 +1258,7 @@ msgstr ""
 #. TRANSLATORS: The word 'directly' is key here. For example, booting to the installer media and then choosing
 #. 'Boot from Hard Disk' from there will not work. Keep it sort (this is a hint in a form) but keep it clear.
 #. Do not translate 'abbr' and 'title', they are part of the HTML markup.
-#: src/components/storage/ProposalSettingsSection.jsx:89
+#: src/components/storage/ProposalSettingsSection.jsx:87
 msgid ""
 "The password will not be needed to boot and access the data if the <abbr "
 "title='Trusted Platform Module'>TPM</abbr> can verify the integrity of the "
@@ -1266,53 +1266,37 @@ msgid ""
 "first run."
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:107
+#: src/components/storage/ProposalSettingsSection.jsx:105
 msgid "Use the TPM to decrypt automatically on each boot"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:152
+#: src/components/storage/ProposalSettingsSection.jsx:148
 msgid ""
 "Uses Btrfs for the root file system allowing to boot to a previous version "
 "of the system after configuration changes or software upgrades."
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:159
+#: src/components/storage/ProposalSettingsSection.jsx:155
 msgid "Use Btrfs Snapshots"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:173
-msgid "Btrfs snapshots required by product."
-msgstr ""
-
-#: src/components/storage/ProposalSettingsSection.jsx:239
+#: src/components/storage/ProposalSettingsSection.jsx:227
 msgid "Change encryption settings"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:244
-#: src/components/storage/ProposalSettingsSection.jsx:265
+#: src/components/storage/ProposalSettingsSection.jsx:232
+#: src/components/storage/ProposalSettingsSection.jsx:253
 msgid "Encryption settings"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:258
+#: src/components/storage/ProposalSettingsSection.jsx:246
 msgid "Use encryption"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:325
+#: src/components/storage/ProposalSettingsSection.jsx:309
 msgid "Settings"
 msgstr ""
 
-#: src/components/storage/ProposalSettingsSection.jsx:330
-msgid "Transactional system"
-msgstr ""
-
-#. TRANSLATORS: %s is replaced by a product name (e.g., openSUSE Tumbleweed)
-#: src/components/storage/ProposalSettingsSection.jsx:333
-#, c-format
-msgid ""
-"%s is an immutable system with atomic updates using a read-only Btrfs root "
-"file system."
-msgstr ""
-
 #: src/components/storage/ProposalSpacePolicySection.jsx:50
 msgid "Delete current content"
 msgstr ""
@@ -1355,13 +1339,13 @@ msgid "Current content"
 msgstr ""
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:74
-#: src/components/storage/ProposalVolumes.jsx:309
-#: src/components/storage/VolumeForm.jsx:741
+#: src/components/storage/ProposalVolumes.jsx:313
+#: src/components/storage/VolumeForm.jsx:745
 msgid "Size"
 msgstr ""
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:75
-#: src/components/storage/ProposalVolumes.jsx:308
+#: src/components/storage/ProposalVolumes.jsx:312
 msgid "Details"
 msgstr ""
 
@@ -1420,7 +1404,7 @@ msgid "Space action selector for %s"
 msgstr ""
 
 #: src/components/storage/ProposalSpacePolicySection.jsx:224
-#: src/components/storage/ProposalVolumes.jsx:229
+#: src/components/storage/ProposalVolumes.jsx:233
 #: src/components/storage/iscsi/NodesPresenter.jsx:77
 msgid "Delete"
 msgstr ""
@@ -1449,7 +1433,18 @@ msgid ""
 "listed below. Choose how to do it."
 msgstr ""
 
-#. TRANSLATORS: header for a list of items
+#: src/components/storage/ProposalTransactionalInfo.jsx:46
+msgid "Transactional root file system"
+msgstr ""
+
+#: src/components/storage/ProposalTransactionalInfo.jsx:49
+#, c-format
+msgid ""
+"%s is an immutable system with atomic updates. It uses a read-only Btrfs "
+"file system updated via snapshots."
+msgstr ""
+
+#. TRANSLATORS: header for a list of items referring to size limits for file systems
 #: src/components/storage/ProposalVolumes.jsx:59
 msgid "These limits are affected by:"
 msgstr ""
@@ -1466,63 +1461,69 @@ msgstr ""
 msgid "Presence of other volumes (%s)"
 msgstr ""
 
+#. TRANSLATORS: list item, describes a factor that affects the computed size of a
+#. file system; eg. adjusting the size of the swap
+#: src/components/storage/ProposalVolumes.jsx:71
+msgid "The amount of RAM in the system"
+msgstr ""
+
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:129
+#: src/components/storage/ProposalVolumes.jsx:133
 msgid "Reset to defaults"
 msgstr ""
 
 #. TRANSLATORS: dropdown menu label
-#: src/components/storage/ProposalVolumes.jsx:137
 #: src/components/storage/ProposalVolumes.jsx:141
+#: src/components/storage/ProposalVolumes.jsx:145
 msgid "Add file system"
 msgstr ""
 
 #. TRANSLATORS: minimum device size, %s is replaced by size string, e.g. "17.5 GiB"
-#: src/components/storage/ProposalVolumes.jsx:191
+#: src/components/storage/ProposalVolumes.jsx:195
 #, c-format
 msgid "At least %s"
 msgstr ""
 
 #. TRANSLATORS: device flag, the partition size is automatically computed
-#: src/components/storage/ProposalVolumes.jsx:197
+#: src/components/storage/ProposalVolumes.jsx:201
 msgid "auto"
 msgstr ""
 
 #. TRANSLATORS: the filesystem uses a logical volume (LVM)
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "logical volume"
 msgstr ""
 
-#: src/components/storage/ProposalVolumes.jsx:207
+#: src/components/storage/ProposalVolumes.jsx:211
 msgid "partition"
 msgstr ""
 
 #. TRANSLATORS: filesystem flag, it uses an encryption
-#: src/components/storage/ProposalVolumes.jsx:216
+#: src/components/storage/ProposalVolumes.jsx:220
 msgid "encrypted"
 msgstr ""
 
 #. TRANSLATORS: filesystem flag, it allows creating snapshots
-#: src/components/storage/ProposalVolumes.jsx:218
+#: src/components/storage/ProposalVolumes.jsx:222
 msgid "with snapshots"
 msgstr ""
 
 #. TRANSLATORS: flag for transactional file system
-#: src/components/storage/ProposalVolumes.jsx:220
+#: src/components/storage/ProposalVolumes.jsx:224
 msgid "transactional"
 msgstr ""
 
-#: src/components/storage/ProposalVolumes.jsx:275
+#: src/components/storage/ProposalVolumes.jsx:279
 msgid "Edit file system"
 msgstr ""
 
-#: src/components/storage/ProposalVolumes.jsx:307
-#: src/components/storage/VolumeForm.jsx:726
-#: src/components/storage/VolumeForm.jsx:731
+#: src/components/storage/ProposalVolumes.jsx:311
+#: src/components/storage/VolumeForm.jsx:730
+#: src/components/storage/VolumeForm.jsx:735
 msgid "Mount point"
 msgstr ""
 
-#: src/components/storage/ProposalVolumes.jsx:345
+#: src/components/storage/ProposalVolumes.jsx:349
 msgid "Table with mount points"
 msgstr ""
 
@@ -1563,37 +1564,42 @@ msgstr ""
 msgid ", "
 msgstr ""
 
+#. TRANSLATORS: item which affects the final computed partition size
+#: src/components/storage/VolumeForm.jsx:315
+msgid "the amount of RAM in the system"
+msgstr ""
+
 #. TRANSLATORS: the %s is replaced by the items which affect the computed size
-#: src/components/storage/VolumeForm.jsx:314
+#: src/components/storage/VolumeForm.jsx:318
 #, c-format
 msgid "The final size depends on %s."
 msgstr ""
 
 #. TRANSLATORS: conjunction for merging two texts
-#: src/components/storage/VolumeForm.jsx:316
+#: src/components/storage/VolumeForm.jsx:320
 msgid " and "
 msgstr ""
 
 #. TRANSLATORS: the partition size is automatically computed
-#: src/components/storage/VolumeForm.jsx:321
+#: src/components/storage/VolumeForm.jsx:325
 msgid "Automatically calculated size according to the selected product."
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:341
+#: src/components/storage/VolumeForm.jsx:345
 msgid "Exact size for the file system."
 msgstr ""
 
 #. TRANSLATORS: requested partition size
-#: src/components/storage/VolumeForm.jsx:353
+#: src/components/storage/VolumeForm.jsx:357
 msgid "Exact size"
 msgstr ""
 
 #. TRANSLATORS: units selector (like KiB, MiB, GiB...)
-#: src/components/storage/VolumeForm.jsx:368
+#: src/components/storage/VolumeForm.jsx:372
 msgid "Size unit"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:396
+#: src/components/storage/VolumeForm.jsx:400
 msgid ""
 "Limits for the file system size. The final size will be a value between the "
 "given minimum and maximum. If no maximum is given then the file system will "
@@ -1601,57 +1607,57 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: the minimal partition size
-#: src/components/storage/VolumeForm.jsx:403
+#: src/components/storage/VolumeForm.jsx:407
 msgid "Minimum"
 msgstr ""
 
 #. TRANSLATORS: the minium partition size
-#: src/components/storage/VolumeForm.jsx:413
+#: src/components/storage/VolumeForm.jsx:417
 msgid "Minimum desired size"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:422
+#: src/components/storage/VolumeForm.jsx:426
 msgid "Unit for the minimum size"
 msgstr ""
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:433
+#: src/components/storage/VolumeForm.jsx:437
 msgid "Maximum"
 msgstr ""
 
 #. TRANSLATORS: the maximum partition size
-#: src/components/storage/VolumeForm.jsx:444
+#: src/components/storage/VolumeForm.jsx:448
 msgid "Maximum desired size"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:452
+#: src/components/storage/VolumeForm.jsx:456
 msgid "Unit for the maximum size"
 msgstr ""
 
 #. TRANSLATORS: radio button label, fully automatically computed partition size, no user input
-#: src/components/storage/VolumeForm.jsx:469
+#: src/components/storage/VolumeForm.jsx:473
 msgid "Auto"
 msgstr ""
 
 #. TRANSLATORS: radio button label, exact partition size requested by user
-#: src/components/storage/VolumeForm.jsx:471
+#: src/components/storage/VolumeForm.jsx:475
 msgid "Fixed"
 msgstr ""
 
 #. TRANSLATORS: radio button label, automatically computed partition size within the user provided min and max limits
-#: src/components/storage/VolumeForm.jsx:473
+#: src/components/storage/VolumeForm.jsx:477
 msgid "Range"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:681
+#: src/components/storage/VolumeForm.jsx:685
 msgid "A size value is required"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:686
+#: src/components/storage/VolumeForm.jsx:690
 msgid "Minimum size is required"
 msgstr ""
 
-#: src/components/storage/VolumeForm.jsx:690
+#: src/components/storage/VolumeForm.jsx:694
 msgid "Maximum must be greater than minimum"
 msgstr ""
 
diff --git a/web/po/zh_Hans.po b/web/po/zh_Hans.po
new file mode 100644
index 000000000..6dc8cbc6e
--- /dev/null
+++ b/web/po/zh_Hans.po
@@ -0,0 +1,2174 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-03-14 02:05+0000\n"
+"PO-Revision-Date: 2024-03-04 15:43+0000\n"
+"Last-Translator: Monstorix <monstorix@outlook.com>\n"
+"Language-Team: Chinese (Simplified) <https://l10n.opensuse.org/projects/"
+"agama/agama-web/zh_Hans/>\n"
+"Language: zh_Hans\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.9.1\n"
+
+#. TRANSLATORS: error message, %s is replaced by the server URL
+#: src/DevServerWrapper.jsx:82
+#, c-format
+msgid "The server at %s is not reachable."
+msgstr "无法访问位于 %s 上的服务器。"
+
+#. TRANSLATORS: error message
+#: src/DevServerWrapper.jsx:88
+msgid "Cannot connect to the Cockpit server"
+msgstr "无法连接到 Cockpit 服务器"
+
+#. TRANSLATORS: button label
+#: src/DevServerWrapper.jsx:104
+msgid "Try Again"
+msgstr "再试一次"
+
+#: src/components/core/About.jsx:43 src/components/core/About.jsx:48
+msgid "About Agama"
+msgstr "关于 Agama"
+
+#. TRANSLATORS: content of the "About" popup (1/2)
+#: src/components/core/About.jsx:53
+msgid ""
+"Agama is an experimental installer for (open)SUSE systems. It is still under "
+"development so, please, do not use it in production environments. If you "
+"want to give it a try, we recommend using a virtual machine to prevent any "
+"possible data loss."
+msgstr ""
+"Agama 是（open）SUSE 系统的实验性安装程序。其仍处于开发阶段，因此请勿将其用于"
+"生产环境。如果您想试用，建议使用虚拟机以防止任何可能的数据丢失。"
+
+#. TRANSLATORS: content of the "About" popup (2/2)
+#. %s is replaced by the project URL
+#: src/components/core/About.jsx:65
+#, c-format
+msgid "For more information, please visit the project's repository at %s."
+msgstr "若想了解更多信息，请从 %s 访问项目仓库。"
+
+#. TRANSLATORS: button label
+#: src/components/core/About.jsx:71 src/components/core/FileViewer.jsx:80
+#: src/components/core/IssuesDialog.jsx:119 src/components/core/Sidebar.jsx:157
+#: src/components/core/Terminal.jsx:48
+#: src/components/network/WifiSelector.jsx:151
+#: src/components/product/ProductPage.jsx:239
+msgid "Close"
+msgstr "关闭"
+
+#. TRANSLATORS: page title
+#: src/components/core/DBusError.jsx:34
+msgid "D-Bus Error"
+msgstr "D-Bus 错误"
+
+#: src/components/core/DBusError.jsx:38
+msgid "Cannot connect to D-Bus"
+msgstr "无法连接到 D-Bus"
+
+#: src/components/core/DBusError.jsx:43
+msgid ""
+"Could not connect to the D-Bus service. Please, check whether it is running."
+msgstr "无法连接到 D-Bus 服务，请检查它是否在运行。"
+
+#. TRANSLATORS: button label
+#: src/components/core/DBusError.jsx:51
+msgid "Reload"
+msgstr "重载"
+
+#: src/components/core/DevelopmentInfo.jsx:55
+msgid "Cockpit server"
+msgstr "Cockpit 服务器"
+
+#: src/components/core/FileViewer.jsx:65
+msgid "Reading file..."
+msgstr "正在读取文件……"
+
+#: src/components/core/FileViewer.jsx:71
+msgid "Cannot read the file"
+msgstr "无法读取文件"
+
+#: src/components/core/InstallButton.jsx:37
+msgid ""
+"There are some reported issues. Please review them in the previous steps "
+"before proceeding with the installation."
+msgstr "此处存在一些已报告的错误。请在继续安装前回顾之前步骤中的内容。"
+
+#: src/components/core/InstallButton.jsx:49
+msgid "Confirm Installation"
+msgstr "确认安装"
+
+#: src/components/core/InstallButton.jsx:55
+msgid ""
+"If you continue, partitions on your hard disk will be modified according to "
+"the provided installation settings."
+msgstr "如果继续，硬盘上的分区将会根据已提供的安装设置进行修改。"
+
+#: src/components/core/InstallButton.jsx:59
+msgid "Please, cancel and check the settings if you are unsure."
+msgstr "如果不确定任何事项，请务必取消并检查已进行的设置。"
+
+#. TRANSLATORS: button label
+#: src/components/core/InstallButton.jsx:65 src/components/core/Popup.jsx:128
+#: src/components/network/WifiConnectionForm.jsx:136
+msgid "Cancel"
+msgstr "取消"
+
+#. TRANSLATORS: button label
+#: src/components/core/InstallButton.jsx:69
+msgid "Continue"
+msgstr "继续"
+
+#: src/components/core/InstallButton.jsx:78
+msgid "Problems Found"
+msgstr "已发现问题"
+
+#: src/components/core/InstallButton.jsx:82
+msgid ""
+"Some problems were found when trying to start the installation. Please, have "
+"a look to the reported errors and try again."
+msgstr "尝试开始安装时发现问题。请查看已报告的错误后重试。"
+
+#. TRANSLATORS: button label
+#: src/components/core/InstallButton.jsx:89 src/components/l10n/L10nPage.jsx:75
+#: src/components/l10n/L10nPage.jsx:191 src/components/l10n/L10nPage.jsx:304
+#: src/components/product/ProductPage.jsx:71
+#: src/components/product/ProductPage.jsx:140
+#: src/components/product/ProductPage.jsx:207
+#: src/components/storage/ProposalDeviceSection.jsx:169
+#: src/components/storage/ProposalDeviceSection.jsx:364
+#: src/components/storage/ProposalSettingsSection.jsx:263
+#: src/components/storage/ProposalVolumes.jsx:152
+#: src/components/storage/ProposalVolumes.jsx:287
+#: src/components/storage/ZFCPPage.jsx:511
+msgid "Accept"
+msgstr "接受"
+
+#. TRANSLATORS: button label
+#: src/components/core/InstallButton.jsx:140
+msgid "Install"
+msgstr "安装"
+
+#: src/components/core/InstallationFinished.jsx:41
+msgid "TPM sealing requires the new system to be booted directly."
+msgstr "TPM 密封过程要求新系统直接启动。"
+
+#: src/components/core/InstallationFinished.jsx:46
+msgid ""
+"If a local media was used to run this installer, remove it before the next "
+"boot."
+msgstr "如果运行此次安装时使用了本地介质，请在下次启动前移除。"
+
+#: src/components/core/InstallationFinished.jsx:50
+msgid "Hide details"
+msgstr "隐藏细节"
+
+#: src/components/core/InstallationFinished.jsx:50
+msgid "See more details"
+msgstr "查看更多细节"
+
+#. TRANSLATORS: Do not translate 'abbr' and 'title', they are part of the HTML markup
+#: src/components/core/InstallationFinished.jsx:55
+msgid ""
+"The final step to configure the <abbr title='Trusted Platform Module'>TPM</"
+"abbr> to automatically open encrypted devices will take place during the "
+"first boot of the new system. For that to work, the machine needs to boot "
+"directly to the new boot loader."
+msgstr ""
+"配置 <abbr title='Trusted Platform Module'>TPM</abbr> 自动开启加密设备的最后"
+"一步将在新系统首次启动时进行。为此，本机需要直接启动到新的引导加载程序。"
+
+#. TRANSLATORS: page title
+#: src/components/core/InstallationFinished.jsx:88
+msgid "Installation Finished"
+msgstr "安装完毕"
+
+#: src/components/core/InstallationFinished.jsx:91
+msgid "Congratulations!"
+msgstr "恭喜！"
+
+#: src/components/core/InstallationFinished.jsx:96
+msgid "The installation on your machine is complete."
+msgstr "在您机器上的安装过程已完成。"
+
+#: src/components/core/InstallationFinished.jsx:100
+msgid "At this point you can power off the machine."
+msgstr "现在您可以关闭机器电源了。"
+
+#: src/components/core/InstallationFinished.jsx:101
+msgid "At this point you can reboot the machine to log in to the new system."
+msgstr "现在您可以重启机器并登录到新系统。"
+
+#: src/components/core/InstallationFinished.jsx:113
+msgid "Finish"
+msgstr "完成"
+
+#: src/components/core/InstallationFinished.jsx:113
+msgid "Reboot"
+msgstr "重启"
+
+#: src/components/core/InstallationProgress.jsx:32
+msgid "Installing"
+msgstr "正在安装"
+
+#. TRANSLATORS: search field placeholder text
+#: src/components/core/ListSearch.jsx:50
+#: src/components/software/PatternSelector.jsx:215
+#: src/components/software/PatternSelector.jsx:216
+msgid "Search"
+msgstr "搜索"
+
+#: src/components/core/LogsButton.jsx:98
+msgid "Collecting logs..."
+msgstr "正在收集日志……"
+
+#: src/components/core/LogsButton.jsx:98
+msgid "Download logs"
+msgstr "下载日志"
+
+#: src/components/core/LogsButton.jsx:106
+msgid ""
+"The browser will run the logs download as soon as they are ready. Please, be "
+"patient."
+msgstr "浏览器将会在日志收集完毕后启动下载过程，请耐心等待。"
+
+#: src/components/core/LogsButton.jsx:114
+msgid "Something went wrong while collecting logs. Please, try again."
+msgstr "收集日志时出现问题，请重试。"
+
+#: src/components/core/Page.jsx:93 src/components/users/UsersPage.jsx:30
+msgid "Back"
+msgstr "返回"
+
+#: src/components/core/Page.jsx:201
+msgid "Show global options"
+msgstr "显示全局选项"
+
+#: src/components/core/Page.jsx:215
+msgid "Page Actions"
+msgstr "页面操作"
+
+#: src/components/core/PasswordAndConfirmationInput.jsx:35
+msgid "Passwords do not match"
+msgstr "密码不匹配"
+
+#: src/components/core/PasswordAndConfirmationInput.jsx:56
+#: src/components/network/WifiConnectionForm.jsx:125
+#: src/components/storage/iscsi/AuthFields.jsx:95
+#: src/components/storage/iscsi/AuthFields.jsx:100
+#: src/components/users/RootAuthMethods.jsx:163
+msgid "Password"
+msgstr "密码"
+
+#: src/components/core/PasswordAndConfirmationInput.jsx:60
+msgid "User password"
+msgstr "用户密码"
+
+#: src/components/core/PasswordAndConfirmationInput.jsx:69
+msgid "Password confirmation"
+msgstr "确认密码"
+
+#: src/components/core/PasswordAndConfirmationInput.jsx:74
+msgid "User password confirmation"
+msgstr "用户确认密码"
+
+#: src/components/core/PasswordInput.jsx:59
+msgid "Password visibility button"
+msgstr "密码可见性按钮"
+
+#: src/components/core/Popup.jsx:90
+msgid "Confirm"
+msgstr "确认"
+
+#. TRANSLATORS: dropdown label
+#: src/components/core/RowActions.jsx:66
+#: src/components/storage/ProposalVolumes.jsx:123
+#: src/components/storage/ProposalVolumes.jsx:314
+msgid "Actions"
+msgstr "操作"
+
+#: src/components/core/SectionSkeleton.jsx:29
+msgid "Waiting"
+msgstr "正在等候"
+
+#. TRANSLATORS: button label
+#: src/components/core/ShowLogButton.jsx:47
+msgid "Show Logs"
+msgstr "显示日志"
+
+#. TRANSLATORS: popup dialog title
+#: src/components/core/ShowLogButton.jsx:53
+msgid "YaST Logs"
+msgstr "YaST 日志"
+
+#. TRANSLATORS: button label
+#: src/components/core/ShowTerminalButton.jsx:48
+msgid "Open Terminal"
+msgstr "打开终端"
+
+#. TRANSLATORS: sidebar header
+#: src/components/core/Sidebar.jsx:113 src/components/core/Sidebar.jsx:121
+msgid "Installer Options"
+msgstr "安装程序选项"
+
+#: src/components/core/Sidebar.jsx:128
+msgid "Hide installer options"
+msgstr "隐藏安装程序选项"
+
+#: src/components/core/Sidebar.jsx:136
+msgid "Diagnostic tools"
+msgstr "诊断工具"
+
+#. TRANSLATORS: Titles used for the popup displaying found section issues
+#: src/components/core/ValidationErrors.jsx:53
+msgid "Software issues"
+msgstr "软件问题"
+
+#: src/components/core/ValidationErrors.jsx:54
+msgid "Product issues"
+msgstr "产品问题"
+
+#: src/components/core/ValidationErrors.jsx:55
+msgid "Storage issues"
+msgstr "存储问题"
+
+#: src/components/core/ValidationErrors.jsx:57
+msgid "Found Issues"
+msgstr "发现问题"
+
+#. TRANSLATORS: %d is replaced with the number of errors found
+#: src/components/core/ValidationErrors.jsx:77
+#, c-format
+msgid "%d error found"
+msgid_plural "%d errors found"
+msgstr[0] "已发现 %d 个错误"
+
+#. TRANSLATORS: label for keyboard layout selection
+#: src/components/l10n/InstallerKeymapSwitcher.jsx:53
+#: src/components/l10n/L10nPage.jsx:357
+msgid "Keyboard"
+msgstr "键盘"
+
+#. TRANSLATORS: label for keyboard layout selection
+#: src/components/l10n/InstallerKeymapSwitcher.jsx:61
+msgid "keyboard"
+msgstr "键盘"
+
+#. TRANSLATORS:
+#: src/components/l10n/InstallerKeymapSwitcher.jsx:70
+msgid "Keyboard layout cannot be changed in remote installation"
+msgstr "无法在远程安装中更改键盘布局"
+
+#. TRANSLATORS: help text for the language selector in the sidebar,
+#. %s will be replaced by the "Localization" page link
+#: src/components/l10n/InstallerLocaleSwitcher.jsx:47
+#, c-format
+msgid ""
+"The language used by the installer. The language for the installed system "
+"can be set in the %s page."
+msgstr "安装程序所使用的语言。可在 %s 页面设置已安装系统的语言。"
+
+#. TRANSLATORS: page section
+#. TRANSLATORS: page title
+#: src/components/l10n/InstallerLocaleSwitcher.jsx:56
+#: src/components/l10n/L10nPage.jsx:384
+#: src/components/overview/L10nSection.jsx:52
+msgid "Localization"
+msgstr "本地化"
+
+#: src/components/l10n/InstallerLocaleSwitcher.jsx:66
+#: src/components/l10n/L10nPage.jsx:246
+msgid "Language"
+msgstr "语言"
+
+#: src/components/l10n/InstallerLocaleSwitcher.jsx:74
+msgid "language"
+msgstr "语言"
+
+#. TRANSLATORS: placeholder text for search input in the keyboard selector.
+#: src/components/l10n/KeymapSelector.jsx:53
+msgid "Filter by description or keymap code"
+msgstr "按描述或键盘映射代码过滤"
+
+#: src/components/l10n/KeymapSelector.jsx:64
+msgid "Available keymaps"
+msgstr "可用的键盘映射"
+
+#: src/components/l10n/L10nPage.jsx:66 src/components/l10n/L10nPage.jsx:140
+msgid "Select time zone"
+msgstr "选择时区"
+
+#: src/components/l10n/L10nPage.jsx:67
+#, c-format
+msgid "%s will use the selected time zone."
+msgstr "%s 将使用已选择的时区。"
+
+#: src/components/l10n/L10nPage.jsx:128
+msgid "Time zone"
+msgstr "时区"
+
+#: src/components/l10n/L10nPage.jsx:134
+msgid "Change time zone"
+msgstr "更改时区"
+
+#: src/components/l10n/L10nPage.jsx:139
+msgid "Time zone not selected yet"
+msgstr "尚未选择时区"
+
+#: src/components/l10n/L10nPage.jsx:182 src/components/l10n/L10nPage.jsx:258
+msgid "Select language"
+msgstr "选择语言"
+
+#: src/components/l10n/L10nPage.jsx:183
+#, c-format
+msgid "%s will use the selected language."
+msgstr "%s 将会使用已选择的语言。"
+
+#: src/components/l10n/L10nPage.jsx:252
+msgid "Change language"
+msgstr "更改语言"
+
+#: src/components/l10n/L10nPage.jsx:257
+msgid "Language not selected yet"
+msgstr "尚未选择语言"
+
+#: src/components/l10n/L10nPage.jsx:295 src/components/l10n/L10nPage.jsx:369
+msgid "Select keyboard"
+msgstr "选择键盘"
+
+#: src/components/l10n/L10nPage.jsx:296
+#, c-format
+msgid "%s will use the selected keyboard."
+msgstr "%s 将会使用已选择的键盘。"
+
+#: src/components/l10n/L10nPage.jsx:363
+msgid "Change keyboard"
+msgstr "更改键盘"
+
+#: src/components/l10n/L10nPage.jsx:368
+msgid "Keyboard not selected yet"
+msgstr "尚未选择键盘"
+
+#: src/components/l10n/LocaleSelector.jsx:53
+msgid "Filter by language, territory or locale code"
+msgstr "按语言、地区或区域设定代码过滤"
+
+#: src/components/l10n/LocaleSelector.jsx:64
+msgid "Available locales"
+msgstr "可用区域设定"
+
+#. TRANSLATORS: placeholder text for search input in the timezone selector.
+#: src/components/l10n/TimezoneSelector.jsx:75
+msgid "Filter by territory, time zone code or UTC offset"
+msgstr "按地区、时区代码或 UTC 偏移量过滤"
+
+#: src/components/l10n/TimezoneSelector.jsx:86
+msgid "Available time zones"
+msgstr "可用时区"
+
+#: src/components/layout/Loading.jsx:30
+msgid "Loading installation environment, please wait."
+msgstr "正在载入安装环境，请稍候。"
+
+#. TRANSLATORS: button label
+#: src/components/network/AddressesDataList.jsx:81
+#: src/components/network/DnsDataList.jsx:87
+msgid "Remove"
+msgstr "移除"
+
+#. TRANSLATORS: input field name
+#: src/components/network/AddressesDataList.jsx:93
+#: src/components/network/AddressesDataList.jsx:94
+#: src/components/network/IpAddressInput.jsx:33
+msgid "IP Address"
+msgstr "IP 地址"
+
+#. TRANSLATORS: input field name
+#: src/components/network/AddressesDataList.jsx:102
+#: src/components/network/AddressesDataList.jsx:103
+msgid "Prefix length or netmask"
+msgstr "前缀长度或掩码"
+
+#: src/components/network/AddressesDataList.jsx:119
+msgid "Add an address"
+msgstr "添加地址"
+
+#. TRANSLATORS: button label
+#: src/components/network/AddressesDataList.jsx:119
+msgid "Add another address"
+msgstr "添加另一个地址"
+
+#: src/components/network/AddressesDataList.jsx:124
+msgid "Addresses"
+msgstr "地址"
+
+#: src/components/network/AddressesDataList.jsx:129
+msgid "Addresses data list"
+msgstr "地址数据列表"
+
+#. TRANSLATORS: table header
+#. TRANSLATORS: input field for the iSCSI initiator name
+#: src/components/network/ConnectionsTable.jsx:57
+#: src/components/network/ConnectionsTable.jsx:86
+#: src/components/storage/ZFCPPage.jsx:360
+#: src/components/storage/iscsi/InitiatorForm.jsx:52
+#: src/components/storage/iscsi/InitiatorPresenter.jsx:68
+#: src/components/storage/iscsi/InitiatorPresenter.jsx:85
+#: src/components/storage/iscsi/NodesPresenter.jsx:100
+#: src/components/storage/iscsi/NodesPresenter.jsx:121
+msgid "Name"
+msgstr "名称"
+
+#. TRANSLATORS: table header
+#: src/components/network/ConnectionsTable.jsx:59
+#: src/components/network/ConnectionsTable.jsx:87
+msgid "IP addresses"
+msgstr "IP 地址"
+
+#: src/components/network/ConnectionsTable.jsx:67
+#: src/components/storage/ProposalVolumes.jsx:238
+#: src/components/storage/iscsi/InitiatorPresenter.jsx:49
+#: src/components/storage/iscsi/NodesPresenter.jsx:73
+#: src/components/users/FirstUser.jsx:208
+msgid "Edit"
+msgstr "编辑"
+
+#. TRANSLATORS: %s is replaced by a network connection name
+#: src/components/network/ConnectionsTable.jsx:70
+#, c-format
+msgid "Edit connection %s"
+msgstr "编辑连接 %s"
+
+#: src/components/network/ConnectionsTable.jsx:74
+msgid "Forget"
+msgstr "忘掉"
+
+#. TRANSLATORS: %s is replaced by a network connection name
+#: src/components/network/ConnectionsTable.jsx:77
+#, c-format
+msgid "Forget connection %s"
+msgstr "忘掉连接 %s"
+
+#. TRANSLATORS: %s is replaced by a network connection name
+#: src/components/network/ConnectionsTable.jsx:92
+#, c-format
+msgid "Actions for connection %s"
+msgstr "对连接 %s 的操作"
+
+#. TRANSLATORS: input field name
+#: src/components/network/DnsDataList.jsx:78
+#: src/components/network/DnsDataList.jsx:79
+msgid "Server IP"
+msgstr "服务器 IP"
+
+#: src/components/network/DnsDataList.jsx:96
+msgid "Add DNS"
+msgstr "添加 DNS"
+
+#. TRANSLATORS: button label
+#: src/components/network/DnsDataList.jsx:96
+msgid "Add another DNS"
+msgstr "添加另一个 DNS"
+
+#: src/components/network/DnsDataList.jsx:101
+msgid "DNS"
+msgstr "DNS"
+
+#. TRANSLATORS: input field name
+#: src/components/network/IpPrefixInput.jsx:33
+msgid "IP prefix or netmask"
+msgstr "IP 前缀或掩码"
+
+#. TRANSLATORS: error message
+#: src/components/network/IpSettingsForm.jsx:87
+msgid "At least one address must be provided for selected mode"
+msgstr "所选模式要求至少提供一个地址"
+
+#. TRANSLATORS: %s is replaced by the iSCSI target node name
+#: src/components/network/IpSettingsForm.jsx:133
+#: src/components/storage/iscsi/EditNodeForm.jsx:50
+#, c-format
+msgid "Edit %s"
+msgstr "编辑 %s"
+
+#. TRANSLATORS: network connection mode (automatic via DHCP or manual with static IP)
+#: src/components/network/IpSettingsForm.jsx:136
+#: src/components/network/IpSettingsForm.jsx:141
+#: src/components/network/IpSettingsForm.jsx:143
+msgid "Mode"
+msgstr "模式"
+
+#: src/components/network/IpSettingsForm.jsx:147
+msgid "Automatic (DHCP)"
+msgstr "自动（DHCP）"
+
+#. TRANSLATORS: manual network configuration mode with a static IP address
+#: src/components/network/IpSettingsForm.jsx:149
+#: src/components/storage/iscsi/NodeStartupOptions.js:25
+msgid "Manual"
+msgstr "手动"
+
+#. TRANSLATORS: network gateway configuration
+#: src/components/network/IpSettingsForm.jsx:164
+#: src/components/network/IpSettingsForm.jsx:167
+msgid "Gateway"
+msgstr "网关"
+
+#: src/components/network/NetworkPage.jsx:38
+msgid "No wired connections found."
+msgstr "未找到有线连接。"
+
+#: src/components/network/NetworkPage.jsx:53
+msgid ""
+"The system has not been configured for connecting to a WiFi network yet."
+msgstr "系统尚未配置为连接到 WiFi 网络。"
+
+#: src/components/network/NetworkPage.jsx:54
+msgid ""
+"The system does not support WiFi connections, probably because of missing or "
+"disabled hardware."
+msgstr "系统不支持 WiFi 连接，可能由于硬件缺失或已被禁用。"
+
+#: src/components/network/NetworkPage.jsx:58
+msgid "No WiFi connections found."
+msgstr "未找到 WiFi 连接。"
+
+#. TRANSLATORS: button label
+#: src/components/network/NetworkPage.jsx:70
+#: src/components/network/NetworkPageMenu.jsx:46
+#: src/components/network/WifiSelector.jsx:134
+msgid "Connect to a Wi-Fi network"
+msgstr "连接到 Wi-Fi 网络"
+
+#. TRANSLATORS: page title
+#. TRANSLATORS: page section title
+#: src/components/network/NetworkPage.jsx:169
+#: src/components/overview/NetworkSection.jsx:83
+msgid "Network"
+msgstr "网络"
+
+#. TRANSLATORS: page section
+#: src/components/network/NetworkPage.jsx:171
+msgid "Wired networks"
+msgstr "有线网络"
+
+#. TRANSLATORS: page section
+#: src/components/network/NetworkPage.jsx:176
+msgid "WiFi networks"
+msgstr "WiFi 网络"
+
+#. TRANSLATORS: WiFi authentication mode
+#: src/components/network/WifiConnectionForm.jsx:43
+#: src/components/storage/iscsi/InitiatorPresenter.jsx:72
+msgid "None"
+msgstr "无"
+
+#. TRANSLATORS: WiFi authentication mode
+#: src/components/network/WifiConnectionForm.jsx:45
+msgid "WPA & WPA2 Personal"
+msgstr "WPA 与 WPA2 个人版"
+
+#: src/components/network/WifiConnectionForm.jsx:91
+#: src/components/product/ProductPage.jsx:128
+#: src/components/product/ProductPage.jsx:194
+#: src/components/storage/ZFCPDiskForm.jsx:112
+#: src/components/storage/iscsi/DiscoverForm.jsx:108
+#: src/components/storage/iscsi/LoginForm.jsx:72
+#: src/components/users/FirstUser.jsx:238
+msgid "Something went wrong"
+msgstr "出了点问题"
+
+#: src/components/network/WifiConnectionForm.jsx:92
+msgid "Please, review provided settings and try again."
+msgstr "请回顾之前提供的设定后再试。"
+
+#. TRANSLATORS: SSID (Wifi network name) configuration
+#: src/components/network/WifiConnectionForm.jsx:97
+#: src/components/network/WifiConnectionForm.jsx:101
+msgid "SSID"
+msgstr "SSID"
+
+#. TRANSLATORS: Wifi security configuration (password protected or not)
+#: src/components/network/WifiConnectionForm.jsx:109
+#: src/components/network/WifiConnectionForm.jsx:112
+msgid "Security"
+msgstr "安全性"
+
+#. TRANSLATORS: WiFi password
+#: src/components/network/WifiConnectionForm.jsx:121
+msgid "WPA Password"
+msgstr "WPA 密码"
+
+#. TRANSLATORS: button label, connect to a WiFi network
+#: src/components/network/WifiConnectionForm.jsx:133
+msgid "Connect"
+msgstr "连接"
+
+#. TRANSLATORS: button label
+#: src/components/network/WifiHiddenNetworkForm.jsx:50
+msgid "Connect to hidden network"
+msgstr "连接到隐藏网络"
+
+#. TRANSLATORS: Wifi network status
+#: src/components/network/WifiNetworkListItem.jsx:41
+#: src/components/network/WifiNetworkListItem.jsx:99
+msgid "Connecting"
+msgstr "正在连接"
+
+#. TRANSLATORS: Wifi network status
+#: src/components/network/WifiNetworkListItem.jsx:44
+msgid "Connected"
+msgstr "已连接"
+
+#. TRANSLATORS: Wifi network status
+#: src/components/network/WifiNetworkListItem.jsx:47
+msgid "Disconnecting"
+msgstr "正在断开连接"
+
+#. TRANSLATORS: Wifi network status
+#. TRANSLATORS: iSCSI connection status
+#: src/components/network/WifiNetworkListItem.jsx:50
+#: src/components/storage/iscsi/NodesPresenter.jsx:63
+msgid "Disconnected"
+msgstr "已断开连接"
+
+#. TRANSLATORS: %s is replaced by a WiFi network name
+#: src/components/network/WifiNetworkListItem.jsx:97
+#, c-format
+msgid "%s connection is waiting for an state change"
+msgstr "连接 %s 正等待状态更改"
+
+#. TRANSLATORS: menu label, remove the selected WiFi network settings
+#: src/components/network/WifiNetworkMenu.jsx:55
+msgid "Forget network"
+msgstr "忘掉网络"
+
+#. TRANSLATORS: %s will be replaced by a language name and territory, example:
+#. "English (United States)".
+#: src/components/overview/L10nSection.jsx:34
+#, c-format
+msgid "The system will use %s as its default language."
+msgstr "系统会使用 %s 作为默认语言。"
+
+#: src/components/overview/NetworkSection.jsx:59
+msgid "No network connections detected"
+msgstr "未检测到网络连接"
+
+#. TRANSLATORS: header for the list of active network connections,
+#. %d is replaced by the number of active connections
+#: src/components/overview/NetworkSection.jsx:68
+#, c-format
+msgid "%d connection set:"
+msgid_plural "%d connections set:"
+msgstr[0] "已设定 %d 个连接："
+
+#. TRANSLATORS: page title
+#: src/components/overview/OverviewPage.jsx:48
+msgid "Installation Summary"
+msgstr "安装概要"
+
+#. TRANSLATORS: %s is replaced by a product name (e.g., SUSE ALP-Dolomite)
+#: src/components/overview/ProductSection.jsx:48
+#, c-format
+msgid "%s (registered)"
+msgstr "%s （已注册）"
+
+#. TRANSLATORS: page title
+#. TRANSLATORS: page section
+#: src/components/overview/ProductSection.jsx:71
+#: src/components/product/ProductPage.jsx:435
+msgid "Product"
+msgstr "产品"
+
+#: src/components/overview/SoftwareSection.jsx:38
+msgid "Reading software repositories"
+msgstr "正在读取软件仓库"
+
+#. TRANSLATORS: clickable link label
+#: src/components/overview/SoftwareSection.jsx:133
+msgid "Refresh the repositories"
+msgstr "刷新仓库"
+
+#. TRANSLATORS: page section
+#. TRANSLATORS: page title
+#: src/components/overview/SoftwareSection.jsx:143
+#: src/components/software/SoftwarePage.jsx:81
+msgid "Software"
+msgstr "软件"
+
+#: src/components/overview/StorageSection.jsx:42
+#: src/components/storage/ProposalDeviceSection.jsx:129
+msgid "No device selected yet"
+msgstr "尚未选择设备"
+
+#. TRANSLATORS: %s will be replaced by the device name and its size,
+#. example: "/dev/sda, 20 GiB"
+#: src/components/overview/StorageSection.jsx:52
+#, c-format
+msgid "Install using device %s shrinking existing partitions as needed"
+msgstr "使用设备 %s 进行安装，并在需要时缩小现有的分区"
+
+#. TRANSLATORS: %s will be replaced by the device name and its size,
+#. example: "/dev/sda, 20 GiB"
+#: src/components/overview/StorageSection.jsx:56
+#, c-format
+msgid "Install using device %s without modifying existing partitions"
+msgstr "使用设备 %s 进行安装且不修改已存在的分区"
+
+#. TRANSLATORS: %s will be replaced by the device name and its size,
+#. example: "/dev/sda, 20 GiB"
+#: src/components/overview/StorageSection.jsx:60
+#, c-format
+msgid "Install using device %s and deleting all its content"
+msgstr "使用设备 %s 进行安装并删除其上的现有内容"
+
+#. TRANSLATORS: %s will be replaced by the device name and its size,
+#. example: "/dev/sda, 20 GiB"
+#: src/components/overview/StorageSection.jsx:66
+#, c-format
+msgid "Install using device %s"
+msgstr "使用设备 %s 安装"
+
+#: src/components/overview/StorageSection.jsx:83
+msgid "Probing storage devices"
+msgstr "正在探测存储设备"
+
+#. TRANSLATORS: page title
+#. TRANSLATORS: page section title
+#: src/components/overview/StorageSection.jsx:208
+#: src/components/storage/ProposalPage.jsx:243
+msgid "Storage"
+msgstr "存储"
+
+#. TRANSLATORS: %s will be replaced by the user name
+#: src/components/overview/UsersSection.jsx:80
+#, c-format
+msgid "User %s will be created"
+msgstr "用户 %s 将被创建"
+
+#: src/components/overview/UsersSection.jsx:87
+msgid "No user defined yet"
+msgstr "尚未设定用户"
+
+#: src/components/overview/UsersSection.jsx:101
+msgid "Root authentication set for using both, password and public SSH Key"
+msgstr "Root 认证设定为同时使用密码与 SSH 公钥"
+
+#: src/components/overview/UsersSection.jsx:102
+msgid "No root authentication method defined"
+msgstr "未设定 Root 认证方法"
+
+#: src/components/overview/UsersSection.jsx:103
+msgid "Root authentication set for using password"
+msgstr "Root 认证设定为使用密码"
+
+#: src/components/overview/UsersSection.jsx:104
+msgid "Root authentication set for using public SSH Key"
+msgstr "Root 认证设定为使用 SSH 公钥"
+
+#. TRANSLATORS: page section title
+#: src/components/overview/UsersSection.jsx:120
+#: src/components/users/UsersPage.jsx:30
+msgid "Users"
+msgstr "用户"
+
+#: src/components/product/ProductPage.jsx:63
+#: src/components/product/ProductSelectionPage.jsx:65
+msgid "Choose a product"
+msgstr "选择产品"
+
+#: src/components/product/ProductPage.jsx:122
+#, c-format
+msgid "Register %s"
+msgstr "注册 %s"
+
+#: src/components/product/ProductPage.jsx:188
+#, c-format
+msgid "Deregister %s"
+msgstr "取消注册 %s"
+
+#. TRANSLATORS: %s is replaced by a product name (e.g., SUSE ALP-Dolomite)
+#: src/components/product/ProductPage.jsx:202
+#, c-format
+msgid "Do you want to deregister %s?"
+msgstr "您想要取消注册 %s 吗？"
+
+#: src/components/product/ProductPage.jsx:227
+msgid "Registered warning"
+msgstr "已注册警告"
+
+#. TRANSLATORS: %s is replaced by a product name (e.g., SUSE ALP-Dolomite)
+#: src/components/product/ProductPage.jsx:232
+#, c-format
+msgid "The product %s must be deregistered before selecting a new product."
+msgstr "选择新产品之前，必须先取消注册产品 %s 。"
+
+#: src/components/product/ProductPage.jsx:263
+msgid "Change product"
+msgstr "更改产品"
+
+#: src/components/product/ProductPage.jsx:305
+msgid "Register"
+msgstr "注册"
+
+#: src/components/product/ProductPage.jsx:337
+msgid "Deregister product"
+msgstr "取消注册产品"
+
+#: src/components/product/ProductPage.jsx:370
+msgid "Code:"
+msgstr "代码："
+
+#: src/components/product/ProductPage.jsx:374
+msgid "Email:"
+msgstr "电子邮件："
+
+#. TRANSLATORS: section title.
+#: src/components/product/ProductPage.jsx:390
+msgid "Registration"
+msgstr "注册"
+
+#: src/components/product/ProductPage.jsx:399
+msgid "This product requires registration."
+msgstr "此产品要求注册。"
+
+#: src/components/product/ProductPage.jsx:405
+msgid "This product does not require registration."
+msgstr "此产品无需注册。"
+
+#: src/components/product/ProductRegistrationForm.jsx:63
+msgid "Registration code"
+msgstr "注册码"
+
+#: src/components/product/ProductRegistrationForm.jsx:66
+msgid "Email"
+msgstr "电子邮件"
+
+#: src/components/product/ProductSelectionPage.jsx:58
+msgid "Loading available products, please wait..."
+msgstr "正在载入可用产品，请稍候……"
+
+#. TRANSLATORS: page title
+#: src/components/product/ProductSelectionPage.jsx:63
+msgid "Product selection"
+msgstr "选择产品"
+
+#: src/components/product/ProductSelectionPage.jsx:72
+msgid "Select"
+msgstr "选择"
+
+#: src/components/product/ProductSelector.jsx:36
+msgid "No products available for selection"
+msgstr "没有可供选择的产品"
+
+#: src/components/product/ProductSelector.jsx:42
+msgid "Available products"
+msgstr "可用产品"
+
+#: src/components/questions/GenericQuestion.jsx:35
+#: src/components/questions/LuksActivationQuestion.jsx:60
+msgid "Question"
+msgstr "问题"
+
+#. TRANSLATORS: error message, user entered a wrong password
+#: src/components/questions/LuksActivationQuestion.jsx:34
+msgid "Given encryption password didn't work"
+msgstr "输入的加密密码无效"
+
+#: src/components/questions/LuksActivationQuestion.jsx:59
+msgid "Encrypted Device"
+msgstr "已加密设备"
+
+#. TRANSLATORS: field label
+#: src/components/questions/LuksActivationQuestion.jsx:69
+msgid "Encryption Password"
+msgstr "加密密码"
+
+#. TRANSLATORS: pattern status, selected to install (by user)
+#: src/components/software/PatternItem.jsx:63
+msgid "selected"
+msgstr "已选择"
+
+#. TRANSLATORS: pattern status, selected to install (by dependencies)
+#: src/components/software/PatternItem.jsx:66
+msgid "automatically selected"
+msgstr "已自动选择"
+
+#. TRANSLATORS: pattern status, not selected to install
+#: src/components/software/PatternItem.jsx:69
+msgid "not selected"
+msgstr "未选择"
+
+#: src/components/software/PatternSelector.jsx:210
+msgid "Software summary and filter options"
+msgstr "软件概述与过滤选项"
+
+#. TRANSLATORS: %s will be replaced by the estimated installation size,
+#. example: "728.8 MiB"
+#: src/components/software/UsedSize.jsx:32
+#, c-format
+msgid "Installation will take %s"
+msgstr "安装将会占用 %s"
+
+#: src/components/storage/DASDFormatProgress.jsx:61
+msgid "Waiting for progress report"
+msgstr "正在等待进度报告"
+
+#: src/components/storage/DASDFormatProgress.jsx:69
+msgid "Formatting DASD devices"
+msgstr "正在格式化 DASD 设备"
+
+#. TRANSLATORS: DASD = Direct Access Storage Device, IBM mainframe storage technology
+#: src/components/storage/DASDPage.jsx:181
+msgid "Storage DASD"
+msgstr "存储 DASD"
+
+#: src/components/storage/DASDTable.jsx:57
+#: src/components/storage/ZFCPPage.jsx:318
+#: src/components/storage/iscsi/InitiatorPresenter.jsx:71
+#: src/components/storage/iscsi/NodesPresenter.jsx:103
+msgid "No"
+msgstr "否"
+
+#: src/components/storage/DASDTable.jsx:57
+#: src/components/storage/ZFCPPage.jsx:318
+#: src/components/storage/iscsi/InitiatorPresenter.jsx:71
+#: src/components/storage/iscsi/NodesPresenter.jsx:103
+msgid "Yes"
+msgstr "是"
+
+#: src/components/storage/DASDTable.jsx:64
+#: src/components/storage/ZFCPDiskForm.jsx:118
+#: src/components/storage/ZFCPPage.jsx:301
+#: src/components/storage/ZFCPPage.jsx:361
+msgid "Channel ID"
+msgstr "通道 ID"
+
+#. TRANSLATORS: table header
+#: src/components/storage/DASDTable.jsx:65
+#: src/components/storage/ZFCPPage.jsx:302
+#: src/components/storage/iscsi/NodesPresenter.jsx:104
+#: src/components/storage/iscsi/NodesPresenter.jsx:125
+#: src/components/users/RootAuthMethods.jsx:157
+msgid "Status"
+msgstr "状态"
+
+#. TRANSLATORS: The storage "Device" section's title
+#: src/components/storage/DASDTable.jsx:66
+#: src/components/storage/ProposalDeviceSection.jsx:423
+msgid "Device"
+msgstr "设备"
+
+#: src/components/storage/DASDTable.jsx:67
+msgid "Type"
+msgstr "类型"
+
+#: src/components/storage/DASDTable.jsx:68
+msgid "Diag"
+msgstr "诊断"
+
+#: src/components/storage/DASDTable.jsx:69
+msgid "Formatted"
+msgstr "已格式化"
+
+#: src/components/storage/DASDTable.jsx:70
+msgid "Partition Info"
+msgstr "分区信息"
+
+#. TRANSLATORS: drop down menu label
+#: src/components/storage/DASDTable.jsx:105
+msgid "Perform an action"
+msgstr "执行操作"
+
+#. TRANSLATORS: drop down menu action, activate the device
+#: src/components/storage/DASDTable.jsx:111
+#: src/components/storage/ZFCPPage.jsx:332
+msgid "Activate"
+msgstr "激活"
+
+#. TRANSLATORS: drop down menu action, deactivate the device
+#: src/components/storage/DASDTable.jsx:113
+#: src/components/storage/ZFCPPage.jsx:374
+msgid "Deactivate"
+msgstr "停用"
+
+#. TRANSLATORS: drop down menu action, enable DIAG access method
+#: src/components/storage/DASDTable.jsx:116
+msgid "Set DIAG On"
+msgstr "开启 DIAG"
+
+#. TRANSLATORS: drop down menu action, disable DIAG access method
+#: src/components/storage/DASDTable.jsx:118
+msgid "Set DIAG Off"
+msgstr "关闭 DIAG"
+
+#. TRANSLATORS: drop down menu action, format the disk
+#: src/components/storage/DASDTable.jsx:121
+msgid "Format"
+msgstr "格式化"
+
+#: src/components/storage/DASDTable.jsx:198
+#: src/components/storage/DASDTable.jsx:199
+msgid "Filter by min channel"
+msgstr "按最小通道过滤"
+
+#: src/components/storage/DASDTable.jsx:206
+msgid "Remove min channel filter"
+msgstr "移除最小通道过滤器"
+
+#: src/components/storage/DASDTable.jsx:219
+#: src/components/storage/DASDTable.jsx:220
+msgid "Filter by max channel"
+msgstr "按最大通道过滤"
+
+#: src/components/storage/DASDTable.jsx:227
+msgid "Remove max channel filter"
+msgstr "移除最大通道过滤器"
+
+#. TRANSLATORS: page title for iSCSI configuration
+#: src/components/storage/ISCSIPage.jsx:31
+msgid "Storage iSCSI"
+msgstr "存储 iSCSI"
+
+#. TRANSLATORS: show/hide toggle action, this is a clickable link
+#: src/components/storage/ProposalActionsSection.jsx:70
+#, c-format
+msgid "Hide %d subvolume action"
+msgid_plural "Hide %d subvolume actions"
+msgstr[0] "隐藏 %d 个子卷操作"
+
+#. TRANSLATORS: show/hide toggle action, this is a clickable link
+#: src/components/storage/ProposalActionsSection.jsx:72
+#, c-format
+msgid "Show %d subvolume action"
+msgid_plural "Show %d subvolume actions"
+msgstr[0] "显示 %d 个子卷操作"
+
+#. TRANSLATORS: The storage "Planned Actions" section's title. The
+#. section shows a list of planned actions for the selected device, e.g.
+#. "delete partition A", "create partition B with filesystem C", ...
+#: src/components/storage/ProposalActionsSection.jsx:124
+msgid "Planned Actions"
+msgstr "计划执行的操作"
+
+#. TRANSLATORS: The storage "Planned Actions" section's description
+#: src/components/storage/ProposalActionsSection.jsx:126
+msgid "Actions to create the file systems and to ensure the new system boots."
+msgstr "创建文件系统并确保新系统启动的操作。"
+
+#: src/components/storage/ProposalDeviceSection.jsx:135
+msgid "Waiting for information about selected device"
+msgstr "正在等待已选择设备的信息"
+
+#: src/components/storage/ProposalDeviceSection.jsx:138
+msgid "Select the device for installing the system."
+msgstr "选择要进行系统安装的设备。"
+
+#: src/components/storage/ProposalDeviceSection.jsx:143
+#: src/components/storage/ProposalDeviceSection.jsx:147
+#: src/components/storage/ProposalDeviceSection.jsx:245
+msgid "Installation device"
+msgstr "安装设备"
+
+#: src/components/storage/ProposalDeviceSection.jsx:153
+msgid "No devices found."
+msgstr "未找到设备。"
+
+#: src/components/storage/ProposalDeviceSection.jsx:242
+msgid "Devices for creating the volume group"
+msgstr "用于创建卷组的设备"
+
+#: src/components/storage/ProposalDeviceSection.jsx:251
+msgid "Custom devices"
+msgstr "自定义设备"
+
+#: src/components/storage/ProposalDeviceSection.jsx:315
+msgid ""
+"Configuration of the system volume group. All the file systems will be "
+"created in a logical volume of the system volume group."
+msgstr "系统卷组的设置。所有文件系统将创建于系统卷组下的逻辑卷中。"
+
+#: src/components/storage/ProposalDeviceSection.jsx:321
+msgid "Configure the LVM settings"
+msgstr "配置 LVM 设定"
+
+#: src/components/storage/ProposalDeviceSection.jsx:326
+#: src/components/storage/ProposalDeviceSection.jsx:346
+msgid "LVM settings"
+msgstr "LVM 设定"
+
+#: src/components/storage/ProposalDeviceSection.jsx:333
+msgid "Waiting for information about LVM"
+msgstr "正在等待 LVM 信息"
+
+#: src/components/storage/ProposalDeviceSection.jsx:339
+msgid "Use logical volume management (LVM)"
+msgstr "使用逻辑卷管理（LVM）"
+
+#: src/components/storage/ProposalDeviceSection.jsx:347
+msgid "System Volume Group"
+msgstr "系统卷组"
+
+#. TRANSLATORS: The storage "Device" sections's description. Do not
+#. translate 'abbr' and 'title', they are part of the HTML markup.
+#: src/components/storage/ProposalDeviceSection.jsx:414
+msgid ""
+"Select the main disk or <abbr title='Logical Volume Manager'>LVM</abbr> "
+"Volume Group for installation."
+msgstr ""
+"选择主磁盘或 <abbr title='Logical Volume Manager'>LVM</abbr> 卷组进行安装。"
+
+#: src/components/storage/ProposalFileSystemsSection.jsx:70
+msgid "File systems"
+msgstr "文件系统"
+
+#: src/components/storage/ProposalPageMenu.jsx:40
+msgid "Manage and format"
+msgstr "管理与格式化"
+
+#: src/components/storage/ProposalPageMenu.jsx:58
+msgid "Activate disks"
+msgstr "激活磁盘"
+
+#: src/components/storage/ProposalPageMenu.jsx:60
+msgid "zFCP"
+msgstr "zFCP"
+
+#: src/components/storage/ProposalPageMenu.jsx:76
+msgid "Connect to iSCSI targets"
+msgstr "连接到 iSCSI 目标"
+
+#: src/components/storage/ProposalPageMenu.jsx:78
+msgid "iSCSI"
+msgstr "iSCSI"
+
+#. TRANSLATORS: The word 'directly' is key here. For example, booting to the installer media and then choosing
+#. 'Boot from Hard Disk' from there will not work. Keep it sort (this is a hint in a form) but keep it clear.
+#. Do not translate 'abbr' and 'title', they are part of the HTML markup.
+#: src/components/storage/ProposalSettingsSection.jsx:87
+msgid ""
+"The password will not be needed to boot and access the data if the <abbr "
+"title='Trusted Platform Module'>TPM</abbr> can verify the integrity of the "
+"system. TPM sealing requires the new system to be booted directly on its "
+"first run."
+msgstr ""
+"若 <abbr title='Trusted Platform Module'>TPM</abbr> 可以验证系统的完整性，启"
+"动和访问数据的时候将无需密码。 TPM 密封要求新系统在首次运行时直接引导。"
+
+#: src/components/storage/ProposalSettingsSection.jsx:105
+msgid "Use the TPM to decrypt automatically on each boot"
+msgstr "使用 TPM 在每次启动时自动解密"
+
+#: src/components/storage/ProposalSettingsSection.jsx:148
+msgid ""
+"Uses Btrfs for the root file system allowing to boot to a previous version "
+"of the system after configuration changes or software upgrades."
+msgstr ""
+"使用 Btrfs 作为根文件系统，可以允许配置被改变或软件更新后回退启动到先前版本的"
+"系统。"
+
+#: src/components/storage/ProposalSettingsSection.jsx:155
+msgid "Use Btrfs Snapshots"
+msgstr "使用 Btrfs 快照"
+
+#: src/components/storage/ProposalSettingsSection.jsx:227
+msgid "Change encryption settings"
+msgstr "更改加密设置"
+
+#: src/components/storage/ProposalSettingsSection.jsx:232
+#: src/components/storage/ProposalSettingsSection.jsx:253
+msgid "Encryption settings"
+msgstr "加密设置"
+
+#: src/components/storage/ProposalSettingsSection.jsx:246
+msgid "Use encryption"
+msgstr "使用加密"
+
+#: src/components/storage/ProposalSettingsSection.jsx:309
+msgid "Settings"
+msgstr "设置"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:50
+msgid "Delete current content"
+msgstr "删除当前内容"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:51
+msgid "All partitions will be removed and any data in the disks will be lost."
+msgstr "所有分区将被移除，磁盘上的数据将丢失。"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:55
+msgid "Shrink existing partitions"
+msgstr "缩小现有分区"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:56
+msgid "The data is kept, but the current partitions will be resized as needed."
+msgstr "数据将被保留，但当前分区的大小将会按需调整。"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:60
+msgid "Use available space"
+msgstr "使用可用空间"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:61
+msgid ""
+"The data is kept. Only the space not assigned to any partition will be used."
+msgstr "数据将被保留。仅使用未分配给任何分区的空间。"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:65
+msgid "Custom"
+msgstr "自定义"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:66
+msgid "Select what to do with each partition."
+msgstr "选择对每个分区执行的操作。"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:72
+msgid "Used device"
+msgstr "已使用的设备"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:73
+msgid "Current content"
+msgstr "当前内容"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:74
+#: src/components/storage/ProposalVolumes.jsx:313
+#: src/components/storage/VolumeForm.jsx:745
+msgid "Size"
+msgstr "大小"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:75
+#: src/components/storage/ProposalVolumes.jsx:312
+msgid "Details"
+msgstr "细节"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:76
+msgid "Action"
+msgstr "操作"
+
+#. TRANSLATORS: %s is replaced by partition table type (e.g., GPT)
+#: src/components/storage/ProposalSpacePolicySection.jsx:110
+#, c-format
+msgid "%s partition table"
+msgstr "%s 分区表"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:121
+msgid "EFI system partition"
+msgstr "EFI 系统分区"
+
+#. TRANSLATORS: %s is replaced by a file system type (e.g., btrfs).
+#: src/components/storage/ProposalSpacePolicySection.jsx:124
+#, c-format
+msgid "%s file system"
+msgstr "%s 文件系统"
+
+#. TRANSLATORS: %s is replaced by a LVM volume group name (e.g., /dev/vg0).
+#: src/components/storage/ProposalSpacePolicySection.jsx:131
+#, c-format
+msgid "LVM physical volume of %s"
+msgstr "%s 中的 LVM 逻辑卷"
+
+#. TRANSLATORS: %s is replaced by a RAID name (e.g., /dev/md0).
+#: src/components/storage/ProposalSpacePolicySection.jsx:134
+#, c-format
+msgid "Member of RAID %s"
+msgstr "RAID %s 的成员"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:136
+msgid "Not identified"
+msgstr "未识别"
+
+#. TRANSLATORS: %s is replaced by a disk size (e.g., 20 GiB)
+#: src/components/storage/ProposalSpacePolicySection.jsx:173
+#, c-format
+msgid "%s unused"
+msgstr "%s 未使用空间"
+
+#. TRANSLATORS: %s is replaced by a disk size (e.g., 2 GiB)
+#: src/components/storage/ProposalSpacePolicySection.jsx:186
+#, c-format
+msgid "Shrinkable by %s"
+msgstr "可缩小 %s"
+
+#. TRANSLATORS: %s is replaced by a device name (e.g., /dev/sda)
+#: src/components/storage/ProposalSpacePolicySection.jsx:221
+#, c-format
+msgid "Space action selector for %s"
+msgstr "%s 的空间操作选择器"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:224
+#: src/components/storage/ProposalVolumes.jsx:233
+#: src/components/storage/iscsi/NodesPresenter.jsx:77
+msgid "Delete"
+msgstr "删除"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:228
+msgid "Allow resize"
+msgstr "允许调整大小"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:230
+msgid "Do not modify"
+msgstr "不要修改"
+
+#: src/components/storage/ProposalSpacePolicySection.jsx:382
+msgid "Actions to find space"
+msgstr "查找空间的操作"
+
+#. TRANSLATORS: The storage "Find Space" section's title
+#: src/components/storage/ProposalSpacePolicySection.jsx:452
+msgid "Find Space"
+msgstr "查找空间"
+
+#. TRANSLATORS: The storage "Find space" sections's description
+#: src/components/storage/ProposalSpacePolicySection.jsx:454
+msgid ""
+"Allocating the file systems might need to find free space in the devices "
+"listed below. Choose how to do it."
+msgstr "若要分配文件系统，或许需要在下列设备中找到可用空间。选择如何操作。"
+
+#: src/components/storage/ProposalTransactionalInfo.jsx:46
+#, fuzzy
+msgid "Transactional root file system"
+msgstr "事务性系统"
+
+#: src/components/storage/ProposalTransactionalInfo.jsx:49
+#, fuzzy, c-format
+msgid ""
+"%s is an immutable system with atomic updates. It uses a read-only Btrfs "
+"file system updated via snapshots."
+msgstr "%s 是使用只读 Btrfs 根文件系统和原子更新的不可变系统。"
+
+#. TRANSLATORS: header for a list of items referring to size limits for file systems
+#: src/components/storage/ProposalVolumes.jsx:59
+msgid "These limits are affected by:"
+msgstr "这些限制受以下因素影响："
+
+#. TRANSLATORS: list item, this affects the computed partition size limits
+#: src/components/storage/ProposalVolumes.jsx:63
+msgid "The configuration of snapshots"
+msgstr "快照配置"
+
+#. TRANSLATORS: list item, this affects the computed partition size limits
+#. %s is replaced by a list of the volumes (like "/home, /boot")
+#: src/components/storage/ProposalVolumes.jsx:67
+#, c-format
+msgid "Presence of other volumes (%s)"
+msgstr "有其他卷存在（%s）"
+
+#. TRANSLATORS: list item, describes a factor that affects the computed size of a
+#. file system; eg. adjusting the size of the swap
+#: src/components/storage/ProposalVolumes.jsx:71
+msgid "The amount of RAM in the system"
+msgstr ""
+
+#. TRANSLATORS: dropdown menu label
+#: src/components/storage/ProposalVolumes.jsx:133
+msgid "Reset to defaults"
+msgstr "重设为默认"
+
+#. TRANSLATORS: dropdown menu label
+#: src/components/storage/ProposalVolumes.jsx:141
+#: src/components/storage/ProposalVolumes.jsx:145
+msgid "Add file system"
+msgstr "添加文件系统"
+
+#. TRANSLATORS: minimum device size, %s is replaced by size string, e.g. "17.5 GiB"
+#: src/components/storage/ProposalVolumes.jsx:195
+#, c-format
+msgid "At least %s"
+msgstr "至少 %s"
+
+#. TRANSLATORS: device flag, the partition size is automatically computed
+#: src/components/storage/ProposalVolumes.jsx:201
+msgid "auto"
+msgstr "自动"
+
+#. TRANSLATORS: the filesystem uses a logical volume (LVM)
+#: src/components/storage/ProposalVolumes.jsx:211
+msgid "logical volume"
+msgstr "逻辑卷"
+
+#: src/components/storage/ProposalVolumes.jsx:211
+msgid "partition"
+msgstr "分区"
+
+#. TRANSLATORS: filesystem flag, it uses an encryption
+#: src/components/storage/ProposalVolumes.jsx:220
+msgid "encrypted"
+msgstr "已加密"
+
+#. TRANSLATORS: filesystem flag, it allows creating snapshots
+#: src/components/storage/ProposalVolumes.jsx:222
+msgid "with snapshots"
+msgstr "带快照"
+
+#. TRANSLATORS: flag for transactional file system
+#: src/components/storage/ProposalVolumes.jsx:224
+msgid "transactional"
+msgstr "事务性"
+
+#: src/components/storage/ProposalVolumes.jsx:279
+msgid "Edit file system"
+msgstr "编辑文件系统"
+
+#: src/components/storage/ProposalVolumes.jsx:311
+#: src/components/storage/VolumeForm.jsx:730
+#: src/components/storage/VolumeForm.jsx:735
+msgid "Mount point"
+msgstr "挂载点"
+
+#: src/components/storage/ProposalVolumes.jsx:349
+msgid "Table with mount points"
+msgstr "挂载点列表"
+
+#: src/components/storage/VolumeForm.jsx:102
+msgid "Select a value"
+msgstr "选择一个值"
+
+#. TRANSLATORS: info about possible file system types.
+#: src/components/storage/VolumeForm.jsx:255
+msgid ""
+"The options for the file system type depends on the product and the mount "
+"point."
+msgstr "文件系统类型的选项数量取决于产品和挂载点。"
+
+#: src/components/storage/VolumeForm.jsx:261
+msgid "More info for file system types"
+msgstr "关于文件系统类型的更多信息"
+
+#. TRANSLATORS: label for the file system selector.
+#: src/components/storage/VolumeForm.jsx:272
+msgid "File system type"
+msgstr "文件系统类型"
+
+#. TRANSLATORS: item which affects the final computed partition size
+#: src/components/storage/VolumeForm.jsx:304
+msgid "the configuration of snapshots"
+msgstr "快照配置"
+
+#. TRANSLATORS: item which affects the final computed partition size
+#. %s is replaced by a list of mount points like "/home, /boot"
+#: src/components/storage/VolumeForm.jsx:309
+#, c-format
+msgid "the presence of the file system for %s"
+msgstr "在 %s 上存在文件系统"
+
+#. TRANSLATORS: conjunction for merging two list items
+#: src/components/storage/VolumeForm.jsx:311
+msgid ", "
+msgstr ", "
+
+#. TRANSLATORS: item which affects the final computed partition size
+#: src/components/storage/VolumeForm.jsx:315
+msgid "the amount of RAM in the system"
+msgstr ""
+
+#. TRANSLATORS: the %s is replaced by the items which affect the computed size
+#: src/components/storage/VolumeForm.jsx:318
+#, c-format
+msgid "The final size depends on %s."
+msgstr "最终大小取决于 %s。"
+
+#. TRANSLATORS: conjunction for merging two texts
+#: src/components/storage/VolumeForm.jsx:320
+msgid " and "
+msgstr " 以及 "
+
+#. TRANSLATORS: the partition size is automatically computed
+#: src/components/storage/VolumeForm.jsx:325
+msgid "Automatically calculated size according to the selected product."
+msgstr "根据选定的产品自动计算大小。"
+
+#: src/components/storage/VolumeForm.jsx:345
+msgid "Exact size for the file system."
+msgstr "文件系统的准确大小。"
+
+#. TRANSLATORS: requested partition size
+#: src/components/storage/VolumeForm.jsx:357
+msgid "Exact size"
+msgstr "准确大小"
+
+#. TRANSLATORS: units selector (like KiB, MiB, GiB...)
+#: src/components/storage/VolumeForm.jsx:372
+msgid "Size unit"
+msgstr "大小单位"
+
+#: src/components/storage/VolumeForm.jsx:400
+msgid ""
+"Limits for the file system size. The final size will be a value between the "
+"given minimum and maximum. If no maximum is given then the file system will "
+"be as big as possible."
+msgstr ""
+"文件系统大小的限度。最终大小将会介于此处给定的最小值和最大值之间。如未给定最"
+"大值，文件系统将尽可能扩大。"
+
+#. TRANSLATORS: the minimal partition size
+#: src/components/storage/VolumeForm.jsx:407
+msgid "Minimum"
+msgstr "最小"
+
+#. TRANSLATORS: the minium partition size
+#: src/components/storage/VolumeForm.jsx:417
+msgid "Minimum desired size"
+msgstr "所需最小尺寸"
+
+#: src/components/storage/VolumeForm.jsx:426
+msgid "Unit for the minimum size"
+msgstr "最小尺寸的单位"
+
+#. TRANSLATORS: the maximum partition size
+#: src/components/storage/VolumeForm.jsx:437
+msgid "Maximum"
+msgstr "最大"
+
+#. TRANSLATORS: the maximum partition size
+#: src/components/storage/VolumeForm.jsx:448
+msgid "Maximum desired size"
+msgstr "所需的最大尺寸"
+
+#: src/components/storage/VolumeForm.jsx:456
+msgid "Unit for the maximum size"
+msgstr "最大尺寸的单位"
+
+#. TRANSLATORS: radio button label, fully automatically computed partition size, no user input
+#: src/components/storage/VolumeForm.jsx:473
+msgid "Auto"
+msgstr "自动"
+
+#. TRANSLATORS: radio button label, exact partition size requested by user
+#: src/components/storage/VolumeForm.jsx:475
+msgid "Fixed"
+msgstr "固定尺寸"
+
+#. TRANSLATORS: radio button label, automatically computed partition size within the user provided min and max limits
+#: src/components/storage/VolumeForm.jsx:477
+msgid "Range"
+msgstr "按范围计算"
+
+#: src/components/storage/VolumeForm.jsx:685
+msgid "A size value is required"
+msgstr "必须输入尺寸值"
+
+#: src/components/storage/VolumeForm.jsx:690
+msgid "Minimum size is required"
+msgstr "需要指定最小尺寸"
+
+#: src/components/storage/VolumeForm.jsx:694
+msgid "Maximum must be greater than minimum"
+msgstr "最大值必须高于最小值"
+
+#: src/components/storage/ZFCPDiskForm.jsx:113
+msgid "The zFCP disk was not activated."
+msgstr "zFCP 磁盘未激活。"
+
+#. TRANSLATORS: abbrev. World Wide Port Name
+#: src/components/storage/ZFCPDiskForm.jsx:129
+#: src/components/storage/ZFCPPage.jsx:362
+msgid "WWPN"
+msgstr "WWPN"
+
+#. TRANSLATORS: abbrev. Logical Unit Number
+#: src/components/storage/ZFCPDiskForm.jsx:140
+#: src/components/storage/ZFCPPage.jsx:363
+msgid "LUN"
+msgstr "LUN"
+
+#: src/components/storage/ZFCPPage.jsx:303
+msgid "Auto LUNs Scan"
+msgstr "自动扫描 LUN"
+
+#: src/components/storage/ZFCPPage.jsx:314
+msgid "Activated"
+msgstr "已激活"
+
+#: src/components/storage/ZFCPPage.jsx:314
+msgid "Deactivated"
+msgstr "已停用"
+
+#: src/components/storage/ZFCPPage.jsx:417
+msgid "No zFCP controllers found."
+msgstr "未找到 zFCP 控制器。"
+
+#: src/components/storage/ZFCPPage.jsx:418
+msgid "Please, try to read the zFCP devices again."
+msgstr "请尝试再次读取 zFCP 设备。"
+
+#. TRANSLATORS: button label
+#: src/components/storage/ZFCPPage.jsx:420
+msgid "Read zFCP devices"
+msgstr "读取 zFCP 设备"
+
+#. TRANSLATORS: the text in the square brackets [] will be displayed in bold
+#: src/components/storage/ZFCPPage.jsx:429
+msgid ""
+"Automatic LUN scan is [enabled]. Activating a controller which is running in "
+"NPIV mode will automatically configures all its LUNs."
+msgstr ""
+"自动 LUN 扫描[已启用]。激活运行在 NPIV 模式下的控制器将自动配置其所有 LUN。"
+
+#. TRANSLATORS: the text in the square brackets [] will be displayed in bold
+#: src/components/storage/ZFCPPage.jsx:432
+msgid ""
+"Automatic LUN scan is [disabled]. LUNs have to be manually configured after "
+"activating a controller."
+msgstr "自动 LUN 扫描[已停用]。激活控制器后须手动配置 LUN。"
+
+#: src/components/storage/ZFCPPage.jsx:498
+msgid "Activate a zFCP disk"
+msgstr "激活 zFCP 磁盘"
+
+#: src/components/storage/ZFCPPage.jsx:537
+msgid "Please, try to activate a zFCP controller."
+msgstr "请尝试激活 zFCP 控制器。"
+
+#: src/components/storage/ZFCPPage.jsx:544
+msgid "Please, try to activate a zFCP disk."
+msgstr "请尝试激活 zFCP 磁盘。"
+
+#. TRANSLATORS: button label
+#: src/components/storage/ZFCPPage.jsx:546
+msgid "Activate zFCP disk"
+msgstr "激活 zFCP 磁盘"
+
+#: src/components/storage/ZFCPPage.jsx:553
+msgid "No zFCP disks found."
+msgstr "未发现 zFCP 磁盘。"
+
+#. TRANSLATORS: button label
+#: src/components/storage/ZFCPPage.jsx:572
+msgid "Activate new disk"
+msgstr "激活新磁盘"
+
+#. TRANSLATORS: section title
+#: src/components/storage/ZFCPPage.jsx:584
+msgid "Disks"
+msgstr "磁盘"
+
+#. TRANSLATORS: page title
+#: src/components/storage/ZFCPPage.jsx:731
+msgid "Storage zFCP"
+msgstr "存储 zFCP"
+
+#. TRANSLATORS: multipath device type
+#: src/components/storage/device-utils.jsx:82
+msgid "Multipath"
+msgstr "多路径"
+
+#. TRANSLATORS: %s is replaced by the device bus ID
+#: src/components/storage/device-utils.jsx:87
+#, c-format
+msgid "DASD %s"
+msgstr "DASD %s"
+
+#. TRANSLATORS: software RAID device, %s is replaced by the RAID level, e.g. RAID-1
+#: src/components/storage/device-utils.jsx:92
+#, c-format
+msgid "Software %s"
+msgstr "软件 %s"
+
+#: src/components/storage/device-utils.jsx:97
+msgid "SD Card"
+msgstr "SD 卡"
+
+#. TRANSLATORS: %s is replaced by the device transport name, e.g. USB, SATA, SCSI...
+#: src/components/storage/device-utils.jsx:99
+#, c-format
+msgid "Transport %s"
+msgstr "传输 %s"
+
+#. TRANSLATORS: RAID details, %s is replaced by list of devices used by the array
+#: src/components/storage/device-utils.jsx:118
+#, c-format
+msgid "Members: %s"
+msgstr "成员：%s"
+
+#. TRANSLATORS: RAID details, %s is replaced by list of devices used by the array
+#: src/components/storage/device-utils.jsx:127
+#, c-format
+msgid "Devices: %s"
+msgstr "设备：%s"
+
+#. TRANSLATORS: multipath details, %s is replaced by list of connections used by the device
+#: src/components/storage/device-utils.jsx:136
+#, c-format
+msgid "Wires: %s"
+msgstr "连线：%s"
+
+#. TRANSLATORS: disk partition info, %s is replaced by partition table
+#. type (MS-DOS or GPT), %d is the number of the partitions
+#: src/components/storage/device-utils.jsx:160
+#, c-format
+msgid "%s with %d partitions"
+msgstr "%s （包含 %d 个分区）"
+
+#. TRANSLATORS: status message, no existing content was found on the disk,
+#. i.e. the disk is completely empty
+#: src/components/storage/device-utils.jsx:184
+msgid "No content found"
+msgstr "未找到内容"
+
+#: src/components/storage/device-utils.jsx:258
+msgid "Available devices"
+msgstr "可用设备"
+
+#: src/components/storage/iscsi/AuthFields.jsx:70
+msgid "Only available if authentication by target is provided"
+msgstr "仅当目标提供身份认证时可用"
+
+#: src/components/storage/iscsi/AuthFields.jsx:77
+msgid "Authentication by target"
+msgstr "目标身份认证"
+
+#: src/components/storage/iscsi/AuthFields.jsx:80
+#: src/components/storage/iscsi/AuthFields.jsx:85
+#: src/components/storage/iscsi/AuthFields.jsx:87
+#: src/components/storage/iscsi/AuthFields.jsx:112
+#: src/components/storage/iscsi/AuthFields.jsx:117
+#: src/components/storage/iscsi/AuthFields.jsx:119
+msgid "User name"
+msgstr "用户名"
+
+#: src/components/storage/iscsi/AuthFields.jsx:91
+#: src/components/storage/iscsi/AuthFields.jsx:124
+msgid "Incorrect user name"
+msgstr "用户名不正确"
+
+#: src/components/storage/iscsi/AuthFields.jsx:105
+#: src/components/storage/iscsi/AuthFields.jsx:139
+msgid "Incorrect password"
+msgstr "密码不正确"
+
+#: src/components/storage/iscsi/AuthFields.jsx:108
+msgid "Authentication by initiator"
+msgstr "发起者身份认证"
+
+#: src/components/storage/iscsi/AuthFields.jsx:133
+msgid "Target Password"
+msgstr "目标密码"
+
+#. TRANSLATORS: popup title
+#: src/components/storage/iscsi/DiscoverForm.jsx:101
+msgid "Discover iSCSI Targets"
+msgstr "发现 iSCSI 目标"
+
+#: src/components/storage/iscsi/DiscoverForm.jsx:110
+#: src/components/storage/iscsi/LoginForm.jsx:73
+msgid "Make sure you provide the correct values"
+msgstr "确保提供了正确的值"
+
+#: src/components/storage/iscsi/DiscoverForm.jsx:115
+msgid "IP address"
+msgstr "IP 地址"
+
+#. TRANSLATORS: network address
+#: src/components/storage/iscsi/DiscoverForm.jsx:122
+#: src/components/storage/iscsi/DiscoverForm.jsx:124
+msgid "Address"
+msgstr "地址"
+
+#: src/components/storage/iscsi/DiscoverForm.jsx:129
+msgid "Incorrect IP address"
+msgstr "不正确的 IP 地址"
+
+#. TRANSLATORS: network port number
+#: src/components/storage/iscsi/DiscoverForm.jsx:133
+#: src/components/storage/iscsi/DiscoverForm.jsx:140
+#: src/components/storage/iscsi/DiscoverForm.jsx:142
+msgid "Port"
+msgstr "端口"
+
+#: src/components/storage/iscsi/DiscoverForm.jsx:147
+msgid "Incorrect port"
+msgstr "不正确的端口"
+
+#: src/components/storage/iscsi/InitiatorForm.jsx:42
+msgid "Edit iSCSI Initiator"
+msgstr "编辑 iSCSI 发起者"
+
+#. TRANSLATORS: iSCSI initiator name
+#: src/components/storage/iscsi/InitiatorForm.jsx:49
+msgid "Initiator name"
+msgstr "发起者名称"
+
+#. TRANSLATORS: usually just keep the original text
+#. iBFT = iSCSI Boot Firmware Table, HW support for booting from iSCSI
+#: src/components/storage/iscsi/InitiatorPresenter.jsx:71
+#: src/components/storage/iscsi/InitiatorPresenter.jsx:86
+#: src/components/storage/iscsi/NodesPresenter.jsx:103
+#: src/components/storage/iscsi/NodesPresenter.jsx:124
+msgid "iBFT"
+msgstr "iBFT"
+
+#: src/components/storage/iscsi/InitiatorPresenter.jsx:72
+#: src/components/storage/iscsi/InitiatorPresenter.jsx:87
+msgid "Offload card"
+msgstr "卸载卡"
+
+#. TRANSLATORS: iSCSI initiator section name
+#: src/components/storage/iscsi/InitiatorSection.jsx:50
+msgid "Initiator"
+msgstr "发起者"
+
+#. TRANSLATORS: %s is replaced by the iSCSI target name
+#: src/components/storage/iscsi/LoginForm.jsx:69
+#, c-format
+msgid "Login %s"
+msgstr "登录 %s"
+
+#. TRANSLATORS: iSCSI start up mode (on boot/manual/automatic)
+#: src/components/storage/iscsi/LoginForm.jsx:76
+#: src/components/storage/iscsi/LoginForm.jsx:79
+msgid "Startup"
+msgstr "启动"
+
+#: src/components/storage/iscsi/NodeStartupOptions.js:26
+msgid "On boot"
+msgstr "开机时"
+
+#: src/components/storage/iscsi/NodeStartupOptions.js:27
+msgid "Automatic"
+msgstr "自动"
+
+#. TRANSLATORS: iSCSI connection status, %s is replaced by node label
+#: src/components/storage/iscsi/NodesPresenter.jsx:67
+#, c-format
+msgid "Connected (%s)"
+msgstr "已连接（%s）"
+
+#: src/components/storage/iscsi/NodesPresenter.jsx:82
+msgid "Login"
+msgstr "登录"
+
+#: src/components/storage/iscsi/NodesPresenter.jsx:86
+msgid "Logout"
+msgstr "登出"
+
+#: src/components/storage/iscsi/NodesPresenter.jsx:101
+#: src/components/storage/iscsi/NodesPresenter.jsx:122
+msgid "Portal"
+msgstr "门户"
+
+#: src/components/storage/iscsi/NodesPresenter.jsx:102
+#: src/components/storage/iscsi/NodesPresenter.jsx:123
+msgid "Interface"
+msgstr "界面"
+
+#: src/components/storage/iscsi/TargetsSection.jsx:139
+msgid "No iSCSI targets found."
+msgstr "未找到 iSCSI 目标。"
+
+#: src/components/storage/iscsi/TargetsSection.jsx:140
+msgid ""
+"Please, perform an iSCSI discovery in order to find available iSCSI targets."
+msgstr "请执行 iSCSI 发现以查找可用的 iSCSI 目标。"
+
+#. TRANSLATORS: button label, starts iSCSI discovery
+#: src/components/storage/iscsi/TargetsSection.jsx:142
+msgid "Discover iSCSI targets"
+msgstr "发现 iSCSI 目标"
+
+#. TRANSLATORS: button label, starts iSCSI discovery
+#: src/components/storage/iscsi/TargetsSection.jsx:153
+msgid "Discover"
+msgstr "发现"
+
+#. TRANSLATORS: iSCSI targets section title
+#: src/components/storage/iscsi/TargetsSection.jsx:167
+msgid "Targets"
+msgstr "目标"
+
+#: src/components/storage/utils.js:49
+msgid "KiB"
+msgstr "KiB"
+
+#: src/components/storage/utils.js:50
+msgid "MiB"
+msgstr "MiB"
+
+#: src/components/storage/utils.js:51
+msgid "GiB"
+msgstr "GiB"
+
+#: src/components/storage/utils.js:52
+msgid "TiB"
+msgstr "TiB"
+
+#: src/components/storage/utils.js:53
+msgid "PiB"
+msgstr "PiB"
+
+#: src/components/users/FirstUser.jsx:50
+msgid "No user defined yet."
+msgstr "尚未设定用户。"
+
+#: src/components/users/FirstUser.jsx:53
+msgid ""
+"Please, be aware that a user must be defined before installing the system to "
+"be able to log into it."
+msgstr "请注意，在安装系统前必须设定用户才能登录。"
+
+#. TRANSLATORS: push button label
+#: src/components/users/FirstUser.jsx:57
+msgid "Define a user now"
+msgstr "现在设定用户"
+
+#: src/components/users/FirstUser.jsx:67 src/components/users/FirstUser.jsx:242
+msgid "Full name"
+msgstr "全名"
+
+#: src/components/users/FirstUser.jsx:68 src/components/users/FirstUser.jsx:256
+#: src/components/users/FirstUser.jsx:264
+#: src/components/users/FirstUser.jsx:266
+msgid "Username"
+msgstr "用户名"
+
+#: src/components/users/FirstUser.jsx:88
+msgid "Username suggestion dropdown"
+msgstr "建议用户名下拉列表"
+
+#. TRANSLATORS: dropdown username suggestions
+#: src/components/users/FirstUser.jsx:102
+msgid "Use suggested username"
+msgstr "使用建议的用户名"
+
+#: src/components/users/FirstUser.jsx:212
+#: src/components/users/RootAuthMethods.jsx:99
+#: src/components/users/RootAuthMethods.jsx:111
+msgid "Discard"
+msgstr "丢弃"
+
+#: src/components/users/FirstUser.jsx:235
+msgid "Create user account"
+msgstr "创建用户账户"
+
+#: src/components/users/FirstUser.jsx:235
+msgid "Edit user account"
+msgstr "编辑用户账户"
+
+#: src/components/users/FirstUser.jsx:246
+#: src/components/users/FirstUser.jsx:248
+msgid "User full name"
+msgstr "用户全名"
+
+#. TRANSLATORS: check box label
+#: src/components/users/FirstUser.jsx:284
+#: src/components/users/FirstUser.jsx:288
+msgid "Edit password too"
+msgstr "同时编辑密码"
+
+#: src/components/users/FirstUser.jsx:301
+msgid "user autologin"
+msgstr "用户自动登录"
+
+#. TRANSLATORS: check box label
+#: src/components/users/FirstUser.jsx:305
+msgid "Auto-login"
+msgstr "自动登录"
+
+#: src/components/users/RootAuthMethods.jsx:35
+msgid "No root authentication method defined yet."
+msgstr "尚未设定 Root 认证方法。"
+
+#: src/components/users/RootAuthMethods.jsx:38
+msgid ""
+"Please, define at least one authentication method for logging into the "
+"system as root."
+msgstr "请至少设定一个认证方法，以使用 Root 身份登录系统。"
+
+#. TRANSLATORS: push button label
+#: src/components/users/RootAuthMethods.jsx:43
+msgid "Set a password"
+msgstr "设置密码"
+
+#. TRANSLATORS: push button label
+#: src/components/users/RootAuthMethods.jsx:45
+msgid "Upload a SSH Public Key"
+msgstr "上传 SSH 公钥"
+
+#: src/components/users/RootAuthMethods.jsx:94
+#: src/components/users/RootAuthMethods.jsx:107
+msgid "Change"
+msgstr "更改"
+
+#: src/components/users/RootAuthMethods.jsx:94
+#: src/components/users/RootAuthMethods.jsx:107
+msgid "Set"
+msgstr "设置"
+
+#: src/components/users/RootAuthMethods.jsx:129
+msgid "Already set"
+msgstr "已设定"
+
+#: src/components/users/RootAuthMethods.jsx:130
+#: src/components/users/RootAuthMethods.jsx:134
+msgid "Not set"
+msgstr "未设定"
+
+#. TRANSLATORS: table header, user authentication method
+#: src/components/users/RootAuthMethods.jsx:155
+msgid "Method"
+msgstr "方法"
+
+#: src/components/users/RootAuthMethods.jsx:170
+msgid "SSH Key"
+msgstr "SSH 密钥"
+
+#: src/components/users/RootAuthMethods.jsx:187
+msgid "Change the root password"
+msgstr "修改 Root 密码"
+
+#: src/components/users/RootAuthMethods.jsx:187
+msgid "Set a root password"
+msgstr "设定 Root 密码"
+
+#: src/components/users/RootAuthMethods.jsx:194
+msgid "Add a SSH Public Key for root"
+msgstr "为 root 添加 SSH 公钥"
+
+#: src/components/users/RootAuthMethods.jsx:194
+msgid "Edit the SSH Public Key for root"
+msgstr "编辑 root 的 SSH 公钥"
+
+#: src/components/users/RootPasswordPopup.jsx:42
+msgid "Root password"
+msgstr "Root 密码"
+
+#: src/components/users/RootSSHKeyPopup.jsx:43
+msgid "Set root SSH public key"
+msgstr "设定 root 的 SSH 公钥"
+
+#: src/components/users/RootSSHKeyPopup.jsx:71
+msgid "Root SSH public key"
+msgstr "Root 的 SSH 公钥"
+
+#: src/components/users/RootSSHKeyPopup.jsx:76
+msgid "Upload, paste, or drop an SSH public key"
+msgstr "上传、粘贴或拖入 SSH 公钥"
+
+#. TRANSLATORS: push button label
+#: src/components/users/RootSSHKeyPopup.jsx:78
+msgid "Upload"
+msgstr "上传"
+
+#. TRANSLATORS: push button label, clears the related input field
+#: src/components/users/RootSSHKeyPopup.jsx:80
+msgid "Clear"
+msgstr "清除"
+
+#: src/components/users/UsersPage.jsx:31
+msgid "User"
+msgstr "用户"
+
+#: src/components/users/UsersPage.jsx:34
+msgid "Root authentication"
+msgstr "Root 认证"
+
+#~ msgid "Btrfs snapshots required by product."
+#~ msgstr "该产品要求启用 Btrfs 快照。"
diff --git a/web/share/update-manifest.py b/web/share/update-languages.py
similarity index 79%
rename from web/share/update-manifest.py
rename to web/share/update-languages.py
index 6976a4e3e..66cd76fab 100755
--- a/web/share/update-manifest.py
+++ b/web/share/update-languages.py
@@ -19,13 +19,16 @@
 # To contact SUSE LLC about this file by physical or electronic mail, you may
 # find current contact information at www.suse.com.
 
+#
+# This script generates the list of supported languages in JSON format.
+#
+
 from argparse import ArgumentParser
 from langtable import language_name
 from pathlib import Path
 import json
-import re
 import subprocess
-
+import sys
 
 class Locale:
     language: str
@@ -76,20 +79,15 @@ def language(self):
         return self.path.stem
 
 
-class Manifest:
-    """ This class takes care of updating the manifest file"""
+class Languages:
+    """ This class takes care of generating the supported languages file"""
 
-    def __init__(self, path: Path):
-        self.path = path
-        self.__read__()
-
-    def __read__(self):
-        with open(self.path) as file:
-            self.content = json.load(file)
+    def __init__(self):
+        self.content = dict()
 
     def update(self, po_files, lang2territory: str, threshold: int):
         """
-        Updates the list of locales in the manifest file
+        Generate the list of supported locales
 
         It does not write the changes to file system. Use the write() function
         for that.
@@ -111,46 +109,43 @@ def update(self, po_files, lang2territory: str, threshold: int):
             if locale.territory is None:
                 print(
                     "could not find a territory for '{language}'"
-                    .format(language=locale.language)
+                    .format(language=locale.language),
+                    file=sys.stderr
                 )
             elif po_file.coverage() < threshold:
                 print(
                     "not enough coverage for '{language}' ({coverage}%)"
                     .format(
                         language=locale.code(),
-                        coverage=po_file.coverage())
+                        coverage=po_file.coverage()),
+                    file=sys.stderr
                 )
             else:
                 supported.append(locale)
 
         languages = [loc.language for loc in supported]
-        self.content["locales"] = dict()
         for locale in supported:
             include_territory = languages.count(locale.language) > 1
-            self.content["locales"][locale.code()] = locale.name(
-                include_territory)
+            self.content[locale.code()] = locale.name(include_territory)
 
-    def write(self):
-        with open(self.path, "w+") as file:
-            json.dump(self.content, file, indent=4, ensure_ascii=False)
+    def dump(self):
+        json.dump(self.content, sys.stdout, indent=4, ensure_ascii=False,
+                  sort_keys=True)
 
 
-def update_manifest(args):
-    """Command to update the manifest.json file"""
-    manifest = Manifest(Path(args.manifest))
+def update_languages(args):
+    """Print the supported languages in JSON format"""
+    languages = Languages()
     paths = [path for path in Path(args.po_directory).glob("*.po")]
     with open(args.territories) as file:
         lang2territory = json.load(file)
-    manifest.update(paths, lang2territory, args.threshold)
-    manifest.write()
+    languages.update(paths, lang2territory, args.threshold)
+    languages.dump()
 
 
 if __name__ == "__main__":
-    parser = ArgumentParser(prog="locales.py")
-    parser.set_defaults(func=update_manifest)
-    parser.add_argument(
-        "manifest", type=str, help="Path to the manifest file",
-    )
+    parser = ArgumentParser(prog="update-languages.py")
+    parser.set_defaults(func=update_languages)
     parser.add_argument(
         "--po-directory", type=str, help="Directory containing the po files",
         default="web/po"
diff --git a/web/src/App.test.jsx b/web/src/App.test.jsx
index e22a279aa..bd0a96395 100644
--- a/web/src/App.test.jsx
+++ b/web/src/App.test.jsx
@@ -61,7 +61,7 @@ const changePhaseTo = phase => act(() => callbacks.onPhaseChange(phase));
 describe("App", () => {
   beforeEach(() => {
     // setting the language through a cookie
-    document.cookie = "CockpitLang=en-us; path=/;";
+    document.cookie = "agamaLang=en-us; path=/;";
     createClient.mockImplementation(() => {
       return {
         manager: {
@@ -94,7 +94,7 @@ describe("App", () => {
 
   afterEach(() => {
     // setting a cookie with already expired date removes it
-    document.cookie = "CockpitLang=; path=/; expires=" + new Date(0).toUTCString();
+    document.cookie = "agamaLang=; path=/; expires=" + new Date(0).toUTCString();
   });
 
   describe("when the software context is not initialized", () => {
diff --git a/web/src/agama.js b/web/src/agama.js
new file mode 100644
index 000000000..f39ecbf1f
--- /dev/null
+++ b/web/src/agama.js
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+/**
+ * This module provides a global "agama" object which can be use from other
+ * scripts like "po.js".
+ */
+
+const agama = {
+  // the current language
+  language: "en",
+};
+
+// mapping with the current translations
+let translations = {};
+// function used for computing the plural form index
+let plural_fn;
+
+// set the current translations, called from po.js
+agama.locale = function locale(po) {
+  if (po) {
+    Object.assign(translations, po);
+
+    const header = po[""];
+    if (header) {
+      if (header["plural-forms"])
+        plural_fn = header["plural-forms"];
+      if (header.language)
+        agama.language = header.language;
+    }
+  } else if (po === null) {
+    translations = {};
+  }
+};
+
+/**
+ * get a translation for a singular text
+ * @param {string} str input text
+ * @return translated text or the original text if the translation is not found
+ */
+agama.gettext = function gettext(str) {
+  if (translations) {
+    const translated = translations[str];
+    // skip the `null` item in the list generated by cockpit-po-plugin
+    // TODO: get rid of that later
+    if (translated?.[1]) return translated[1];
+  }
+
+  // fallback, return the original text
+  return str;
+};
+
+/**
+ * get a translation for a plural text
+ * @param {string} str1 input singular text
+ * @param {string} strN input plural text
+ * @param {number} n the actual number which decides whether to use the
+ *   singular or plural form (of which plural form if there are several of them)
+ * @return translated text or the original text if the translation is not found
+ */
+agama.ngettext = function ngettext(str1, strN, n) {
+  if (translations && plural_fn) {
+    // plural form translations are indexed by the singular variant
+    const translation = translations[str1];
+
+    if (translation) {
+      const plural_index = plural_fn(n);
+
+      // the plural function either returns direct index (integer) in the plural
+      // translations or a boolean indicating simple plural form which
+      // needs to be converted to index 0 (singular) or 1 (plural)
+      let index = (plural_index === true ? 1 : plural_index || 0);
+
+      // skip the `null` item in the list generated by cockpit-po-plugin
+      // TODO: get rid of that later
+      index += 1;
+
+      if (translation[index]) return translation[index];
+    }
+  }
+
+  // fallback, return the original text
+  return (n === 1) ? str1 : strN;
+};
+
+// register a global object so it can be accessed from a separate po.js script
+window.agama = agama;
+
+export default agama;
diff --git a/web/src/assets/styles/blocks.scss b/web/src/assets/styles/blocks.scss
index 65fddee32..03558f514 100644
--- a/web/src/assets/styles/blocks.scss
+++ b/web/src/assets/styles/blocks.scss
@@ -432,6 +432,190 @@ ul[data-items-type="agama/patterns"] {
   }
 }
 
+[data-type="agama/tag"] {
+  font-size: var(--fs-small);
+
+  &[data-variant="teal"] {
+    color: var(--color-teal);
+  }
+
+  &[data-variant="orange"] {
+    color: var(--color-orange);
+  }
+
+  &[data-variant="gray-highlight"] {
+    padding: var(--spacer-smaller);
+    color: var(--color-gray-darkest);
+    background: var(--color-gray);
+    border: 1px solid var(--color-gray-dark);
+    border-radius: 5px;
+    margin-inline-start: var(--spacer-smaller);
+  }
+}
+
+[data-type="agama/controlled-panels"] {
+  [data-type="agama/option"] {
+    label, input {
+      cursor: pointer;
+    }
+
+    label {
+      display: flex;
+      gap: var(--spacer-smaller);
+    }
+  }
+
+  [data-variant="buttons"] {
+    input { position: absolute; opacity: 0 }
+
+    label {
+      border: 1px solid var(--color-primary);
+      padding: var(--spacer-small);
+      gap: var(--spacer-small);
+      border-radius: var(--spacer-smaller);
+      position: relative;
+
+      &:has(input:checked) {
+        background: var(--color-primary);
+        color: white;
+      }
+
+      &:has(input:focus-visible) {
+        // outline: 1px dotted;
+        // outline-offset: 0.25rem;
+        box-shadow: 0 0 0 3px var(--focus-color);
+      }
+    }
+
+    [data-type="agama/option"]:not(:last-child) {
+      border-inline-end: 2px solid var(--color-gray-darker);
+      padding-inline-end: var(--spacer-small);
+    }
+  }
+
+  > div[aria-expanded="false"] {
+    display: none;
+  }
+}
+
+table[data-type="agama/tree-table"] {
+  th:first-child {
+    block-size: fit-content;
+    padding-inline-end: var(--spacer-normal);
+  }
+
+  th.fit-content {
+    block-size: fit-content;
+    overflow: visible;
+    text-overflow: unset;
+  }
+
+  /**
+   * Temporary PF/Table overrides for small devices
+   **/
+  @media (width <= 768px) {
+    &.pf-m-tree-view-grid-md.pf-v5-c-table tr[aria-level="1"] td {
+      padding-inline-start: var(--spacer-medium);
+    }
+
+    &.pf-m-tree-view-grid-md.pf-v5-c-table tr[aria-level="2"] th {
+      padding-inline-start: calc(var(--spacer-large) * 1.1);
+    }
+
+    &.pf-m-tree-view-grid-md.pf-v5-c-table tr[aria-level="2"] td {
+      padding-inline-start: calc(var(--spacer-large) * 1.4);
+    }
+
+    &.pf-m-tree-view-grid-md.pf-v5-c-table tr:where(.pf-v5-c-table__tr).pf-m-tree-view-details-expanded {
+      padding-block-end: var(--spacer-smaller);
+    }
+
+    &.pf-m-tree-view-grid-md.pf-v5-c-table tr:where(.pf-v5-c-table__tr) td:empty,
+    &.pf-m-tree-view-grid-md.pf-v5-c-table tr:where(.pf-v5-c-table__tr) td *:empty,
+    &.pf-m-tree-view-grid-md.pf-v5-c-table tr:where(.pf-v5-c-table__tr) td:has(> *:empty) {
+      display: none;
+    }
+
+    &.pf-m-tree-view-grid-md.pf-v5-c-table tr:where(.pf-v5-c-table__tr) td:has(> *:not(:empty)) {
+      display: inherit;
+    }
+
+    &.pf-m-tree-view-grid-md.pf-v5-c-table tbody:where(.pf-v5-c-table__tbody) tr:where(.pf-v5-c-table__tr)::before {
+      inset-inline-start: 0;
+    }
+
+    &.pf-v5-c-table.pf-m-compact tr:where(.pf-v5-c-table__tr):not(.pf-v5-c-table__expandable-row) > *:last-child {
+      padding-inline-end: 8px;
+    }
+
+    tbody th:first-child {
+      font-size: var(--fs-large);
+      padding-block-start: var(--spacer-small);
+    }
+  }
+}
+
+// FIXME: use a single selector
+table.devices-table,
+table.proposal-result {
+  tr.dimmed-row {
+    background-color: #fff;
+    opacity: 0.8;
+    background: repeating-linear-gradient( -45deg, #fcfcff, #fcfcff 3px, #fff 3px, #fff 10px );
+
+    td {
+      color: var(--color-gray-dimmed);
+      padding-block: 0;
+    }
+
+  }
+
+  /**
+   * Temporary hack because the collapse/expand callback was not given to the
+   * tree table
+   **/
+  th button {
+    display: none;
+  }
+
+  tbody th .pf-v5-c-table__tree-view-main {
+    padding-inline-start: var(--pf-v5-c-table--m-compact--cell--first-last-child--PaddingLeft);
+    cursor: auto;
+  }
+
+  tbody tr[aria-level="2"] th .pf-v5-c-table__tree-view-main {
+    padding-inline-start: calc(
+       var(--pf-v5-c-table--m-compact--cell--first-last-child--PaddingLeft) + var(--spacer-large)
+    );
+  }
+  /** End of temporary hack */
+
+  @media (width > 768px) {
+    th.details-column {
+      padding-inline-start: calc(60px + var(--spacer-smaller) * 2);
+    }
+
+    td.details-column {
+      display: grid;
+      gap: var(--spacer-smaller);
+      grid-template-columns: 60px 1fr;
+
+      :first-child {
+        text-align: end;
+      }
+    }
+
+    th.sizes-column,
+    td.sizes-column {
+      text-align: end;
+
+      div.split {
+        justify-content: flex-end;
+      }
+    }
+  }
+}
+
 // compact lists in popover
 .pf-v5-c-popover li + li {
   margin: 0;
@@ -515,7 +699,24 @@ ul[data-items-type="agama/patterns"] {
 
   h4 {
     color: var(--accent-color);
-    margin-block-end: var(--spacer-smaller);
+  }
+
+  h4 ~ * {
+    margin-block-start: var(--spacer-small);
+  }
+}
+
+section [data-type="agama/reminder"] {
+  margin-inline: 0;
+}
+
+[data-type="agama/reminder"][data-variant="subtle"] {
+  --accent-color: var(--color-primary);
+  padding-block: 0;
+  border-inline-start-width: 1px;
+
+  h4 {
+    font-size: var(--fs-normal);
   }
 }
 
@@ -545,3 +746,36 @@ ul[data-items-type="agama/patterns"] {
     max-inline-size: 100%;
   }
 }
+
+
+[data-type="agama/expandable-selector"] {
+  // The expandable selector is built on top of PF/Table#expandable
+  // Let's tweak some styles
+  tr {
+    td:first-child {
+      padding-inline-start: 0;
+    }
+
+    td:last-child {
+      padding-inline-end: 0;
+    }
+  }
+
+  tr.pf-v5-c-table__expandable-row.pf-m-expanded {
+    border-bottom: 0;
+
+    .pf-v5-c-table__expandable-row-content {
+      font-size: var(--fs-medium);
+      padding-block: var(--spacer-small);
+    }
+  }
+}
+
+#boot-form {
+  legend {
+    label {
+      font-size: var(--fs-large);
+      font-weight: bold;
+    }
+  }
+}
diff --git a/web/src/assets/styles/variables.scss b/web/src/assets/styles/variables.scss
index b25bfcbad..71a5d7e02 100644
--- a/web/src/assets/styles/variables.scss
+++ b/web/src/assets/styles/variables.scss
@@ -9,6 +9,7 @@
   --fw-bold: 700;
 
   --fs-small: 0.7rem;
+  --fs-medium: 12px;
   --fs-base: 14px;
   --fs-large: 1rem;
   --fs-h1: 1.5rem;
@@ -51,8 +52,12 @@
   --color-gray: #f2f2f2;
   --color-gray-dark: #efefef; // Fog
   --color-gray-darker: #999;
+  --color-gray-darkest: #333;
   --color-gray-dimmed: #888;
   --color-gray-dimmest: #666;
+  --color-teal: #279c9c;
+  --color-blue: #0d4ea6;
+  --color-orange: #e86427;
 
   --color-link: #0c322c;
   --color-link-hover: #30ba78;
diff --git a/web/src/client/storage.js b/web/src/client/storage.js
index 488862d9a..1412d80d8 100644
--- a/web/src/client/storage.js
+++ b/web/src/client/storage.js
@@ -22,15 +22,16 @@
 // @ts-check
 // cspell:ignore ptable
 
+import { compact, hex, uniq } from "~/utils";
 import DBusClient from "./dbus";
 import { WithIssues, WithStatus, WithProgress } from "./mixins";
-import { hex } from "~/utils";
 
 const STORAGE_OBJECT = "/org/opensuse/Agama/Storage1";
 const STORAGE_IFACE = "org.opensuse.Agama.Storage1";
 const STORAGE_JOBS_NAMESPACE = "/org/opensuse/Agama/Storage1/jobs";
 const STORAGE_JOB_IFACE = "org.opensuse.Agama.Storage1.Job";
 const STORAGE_SYSTEM_NAMESPACE = "/org/opensuse/Agama/Storage1/system";
+const STORAGE_STAGING_NAMESPACE = "/org/opensuse/Agama/Storage1/staging";
 const PROPOSAL_IFACE = "org.opensuse.Agama.Storage1.Proposal";
 const PROPOSAL_CALCULATOR_IFACE = "org.opensuse.Agama.Storage1.Proposal.Calculator";
 const ISCSI_INITIATOR_IFACE = "org.opensuse.Agama.Storage1.ISCSI.Initiator";
@@ -46,6 +47,108 @@ const ZFCP_CONTROLLER_IFACE = "org.opensuse.Agama.Storage1.ZFCP.Controller";
 const ZFCP_DISKS_NAMESPACE = "/org/opensuse/Agama/Storage1/zfcp_disks";
 const ZFCP_DISK_IFACE = "org.opensuse.Agama.Storage1.ZFCP.Disk";
 
+/**
+ * @typedef {object} StorageDevice
+ * @property {number} sid - Storage ID
+ * @property {string} name - Device name
+ * @property {string} description - Device description
+ * @property {boolean} isDrive - Whether the device is a drive
+ * @property {string} type - Type of device (e.g., "disk", "raid", "multipath", "dasd", "md")
+ * @property {string} [vendor]
+ * @property {string} [model]
+ * @property {string[]} [driver]
+ * @property {string} [bus]
+ * @property {string} [busId] - DASD Bus ID (only for "dasd" type)
+ * @property {string} [transport]
+ * @property {boolean} [sdCard]
+ * @property {boolean} [dellBOOS]
+ * @property {string[]} [devices] - RAID devices (only for "raid" and "md" types)
+ * @property {string[]} [wires] - Multipath wires (only for "multipath" type)
+ * @property {string} [level] - MD RAID level (only for "md" type)
+ * @property {string} [uuid]
+ * @property {number} [start] - First block of the region (only for block devices)
+ * @property {boolean} [active]
+ * @property {boolean} [encrypted] - Whether the device is encrypted (only for block devices)
+ * @property {boolean} [isEFI] - Whether the device is an EFI partition (only for partition)
+ * @property {number} [size]
+ * @property {number} [recoverableSize]
+ * @property {string[]} [systems] - Name of the installed systems
+ * @property {string[]} [udevIds]
+ * @property {string[]} [udevPaths]
+ * @property {PartitionTable} [partitionTable]
+ * @property {Filesystem} [filesystem]
+ * @property {Component} [component] - When it is used as component of other devices
+ * @property {StorageDevice[]} [physicalVolumes] - Only for LVM VGs
+ * @property {StorageDevice[]} [logicalVolumes] - Only for LVM VGs
+ *
+ * @typedef {object} PartitionTable
+ * @property {string} type
+ * @property {StorageDevice[]} partitions
+ * @property {PartitionSlot[]} unusedSlots
+ * @property {number} unpartitionedSize - Total size not assigned to any partition
+ *
+ * @typedef {object} PartitionSlot
+ * @property {number} start
+ * @property {number} size
+ *
+ * @typedef {object} Component
+ * @property {string} type
+ * @property {string[]} deviceNames
+ *
+ * @typedef {object} Filesystem
+ * @property {number} sid
+ * @property {string} type
+ * @property {string} [mountPath]
+ *
+ * @typedef {object} ProposalResult
+ * @property {ProposalSettings} settings
+ * @property {Action[]} actions
+ *
+ * @typedef {object} Action
+ * @property {number} device
+ * @property {string} text
+ * @property {boolean} subvol
+ * @property {boolean} delete
+ *
+ * @typedef {object} ProposalSettings
+ * @property {string} target
+ * @property {string} [targetDevice]
+ * @property {string[]} targetPVDevices
+ * @property {boolean} configureBoot
+ * @property {string} bootDevice
+ * @property {string} defaultBootDevice
+ * @property {string} encryptionPassword
+ * @property {string} encryptionMethod
+ * @property {string} spacePolicy
+ * @property {SpaceAction[]} spaceActions
+ * @property {Volume[]} volumes
+ * @property {StorageDevice[]} installationDevices
+ *
+ * @typedef {object} SpaceAction
+ * @property {string} device
+ * @property {string} action
+ *
+ * @typedef {object} Volume
+ * @property {string} mountPath
+ * @property {string} target
+ * @property {string} [targetDevice]
+ * @property {string} fsType
+ * @property {number} minSize
+ * @property {number} [maxSize]
+ * @property {boolean} autoSize
+ * @property {boolean} snapshots
+ * @property {boolean} transactional
+ * @property {VolumeOutline} outline
+ *
+ * @typedef {object} VolumeOutline
+ * @property {boolean} required
+ * @property {string[]} fsTypes
+ * @property {boolean} supportAutoSize
+ * @property {boolean} snapshotsConfigurable
+ * @property {boolean} snapshotsAffectSizes
+ * @property {string[]} sizeRelevantVolumes
+ */
+
 /**
  * Enum for the encryption method values
  *
@@ -105,44 +208,15 @@ class DevicesManager {
    * Gets all the exported devices
    *
    * @returns {Promise<StorageDevice[]>}
-   *
-   * @typedef {object} StorageDevice
-   * @property {string} sid - Internal id that is used as D-Bus object basename
-   * @property {boolean} isDrive - Whether the device is a drive
-   * @property {string} type - Type of device ("disk", "raid", "multipath", "dasd", "md")
-   * @property {string} [vendor]
-   * @property {string} [model]
-   * @property {string[]} [driver]
-   * @property {string} [bus]
-   * @property {string} [busId] - DASD Bus ID (only for "dasd" type)
-   * @property {string} [transport]
-   * @property {boolean} [sdCard]
-   * @property {boolean} [dellBOOS]
-   * @property {string[]} [devices] - RAID devices (only for "raid" and "md" types)
-   * @property {string[]} [wires] - Multipath wires (only for "multipath" type)
-   * @property {string} [level] - MD RAID level (only for "md" type)
-   * @property {string} [uuid]
-   * @property {boolean} [active]
-   * @property {string} [name] - Block device name
-   * @property {number} [size]
-   * @property {number} [recoverableSize]
-   * @property {string[]} [systems] - Name of the installed systems
-   * @property {string[]} [udevIds]
-   * @property {string[]} [udevPaths]
-   * @property {PartitionTable} [partitionTable]
-   * @property {Filesystem} [filesystem]
-   *
-   * @typedef {object} PartitionTable
-   * @property {string} type
-   * @property {StorageDevice[]} partitions
-   * @property {number} unpartitionedSize - Total size not assigned to any partition
-   *
-   * @typedef {object} Filesystem
-   * @property {string} type
-   * @property {boolean} isEFI
    */
   async getDevices() {
     const buildDevice = (path, dbusDevices) => {
+      const addDeviceProperties = (device, dbusProperties) => {
+        device.sid = dbusProperties.SID.v;
+        device.name = dbusProperties.Name.v;
+        device.description = dbusProperties.Description.v;
+      };
+
       const addDriveProperties = (device, dbusProperties) => {
         device.isDrive = true;
         device.type = dbusProperties.Type.v;
@@ -173,7 +247,8 @@ class DevicesManager {
 
       const addBlockProperties = (device, blockProperties) => {
         device.active = blockProperties.Active.v;
-        device.name = blockProperties.Name.v;
+        device.encrypted = blockProperties.Encrypted.v;
+        device.start = blockProperties.Start.v;
         device.size = blockProperties.Size.v;
         device.recoverableSize = blockProperties.RecoverableSize.v;
         device.systems = blockProperties.Systems.v;
@@ -181,19 +256,41 @@ class DevicesManager {
         device.udevPaths = blockProperties.UdevPaths.v;
       };
 
+      const addPartitionProperties = (device, partitionProperties) => {
+        device.type = "partition";
+        device.isEFI = partitionProperties.EFI.v;
+      };
+
+      const addLvmVgProperties = (device, lvmVgProperties) => {
+        device.type = "lvmVg";
+        device.size = lvmVgProperties.Size.v;
+        device.physicalVolumes = lvmVgProperties.PhysicalVolumes.v.map(d => buildDevice(d, dbusDevices));
+        device.logicalVolumes = lvmVgProperties.LogicalVolumes.v.map(d => buildDevice(d, dbusDevices));
+      };
+
+      const addLvmLvProperties = (device) => {
+        device.type = "lvmLv";
+      };
+
       const addPtableProperties = (device, ptableProperties) => {
+        const buildPartitionSlot = ([start, size]) => ({ start, size });
         const partitions = ptableProperties.Partitions.v.map(p => buildDevice(p, dbusDevices));
         device.partitionTable = {
           type: ptableProperties.Type.v,
           partitions,
-          unpartitionedSize: device.size - partitions.reduce((s, p) => s + p.size, 0)
+          unpartitionedSize: device.size - partitions.reduce((s, p) => s + p.size, 0),
+          unusedSlots: ptableProperties.UnusedSlots.v.map(buildPartitionSlot)
         };
       };
 
       const addFilesystemProperties = (device, filesystemProperties) => {
+        const buildMountPath = path => path.length > 0 ? path : undefined;
+        const buildLabel = label => label.length > 0 ? label : undefined;
         device.filesystem = {
+          sid: filesystemProperties.SID.v,
           type: filesystemProperties.Type.v,
-          isEFI: filesystemProperties.EFI.v
+          mountPath: buildMountPath(filesystemProperties.MountPath.v),
+          label: buildLabel(filesystemProperties.Label.v)
         };
       };
 
@@ -206,6 +303,8 @@ class DevicesManager {
 
       const device = {
         sid: path.split("/").pop(),
+        name: "",
+        description: "",
         isDrive: false,
         type: ""
       };
@@ -213,6 +312,9 @@ class DevicesManager {
       const dbusDevice = dbusDevices[path];
       if (!dbusDevice) return device;
 
+      const deviceProperties = dbusDevice["org.opensuse.Agama.Storage1.Device"];
+      if (deviceProperties !== undefined) addDeviceProperties(device, deviceProperties);
+
       const driveProperties = dbusDevice["org.opensuse.Agama.Storage1.Drive"];
       if (driveProperties !== undefined) addDriveProperties(device, driveProperties);
 
@@ -228,6 +330,15 @@ class DevicesManager {
       const blockProperties = dbusDevice["org.opensuse.Agama.Storage1.Block"];
       if (blockProperties !== undefined) addBlockProperties(device, blockProperties);
 
+      const partitionProperties = dbusDevice["org.opensuse.Agama.Storage1.Partition"];
+      if (partitionProperties !== undefined) addPartitionProperties(device, partitionProperties);
+
+      const lvmVgProperties = dbusDevice["org.opensuse.Agama.Storage1.LVM.VolumeGroup"];
+      if (lvmVgProperties !== undefined) addLvmVgProperties(device, lvmVgProperties);
+
+      const lvmLvProperties = dbusDevice["org.opensuse.Agama.Storage1.LVM.LogicalVolume"];
+      if (lvmLvProperties !== undefined) addLvmLvProperties(device);
+
       const ptableProperties = dbusDevice["org.opensuse.Agama.Storage1.PartitionTable"];
       if (ptableProperties !== undefined) addPtableProperties(device, ptableProperties);
 
@@ -270,42 +381,6 @@ class ProposalManager {
     };
   }
 
-  /**
-   * @typedef {object} ProposalSettings
-   * @property {string} bootDevice
-   * @property {string} encryptionPassword
-   * @property {string} encryptionMethod
-   * @property {boolean} lvm
-   * @property {string} spacePolicy
-   * @property {SpaceAction[]} spaceActions
-   * @property {string[]} systemVGDevices
-   * @property {Volume[]} volumes
-   * @property {StorageDevice[]} installationDevices
-   *
-   * @typedef {object} SpaceAction
-   * @property {string} device
-   * @property {string} action
-   *
-   * @typedef {object} Volume
-   * @property {string} mountPath
-   * @property {string} fsType
-   * @property {number} minSize
-   * @property {number} [maxSize]
-   * @property {boolean} autoSize
-   * @property {boolean} snapshots
-   * @property {boolean} transactional
-   * @property {VolumeOutline} outline
-   *
-   * @typedef {object} VolumeOutline
-   * @property {boolean} required
-   * @property {string[]} fsTypes
-   * @property {boolean} supportAutoSize
-   * @property {boolean} adjustByRam
-   * @property {boolean} snapshotsConfigurable
-   * @property {boolean} snapshotsAffectSizes
-   * @property {string[]} sizeRelevantVolumes
-   */
-
   /**
    * Gets the list of available devices
    *
@@ -314,7 +389,7 @@ class ProposalManager {
   async getAvailableDevices() {
     const findDevice = (devices, path) => {
       const sid = path.split("/").pop();
-      const device = devices.find(d => d.sid === sid);
+      const device = devices.find(d => d.sid === Number(sid));
 
       if (device === undefined) console.log("D-Bus object not found: ", path);
 
@@ -362,15 +437,6 @@ class ProposalManager {
    * Gets the values of the current proposal
    *
    * @return {Promise<ProposalResult|undefined>}
-   *
-   * @typedef {object} ProposalResult
-   * @property {ProposalSettings} settings
-   * @property {Action[]} actions
-   *
-   * @typedef {object} Action
-   * @property {string} text
-   * @property {boolean} subvol
-   * @property {boolean} delete
   */
   async getResult() {
     const proxy = await this.proposalProxy();
@@ -389,14 +455,22 @@ class ProposalManager {
 
       const buildAction = dbusAction => {
         return {
+          device: dbusAction.Device.v,
           text: dbusAction.Text.v,
           subvol: dbusAction.Subvol.v,
           delete: dbusAction.Delete.v
         };
       };
 
-      const buildInstallationDevices = (proxy, devices) => {
-        const findDevice = (devices, name) => {
+      const buildTargetPVDevices = dbusTargetPVDevices => {
+        if (!dbusTargetPVDevices) return [];
+
+        return dbusTargetPVDevices.v.map(d => d.v);
+      };
+
+      // TODO: Read installation devices from D-Bus.
+      const buildInstallationDevices = (dbusSettings, devices) => {
+        const findDevice = (name) => {
           const device = devices.find(d => d.name === name);
 
           if (device === undefined) console.log("D-Bus object not found: ", name);
@@ -404,26 +478,39 @@ class ProposalManager {
           return device;
         };
 
-        const names = proxy.SystemVGDevices.filter(n => n !== proxy.BootDevice).concat([proxy.BootDevice]);
+        const values = [
+          dbusSettings.TargetDevice?.v,
+          buildTargetPVDevices(dbusSettings.TargetPVDevices),
+          dbusSettings.BootDevice.v,
+          dbusSettings.Volumes.v.map(vol => vol.v.TargetDevice.v)
+        ].flat();
+
+        const names = uniq(compact(values)).filter(d => d.length > 0);
+
         // #findDevice returns undefined if no device is found with the given name.
-        return names.map(dev => findDevice(devices, dev)).filter(dev => dev !== undefined);
+        return compact(names.map(n => findDevice(n)));
       };
 
+      const dbusSettings = proxy.Settings;
+
       return {
         settings: {
-          bootDevice: proxy.BootDevice,
-          lvm: proxy.LVM,
-          spacePolicy: proxy.SpacePolicy,
-          spaceActions: proxy.SpaceActions.map(buildSpaceAction),
-          systemVGDevices: proxy.SystemVGDevices,
-          encryptionPassword: proxy.EncryptionPassword,
-          encryptionMethod: proxy.EncryptionMethod,
-          volumes: proxy.Volumes.map(this.buildVolume),
+          target: dbusSettings.Target.v,
+          targetDevice: dbusSettings.TargetDevice?.v,
+          targetPVDevices: buildTargetPVDevices(dbusSettings.TargetPVDevices),
+          configureBoot: dbusSettings.ConfigureBoot.v,
+          bootDevice: dbusSettings.BootDevice.v,
+          defaultBootDevice: dbusSettings.DefaultBootDevice.v,
+          spacePolicy: dbusSettings.SpacePolicy.v,
+          spaceActions: dbusSettings.SpaceActions.v.map(a => buildSpaceAction(a.v)),
+          encryptionPassword: dbusSettings.EncryptionPassword.v,
+          encryptionMethod: dbusSettings.EncryptionMethod.v,
+          volumes: dbusSettings.Volumes.v.map(vol => this.buildVolume(vol.v)),
           // NOTE: strictly speaking, installation devices does not belong to the settings. It
           // should be a separate method instead of an attribute in the settings object.
           // Nevertheless, it was added here for simplicity and to avoid passing more props in some
           // react components. Please, do not use settings as a jumble.
-          installationDevices: buildInstallationDevices(proxy, systemDevices)
+          installationDevices: buildInstallationDevices(proxy.Settings, systemDevices)
         },
         actions: proxy.Actions.map(buildAction)
       };
@@ -440,13 +527,15 @@ class ProposalManager {
    */
   async calculate(settings) {
     const {
+      target,
+      targetDevice,
+      targetPVDevices,
+      configureBoot,
       bootDevice,
       encryptionPassword,
       encryptionMethod,
-      lvm,
       spacePolicy,
       spaceActions,
-      systemVGDevices,
       volumes
     } = settings;
 
@@ -476,13 +565,15 @@ class ProposalManager {
     };
 
     const dbusSettings = removeUndefinedCockpitProperties({
+      Target: { t: "s", v: target },
+      TargetDevice: { t: "s", v: targetDevice },
+      TargetPVDevices: { t: "as", v: targetPVDevices },
+      ConfigureBoot: { t: "b", v: configureBoot },
       BootDevice: { t: "s", v: bootDevice },
       EncryptionPassword: { t: "s", v: encryptionPassword },
       EncryptionMethod: { t: "s", v: encryptionMethod },
-      LVM: { t: "b", v: lvm },
       SpacePolicy: { t: "s", v: spacePolicy },
       SpaceActions: { t: "aa{sv}", v: dbusSpaceActions() },
-      SystemVGDevices: { t: "as", v: systemVGDevices },
       Volumes: { t: "aa{sv}", v: volumes?.map(dbusVolume) }
     });
 
@@ -497,6 +588,8 @@ class ProposalManager {
    * @param {DBusVolume} dbusVolume
    *
    * @typedef {Object} DBusVolume
+   * @property {CockpitString} Target
+   * @property {CockpitString} [TargetDevice]
    * @property {CockpitString} MountPath
    * @property {CockpitString} FsType
    * @property {CockpitNumber} MinSize
@@ -552,6 +645,8 @@ class ProposalManager {
     };
 
     return {
+      target: dbusVolume.Target.v,
+      targetDevice: dbusVolume.TargetDevice?.v,
       mountPath: dbusVolume.MountPath.v,
       fsType: dbusVolume.FsType.v,
       minSize: dbusVolume.MinSize.v,
@@ -1469,6 +1564,7 @@ class StorageBaseClient {
   constructor(address = undefined) {
     this.client = new DBusClient(StorageBaseClient.SERVICE, address);
     this.system = new DevicesManager(this.client, STORAGE_SYSTEM_NAMESPACE);
+    this.staging = new DevicesManager(this.client, STORAGE_STAGING_NAMESPACE);
     this.proposal = new ProposalManager(this.client, this.system);
     this.iscsi = new ISCSIManager(StorageBaseClient.SERVICE, address);
     this.dasd = new DASDManager(StorageBaseClient.SERVICE, address);
diff --git a/web/src/client/storage.test.js b/web/src/client/storage.test.js
index 6b797556a..7fc98b979 100644
--- a/web/src/client/storage.test.js
+++ b/web/src/client/storage.test.js
@@ -33,10 +33,10 @@ const cockpitCallbacks = {};
 
 let managedObjects = {};
 
-// Define devices
+// System devices
 
 const sda = {
-  sid: "59",
+  sid: 59,
   isDrive: true,
   type: "disk",
   vendor: "Micron",
@@ -49,7 +49,10 @@ const sda = {
   sdCard: true,
   active: true,
   name: "/dev/sda",
+  description: "",
   size: 1024,
+  start: 0,
+  encrypted: false,
   recoverableSize: 0,
   systems : [],
   udevIds: ["ata-Micron_1100_SATA_512GB_12563", "scsi-0ATA_Micron_1100_SATA_512GB"],
@@ -57,33 +60,41 @@ const sda = {
 };
 
 const sda1 = {
-  sid: "60",
+  sid: 60,
   isDrive: false,
-  type: "",
+  type: "partition",
   active: true,
   name: "/dev/sda1",
+  description: "",
   size: 512,
+  start: 123,
+  encrypted: false,
   recoverableSize: 128,
   systems : [],
   udevIds: [],
-  udevPaths: []
+  udevPaths: [],
+  isEFI: false
 };
 
 const sda2 = {
-  sid: "61",
+  sid: 61,
   isDrive: false,
-  type: "",
+  type: "partition",
   active: true,
   name: "/dev/sda2",
+  description: "",
   size: 256,
+  start: 1789,
+  encrypted: false,
   recoverableSize: 0,
   systems : [],
   udevIds: [],
-  udevPaths: []
+  udevPaths: [],
+  isEFI: false
 };
 
 const sdb = {
-  sid: "62",
+  sid: 62,
   isDrive: true,
   type: "disk",
   vendor: "Samsung",
@@ -96,7 +107,10 @@ const sdb = {
   sdCard: false,
   active: true,
   name: "/dev/sdb",
+  description: "",
   size: 2048,
+  start: 0,
+  encrypted: false,
   recoverableSize: 0,
   systems : [],
   udevIds: [],
@@ -104,7 +118,7 @@ const sdb = {
 };
 
 const sdc = {
-  sid: "63",
+  sid: 63,
   isDrive: true,
   type: "disk",
   vendor: "Disk",
@@ -117,7 +131,10 @@ const sdc = {
   sdCard: false,
   active: true,
   name: "/dev/sdc",
+  description: "",
   size: 2048,
+  start: 0,
+  encrypted: false,
   recoverableSize: 0,
   systems : [],
   udevIds: [],
@@ -125,7 +142,7 @@ const sdc = {
 };
 
 const sdd = {
-  sid: "64",
+  sid: 64,
   isDrive: true,
   type: "disk",
   vendor: "Disk",
@@ -138,7 +155,10 @@ const sdd = {
   sdCard: false,
   active: true,
   name: "/dev/sdd",
+  description: "",
   size: 2048,
+  start: 0,
+  encrypted: false,
   recoverableSize: 0,
   systems : [],
   udevIds: [],
@@ -146,7 +166,7 @@ const sdd = {
 };
 
 const sde = {
-  sid: "65",
+  sid: 65,
   isDrive: true,
   type: "disk",
   vendor: "Disk",
@@ -159,7 +179,10 @@ const sde = {
   sdCard: false,
   active: true,
   name: "/dev/sde",
+  description: "",
   size: 2048,
+  start: 0,
+  encrypted: false,
   recoverableSize: 0,
   systems : [],
   udevIds: [],
@@ -167,23 +190,26 @@ const sde = {
 };
 
 const md0 = {
-  sid: "66",
+  sid: 66,
   isDrive: false,
   type: "md",
   level: "raid0",
   uuid: "12345:abcde",
   active: true,
   name: "/dev/md0",
+  description: "EXT4 RAID",
   size: 2048,
+  start: 0,
+  encrypted: false,
   recoverableSize: 0,
   systems : ["openSUSE Leap 15.2"],
   udevIds: [],
   udevPaths: [],
-  filesystem: { type: "ext4", isEFI: false }
+  filesystem: { sid: 100, type: "ext4", mountPath: "/test", label: "system" }
 };
 
 const raid = {
-  sid: "67",
+  sid: 67,
   isDrive: true,
   type: "raid",
   vendor: "Dell",
@@ -196,7 +222,10 @@ const raid = {
   sdCard: false,
   active: true,
   name: "/dev/mapper/isw_ddgdcbibhd_244",
+  description: "",
   size: 2048,
+  start: 0,
+  encrypted: false,
   recoverableSize: 0,
   systems : [],
   udevIds: [],
@@ -204,7 +233,7 @@ const raid = {
 };
 
 const multipath = {
-  sid: "68",
+  sid: 68,
   isDrive: true,
   type: "multipath",
   vendor: "",
@@ -217,7 +246,10 @@ const multipath = {
   sdCard: false,
   active: true,
   name: "/dev/mapper/36005076305ffc73a00000000000013b4",
+  description: "",
   size: 2048,
+  start: 0,
+  encrypted: false,
   recoverableSize: 0,
   systems : [],
   udevIds: [],
@@ -225,7 +257,7 @@ const multipath = {
 };
 
 const dasd = {
-  sid: "69",
+  sid: 69,
   isDrive: true,
   type: "dasd",
   vendor: "IBM",
@@ -238,7 +270,76 @@ const dasd = {
   sdCard: false,
   active: true,
   name: "/dev/dasda",
+  description: "",
   size: 2048,
+  start: 0,
+  encrypted: false,
+  recoverableSize: 0,
+  systems : [],
+  udevIds: [],
+  udevPaths: []
+};
+
+const sdf = {
+  sid: 70,
+  isDrive: true,
+  type: "disk",
+  vendor: "Disk",
+  model: "",
+  driver: [],
+  bus: "IDE",
+  busId: "",
+  transport: "",
+  dellBOSS: false,
+  sdCard: false,
+  active: true,
+  name: "/dev/sdf",
+  description: "",
+  size: 2048,
+  start: 0,
+  encrypted: false,
+  recoverableSize: 0,
+  systems : [],
+  udevIds: [],
+  udevPaths: []
+};
+
+const sdf1 = {
+  sid: 71,
+  isDrive: false,
+  type: "partition",
+  active: true,
+  name: "/dev/sdf1",
+  description: "PV of vg0",
+  size: 512,
+  start: 1024,
+  encrypted: true,
+  recoverableSize: 0,
+  systems : [],
+  udevIds: [],
+  udevPaths: [],
+  isEFI: false
+};
+
+const lvmVg = {
+  sid: 72,
+  isDrive: false,
+  type: "lvmVg",
+  name: "/dev/vg0",
+  description: "LVM",
+  size: 512
+};
+
+const lvmLv1 = {
+  sid: 73,
+  isDrive: false,
+  type: "lvmLv",
+  active: true,
+  name: "/dev/vg0/lv1",
+  description: "",
+  size: 512,
+  start: 0,
+  encrypted: false,
   recoverableSize: 0,
   systems : [],
   udevIds: [],
@@ -250,7 +351,8 @@ const dasd = {
 sda.partitionTable = {
   type: "gpt",
   partitions: [sda1, sda2],
-  unpartitionedSize: 256
+  unpartitionedSize: 256,
+  unusedSlots: [{ start: 1234, size: 256 }]
 };
 
 sda1.component = {
@@ -283,13 +385,60 @@ sde.component = {
   deviceNames: ["/dev/mapper/36005076305ffc73a00000000000013b4"]
 };
 
+sdf.partitionTable = {
+  type: "gpt",
+  partitions: [sdf1],
+  unpartitionedSize: 1536,
+  unusedSlots: []
+};
+
+sdf1.component = {
+  type: "physical_volume",
+  deviceNames: ["/dev/vg0"]
+};
+
 md0.devices = [sda1, sda2];
 
 raid.devices = [sdb, sdc];
 
 multipath.wires = [sdd, sde];
 
-const systemDevices = { sda, sda1, sda2, sdb, sdc, sdd, sde, md0, raid, multipath, dasd };
+lvmVg.logicalVolumes = [lvmLv1];
+lvmVg.physicalVolumes = [sdf1];
+
+const systemDevices = {
+  sda, sda1, sda2, sdb, sdc, sdd, sde, md0, raid, multipath, dasd, sdf, sdf1, lvmVg, lvmLv1
+};
+
+// Staging devices
+//
+// Using a single device because most of the checks are already done with system devices.
+
+const sdbStaging = {
+  sid: 62,
+  isDrive: true,
+  type: "disk",
+  vendor: "Samsung",
+  model: "Samsung Evo 8 Pro",
+  driver: ["ahci"],
+  bus: "IDE",
+  busId: "",
+  transport: "",
+  dellBOSS: false,
+  sdCard: false,
+  active: true,
+  name: "/dev/sdb",
+  description: "",
+  size: 2048,
+  start: 0,
+  encrypted: false,
+  recoverableSize: 0,
+  systems : [],
+  udevIds: [],
+  udevPaths: ["pci-0000:00-19"]
+};
+
+const stagingDevices = { sdb: sdbStaging };
 
 const contexts = {
   withoutProposal: () => {
@@ -297,67 +446,101 @@ const contexts = {
   },
   withProposal: () => {
     cockpitProxies.proposal = {
-      BootDevice: "/dev/sda",
-      LVM: true,
-      SystemVGDevices: ["/dev/sda", "/dev/sdb"],
-      EncryptionPassword: "00000",
-      SpacePolicy: "custom",
-      SpaceActions: [
-        {
-          Device: { t: "s", v: "/dev/sda" },
-          Action: { t: "s", v: "force_delete" }
+      Settings: {
+        Target: { t: "s", v: "newLvmVg" },
+        TargetPVDevices: {
+          t: "av",
+          v: [
+            { t: "s", v: "/dev/sda" },
+            { t: "s", v: "/dev/sdb" }
+          ]
         },
-        {
-          Device: { t: "s", v: "/dev/sdb" },
-          Action: { t: "s", v: "resize" }
-        }
-      ],
-      Volumes: [
-        {
-          MountPath: { t: "s", v: "/" },
-          FsType: { t: "s", v: "Btrfs" },
-          MinSize: { t: "x", v: 1024 },
-          MaxSize: { t: "x", v: 2048 },
-          AutoSize: { t: "b", v: true },
-          Snapshots: { t: "b", v: true },
-          Transactional: { t: "b", v: true },
-          Outline: {
-            t: "a{sv}",
-            v: {
-              Required: { t: "b", v: true },
-              FsTypes: { t: "as", v: [{ t: "s", v: "Btrfs" }, { t: "s", v: "Ext3" }] },
-              SupportAutoSize: { t: "b", v: true },
-              SnapshotsConfigurable: { t: "b", v: true },
-              SnapshotsAffectSizes: { t: "b", v: true },
-              AdjustByRam: { t: "b", v: false },
-              SizeRelevantVolumes: { t: "as", v: [{ t: "s", v: "/home" }] }
+        ConfigureBoot: { t: "b", v: true },
+        BootDevice: { t: "s", v: "/dev/sda" },
+        DefaultBootDevice: { t: "s", v: "/dev/sdb" },
+        EncryptionPassword: { t: "s", v: "00000" },
+        EncryptionMethod: { t: "s", v: "luks1" },
+        SpacePolicy: { t: "s", v: "custom" },
+        SpaceActions: {
+          t: "av",
+          v: [
+            {
+              t: "a{sv}",
+              v: {
+                Device: { t: "s", v: "/dev/sda" },
+                Action: { t: "s", v: "force_delete" }
+              }
+            },
+            {
+              t: "a{sv}",
+              v: {
+                Device: { t: "s", v: "/dev/sdb" },
+                Action: { t: "s", v: "resize" }
+              }
             }
-          }
+          ]
         },
-        {
-          MountPath: { t: "s", v: "/home" },
-          FsType: { t: "s", v: "XFS" },
-          MinSize: { t: "x", v: 2048 },
-          MaxSize: { t: "x", v: 4096 },
-          AutoSize: { t: "b", v: false },
-          Snapshots: { t: "b", v: false },
-          Transactional: { t: "b", v: false },
-          Outline: {
-            t: "a{sv}",
-            v: {
-              Required: { t: "b", v: false },
-              FsTypes: { t: "as", v: [{ t: "s", v: "Ext4" }, { t: "s", v: "XFS" }] },
-              SupportAutoSize: { t: "b", v: false },
-              SnapshotsConfigurable: { t: "b", v: false },
-              SnapshotsAffectSizes: { t: "b", v: false },
-              AdjustByRam: { t: "b", v: false },
-              SizeRelevantVolumes: { t: "as", v: [] }
+        Volumes: {
+          t: "av",
+          v: [
+            {
+              t: "a{sv}",
+              v: {
+                MountPath: { t: "s", v: "/" },
+                Target: { t: "s", v: "default" },
+                TargetDevice: { t: "s", v: "" },
+                FsType: { t: "s", v: "Btrfs" },
+                MinSize: { t: "x", v: 1024 },
+                MaxSize: { t: "x", v: 2048 },
+                AutoSize: { t: "b", v: true },
+                Snapshots: { t: "b", v: true },
+                Transactional: { t: "b", v: true },
+                Outline: {
+                  t: "a{sv}",
+                  v: {
+                    Required: { t: "b", v: true },
+                    FsTypes: { t: "as", v: [{ t: "s", v: "Btrfs" }, { t: "s", v: "Ext3" }] },
+                    SupportAutoSize: { t: "b", v: true },
+                    SnapshotsConfigurable: { t: "b", v: true },
+                    SnapshotsAffectSizes: { t: "b", v: true },
+                    AdjustByRam: { t: "b", v: false },
+                    SizeRelevantVolumes: { t: "as", v: [{ t: "s", v: "/home" }] }
+                  }
+                }
+              }
+            },
+            {
+              t: "a{sv}",
+              v: {
+                MountPath: { t: "s", v: "/home" },
+                Target: { t: "s", v: "default" },
+                TargetDevice: { t: "s", v: "" },
+                FsType: { t: "s", v: "XFS" },
+                MinSize: { t: "x", v: 2048 },
+                MaxSize: { t: "x", v: 4096 },
+                AutoSize: { t: "b", v: false },
+                Snapshots: { t: "b", v: false },
+                Transactional: { t: "b", v: false },
+                Outline: {
+                  t: "a{sv}",
+                  v: {
+                    Required: { t: "b", v: false },
+                    FsTypes: { t: "as", v: [{ t: "s", v: "Ext4" }, { t: "s", v: "XFS" }] },
+                    SupportAutoSize: { t: "b", v: false },
+                    SnapshotsConfigurable: { t: "b", v: false },
+                    SnapshotsAffectSizes: { t: "b", v: false },
+                    AdjustByRam: { t: "b", v: false },
+                    SizeRelevantVolumes: { t: "as", v: [] }
+                  }
+                }
+              }
             }
-          }
-        }
-      ],
+          ]
+        },
+      },
       Actions: [
         {
+          Device: { t: "u", v: 2 },
           Text: { t: "s", v: "Mount /dev/sdb1 as root" },
           Subvol: { t: "b", v: false },
           Delete: { t: "b", v: false }
@@ -479,6 +662,11 @@ const contexts = {
   },
   withSystemDevices: () => {
     managedObjects["/org/opensuse/Agama/Storage1/system/59"] = {
+      "org.opensuse.Agama.Storage1.Device": {
+        SID: { t: "u", v: 59 },
+        Name: { t: "s", v: "/dev/sda" },
+        Description: { t: "s", v: "" }
+      },
       "org.opensuse.Agama.Storage1.Drive": {
         Type: { t: "s", v: "disk" },
         Vendor: { t: "s", v: "Micron" },
@@ -491,8 +679,9 @@ const contexts = {
       },
       "org.opensuse.Agama.Storage1.Block": {
         Active: { t: "b", v: true },
-        Name: { t: "s", v: "/dev/sda" },
+        Encrypted: { t: "b", v: false },
         Size: { t: "x", v: 1024 },
+        Start: { t: "t", v: 0 },
         RecoverableSize: { t: "x", v: 0 },
         Systems: { t: "as", v: [] },
         UdevIds: { t: "as", v: ["ata-Micron_1100_SATA_512GB_12563", "scsi-0ATA_Micron_1100_SATA_512GB"] },
@@ -503,14 +692,24 @@ const contexts = {
         Partitions: {
           t: "as",
           v: ["/org/opensuse/Agama/Storage1/system/60", "/org/opensuse/Agama/Storage1/system/61"]
-        }
+        },
+        UnusedSlots: { t: "a(tt)", v: [[1234, 256]] }
       }
     };
     managedObjects["/org/opensuse/Agama/Storage1/system/60"] = {
+      "org.opensuse.Agama.Storage1.Device": {
+        SID: { t: "u", v: 60 },
+        Name: { t: "s", v: "/dev/sda1" },
+        Description: { t: "s", v: "" }
+      },
+      "org.opensuse.Agama.Storage1.Partition": {
+        EFI: { t: "b", v: false }
+      },
       "org.opensuse.Agama.Storage1.Block": {
         Active: { t: "b", v: true },
-        Name: { t: "s", v: "/dev/sda1" },
+        Encrypted: { t: "b", v: false },
         Size: { t: "x", v: 512 },
+        Start: { t: "t", v: 123 },
         RecoverableSize: { t: "x", v: 128 },
         Systems: { t: "as", v: [] },
         UdevIds: { t: "as", v: [] },
@@ -523,10 +722,19 @@ const contexts = {
       }
     };
     managedObjects["/org/opensuse/Agama/Storage1/system/61"] = {
+      "org.opensuse.Agama.Storage1.Device": {
+        SID: { t: "u", v: 61 },
+        Name: { t: "s", v: "/dev/sda2" },
+        Description: { t: "s", v: "" }
+      },
+      "org.opensuse.Agama.Storage1.Partition": {
+        EFI: { t: "b", v: false }
+      },
       "org.opensuse.Agama.Storage1.Block": {
         Active: { t: "b", v: true },
-        Name: { t: "s", v: "/dev/sda2" },
+        Encrypted: { t: "b", v: false },
         Size: { t: "x", v: 256 },
+        Start: { t: "t", v: 1789 },
         RecoverableSize: { t: "x", v: 0 },
         Systems: { t: "as", v: [] },
         UdevIds: { t: "as", v: [] },
@@ -539,6 +747,11 @@ const contexts = {
       }
     };
     managedObjects["/org/opensuse/Agama/Storage1/system/62"] = {
+      "org.opensuse.Agama.Storage1.Device": {
+        SID: { t: "u", v: 62 },
+        Name: { t: "s", v: "/dev/sdb" },
+        Description: { t: "s", v: "" }
+      },
       "org.opensuse.Agama.Storage1.Drive": {
         Type: { t: "s", v: "disk" },
         Vendor: { t: "s", v: "Samsung" },
@@ -551,8 +764,9 @@ const contexts = {
       },
       "org.opensuse.Agama.Storage1.Block": {
         Active: { t: "b", v: true },
-        Name: { t: "s", v: "/dev/sdb" },
+        Encrypted: { t: "b", v: false },
         Size: { t: "x", v: 2048 },
+        Start: { t: "t", v: 0 },
         RecoverableSize: { t: "x", v: 0 },
         Systems: { t: "as", v: [] },
         UdevIds: { t: "as", v: [] },
@@ -565,6 +779,11 @@ const contexts = {
       }
     };
     managedObjects["/org/opensuse/Agama/Storage1/system/63"] = {
+      "org.opensuse.Agama.Storage1.Device": {
+        SID: { t: "u", v: 63 },
+        Name: { t: "s", v: "/dev/sdc" },
+        Description: { t: "s", v: "" }
+      },
       "org.opensuse.Agama.Storage1.Drive": {
         Type: { t: "s", v: "disk" },
         Vendor: { t: "s", v: "Disk" },
@@ -577,8 +796,9 @@ const contexts = {
       },
       "org.opensuse.Agama.Storage1.Block": {
         Active: { t: "b", v: true },
-        Name: { t: "s", v: "/dev/sdc" },
+        Encrypted: { t: "b", v: false },
         Size: { t: "x", v: 2048 },
+        Start: { t: "t", v: 0 },
         RecoverableSize: { t: "x", v: 0 },
         Systems: { t: "as", v: [] },
         UdevIds: { t: "as", v: [] },
@@ -591,6 +811,11 @@ const contexts = {
       }
     };
     managedObjects["/org/opensuse/Agama/Storage1/system/64"] = {
+      "org.opensuse.Agama.Storage1.Device": {
+        SID: { t: "u", v: 64 },
+        Name: { t: "s", v: "/dev/sdd" },
+        Description: { t: "s", v: "" }
+      },
       "org.opensuse.Agama.Storage1.Drive": {
         Type: { t: "s", v: "disk" },
         Vendor: { t: "s", v: "Disk" },
@@ -603,8 +828,9 @@ const contexts = {
       },
       "org.opensuse.Agama.Storage1.Block": {
         Active: { t: "b", v: true },
-        Name: { t: "s", v: "/dev/sdd" },
+        Encrypted: { t: "b", v: false },
         Size: { t: "x", v: 2048 },
+        Start: { t: "t", v: 0 },
         RecoverableSize: { t: "x", v: 0 },
         Systems: { t: "as", v: [] },
         UdevIds: { t: "as", v: [] },
@@ -617,6 +843,11 @@ const contexts = {
       }
     };
     managedObjects["/org/opensuse/Agama/Storage1/system/65"] = {
+      "org.opensuse.Agama.Storage1.Device": {
+        SID: { t: "u", v: 65 },
+        Name: { t: "s", v: "/dev/sde" },
+        Description: { t: "s", v: "" }
+      },
       "org.opensuse.Agama.Storage1.Drive": {
         Type: { t: "s", v: "disk" },
         Vendor: { t: "s", v: "Disk" },
@@ -629,8 +860,9 @@ const contexts = {
       },
       "org.opensuse.Agama.Storage1.Block": {
         Active: { t: "b", v: true },
-        Name: { t: "s", v: "/dev/sde" },
+        Encrypted: { t: "b", v: false },
         Size: { t: "x", v: 2048 },
+        Start: { t: "t", v: 0 },
         RecoverableSize: { t: "x", v: 0 },
         Systems: { t: "as", v: [] },
         UdevIds: { t: "as", v: [] },
@@ -643,6 +875,11 @@ const contexts = {
       }
     };
     managedObjects["/org/opensuse/Agama/Storage1/system/66"] = {
+      "org.opensuse.Agama.Storage1.Device": {
+        SID: { t: "u", v: 66 },
+        Name: { t: "s", v: "/dev/md0" },
+        Description: { t: "s", v: "EXT4 RAID" }
+      },
       "org.opensuse.Agama.Storage1.MD": {
         Level: { t: "s", v: "raid0" },
         UUID: { t: "s", v: "12345:abcde" },
@@ -653,19 +890,27 @@ const contexts = {
       },
       "org.opensuse.Agama.Storage1.Block": {
         Active: { t: "b", v: true },
-        Name: { t: "s", v: "/dev/md0" },
+        Encrypted: { t: "b", v: false },
         Size: { t: "x", v: 2048 },
+        Start: { t: "t", v: 0 },
         RecoverableSize: { t: "x", v: 0 },
         Systems: { t: "as", v: ["openSUSE Leap 15.2"] },
         UdevIds: { t: "as", v: [] },
         UdevPaths: { t: "as", v: [] }
       },
       "org.opensuse.Agama.Storage1.Filesystem": {
+        SID: { t: "u", v: 100 },
         Type: { t: "s", v: "ext4" },
-        EFI: { t: "b", v: false }
+        MountPath: { t: "s", v: "/test" },
+        Label: { t: "s", v: "system" }
       }
     };
     managedObjects["/org/opensuse/Agama/Storage1/system/67"] = {
+      "org.opensuse.Agama.Storage1.Device": {
+        SID: { t: "u", v: 67 },
+        Name: { t: "s", v: "/dev/mapper/isw_ddgdcbibhd_244" },
+        Description: { t: "s", v: "" }
+      },
       "org.opensuse.Agama.Storage1.Drive": {
         Type: { t: "s", v: "raid" },
         Vendor: { t: "s", v: "Dell" },
@@ -684,8 +929,9 @@ const contexts = {
       },
       "org.opensuse.Agama.Storage1.Block": {
         Active: { t: "b", v: true },
-        Name: { t: "s", v: "/dev/mapper/isw_ddgdcbibhd_244" },
+        Encrypted: { t: "b", v: false },
         Size: { t: "x", v: 2048 },
+        Start: { t: "t", v: 0 },
         RecoverableSize: { t: "x", v: 0 },
         Systems: { t: "as", v: [] },
         UdevIds: { t: "as", v: [] },
@@ -693,6 +939,11 @@ const contexts = {
       }
     };
     managedObjects["/org/opensuse/Agama/Storage1/system/68"] = {
+      "org.opensuse.Agama.Storage1.Device": {
+        SID: { t: "u", v: 68 },
+        Name: { t: "s", v: "/dev/mapper/36005076305ffc73a00000000000013b4" },
+        Description: { t: "s", v: "" }
+      },
       "org.opensuse.Agama.Storage1.Drive": {
         Type: { t: "s", v: "multipath" },
         Vendor: { t: "s", v: "" },
@@ -711,8 +962,9 @@ const contexts = {
       },
       "org.opensuse.Agama.Storage1.Block": {
         Active: { t: "b", v: true },
-        Name: { t: "s", v: "/dev/mapper/36005076305ffc73a00000000000013b4" },
+        Encrypted: { t: "b", v: false },
         Size: { t: "x", v: 2048 },
+        Start: { t: "t", v: 0 },
         RecoverableSize: { t: "x", v: 0 },
         Systems: { t: "as", v: [] },
         UdevIds: { t: "as", v: [] },
@@ -720,6 +972,11 @@ const contexts = {
       }
     };
     managedObjects["/org/opensuse/Agama/Storage1/system/69"] = {
+      "org.opensuse.Agama.Storage1.Device": {
+        SID: { t: "u", v: 69 },
+        Name: { t: "s", v: "/dev/dasda" },
+        Description: { t: "s", v: "" }
+      },
       "org.opensuse.Agama.Storage1.Drive": {
         Type: { t: "s", v: "dasd" },
         Vendor: { t: "s", v: "IBM" },
@@ -732,12 +989,135 @@ const contexts = {
       },
       "org.opensuse.Agama.Storage1.Block": {
         Active: { t: "b", v: true },
-        Name: { t: "s", v: "/dev/dasda" },
+        Encrypted: { t: "b", v: false },
+        Size: { t: "x", v: 2048 },
+        Start: { t: "t", v: 0 },
+        RecoverableSize: { t: "x", v: 0 },
+        Systems: { t: "as", v: [] },
+        UdevIds: { t: "as", v: [] },
+        UdevPaths: { t: "as", v: [] }
+      }
+    };
+    managedObjects["/org/opensuse/Agama/Storage1/system/70"] = {
+      "org.opensuse.Agama.Storage1.Device": {
+        SID: { t: "u", v: 70 },
+        Name: { t: "s", v: "/dev/sdf" },
+        Description: { t: "s", v: "" }
+      },
+      "org.opensuse.Agama.Storage1.Drive": {
+        Type: { t: "s", v: "disk" },
+        Vendor: { t: "s", v: "Disk" },
+        Model: { t: "s", v: "" },
+        Driver: { t: "as", v: [] },
+        Bus: { t: "s", v: "IDE" },
+        BusId: { t: "s", v: "" },
+        Transport: { t: "s", v: "" },
+        Info: { t: "a{sv}", v: { DellBOSS: { t: "b", v: false }, SDCard: { t: "b", v: false } } },
+      },
+      "org.opensuse.Agama.Storage1.Block": {
+        Active: { t: "b", v: true },
+        Encrypted: { t: "b", v: false },
         Size: { t: "x", v: 2048 },
+        Start: { t: "t", v: 0 },
         RecoverableSize: { t: "x", v: 0 },
         Systems: { t: "as", v: [] },
         UdevIds: { t: "as", v: [] },
         UdevPaths: { t: "as", v: [] }
+      },
+      "org.opensuse.Agama.Storage1.PartitionTable": {
+        Type: { t: "s", v: "gpt" },
+        Partitions: {
+          t: "as",
+          v: ["/org/opensuse/Agama/Storage1/system/71"]
+        },
+        UnusedSlots: { t: "a(tt)", v: [] }
+      }
+    };
+    managedObjects["/org/opensuse/Agama/Storage1/system/71"] = {
+      "org.opensuse.Agama.Storage1.Device": {
+        SID: { t: "u", v: 71 },
+        Name: { t: "s", v: "/dev/sdf1" },
+        Description: { t: "s", v: "PV of vg0" }
+      },
+      "org.opensuse.Agama.Storage1.Partition": {
+        EFI: { t: "b", v: false }
+      },
+      "org.opensuse.Agama.Storage1.Block": {
+        Active: { t: "b", v: true },
+        Encrypted: { t: "b", v: true },
+        Size: { t: "x", v: 512 },
+        Start: { t: "t", v: 1024 },
+        RecoverableSize: { t: "x", v: 0 },
+        Systems: { t: "as", v: [] },
+        UdevIds: { t: "as", v: [] },
+        UdevPaths: { t: "as", v: [] }
+      },
+      "org.opensuse.Agama.Storage1.Component": {
+        Type: { t: "s", v: "physical_volume" },
+        DeviceNames: { t: "as", v: ["/dev/vg0"] },
+        Devices: { t: "ao", v: ["/org/opensuse/Agama/Storage1/system/72"] }
+      }
+    };
+    managedObjects["/org/opensuse/Agama/Storage1/system/72"] = {
+      "org.opensuse.Agama.Storage1.Device": {
+        SID: { t: "u", v: 72 },
+        Name: { t: "s", v: "/dev/vg0" },
+        Description: { t: "s", v: "LVM" }
+      },
+      "org.opensuse.Agama.Storage1.LVM.VolumeGroup": {
+        Type: { t: "s", v: "physical_volume" },
+        Size: { t: "x", v: 512 },
+        PhysicalVolumes: { t: "ao", v: ["/org/opensuse/Agama/Storage1/system/71"] },
+        LogicalVolumes: { t: "ao", v: ["/org/opensuse/Agama/Storage1/system/73"] }
+      }
+    };
+    managedObjects["/org/opensuse/Agama/Storage1/system/73"] = {
+      "org.opensuse.Agama.Storage1.Device": {
+        SID: { t: "u", v: 73 },
+        Name: { t: "s", v: "/dev/vg0/lv1" },
+        Description: { t: "s", v: "" }
+      },
+      "org.opensuse.Agama.Storage1.Block": {
+        Active: { t: "b", v: true },
+        Encrypted: { t: "b", v: false },
+        Size: { t: "x", v: 512 },
+        Start: { t: "t", v: 0 },
+        RecoverableSize: { t: "x", v: 0 },
+        Systems: { t: "as", v: [] },
+        UdevIds: { t: "as", v: [] },
+        UdevPaths: { t: "as", v: [] }
+      },
+      "org.opensuse.Agama.Storage1.LVM.LogicalVolume": {
+        VolumeGroup: { t: "o", v: "/org/opensuse/Agama/Storage1/system/72" }
+      }
+    };
+  },
+  withStagingDevices: () => {
+    managedObjects["/org/opensuse/Agama/Storage1/staging/62"] = {
+      "org.opensuse.Agama.Storage1.Device": {
+        SID: { t: "u", v: 62 },
+        Name: { t: "s", v: "/dev/sdb" },
+        Description: { t: "s", v: "" }
+      },
+      "org.opensuse.Agama.Storage1.Drive": {
+        Type: { t: "s", v: "disk" },
+        Vendor: { t: "s", v: "Samsung" },
+        Model: { t: "s", v: "Samsung Evo 8 Pro" },
+        Driver: { t: "as", v: ["ahci"] },
+        Bus: { t: "s", v: "IDE" },
+        BusId: { t: "s", v: "" },
+        Transport: { t: "s", v: "" },
+        Info: { t: "a{sv}", v: { DellBOSS: { t: "b", v: false }, SDCard: { t: "b", v: false } } },
+      },
+      "org.opensuse.Agama.Storage1.Block": {
+        Active: { t: "b", v: true },
+        Encrypted: { t: "b", v: false },
+        Size: { t: "x", v: 2048 },
+        Start: { t: "t", v: 0 },
+        RecoverableSize: { t: "x", v: 0 },
+        Systems: { t: "as", v: [] },
+        UdevIds: { t: "as", v: [] },
+        UdevPaths: { t: "as", v: ["pci-0000:00-19"] }
       }
     };
   }
@@ -973,6 +1353,33 @@ describe("#system", () => {
   });
 });
 
+describe("#staging", () => {
+  describe("#getDevices", () => {
+    describe("when there are devices", () => {
+      beforeEach(() => {
+        contexts.withStagingDevices();
+        client = new StorageClient();
+      });
+
+      it("returns the staging devices", async () => {
+        const devices = await client.staging.getDevices();
+        expect(devices).toEqual(Object.values(stagingDevices));
+      });
+    });
+
+    describe("when there are not devices", () => {
+      beforeEach(() => {
+        client = new StorageClient();
+      });
+
+      it("returns an empty list", async () => {
+        const devices = await client.staging.getDevices();
+        expect(devices).toEqual([]);
+      });
+    });
+  });
+});
+
 describe("#proposal", () => {
   describe("#getAvailableDevices", () => {
     beforeEach(() => {
@@ -1005,6 +1412,8 @@ describe("#proposal", () => {
         switch (mountPath) {
           case "/home": return {
             MountPath: { t: "s", v: "/home" },
+            Target: { t: "s", v: "default" },
+            TargetDevice: { t: "s", v: "" },
             FsType: { t: "s", v: "XFS" },
             MinSize: { t: "x", v: 2048 },
             MaxSize: { t: "x", v: 4096 },
@@ -1026,6 +1435,8 @@ describe("#proposal", () => {
           };
           case "": return {
             MountPath: { t: "s", v: "" },
+            Target: { t: "s", v: "default" },
+            TargetDevice: { t: "s", v: "" },
             FsType: { t: "s", v: "Ext4" },
             MinSize: { t: "x", v: 1024 },
             MaxSize: { t: "x", v: 2048 },
@@ -1056,6 +1467,8 @@ describe("#proposal", () => {
 
       expect(home).toStrictEqual({
         mountPath: "/home",
+        target: "default",
+        targetDevice: "",
         fsType: "XFS",
         minSize: 2048,
         maxSize: 4096,
@@ -1077,6 +1490,8 @@ describe("#proposal", () => {
 
       expect(generic).toStrictEqual({
         mountPath: "",
+        target: "default",
+        targetDevice: "",
         fsType: "Ext4",
         minSize: 1024,
         maxSize: 2048,
@@ -1120,9 +1535,11 @@ describe("#proposal", () => {
         const { settings, actions } = await client.proposal.getResult();
 
         expect(settings).toMatchObject({
+          target: "newLvmVg",
+          targetPVDevices: ["/dev/sda", "/dev/sdb"],
+          configureBoot: true,
           bootDevice: "/dev/sda",
-          lvm: true,
-          systemVGDevices: ["/dev/sda", "/dev/sdb"],
+          defaultBootDevice: "/dev/sdb",
           encryptionPassword: "00000",
           spacePolicy: "custom",
           spaceActions: [
@@ -1132,6 +1549,8 @@ describe("#proposal", () => {
           volumes: [
             {
               mountPath: "/",
+              target: "default",
+              targetDevice: "",
               fsType: "Btrfs",
               minSize: 1024,
               maxSize: 2048,
@@ -1149,6 +1568,8 @@ describe("#proposal", () => {
             },
             {
               mountPath: "/home",
+              target: "default",
+              targetDevice: "",
               fsType: "XFS",
               minSize: 2048,
               maxSize: 4096,
@@ -1172,7 +1593,7 @@ describe("#proposal", () => {
         );
 
         expect(actions).toStrictEqual([
-          { text: "Mount /dev/sdb1 as root", subvol: false, delete: false }
+          { device: 2, text: "Mount /dev/sdb1 as root", subvol: false, delete: false }
         ]);
       });
     });
@@ -1194,10 +1615,11 @@ describe("#proposal", () => {
 
     it("calculates a proposal with the given settings", async () => {
       await client.proposal.calculate({
+        target: "disk",
+        targetDevice: "/dev/vdc",
+        configureBoot: true,
         bootDevice: "/dev/vdb",
         encryptionPassword: "12345",
-        lvm: true,
-        systemVGDevices: ["/dev/sdc"],
         spacePolicy: "custom",
         spaceActions: [{ device: "/dev/sda", action: "resize" }],
         volumes: [
@@ -1217,10 +1639,11 @@ describe("#proposal", () => {
       });
 
       expect(cockpitProxies.proposalCalculator.Calculate).toHaveBeenCalledWith({
+        Target: { t: "s", v: "disk" },
+        TargetDevice: { t: "s", v: "/dev/vdc" },
+        ConfigureBoot: { t: "b", v: true },
         BootDevice: { t: "s", v: "/dev/vdb" },
         EncryptionPassword: { t: "s", v: "12345" },
-        LVM: { t: "b", v: true },
-        SystemVGDevices: { t: "as", v: ["/dev/sdc"] },
         SpacePolicy: { t: "s", v: "custom" },
         SpaceActions: {
           t: "aa{sv}",
diff --git a/web/src/components/core/ControlledPanels.jsx b/web/src/components/core/ControlledPanels.jsx
new file mode 100644
index 000000000..6c164607f
--- /dev/null
+++ b/web/src/components/core/ControlledPanels.jsx
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+// @ts-check
+
+import React from "react";
+
+/**
+ * Wrapper component for holding ControlledPanel options
+ *
+ * Useful for rendering the ControlledPanel options horizontally.
+ *
+ * @see ControlledPanel examples.
+ *
+ * @param {React.PropsWithChildren} props
+ */
+const Options = ({ children, ...props }) => {
+  return (
+    <div className="split" {...props}>
+      { children }
+    </div>
+  );
+};
+
+/**
+ * Renders an option intended to control the visibility of panels referenced by
+ * the controls prop.
+ *
+ * @typedef {object} OptionProps
+ * @property {string} id - The option id.
+ * @property {React.AriaAttributes["aria-controls"]} controls - A space-separated of one or more ID values
+ *   referencing the elements whose contents or presence are controlled by the option.
+ * @property {boolean} isSelected - Whether the option is selected or not.
+ * @typedef {Omit<React.ComponentPropsWithoutRef<"input">, "aria-controls">} InputProps
+ *
+ * @param {React.PropsWithChildren<InputProps & OptionProps>} props
+ */
+const Option = ({ id, controls, isSelected, children, ...props }) => {
+  return (
+    <div data-type="agama/option">
+      <label htmlFor={id}>
+        <input id={id} checked={isSelected} type="radio" aria-controls={controls} {...props} />
+        {children}
+      </label>
+    </div>
+  );
+};
+
+/**
+ * Renders content whose visibility will be controlled by an option
+ *
+ * @typedef {object} PanelBaseProps
+ * @property {string} id - The option id.
+ * @property {boolean} isExpanded - The value for the aria-expanded attribute
+ *   which will determine if the panel is visible or not.
+ *
+ * @typedef {PanelBaseProps & Omit<React.HTMLAttributes<HTMLDivElement>, "id" | "aria-expanded">} PanelProps
+ *
+ * @param {PanelProps} props
+ */
+const Panel = ({ id, isExpanded = false, children, ...props }) => {
+  return (
+    <div {...props} id={id} aria-expanded={isExpanded}>
+      { children }
+    </div>
+  );
+};
+
+/**
+ * TODO: Write the documentation and examples.
+ * TODO: Find a better name.
+ * TODO: Improve it.
+ * NOTE: Please, be aware that despite the name, this has no relation with so
+ * called React controlled components https://react.dev/learn/sharing-state-between-components#controlled-and-uncontrolled-components
+ * This is just a convenient, dummy component for simplifying the use of this
+ * options/tabs pattern across Agama UI.
+ */
+const ControlledPanels = ({ children, ...props }) => {
+  return (
+    <div {...props} data-type="agama/controlled-panels">
+      { children }
+    </div>
+  );
+};
+
+ControlledPanels.Options = Options;
+ControlledPanels.Option = Option;
+ControlledPanels.Panel = Panel;
+
+export default ControlledPanels;
diff --git a/web/src/components/core/ExpandableSelector.jsx b/web/src/components/core/ExpandableSelector.jsx
new file mode 100644
index 000000000..7499f37f1
--- /dev/null
+++ b/web/src/components/core/ExpandableSelector.jsx
@@ -0,0 +1,240 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+// @ts-check
+
+import React, { useState } from "react";
+import { Table, Thead, Tr, Th, Tbody, Td, ExpandableRowContent, RowSelectVariant } from "@patternfly/react-table";
+
+/**
+ * An object for sharing data across nested maps
+ *
+ * Since function arguments are always passed by value, an object passed by
+ * sharing is needed for sharing data that might be mutated from different
+ * places, as it is the case of the rowIndex prop here.
+ *
+ * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions#passing_arguments
+ *
+ * @typedef {object} SharedData
+ * @property {number} rowIndex - The current row index, to be incremented each time a table row is generated.
+ */
+
+/**
+ * @typedef {object} ExpandableSelectorColumn
+ * @property {string} name - The column header text.
+ * @property {(object) => React.ReactNode} value - A function receiving
+ *   the item to work with and returning the column value.
+ * @property {string} [classNames] - space-separated list of additional CSS class names.
+ */
+
+/**
+ * Internal component for building the table header
+ *
+ * @param {object} props
+ * @param {ExpandableSelectorColumn[]} props.columns
+ */
+const TableHeader = ({ columns }) => (
+  <Thead>
+    <Tr>
+      <Th />
+      <Th />
+      { columns?.map((c, i) => <Th key={i} className={c.classNames}>{c.name}</Th>) }
+    </Tr>
+  </Thead>
+);
+
+/**
+ * Helper function for ensuring a good value for ExpandableSelector#itemsSelected prop
+ *
+ * It logs information to console.error if given value does not match
+ * expectations.
+ *
+ * @param {*} selection - The value to check.
+ * @param {boolean} allowMultiple - Whether the returned collection can have
+ *   more than one item
+ * @return {Array} Empty array if given value is not valid. The first element if
+ *   it is a collection with more than one but selector does not allow multiple.
+ *   The original value otherwise.
+ */
+const sanitizeSelection = (selection, allowMultiple) => {
+  if (!Array.isArray(selection)) {
+    console.error("`itemSelected` prop must be an array. Ignoring given value", selection);
+    return [];
+  }
+
+  if (!allowMultiple && selection.length > 1) {
+    console.error(
+      "`itemsSelected` prop can only have more than one item when selector `isMultiple`. " +
+        "Using only the first element"
+    );
+
+    return [selection[0]];
+  }
+
+  return selection;
+};
+
+/**
+ * Build a expandable table with selectable items
+ * @component
+ *
+ * @note It only accepts one nesting level.
+ *
+ * @param {object} props
+ * @param {ExpandableSelectorColumn[]} props.columns - Collection of objects defining columns.
+ * @param {boolean} [props.isMultiple=false] - Whether multiple selection is allowed.
+ * @param {object[]} props.items - Collection of items to be rendered.
+ * @param {string} [props.itemIdKey="id"] - The key for retrieving the item id.
+ * @param {(item: object) => Array<object>} [props.itemChildren=() => []] - Lookup method to retrieve children from given item.
+ * @param {(item: object) => boolean} [props.itemSelectable=() => true] - Whether an item will be selectable or not.
+ * @param {(item: object) => (string|undefined)} [props.itemClassNames=() => ""] - Callback that allows adding additional CSS class names to item row.
+ * @param {object[]} [props.itemsSelected=[]] - Collection of selected items.
+ * @param {string[]} [props.initialExpandedKeys=[]] - Ids of initially expanded items.
+ * @param {(selection: Array<object>) => void} [props.onSelectionChange=noop] - Callback to be triggered when selection changes.
+ * @param {object} [props.tableProps] - Props for {@link https://www.patternfly.org/components/table/#table PF/Table}.
+ */
+export default function ExpandableSelector({
+  columns = [],
+  isMultiple = false,
+  items = [],
+  itemIdKey = "id",
+  itemChildren = () => [],
+  itemSelectable = () => true,
+  itemClassNames = () => "",
+  itemsSelected = [],
+  initialExpandedKeys = [],
+  onSelectionChange,
+  ...tableProps
+}) {
+  const [expandedItemsKeys, setExpandedItemsKeys] = useState(initialExpandedKeys);
+  const selection = sanitizeSelection(itemsSelected, isMultiple);
+  const isItemSelected = (item) => selection.includes(item);
+  const isItemExpanded = (key) => expandedItemsKeys.includes(key);
+  const toggleExpanded = (key) => {
+    if (isItemExpanded(key)) {
+      setExpandedItemsKeys(expandedItemsKeys.filter(k => k !== key));
+    } else {
+      setExpandedItemsKeys([...expandedItemsKeys, key]);
+    }
+  };
+
+  const updateSelection = (item) => {
+    if (!isMultiple) {
+      onSelectionChange([item]);
+      return;
+    }
+
+    if (isItemSelected(item)) {
+      onSelectionChange(selection.filter(i => i !== item));
+    } else {
+      onSelectionChange([...selection, item]);
+    }
+  };
+
+  /**
+   * Render method for building the markup for an item child
+   *
+   * @param {object} item - The child to be rendered
+   * @param {boolean} isExpanded - Whether the child should be shown or not
+   * @param {SharedData} sharedData - An object holding shared data
+   */
+  const renderItemChild = (item, isExpanded, sharedData) => {
+    const rowIndex = sharedData.rowIndex++;
+
+    const selectProps = {
+      rowIndex,
+      onSelect: () => updateSelection(item),
+      isSelected: isItemSelected(item),
+      variant: isMultiple ? RowSelectVariant.checkbox : RowSelectVariant.radio
+    };
+
+    return (
+      <Tr key={rowIndex} isExpanded={isExpanded} className={itemClassNames(item)}>
+        <Td />
+        <Td select={itemSelectable(item) ? selectProps : undefined} />
+        { columns?.map((column, index) => (
+          <Td key={index} dataLabel={column.name} className={column.classNames}>
+            <ExpandableRowContent>{column.value(item)}</ExpandableRowContent>
+          </Td>
+        ))}
+      </Tr>
+    );
+  };
+
+  /**
+   * Render method for building the markup for item
+   *
+   * @param {object} item - The item to be rendered
+   * @param {SharedData} sharedData - An object holding shared data
+   */
+  const renderItem = (item, sharedData) => {
+    const itemKey = item[itemIdKey];
+    const rowIndex = sharedData.rowIndex++;
+    const children = itemChildren(item);
+    const validChildren = Array.isArray(children) && children.length > 0;
+    const expandProps = validChildren && {
+      rowIndex,
+      isExpanded: isItemExpanded(itemKey),
+      onToggle: () => toggleExpanded(itemKey),
+    };
+
+    const selectProps = {
+      rowIndex,
+      onSelect: () => updateSelection(item),
+      isSelected: isItemSelected(item),
+      variant: isMultiple ? RowSelectVariant.checkbox : RowSelectVariant.radio
+    };
+
+    const renderChildren = () => {
+      if (!validChildren) return;
+
+      return children.map(item => renderItemChild(item, isItemExpanded(itemKey), sharedData));
+    };
+
+    // TODO: Add label to Tbody?
+    return (
+      <Tbody key={rowIndex} isExpanded={isItemExpanded(itemKey)}>
+        <Tr className={itemClassNames(item)}>
+          <Td expand={expandProps} />
+          <Td select={itemSelectable(item) ? selectProps : undefined} />
+          { columns?.map((column, index) => (
+            <Td key={index} dataLabel={column.name} className={column.classNames}>
+              {column.value(item)}
+            </Td>
+          ))}
+        </Tr>
+        { renderChildren() }
+      </Tbody>
+    );
+  };
+
+  // @see SharedData
+  const sharedData = { rowIndex: 0 };
+
+  const TableBody = () => items?.map(item => renderItem(item, sharedData));
+
+  return (
+    <Table data-type="agama/expandable-selector" {...tableProps}>
+      <TableHeader columns={columns} />
+      <TableBody />
+    </Table>
+  );
+}
diff --git a/web/src/components/core/ExpandableSelector.test.jsx b/web/src/components/core/ExpandableSelector.test.jsx
new file mode 100644
index 000000000..bcfaf8887
--- /dev/null
+++ b/web/src/components/core/ExpandableSelector.test.jsx
@@ -0,0 +1,449 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+import React from "react";
+import { screen, within } from "@testing-library/react";
+import { plainRender } from "~/test-utils";
+import { ExpandableSelector } from "~/components/core";
+
+const sda = {
+  sid: "59",
+  isDrive: true,
+  type: "disk",
+  vendor: "Micron",
+  model: "Micron 1100 SATA",
+  driver: ["ahci", "mmcblk"],
+  bus: "IDE",
+  busId: "",
+  transport: "usb",
+  dellBOSS: false,
+  sdCard: true,
+  active: true,
+  name: "/dev/sda",
+  size: 1024,
+  recoverableSize: 0,
+  systems : [],
+  udevIds: ["ata-Micron_1100_SATA_512GB_12563", "scsi-0ATA_Micron_1100_SATA_512GB"],
+  udevPaths: ["pci-0000:00-12", "pci-0000:00-12-ata"],
+};
+
+const sda1 = {
+  sid: "60",
+  isDrive: false,
+  type: "",
+  active: true,
+  name: "/dev/sda1",
+  size: 512,
+  recoverableSize: 128,
+  systems : [],
+  udevIds: [],
+  udevPaths: []
+};
+
+const sda2 = {
+  sid: "61",
+  isDrive: false,
+  type: "",
+  active: true,
+  name: "/dev/sda2",
+  size: 512,
+  recoverableSize: 0,
+  systems : [],
+  udevIds: [],
+  udevPaths: []
+};
+
+sda.partitionTable = {
+  type: "gpt",
+  partitions: [sda1, sda2],
+  unpartitionedSize: 512
+};
+
+const sdb = {
+  sid: "62",
+  isDrive: true,
+  type: "disk",
+  vendor: "Samsung",
+  model: "Samsung Evo 8 Pro",
+  driver: ["ahci"],
+  bus: "IDE",
+  busId: "",
+  transport: "",
+  dellBOSS: false,
+  sdCard: false,
+  active: true,
+  name: "/dev/sdb",
+  size: 2048,
+  recoverableSize: 0,
+  systems : [],
+  udevIds: [],
+  udevPaths: ["pci-0000:00-19"]
+};
+
+const lv1 = {
+  sid: "163",
+  name: "/dev/system/vg/lv1",
+  content: "Personal Data"
+};
+
+const vg = {
+  sid: "162",
+  type: "vg",
+  name: "/dev/system/vg",
+  lvs: [
+    lv1
+  ]
+};
+
+const columns = [
+  { name: "Device", value: (item) => item.name },
+  {
+    name: "Content",
+    value: (item) => {
+      if (item.isDrive) return item.systems.map((s, i) => <p key={i}>{s}</p>);
+      if (item.type === "vg") return `${item.lvs.length} logical volume(s)`;
+
+      return item.content;
+    }
+  },
+  { name: "Size", value: (item) => item.size },
+];
+
+const onChangeFn = jest.fn();
+
+let props;
+const commonProps = {
+  columns,
+  items: [sda, sdb, vg],
+  itemIdKey: "sid",
+  initialExpandedKeys: [sda.sid, vg.sid],
+  itemChildren: (item) => (
+    item.isDrive ? item.partitionTable?.partitions : item.lvs
+  ),
+  onSelectionChange: onChangeFn,
+  "aria-label": "Device selector"
+};
+
+describe("ExpandableSelector", () => {
+  beforeAll(() => {
+    jest.spyOn(console, "error").mockImplementation();
+  });
+
+  afterAll(() => {
+    console.error.mockRestore();
+  });
+
+  beforeEach(() => {
+    props = { ...commonProps };
+  });
+
+  it("renders a table with given name", () => {
+    plainRender(<ExpandableSelector {...props} />);
+    screen.getByRole("grid", { name: "Device selector" });
+  });
+
+  it("renders the table headers", () => {
+    plainRender(<ExpandableSelector {...props} />);
+    const table = screen.getByRole("grid");
+    within(table).getByRole("columnheader", { name: "Device" });
+    within(table).getByRole("columnheader", { name: "Content" });
+    within(table).getByRole("columnheader", { name: "Size" });
+  });
+
+  it("renders a rowgroup per parent item", () => {
+    plainRender(<ExpandableSelector {...props} />);
+    const groups = screen.getAllByRole("rowgroup");
+    // NOTE: since <thead> has also the rowgroup role, we expect to found 4 in
+    // this example: 1 thead + 3 tbody (sda, sdb, vg)
+    expect(groups.length).toEqual(4);
+  });
+
+  it("renders a row per given item and found children", () => {
+    plainRender(<ExpandableSelector {...props} />);
+    const table = screen.getByRole("grid");
+    within(table).getByRole("row", { name: /dev\/sda 1024/ });
+    within(table).getByRole("row", { name: /dev\/sdb 2048/ });
+    within(table).getByRole("row", { name: /dev\/system\/vg 1 logical/ });
+    within(table).getByRole("row", { name: /dev\/sda1 512/ });
+    within(table).getByRole("row", { name: /dev\/sda2 512/ });
+    within(table).getByRole("row", { name: /Personal Data/ });
+  });
+
+  it("renders a expand toggler in items with children", () => {
+    plainRender(<ExpandableSelector {...props} />);
+    const table = screen.getByRole("grid");
+    const sdaRow = within(table).getByRole("row", { name: /dev\/sda 1024/ });
+    const sdbRow = within(table).getByRole("row", { name: /dev\/sdb 2048/ });
+    const lvRow = within(table).getByRole("row", { name: /dev\/system\/vg 1 logical/ });
+
+    within(sdaRow).getByRole("button", { name: "Details" });
+    within(lvRow).getByRole("button", { name: "Details" });
+    // `/dev/sdb` does not have children, toggler must not be there
+    const sdbChildrenToggler = within(sdbRow).queryByRole("button", { name: "Details" });
+    expect(sdbChildrenToggler).toBeNull();
+  });
+
+  it("renders as expanded items which value for `itemIdKey` is included in `initialExpandedKeys` prop", () => {
+    plainRender(
+      <ExpandableSelector {...props} itemIdKey="name" initialExpandedKeys={["/dev/sda"]} />
+    );
+    const table = screen.getByRole("grid");
+    within(table).getByRole("row", { name: /dev\/sda1 512/ });
+    within(table).getByRole("row", { name: /dev\/sda2 512/ });
+  });
+
+  it("keeps track of expanded items", async () => {
+    const { user } = plainRender(
+      <ExpandableSelector {...props} itemIdKey="name" initialExpandedKeys={["/dev/sda"]} />
+    );
+    const table = screen.getByRole("grid");
+    const sdaRow = within(table).getByRole("row", { name: /sda 1024/ });
+    const sdaToggler = within(sdaRow).getByRole("button", { name: "Details" });
+    const vgRow = within(table).getByRole("row", { name: /vg 1 logical/ });
+    const vgToggler = within(vgRow).getByRole("button", { name: "Details" });
+
+    within(table).getByRole("row", { name: /dev\/sda1 512/ });
+    within(table).getByRole("row", { name: /dev\/sda2 512/ });
+
+    await user.click(vgToggler);
+
+    within(table).getByRole("row", { name: /Personal Data/ });
+
+    await user.click(sdaToggler);
+    const sdaPartitionsRows = within(table).queryAllByRole("row", { name: /sda[d] 512/ });
+    expect(sdaPartitionsRows.length).toEqual(0);
+  });
+
+  it("uses 'id' as key when `itemIdKey` prop is not given", () => {
+    plainRender(
+      <ExpandableSelector {...props} itemIdKey={undefined} />
+    );
+
+    const table = screen.getByRole("grid");
+    // Since itemIdKey does not match the id used for the item, they are
+    // collapsed by default and their children are not visible
+    const sdaChild = within(table).queryByRole("row", { name: /dev\/sda1 512/ });
+    expect(sdaChild).toBeNull();
+  });
+
+  it("uses given `itemIdKey` as key", () => {
+    plainRender(
+      <ExpandableSelector {...props} itemIdKey="name" initialExpandedKeys={["/dev/sda"]} />
+    );
+
+    const table = screen.getByRole("grid");
+    // Since itemIdKey === "name", "/dev/sda" is properly mounted as expanded. Its
+    // children must be visible
+    const sdaChild = within(table).queryByRole("row", { name: /dev\/sda1 512/ });
+    expect(sdaChild).not.toBeNull();
+  });
+
+  describe("when `itemsSelected` is given", () => {
+    it("renders nothing as checked if value is an empty array", () => {
+      plainRender(<ExpandableSelector {...props} itemsSelected={[]} />);
+      const table = screen.getByRole("grid");
+      const selection = within(table).queryAllByRole("radio", { checked: true });
+      expect(selection.length).toEqual(0);
+    });
+
+    describe("but it isn't an array", () => {
+      it("outputs to console.error", () => {
+        plainRender(<ExpandableSelector {...props} itemsSelected="Whatever" />);
+        expect(console.error).toHaveBeenCalledWith(
+          expect.stringContaining("prop must be an array"),
+          "Whatever"
+        );
+      });
+
+      it("renders nothing as selected", () => {
+        plainRender(<ExpandableSelector {...props} itemsSelected="Whatever" />);
+        const table = screen.getByRole("grid");
+        const selection = within(table).queryAllByRole("radio", { checked: true });
+        expect(selection.length).toEqual(0);
+      });
+    });
+  });
+
+  describe("when mounted as single selector", () => {
+    describe.each([undefined, null, false])("because isMultiple={%s}", (isMultiple) => {
+      beforeEach(() => {
+        props = { ...props, isMultiple };
+      });
+
+      it("renders a radio per item row", () => {
+        plainRender(<ExpandableSelector {...props} />);
+        const table = screen.getByRole("grid");
+        const radios = within(table).getAllByRole("radio");
+        expect(radios.length).toEqual(6);
+      });
+
+      describe("but `itemSelectable` is given", () => {
+        it("renders a radio only for items for which it returns true", () => {
+          const itemSelectable = (item) => item.isDrive || item.type === "vg";
+          plainRender(<ExpandableSelector {...props} itemSelectable={itemSelectable} />);
+          const table = screen.getByRole("grid");
+          const radios = within(table).getAllByRole("radio");
+
+          // Expected only three radios
+          expect(radios.length).toEqual(3);
+
+          // Not in below items
+          const sda1Row = within(table).getByRole("row", { name: /dev\/sda1/ });
+          const sda2Row = within(table).getByRole("row", { name: /dev\/sda2/ });
+          const lv1Row = within(table).getByRole("row", { name: /lv1/ });
+          expect(within(sda1Row).queryAllByRole("radio")).toEqual([]);
+          expect(within(sda2Row).queryAllByRole("radio")).toEqual([]);
+          expect(within(lv1Row).queryAllByRole("radio")).toEqual([]);
+        });
+      });
+
+      describe("and `itemsSelected` is given", () => {
+        describe("and it is an array with just one item", () => {
+          it("renders it as checked", async () => {
+            plainRender(<ExpandableSelector {...props} itemsSelected={[sda1]} />);
+            const table = screen.getByRole("grid");
+            const sda1Row = within(table).getByRole("row", { name: /dev\/sda1/ });
+            const selection = screen.getAllByRole("radio", { checked: true });
+            expect(selection.length).toEqual(1);
+            within(sda1Row).getByRole("radio", { checked: true });
+          });
+        });
+
+        describe("but it is an array with more than one item", () => {
+          it("outputs to console.error", () => {
+            plainRender(<ExpandableSelector {...props} itemsSelected={[sda1, lv1]} />);
+            expect(console.error).toHaveBeenCalledWith(
+              expect.stringContaining("Using only the first element")
+            );
+          });
+
+          it("renders the first one as checked", async () => {
+            plainRender(<ExpandableSelector {...props} itemsSelected={[sda1, lv1]} />);
+            const table = screen.getByRole("grid");
+            const selection = screen.getAllByRole("radio", { checked: true });
+            const sda1Row = within(table).getByRole("row", { name: /dev\/sda1/ });
+            const lv1Row = within(table).getByRole("row", { name: /Personal Data/ });
+            const lv1Radio = within(lv1Row).getByRole("radio");
+            within(sda1Row).getByRole("radio", { checked: true });
+            expect(lv1Radio).not.toHaveAttribute("checked", true);
+            expect(selection.length).toEqual(1);
+          });
+        });
+      });
+
+      describe("and user selects an already selected item", () => {
+        it("does not trigger the `onSelectionChange` callback", async () => {
+          const { user } = plainRender(<ExpandableSelector {...props} itemsSelected={[sda1]} />);
+          const sda1row = screen.getByRole("row", { name: /dev\/sda1/ });
+          const sda1radio = within(sda1row).getByRole("radio");
+          await user.click(sda1radio);
+          expect(onChangeFn).not.toHaveBeenCalled();
+        });
+      });
+
+      describe("and user selects a not selected item", () => {
+        it("calls the `onSelectionChange` callback with a collection holding only selected item", async () => {
+          const { user } = plainRender(<ExpandableSelector {...props} itemsSelected={[sda1]} />);
+          const sda2row = screen.getByRole("row", { name: /dev\/sda2/ });
+          const sda2radio = within(sda2row).getByRole("radio");
+          await user.click(sda2radio);
+          expect(onChangeFn).toHaveBeenCalledWith([sda2]);
+        });
+      });
+    });
+  });
+
+  describe("when mounted as multiple selector", () => {
+    beforeEach(() => {
+      props = { ...props, isMultiple: true };
+    });
+
+    it("renders a checkbox per item row", () => {
+      plainRender(<ExpandableSelector {...props} />);
+      const table = screen.getByRole("grid");
+      const checkboxes = within(table).getAllByRole("checkbox");
+      expect(checkboxes.length).toEqual(6);
+    });
+
+    describe("but `itemSelectable` is given", () => {
+      it("renders a checkbox only for items for which it returns true", () => {
+        const itemSelectable = (item) => item.isDrive || item.type === "vg";
+        plainRender(<ExpandableSelector {...props} itemSelectable={itemSelectable} />);
+        const table = screen.getByRole("grid");
+        const checkboxes = within(table).getAllByRole("checkbox");
+
+        // Expected only three checkboxes
+        expect(checkboxes.length).toEqual(3);
+
+        // Not in below items
+        const sda1Row = within(table).getByRole("row", { name: /dev\/sda1/ });
+        const sda2Row = within(table).getByRole("row", { name: /dev\/sda2/ });
+        const lv1Row = within(table).getByRole("row", { name: /lv1/ });
+        expect(within(sda1Row).queryAllByRole("checkbox")).toEqual([]);
+        expect(within(sda2Row).queryAllByRole("checkbox")).toEqual([]);
+        expect(within(lv1Row).queryAllByRole("checkbox")).toEqual([]);
+      });
+    });
+
+    describe("and `itemsSelected` is given", () => {
+      it("renders given items as checked", async () => {
+        plainRender(<ExpandableSelector {...props} itemsSelected={[sda1, lv1]} />);
+        const table = screen.getByRole("grid");
+        const selection = screen.getAllByRole("checkbox", { checked: true });
+        const sda1Row = within(table).getByRole("row", { name: /dev\/sda1/ });
+        const lv1Row = within(table).getByRole("row", { name: /Personal Data/ });
+        within(sda1Row).getByRole("checkbox", { checked: true });
+        within(lv1Row).getByRole("checkbox", { checked: true });
+        expect(selection.length).toEqual(2);
+      });
+    });
+
+    it("renders initially selected items given via `itemsSelected` prop", async () => {
+      plainRender(<ExpandableSelector {...props} isMultiple itemsSelected={[sda1, lv1]} />);
+      const table = screen.getByRole("grid");
+      const sda1Row = within(table).getByRole("row", { name: /dev\/sda1/ });
+      const lv1Row = within(table).getByRole("row", { name: /Personal Data/ });
+      const selection = screen.getAllByRole("checkbox", { checked: true });
+      expect(selection.length).toEqual(2);
+      [sda1Row, lv1Row].forEach(row => within(row).getByRole("checkbox", { checked: true }));
+    });
+
+    describe("and user selects an already selected item", () => {
+      it("triggers the `onSelectionChange` callback with a collection not including the item", async () => {
+        const { user } = plainRender(<ExpandableSelector {...props} itemsSelected={[sda1, sda2]} />);
+        const sda1row = screen.getByRole("row", { name: /dev\/sda1/ });
+        const sda1radio = within(sda1row).getByRole("checkbox");
+        await user.click(sda1radio);
+        expect(onChangeFn).toHaveBeenCalledWith([sda2]);
+      });
+    });
+
+    describe("and user selects a not selected item", () => {
+      it("calls the `onSelectionChange` callback with a collection including the item", async () => {
+        const { user } = plainRender(<ExpandableSelector {...props} itemsSelected={[sda1]} />);
+        const sda2row = screen.getByRole("row", { name: /dev\/sda2/ });
+        const sda2checkbox = within(sda2row).getByRole("checkbox");
+        await user.click(sda2checkbox);
+        expect(onChangeFn).toHaveBeenCalledWith([sda1, sda2]);
+      });
+    });
+  });
+});
diff --git a/web/src/components/core/Reminder.jsx b/web/src/components/core/Reminder.jsx
index 997e870a9..cd4e0943a 100644
--- a/web/src/components/core/Reminder.jsx
+++ b/web/src/components/core/Reminder.jsx
@@ -62,7 +62,8 @@ const ReminderTitle = ({ children }) => {
  * @param {object} props
  * @param {string} [props.icon] - The name of desired icon.
  * @param {JSX.Element|string} [props.title] - The content for the title.
- * @param {string} [props.role="status"] - The reminder's role, "status" by
+ * @param {string} [props.role="status"] - The reminder's role, "status" by default.
+ * @param {("subtle")} [props.variant] - The reminder's variant, none by default.
  *   default. See {@link https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles/status_role}
  * @param {JSX.Element} [props.children] - The content for the description.
  */
@@ -70,10 +71,11 @@ export default function Reminder ({
   icon,
   title,
   role = "status",
+  variant,
   children
 }) {
   return (
-    <div role={role} data-type="agama/reminder">
+    <div role={role} data-type="agama/reminder" data-variant={variant}>
       <ReminderIcon name={icon} />
       <div>
         <ReminderTitle>{title}</ReminderTitle>
diff --git a/web/src/components/core/Reminder.test.jsx b/web/src/components/core/Reminder.test.jsx
index 24527cf2d..41ebfaf30 100644
--- a/web/src/components/core/Reminder.test.jsx
+++ b/web/src/components/core/Reminder.test.jsx
@@ -37,6 +37,12 @@ describe("Reminder", () => {
     within(reminder).getByText("Example");
   });
 
+  it("renders a region with given data-variant, if any", () => {
+    plainRender(<Reminder role="alert" variant="subtle">Example</Reminder>);
+    const reminder = screen.getByRole("alert");
+    expect(reminder).toHaveAttribute("data-variant", "subtle");
+  });
+
   it("renders given title", () => {
     plainRender(
       <Reminder title={<span><strong>Kindly</strong> reminder</span>}>
diff --git a/web/src/components/core/Tag.jsx b/web/src/components/core/Tag.jsx
new file mode 100644
index 000000000..c910d0729
--- /dev/null
+++ b/web/src/components/core/Tag.jsx
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+// @ts-check
+
+import React from "react";
+
+/**
+ * Simple component that helps wrapped content stand out visually. The variant
+ * prop determines what kind of enhancement is applied.
+ * @component
+ *
+ * @param {object} props
+ * @param {("simple"|"teal"|"orange"|"gray-highlight")} [props.variant="simple"]
+ * @param {React.ReactNode} props.children
+ */
+export default function Tag ({ variant = "simple", children }) {
+  return (
+    <span data-type="agama/tag" data-variant={variant}>
+      {children}
+    </span>
+  );
+}
diff --git a/web/src/components/core/Tag.test.jsx b/web/src/components/core/Tag.test.jsx
new file mode 100644
index 000000000..e4a9739ab
--- /dev/null
+++ b/web/src/components/core/Tag.test.jsx
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+import React from "react";
+import { screen } from "@testing-library/react";
+import { plainRender } from "~/test-utils";
+import { Tag } from "~/components/core";
+
+describe("Tag", () => {
+  it("renders its children in a node with data-type='agama/tag' attribute", () => {
+    plainRender(<Tag>New</Tag>);
+    const node = screen.getByText("New");
+    expect(node).toHaveAttribute("data-type", "agama/tag");
+  });
+});
diff --git a/web/src/components/core/TreeTable.jsx b/web/src/components/core/TreeTable.jsx
new file mode 100644
index 000000000..5f7612adb
--- /dev/null
+++ b/web/src/components/core/TreeTable.jsx
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+// @ts-check
+
+import React from "react";
+import { Table, Thead, Tr, Th, Tbody, Td, TreeRowWrapper } from '@patternfly/react-table';
+
+/**
+ * @typedef {import("@patternfly/react-table").TableProps} TableProps
+ */
+
+/**
+ * @typedef {object} TreeTableColumn
+ * @property {string} title
+ * @property {(any) => React.ReactNode} content
+ * @property {string} [classNames]
+ */
+
+/**
+ * @typedef {object} TreeTableBaseProps
+ * @property {TreeTableColumn[]} columns=[]
+ * @property {object[]} items=[]
+ * @property {(any) => array} [itemChildren]
+ * @property {(any) => string} [rowClassNames]
+ */
+
+/**
+ * Table built on top of PF/Table
+ * @component
+ *
+ * FIXME: omitting `ref` here to avoid a TypeScript error but keep component as
+ * typed as possible. Further investigation is needed.
+ *
+ * @typedef {TreeTableBaseProps & Omit<TableProps, "isTreeTable" | "ref">} TreeTableProps
+ *
+ * @param {TreeTableProps} props
+ */
+export default function TreeTable({
+  columns = [],
+  items = [],
+  itemChildren = () => [],
+  rowClassNames = () => "",
+  ...tableProps
+}) {
+  const renderColumns = (item, treeRow) => {
+    return columns.map((c, cIdx) => {
+      const props = {
+        dataLabel: c.title,
+        className: c.classNames
+      };
+
+      if (cIdx === 0) props.treeRow = treeRow;
+
+      return (
+        <Td key={cIdx} {...props}>{c.content(item)}</Td>
+      );
+    });
+  };
+
+  const renderRows = (items, level) => {
+    if (items?.length <= 0) return;
+
+    return (
+      items.map((item, itemIdx) => {
+        const children = itemChildren(item);
+
+        const treeRow = {
+          props: {
+            isExpanded: true,
+            isDetailsExpanded: true,
+            "aria-level": level,
+            "aria-posinset": itemIdx + 1,
+            "aria-setsize": children?.length || 0
+          }
+        };
+
+        const rowProps = {
+          row: { props: treeRow.props },
+          className: rowClassNames(item)
+        };
+
+        return (
+          <React.Fragment key={itemIdx}>
+            <TreeRowWrapper {...rowProps}>{renderColumns(item, treeRow)}</TreeRowWrapper>
+            { renderRows(children, level + 1)}
+          </React.Fragment>
+        );
+      })
+    );
+  };
+
+  return (
+    <Table
+      variant="compact"
+      {...tableProps}
+      isTreeTable
+      data-type="agama/tree-table"
+    >
+      <Thead>
+        <Tr>
+          { columns.map((c, i) => <Th key={i} className={c.classNames}>{c.title}</Th>) }
+        </Tr>
+      </Thead>
+      <Tbody>
+        { renderRows(items, 1) }
+      </Tbody>
+    </Table>
+  );
+}
diff --git a/web/src/components/core/TreeTable.test.jsx b/web/src/components/core/TreeTable.test.jsx
new file mode 100644
index 000000000..c1c858da1
--- /dev/null
+++ b/web/src/components/core/TreeTable.test.jsx
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+describe("TreeTable", () => {
+  it.todo("add examples for testing core/TreeTable component");
+});
diff --git a/web/src/components/core/index.js b/web/src/components/core/index.js
index 286ac5d54..e5fbff090 100644
--- a/web/src/components/core/index.js
+++ b/web/src/components/core/index.js
@@ -55,5 +55,9 @@ export { default as ShowTerminalButton } from "./ShowTerminalButton";
 export { default as NumericTextInput } from "./NumericTextInput";
 export { default as PasswordInput } from "./PasswordInput";
 export { default as Selector } from "./Selector";
+export { default as ExpandableSelector } from "./ExpandableSelector";
 export { default as OptionsPicker } from "./OptionsPicker";
 export { default as Reminder } from "./Reminder";
+export { default as Tag } from "./Tag";
+export { default as TreeTable } from "./TreeTable";
+export { default as ControlledPanels } from "./ControlledPanels";
diff --git a/web/src/components/l10n/InstallerKeymapSwitcher.jsx b/web/src/components/l10n/InstallerKeymapSwitcher.jsx
index 936040a70..2aa3c742b 100644
--- a/web/src/components/l10n/InstallerKeymapSwitcher.jsx
+++ b/web/src/components/l10n/InstallerKeymapSwitcher.jsx
@@ -22,7 +22,7 @@
 import React from "react";
 import { FormSelect, FormSelectOption } from "@patternfly/react-core";
 
-import cockpit from "../../lib/cockpit";
+import agama from "~/agama";
 
 import { Icon } from "~/components/layout";
 import { _ } from "~/i18n";
@@ -33,7 +33,7 @@ import { If } from "~/components/core";
 
 const sort = (keymaps) => {
   // sort the keymap names using the current locale
-  const lang = cockpit.language || "en";
+  const lang = agama.language || "en";
   return keymaps.sort((k1, k2) => k1.name.localeCompare(k2.name, lang));
 };
 
diff --git a/web/src/components/l10n/InstallerLocaleSwitcher.jsx b/web/src/components/l10n/InstallerLocaleSwitcher.jsx
index ad81c2ad7..ac8054e36 100644
--- a/web/src/components/l10n/InstallerLocaleSwitcher.jsx
+++ b/web/src/components/l10n/InstallerLocaleSwitcher.jsx
@@ -26,12 +26,11 @@ import { FormSelect, FormSelectOption, Popover } from "@patternfly/react-core";
 import { Icon } from "../layout";
 import { _ } from "~/i18n";
 import { useInstallerL10n } from "~/context/installerL10n";
-import cockpit from "~/lib/cockpit";
+import supportedLanguages from "~/languages.json";
 
 export default function InstallerLocaleSwitcher() {
   const { language, changeLanguage } = useInstallerL10n();
   const [selected, setSelected] = useState(null);
-  const languages = cockpit.manifests.agama?.locales || [];
 
   const onChange = useCallback((_event, value) => {
     setSelected(value);
@@ -39,8 +38,8 @@ export default function InstallerLocaleSwitcher() {
   }, [setSelected, changeLanguage]);
 
   // sort by the language code to maintain consistent order
-  const options = Object.keys(languages).sort()
-    .map(id => <FormSelectOption key={id} value={id} label={languages[id]} />);
+  const options = Object.keys(supportedLanguages).sort()
+    .map(id => <FormSelectOption key={id} value={id} label={supportedLanguages[id]} />);
 
   // TRANSLATORS: help text for the language selector in the sidebar,
   // %s will be replaced by the "Localization" page link
diff --git a/web/src/components/l10n/InstallerLocaleSwitcher.test.jsx b/web/src/components/l10n/InstallerLocaleSwitcher.test.jsx
index f51f3bdea..91e35cbbb 100644
--- a/web/src/components/l10n/InstallerLocaleSwitcher.test.jsx
+++ b/web/src/components/l10n/InstallerLocaleSwitcher.test.jsx
@@ -27,17 +27,10 @@ import InstallerLocaleSwitcher from "./InstallerLocaleSwitcher";
 const mockLanguage = "es-es";
 let mockChangeLanguageFn;
 
-jest.mock("~/lib/cockpit", () => ({
-  gettext: term => term,
-  manifests: {
-    agama: {
-      locales: {
-        "de-de": "Deutsch",
-        "en-us": "English (US)",
-        "es-es": "Español"
-      }
-    }
-  }
+jest.mock("~/languages.json", () => ({
+  "de-de": "Deutsch",
+  "en-us": "English (US)",
+  "es-es": "Español"
 }));
 
 jest.mock("~/context/installerL10n", () => ({
diff --git a/web/src/components/overview/StorageSection.jsx b/web/src/components/overview/StorageSection.jsx
index 1246183b4..733b2cbe6 100644
--- a/web/src/components/overview/StorageSection.jsx
+++ b/web/src/components/overview/StorageSection.jsx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2022-2023] SUSE LLC
+ * Copyright (c) [2022-2024] SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -27,7 +27,8 @@ import { useInstallerClient } from "~/context/installer";
 import { BUSY } from "~/client/status";
 import { deviceLabel } from "~/components/storage/utils";
 import { Em, ProgressText, Section } from "~/components/core";
-import { _ } from "~/i18n";
+import { sprintf } from "sprintf-js";
+import { _, n_ } from "~/i18n";
 
 /**
  * Text explaining the storage proposal
@@ -38,11 +39,72 @@ import { _ } from "~/i18n";
 const ProposalSummary = ({ proposal }) => {
   const { availableDevices = [], result = {} } = proposal;
 
-  const bootDevice = result.settings?.bootDevice;
-  if (!bootDevice) return <Text>{_("No device selected yet")}</Text>;
+  const label = (deviceName) => {
+    const device = availableDevices.find(d => d.name === deviceName);
+    return device ? deviceLabel(device) : deviceName;
+  };
+
+  if (result.settings?.target === "newLvmVg") {
+    // TRANSLATORS: Part of the message describing where the system will be installed.
+    // Do not translate 'abbr' and 'title', they are part of the HTML markup.
+    const vg = _("<abbr title='Logical Volume Manager'>LVM</abbr> volume group");
+    const pvDevices = result.settings?.targetPVDevices;
+    const fullMsg = (policy, num_pvs) => {
+      switch (policy) {
+        case "resize":
+          // TRANSLATORS: %1$s will be replaced by "LVM volume group" (already translated and with some markup)
+          // %2$s (if present) will be replaced by a device name and its size (eg. "/dev/sda, 20 GiB")
+          return n_(
+            "Install in a new %1$s on %2$s shrinking existing partitions as needed",
+            "Install in a new %1$s shrinking existing partitions at the underlying devices as needed",
+            num_pvs
+          );
+        case "keep":
+          // TRANSLATORS: %1$s will be replaced by "LVM volume group" (already translated and with some markup)
+          // %2$s (if present) will be replaced by a device name and its size (eg. "/dev/sda, 20 GiB")
+          return n_(
+            "Install in a new %1$s on %2$s without modifying existing partitions",
+            "Install in a new %1$s without modifying the partitions at the underlying devices",
+            num_pvs
+          );
+        case "delete":
+          // TRANSLATORS: %1$s will be replaced by "LVM volume group" (already translated and with some markup)
+          // %2$s (if present) will be replaced by a device name and its size (eg. "/dev/sda, 20 GiB")
+          return n_(
+            "Install in a new %1$s on %2$s deleting all its content",
+            "Install in a new %1$s deleting all the content of the underlying devices",
+            num_pvs
+          );
+        case "custom":
+          // TRANSLATORS: %1$s will be replaced by "LVM volume group" (already translated and with some markup)
+          // %2$s (if present) will be replaced by a device name and its size (eg. "/dev/sda, 20 GiB")
+          return n_(
+            "Install in a new %1$s on %2$s using a custom strategy to find the needed space",
+            "Install in a new %1$s using a custom strategy to find the needed space at the underlying devices",
+            num_pvs
+          );
+      }
+    };
+
+    const msg = sprintf(fullMsg(result.settings?.spacePolicy, pvDevices.length), vg, "%dev%");
+
+    if (pvDevices.length > 1) {
+      return (<span dangerouslySetInnerHTML={{ __html: msg }} />);
+    } else {
+      const [msg1, msg2] = msg.split("%dev%");
+
+      return (
+        <Text>
+          <span dangerouslySetInnerHTML={{ __html: msg1 }} />
+          <Em>{ label(pvDevices[0]) }</Em>
+          <span dangerouslySetInnerHTML={{ __html: msg2 }} />
+        </Text>
+      );
+    }
+  }
 
-  const device = availableDevices.find(d => d.name === bootDevice);
-  const label = device ? deviceLabel(device) : bootDevice;
+  const targetDevice = result.settings?.targetDevice;
+  if (!targetDevice) return <Text>{_("No device selected yet")}</Text>;
 
   const fullMsg = (policy) => {
     switch (policy) {
@@ -60,17 +122,16 @@ const ProposalSummary = ({ proposal }) => {
         return _("Install using device %s and deleting all its content");
     }
 
-    console.log(`Unknown space policy: ${policy}`);
     // TRANSLATORS: %s will be replaced by the device name and its size,
     // example: "/dev/sda, 20 GiB"
-    return _("Install using device %s");
+    return _("Install using device %s with a custom strategy to find the needed space");
   };
 
   const [msg1, msg2] = fullMsg(result.settings?.spacePolicy).split("%s");
 
   return (
     <Text>
-      {msg1}<Em>{label}</Em>{msg2}
+      {msg1}<Em>{label(targetDevice)}</Em>{msg2}
     </Text>
   );
 };
diff --git a/web/src/components/overview/StorageSection.test.jsx b/web/src/components/overview/StorageSection.test.jsx
index ba0828029..251f751d9 100644
--- a/web/src/components/overview/StorageSection.test.jsx
+++ b/web/src/components/overview/StorageSection.test.jsx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2022-2023] SUSE LLC
+ * Copyright (c) [2022-2024] SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -39,8 +39,8 @@ const encryptionMethods = ["luks2", "tpm_fde"];
 
 const proposalResult = {
   settings: {
-    bootDevice: "/dev/sda",
-    lvm: false,
+    target: "disk",
+    targetDevice: "/dev/sda",
     spacePolicy: "delete"
   },
   actions: []
@@ -95,7 +95,7 @@ describe("when there is a proposal", () => {
 
   describe("and the space policy is set to 'resize'", () => {
     beforeEach(() => {
-      const result = { settings: { spacePolicy: "resize", bootDevice: "/dev/sda" } };
+      const result = { settings: { spacePolicy: "resize", targetDevice: "/dev/sda" } };
       storage.proposal.getResult = jest.fn().mockResolvedValue(result);
     });
 
@@ -108,7 +108,7 @@ describe("when there is a proposal", () => {
 
   describe("and the space policy is set to 'keep'", () => {
     beforeEach(() => {
-      const result = { settings: { spacePolicy: "keep", bootDevice: "/dev/sda" } };
+      const result = { settings: { spacePolicy: "keep", targetDevice: "/dev/sda" } };
       storage.proposal.getResult = jest.fn().mockResolvedValue(result);
     });
 
@@ -119,9 +119,9 @@ describe("when there is a proposal", () => {
     });
   });
 
-  describe("and there is no boot device", () => {
+  describe("and there is no target device", () => {
     beforeEach(() => {
-      const result = { settings: { bootDevice: "" } };
+      const result = { settings: { targetDevice: "" } };
       storage.proposal.getResult = jest.fn().mockResolvedValue(result);
     });
 
diff --git a/web/src/components/storage/BootSelectionDialog.jsx b/web/src/components/storage/BootSelectionDialog.jsx
new file mode 100644
index 000000000..e33b03998
--- /dev/null
+++ b/web/src/components/storage/BootSelectionDialog.jsx
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+import React, { useState } from "react";
+import { Form } from "@patternfly/react-core";
+import { _ } from "~/i18n";
+import { DevicesFormSelect } from "~/components/storage";
+import { noop } from "~/utils";
+import { Popup } from "~/components/core";
+import { deviceLabel } from "~/components/storage/utils";
+import { sprintf } from "sprintf-js";
+
+/**
+ * @typedef {import ("~/client/storage").StorageDevice} StorageDevice
+ */
+
+const BOOT_AUTO_ID = "boot-auto";
+const BOOT_MANUAL_ID = "boot-manual";
+const BOOT_DISABLED_ID = "boot-disabled";
+const OPTIONS_NAME = "boot-mode";
+
+/**
+ * Internal component for building the options
+ * @component
+ *
+ * @param {React.PropsWithChildren<React.ComponentProps<"input">>} props
+ */
+const RadioOption = ({ id, onChange, defaultChecked, children }) => {
+  return (
+    <>
+      <input id={id} name={OPTIONS_NAME} type="radio" defaultChecked={defaultChecked} onChange={onChange} />
+      <label htmlFor={id}>{children}</label>
+    </>
+  );
+};
+
+/**
+ * Renders a dialog that allows the user to select the boot configuration.
+ * @component
+ *
+ * @typedef {object} Boot
+ * @property {boolean} configureBoot
+ * @property {StorageDevice|undefined} bootDevice
+ *
+ * @param {object} props
+ * @param {boolean} props.configureBoot - Whether the boot is configurable
+ * @param {StorageDevice|undefined} props.bootDevice - Currently selected booting device.
+ * @param {StorageDevice|undefined} props.defaultBootDevice - Default booting device.
+ * @param {StorageDevice[]} props.devices - Devices that user can select to boot from.
+ * @param {boolean} [props.isOpen=false] - Whether the dialog is visible or not.
+ * @param {function} [props.onCancel=noop]
+ * @param {(boot: Boot) => void} [props.onAccept=noop]
+ */
+export default function BootSelectionDialog({
+  configureBoot: configureBootProp,
+  bootDevice: bootDeviceProp,
+  defaultBootDevice,
+  devices,
+  isOpen,
+  onCancel = noop,
+  onAccept = noop,
+  ...props
+}) {
+  const [configureBoot, setConfigureBoot] = useState(configureBootProp);
+  const [bootDevice, setBootDevice] = useState(bootDeviceProp || defaultBootDevice);
+  const [isBootAuto, setIsBootAuto] = useState(configureBootProp && bootDeviceProp === undefined);
+
+  const isBootManual = configureBoot && !isBootAuto;
+
+  const selectBootAuto = () => {
+    setConfigureBoot(true);
+    setIsBootAuto(true);
+  };
+
+  const selectBootManual = () => {
+    setConfigureBoot(true);
+    setIsBootAuto(false);
+  };
+
+  const selectBootDisabled = () => {
+    setConfigureBoot(false);
+    setIsBootAuto(false);
+  };
+
+  const onSubmit = (e) => {
+    e.preventDefault();
+    const device = isBootAuto ? undefined : bootDevice;
+    onAccept({ configureBoot, bootDevice: device });
+  };
+
+  const isAcceptDisabled = () => {
+    return isBootManual && bootDevice === undefined;
+  };
+
+  const description = _(
+    "To ensure the new system is able to boot, the installer may need to create or configure some \
+partitions in the appropriate disk."
+  );
+
+  const automaticText = () => {
+    if (!defaultBootDevice) {
+      return _("Partitions to boot will be allocated at the installation disk.");
+    }
+
+    return sprintf(
+      // TRANSLATORS: %s is replaced by a device name and size (e.g., "/dev/sda, 500GiB")
+      _("Partitions to boot will be allocated at the installation disk (%s)."),
+      deviceLabel(defaultBootDevice)
+    );
+  };
+
+  return (
+    <Popup
+      title={_("Partitions for booting")}
+      description={description}
+      isOpen={isOpen}
+      {...props}
+    >
+      <Form id="boot-form" onSubmit={onSubmit}>
+        <fieldset className="stack">
+          <legend className="split">
+            <RadioOption id={BOOT_AUTO_ID} defaultChecked={isBootAuto} onChange={() => selectBootAuto()}>
+              {_("Automatic")}
+            </RadioOption>
+          </legend>
+          <div>
+            {automaticText()}
+          </div>
+        </fieldset>
+
+        <fieldset className="stack">
+          <legend className="split">
+            <RadioOption id={BOOT_MANUAL_ID} defaultChecked={isBootManual} onChange={() => selectBootManual()}>
+              {_("Select a disk")}
+            </RadioOption>
+          </legend>
+
+          <div className="stack">
+            <div>
+              {_("Partitions to boot will be allocated at the following device.")}
+            </div>
+            <DevicesFormSelect
+              aria-label={_("Choose a disk for placing the boot loader")}
+              devices={devices}
+              selectedDevice={bootDevice}
+              onChange={setBootDevice}
+              isDisabled={!isBootManual}
+            />
+          </div>
+        </fieldset>
+
+        <fieldset className="stack">
+          <legend className="split">
+            <RadioOption id={BOOT_DISABLED_ID} defaultChecked={!configureBoot} onChange={() => selectBootDisabled()}>
+              {_("Do not configure")}
+            </RadioOption>
+          </legend>
+          <div>
+            {_("No partitions will be automatically configured for booting. Use with caution.")}
+          </div>
+        </fieldset>
+      </Form>
+      <Popup.Actions>
+        <Popup.Confirm form="boot-form" type="submit" isDisabled={isAcceptDisabled()} />
+        <Popup.Cancel onClick={onCancel} />
+      </Popup.Actions>
+    </Popup>
+  );
+}
diff --git a/web/src/components/storage/BootSelectionDialog.test.jsx b/web/src/components/storage/BootSelectionDialog.test.jsx
new file mode 100644
index 000000000..7e759a111
--- /dev/null
+++ b/web/src/components/storage/BootSelectionDialog.test.jsx
@@ -0,0 +1,243 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+import React from "react";
+import { screen, within } from "@testing-library/react";
+import { plainRender } from "~/test-utils";
+import { BootSelectionDialog } from "~/components/storage";
+
+const sda = {
+  sid: 59,
+  isDrive: true,
+  type: "disk",
+  vendor: "Micron",
+  model: "Micron 1100 SATA",
+  driver: ["ahci", "mmcblk"],
+  bus: "IDE",
+  busId: "",
+  transport: "usb",
+  dellBOSS: false,
+  sdCard: true,
+  active: true,
+  name: "/dev/sda",
+  size: 1024,
+  recoverableSize: 0,
+  systems : [],
+  udevIds: ["ata-Micron_1100_SATA_512GB_12563", "scsi-0ATA_Micron_1100_SATA_512GB"],
+  udevPaths: ["pci-0000:00-12", "pci-0000:00-12-ata"],
+};
+
+const sdb = {
+  sid: 62,
+  isDrive: true,
+  type: "disk",
+  vendor: "Samsung",
+  model: "Samsung Evo 8 Pro",
+  driver: ["ahci"],
+  bus: "IDE",
+  busId: "",
+  transport: "",
+  dellBOSS: false,
+  sdCard: false,
+  active: true,
+  name: "/dev/sdb",
+  size: 2048,
+  recoverableSize: 0,
+  systems : [],
+  udevIds: [],
+  udevPaths: ["pci-0000:00-19"]
+};
+
+const sdc = {
+  sid: 63,
+  isDrive: true,
+  type: "disk",
+  vendor: "Samsung",
+  model: "Samsung Evo 8 Pro",
+  driver: ["ahci"],
+  bus: "IDE",
+  busId: "",
+  transport: "",
+  dellBOSS: false,
+  sdCard: false,
+  active: true,
+  name: "/dev/sdc",
+  size: 2048,
+  recoverableSize: 0,
+  systems : [],
+  udevIds: [],
+  udevPaths: ["pci-0000:00-19"]
+};
+
+let props;
+
+describe("BootSelectionDialog", () => {
+  beforeEach(() => {
+    props = {
+      isOpen: true,
+      configureBoot: false,
+      devices: [sda, sdb, sdc],
+      onCancel: jest.fn(),
+      onAccept: jest.fn()
+    };
+  });
+
+  const automaticOption = () => screen.queryByRole("radio", { name: "Automatic" });
+  const selectDiskOption = () => screen.queryByRole("radio", { name: "Select a disk" });
+  const notConfigureOption = () => screen.queryByRole("radio", { name: "Do not configure" });
+  const diskSelector = () => screen.queryByRole("combobox", { name: /choose a disk/i });
+
+  it("offers an option to configure boot in the installation disk", () => {
+    plainRender(<BootSelectionDialog {...props} />);
+    expect(automaticOption()).toBeInTheDocument();
+  });
+
+  it("offers an option to configure boot in a selected disk", () => {
+    plainRender(<BootSelectionDialog {...props} />);
+    expect(selectDiskOption()).toBeInTheDocument();
+    expect(diskSelector()).toBeInTheDocument();
+  });
+
+  it("offers an option to not configure boot", () => {
+    plainRender(<BootSelectionDialog {...props} />);
+    expect(notConfigureOption()).toBeInTheDocument();
+  });
+
+  describe("if the current value is set to boot from the installation disk", () => {
+    beforeEach(() => {
+      props.configureBoot = true;
+      props.bootDevice = undefined;
+    });
+
+    it("selects 'Automatic' option by default", () => {
+      plainRender(<BootSelectionDialog {...props} />);
+      expect(automaticOption()).toBeChecked();
+      expect(selectDiskOption()).not.toBeChecked();
+      expect(diskSelector()).toBeDisabled();
+      expect(notConfigureOption()).not.toBeChecked();
+    });
+  });
+
+  describe("if the current value is set to boot from a selected disk", () => {
+    beforeEach(() => {
+      props.configureBoot = true;
+      props.bootDevice = sdb;
+    });
+
+    it("selects 'Select a disk' option by default", () => {
+      plainRender(<BootSelectionDialog {...props} />);
+      expect(automaticOption()).not.toBeChecked();
+      expect(selectDiskOption()).toBeChecked();
+      expect(diskSelector()).toBeEnabled();
+      expect(notConfigureOption()).not.toBeChecked();
+    });
+  });
+
+  describe("if the current value is set to not configure boot", () => {
+    beforeEach(() => {
+      props.configureBoot = false;
+      props.bootDevice = sdb;
+    });
+
+    it("selects 'Do not configure' option by default", () => {
+      plainRender(<BootSelectionDialog {...props} />);
+      expect(automaticOption()).not.toBeChecked();
+      expect(selectDiskOption()).not.toBeChecked();
+      expect(diskSelector()).toBeDisabled();
+      expect(notConfigureOption()).toBeChecked();
+    });
+  });
+
+  it("does not call onAccept on cancel", async () => {
+    const { user } = plainRender(<BootSelectionDialog {...props} />);
+    const cancel = screen.getByRole("button", { name: "Cancel" });
+
+    await user.click(cancel);
+
+    expect(props.onAccept).not.toHaveBeenCalled();
+  });
+
+  describe("if the 'Automatic' option is selected", () => {
+    beforeEach(() => {
+      props.configureBoot = false;
+      props.bootDevice = undefined;
+    });
+
+    it("calls onAccept with the selected options on accept", async () => {
+      const { user } = plainRender(<BootSelectionDialog {...props} />);
+
+      await user.click(automaticOption());
+
+      const accept = screen.getByRole("button", { name: "Confirm" });
+      await user.click(accept);
+
+      expect(props.onAccept).toHaveBeenCalledWith({
+        configureBoot: true,
+        bootDevice: undefined
+      });
+    });
+  });
+
+  describe("if the 'Select a disk' option is selected", () => {
+    beforeEach(() => {
+      props.configureBoot = false;
+      props.bootDevice = undefined;
+    });
+
+    it("calls onAccept with the selected options on accept", async () => {
+      const { user } = plainRender(<BootSelectionDialog {...props} />);
+
+      await user.click(selectDiskOption());
+      const selector = diskSelector();
+      const sdbOption = within(selector).getByRole("option", { name: /sdb/ });
+      await user.selectOptions(selector, sdbOption);
+
+      const accept = screen.getByRole("button", { name: "Confirm" });
+      await user.click(accept);
+
+      expect(props.onAccept).toHaveBeenCalledWith({
+        configureBoot: true,
+        bootDevice: sdb
+      });
+    });
+  });
+
+  describe("if the 'Do not configure' option is selected", () => {
+    beforeEach(() => {
+      props.configureBoot = true;
+      props.bootDevice = undefined;
+    });
+
+    it("calls onAccept with the selected options on accept", async () => {
+      const { user } = plainRender(<BootSelectionDialog {...props} />);
+
+      await user.click(notConfigureOption());
+
+      const accept = screen.getByRole("button", { name: "Confirm" });
+      await user.click(accept);
+
+      expect(props.onAccept).toHaveBeenCalledWith({
+        configureBoot: false,
+        bootDevice: undefined
+      });
+    });
+  });
+});
diff --git a/web/src/components/storage/DeviceSelectionDialog.jsx b/web/src/components/storage/DeviceSelectionDialog.jsx
new file mode 100644
index 000000000..fd6972c0f
--- /dev/null
+++ b/web/src/components/storage/DeviceSelectionDialog.jsx
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+import React, { useState } from "react";
+import { Form } from "@patternfly/react-core";
+
+import { _ } from "~/i18n";
+import { deviceChildren } from "~/components/storage/utils";
+import { ControlledPanels as Panels, Popup } from "~/components/core";
+import { DeviceSelectorTable } from "~/components/storage";
+import { noop } from "~/utils";
+
+/**
+ * @typedef {import ("~/client/storage").ProposalSettings} ProposalSettings
+ * @typedef {import ("~/client/storage").StorageDevice} StorageDevice
+ */
+
+const SELECT_DISK_ID = "select-disk";
+const CREATE_LVM_ID = "create-lvm";
+const SELECT_DISK_PANEL_ID = "panel-for-disk-selection";
+const CREATE_LVM_PANEL_ID = "panel-for-lvm-creation";
+const OPTIONS_NAME = "selection-mode";
+
+const Html = ({ children, ...props }) => (
+  <div {...props} dangerouslySetInnerHTML={{ __html: children }} />
+);
+
+/**
+ * Renders a dialog that allows the user to select a target device for installation.
+ * @component
+ *
+ * @param {object} props
+ * @param {string} props.target
+ * @param {StorageDevice|undefined} props.targetDevice
+ * @param {StorageDevice[]} props.targetPVDevices
+ * @param {StorageDevice[]} props.devices - The actions to perform in the system.
+ * @param {boolean} [props.isOpen=false] - Whether the dialog is visible or not.
+ * @param {function} [props.onCancel=noop]
+ * @param {(target: Target) => void} [props.onAccept=noop]
+ *
+ * @typedef {object} Target
+ * @property {string} target
+ * @property {StorageDevice|undefined} targetDevice
+ * @property {StorageDevice[]} targetPVDevices
+
+ */
+export default function DeviceSelectionDialog({
+  target: defaultTarget,
+  targetDevice: defaultTargetDevice,
+  targetPVDevices: defaultPVDevices,
+  devices,
+  isOpen,
+  onCancel = noop,
+  onAccept = noop,
+  ...props
+}) {
+  const [target, setTarget] = useState(defaultTarget);
+  const [targetDevice, setTargetDevice] = useState(defaultTargetDevice);
+  const [targetPVDevices, setTargetPVDevices] = useState(defaultPVDevices);
+
+  const isTargetDisk = target === "disk";
+  const isTargetNewLvmVg = target === "newLvmVg";
+
+  const selectTargetDisk = () => setTarget("disk");
+  const selectTargetNewLvmVG = () => setTarget("newLvmVg");
+
+  const selectTargetDevice = (devices) => setTargetDevice(devices[0]);
+
+  const onSubmit = (e) => {
+    e.preventDefault();
+    onAccept({ target, targetDevice, targetPVDevices });
+  };
+
+  const isAcceptDisabled = () => {
+    if (isTargetDisk) return targetDevice === undefined;
+    if (isTargetNewLvmVg) return targetPVDevices.length === 0;
+
+    return true;
+  };
+
+  const isDeviceSelectable = (device) => device.isDrive || device.type === "md";
+
+  return (
+    <Popup
+      title={_("Device for installing the system")}
+      isOpen={isOpen}
+      variant="medium"
+      {...props}
+    >
+      <Form id="target-form" onSubmit={onSubmit}>
+        <Panels className="stack">
+          <Panels.Options data-variant="buttons">
+            <Panels.Option
+              id={SELECT_DISK_ID}
+              name={OPTIONS_NAME}
+              isSelected={isTargetDisk}
+              onChange={selectTargetDisk}
+              controls={SELECT_DISK_PANEL_ID}
+            >
+              {_("Select a disk")}
+            </Panels.Option>
+            <Panels.Option
+              id={CREATE_LVM_ID}
+              name={OPTIONS_NAME}
+              isSelected={isTargetNewLvmVg}
+              onChange={selectTargetNewLvmVG}
+              controls={CREATE_LVM_PANEL_ID}
+            >
+              {_("Create an LVM Volume Group")}
+            </Panels.Option>
+          </Panels.Options>
+
+          <Panels.Panel id={SELECT_DISK_PANEL_ID} isExpanded={isTargetDisk}>
+            <Html>
+              {
+                // TRANSLATORS: beware the HTML markup (<b> and </b>)
+                _("The file systems will be allocated by default as <b>new partitions in the selected device</b>.")
+              }
+            </Html>
+
+            <DeviceSelectorTable
+              aria-label={_("Device selector for target disk")}
+              devices={devices}
+              selected={[targetDevice]}
+              itemChildren={deviceChildren}
+              itemSelectable={isDeviceSelectable}
+              onSelectionChange={selectTargetDevice}
+              variant="compact"
+            />
+          </Panels.Panel>
+
+          <Panels.Panel id={CREATE_LVM_PANEL_ID} isExpanded={isTargetNewLvmVg} className="stack">
+            <Html>
+              {
+                // TRANSLATORS: beware the HTML markup (<b> and </b>)
+                _("The file systems will be allocated by default as <b>logical volumes of a new LVM Volume \
+Group</b>. The corresponding physical volumes will be created on demand as new partitions at the selected devices.")
+              }
+            </Html>
+
+            <DeviceSelectorTable
+              aria-label={_("Device selector for new LVM volume group")}
+              isMultiple
+              devices={devices}
+              selected={targetPVDevices}
+              itemChildren={deviceChildren}
+              itemSelectable={isDeviceSelectable}
+              onSelectionChange={setTargetPVDevices}
+              variant="compact"
+            />
+          </Panels.Panel>
+        </Panels>
+      </Form>
+      <Popup.Actions>
+        <Popup.Confirm form="target-form" type="submit" isDisabled={isAcceptDisabled()} />
+        <Popup.Cancel onClick={onCancel} />
+      </Popup.Actions>
+    </Popup>
+  );
+}
diff --git a/web/src/components/storage/DeviceSelectionDialog.test.jsx b/web/src/components/storage/DeviceSelectionDialog.test.jsx
new file mode 100644
index 000000000..bb450ccf8
--- /dev/null
+++ b/web/src/components/storage/DeviceSelectionDialog.test.jsx
@@ -0,0 +1,297 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+import React from "react";
+import { screen, within } from "@testing-library/react";
+import { plainRender } from "~/test-utils";
+import { DeviceSelectionDialog } from "~/components/storage";
+
+const sda = {
+  sid: 59,
+  isDrive: true,
+  type: "disk",
+  vendor: "Micron",
+  model: "Micron 1100 SATA",
+  driver: ["ahci", "mmcblk"],
+  bus: "IDE",
+  busId: "",
+  transport: "usb",
+  dellBOSS: false,
+  sdCard: true,
+  active: true,
+  name: "/dev/sda",
+  size: 1024,
+  recoverableSize: 0,
+  systems : [],
+  udevIds: ["ata-Micron_1100_SATA_512GB_12563", "scsi-0ATA_Micron_1100_SATA_512GB"],
+  udevPaths: ["pci-0000:00-12", "pci-0000:00-12-ata"],
+};
+
+const sdb = {
+  sid: 62,
+  isDrive: true,
+  type: "disk",
+  vendor: "Samsung",
+  model: "Samsung Evo 8 Pro",
+  driver: ["ahci"],
+  bus: "IDE",
+  busId: "",
+  transport: "",
+  dellBOSS: false,
+  sdCard: false,
+  active: true,
+  name: "/dev/sdb",
+  size: 2048,
+  recoverableSize: 0,
+  systems : [],
+  udevIds: [],
+  udevPaths: ["pci-0000:00-19"]
+};
+
+const sdc = {
+  sid: 63,
+  isDrive: true,
+  type: "disk",
+  vendor: "Samsung",
+  model: "Samsung Evo 8 Pro",
+  driver: ["ahci"],
+  bus: "IDE",
+  busId: "",
+  transport: "",
+  dellBOSS: false,
+  sdCard: false,
+  active: true,
+  name: "/dev/sdc",
+  size: 2048,
+  recoverableSize: 0,
+  systems : [],
+  udevIds: [],
+  udevPaths: ["pci-0000:00-19"]
+};
+
+let props;
+
+const expectSelector = (selector) => {
+  const option = (name) => {
+    const row = within(selector).getByRole("row", { name });
+    return within(row).queryByRole("radio") || within(row).queryByRole("checkbox");
+  };
+
+  const matchers = (modifier = (obj) => obj) => {
+    return {
+      toHaveCheckedOption: (name) => {
+        modifier(expect(option(name))).toBeChecked();
+      },
+      toBeVisible: () => {
+        // Jsdom does not report correct styles, see https://github.com/jsdom/jsdom/issues/2986.
+        // expect(selector).not.toBeVisible();
+        modifier(expect(selector.parentNode)).toHaveAttribute("aria-expanded", "true");
+      }
+    };
+  };
+
+  return { ...matchers(), not: { ...matchers((obj) => obj.not) } };
+};
+
+const clickSelectorOption = async (user, selector, name) => {
+  const row = within(selector).getByRole("row", { name });
+  const option = within(row).queryByRole("radio") || within(row).queryByRole("checkbox");
+  await user.click(option);
+};
+
+describe("DeviceSelectionDialog", () => {
+  beforeEach(() => {
+    props = {
+      isOpen: true,
+      target: "disk",
+      targetPVDevices: [],
+      devices: [sda, sdb, sdc],
+      onCancel: jest.fn(),
+      onAccept: jest.fn()
+    };
+  });
+
+  it("offers an option to select a disk as target device for installation", () => {
+    plainRender(<DeviceSelectionDialog {...props} />);
+    screen.getByRole("radio", { name: "Select a disk" });
+  });
+
+  it("offers an option to create a new LVM volume group as target device for installation", () => {
+    plainRender(<DeviceSelectionDialog {...props} />);
+    screen.getByRole("radio", { name: "Create an LVM Volume Group" });
+  });
+
+  describe("if the target is a disk", () => {
+    beforeEach(() => {
+      props.target = "disk";
+      props.targetDevice = sda;
+    });
+
+    it("selects the disk option by default", () => {
+      plainRender(<DeviceSelectionDialog {...props} />);
+      const diskOption = screen.getByRole("radio", { name: /select a disk/i });
+      expect(diskOption).toBeChecked();
+      const lvmOption = screen.getByRole("radio", { name: /create an lvm/i });
+      expect(lvmOption).not.toBeChecked();
+    });
+
+    it("shows the disk selector", async () => {
+      plainRender(<DeviceSelectionDialog {...props} />);
+      const diskSelector = screen.getByRole("grid", { name: /selector for target disk/i });
+      expect(diskSelector).toBeVisible();
+      const lvmSelector = screen.getByRole("grid", { name: /selector for new lvm/i });
+      expectSelector(lvmSelector).not.toBeVisible();
+    });
+
+    it("shows the target disk as selected", () => {
+      plainRender(<DeviceSelectionDialog {...props} />);
+      const selector = screen.getByRole("grid", { name: /selector for target disk/i });
+      expectSelector(selector).toHaveCheckedOption(/sda/);
+      expectSelector(selector).not.toHaveCheckedOption(/sdb/);
+      expectSelector(selector).not.toHaveCheckedOption(/sdc/);
+    });
+
+    it("allows to switch to new LVM", async () => {
+      const { user } = plainRender(<DeviceSelectionDialog {...props} />);
+      const lvmOption = screen.getByRole("radio", { name: /create an lvm/i });
+      expect(lvmOption).not.toBeChecked();
+
+      await user.click(lvmOption);
+
+      expect(lvmOption).toBeChecked();
+      const diskOption = screen.getByRole("radio", { name: /select a disk/i });
+      expect(diskOption).not.toBeChecked();
+      const lvmSelector = screen.getByRole("grid", { name: /selector for new lvm/i });
+      expect(lvmSelector).toBeVisible();
+      const diskSelector = screen.getByRole("grid", { name: /selector for target disk/i });
+      expectSelector(diskSelector).not.toBeVisible();
+    });
+  });
+
+  describe("if the target is a new LVM volume group", () => {
+    beforeEach(() => {
+      props.target = "newLvmVg";
+      props.targetPVDevices = [sda, sdc];
+    });
+
+    it("selects the LVM option by default", () => {
+      plainRender(<DeviceSelectionDialog {...props} />);
+      const lvmOption = screen.getByRole("radio", { name: /create an lvm/i });
+      expect(lvmOption).toBeChecked();
+      const diskOption = screen.getByRole("radio", { name: /select a disk/i });
+      expect(diskOption).not.toBeChecked();
+    });
+
+    it("shows the selector for LVM candidate devices", () => {
+      plainRender(<DeviceSelectionDialog {...props} />);
+      const lvmSelector = screen.getByRole("grid", { name: /selector for new lvm/i });
+      expect(lvmSelector).toBeVisible();
+      const diskSelector = screen.getByRole("grid", { name: /selector for target disk/i });
+      expectSelector(diskSelector).not.toBeVisible();
+    });
+
+    it("shows the current candidate devices as selected", () => {
+      plainRender(<DeviceSelectionDialog {...props} />);
+      const selector = screen.getByRole("grid", { name: /selector for new lvm/i });
+      expectSelector(selector).toHaveCheckedOption(/sda/);
+      expectSelector(selector).not.toHaveCheckedOption(/sdb/);
+      expectSelector(selector).toHaveCheckedOption(/sdc/);
+    });
+
+    it("allows to switch to disk", async () => {
+      const { user } = plainRender(<DeviceSelectionDialog {...props} />);
+      const diskOption = screen.getByRole("radio", { name: /select a disk/i });
+      expect(diskOption).not.toBeChecked();
+
+      await user.click(diskOption);
+
+      expect(diskOption).toBeChecked();
+      const diskSelector = screen.getByRole("grid", { name: /selector for target disk/i });
+      expect(diskSelector).toBeVisible();
+      const lvmOption = screen.getByRole("radio", { name: /create an lvm/i });
+      expect(lvmOption).not.toBeChecked();
+      const lvmSelector = screen.getByRole("grid", { name: /selector for new lvm/i });
+      expectSelector(lvmSelector).not.toBeVisible();
+    });
+  });
+
+  it("does not call onAccept on cancel", async () => {
+    const { user } = plainRender(<DeviceSelectionDialog {...props} />);
+    const cancel = screen.getByRole("button", { name: "Cancel" });
+
+    await user.click(cancel);
+
+    expect(props.onAccept).not.toHaveBeenCalled();
+  });
+
+  describe("if the option to select a disk as target device is selected", () => {
+    beforeEach(() => {
+      props.target = "newLvmVg";
+      props.targetDevice = sda;
+    });
+
+    it("calls onAccept with the selected target and disk on accept", async () => {
+      const { user } = plainRender(<DeviceSelectionDialog {...props} />);
+
+      const diskOption = screen.getByRole("radio", { name: /select a disk/i });
+      await user.click(diskOption);
+
+      const selector = screen.getByRole("grid", { name: /selector for target disk/i });
+      await clickSelectorOption(user, selector, /sdb/);
+
+      const accept = screen.getByRole("button", { name: "Confirm" });
+      await user.click(accept);
+
+      expect(props.onAccept).toHaveBeenCalledWith({
+        target: "disk",
+        targetDevice: sdb,
+        targetPVDevices: []
+      });
+    });
+  });
+
+  describe("if the option to create a new LVM volume group is selected", () => {
+    beforeEach(() => {
+      props.target = "disk";
+      props.targetDevice = sdb;
+    });
+
+    it("calls onAccept with the selected target and the candidate devices on accept", async () => {
+      const { user } = plainRender(<DeviceSelectionDialog {...props} />);
+
+      const lvmOption = screen.getByRole("radio", { name: /create an lvm/i });
+      await user.click(lvmOption);
+
+      const selector = screen.getByRole("grid", { name: /selector for new lvm/i });
+      await clickSelectorOption(user, selector, /sda/);
+      await clickSelectorOption(user, selector, /sdc/);
+
+      const accept = screen.getByRole("button", { name: "Confirm" });
+      await user.click(accept);
+
+      expect(props.onAccept).toHaveBeenCalledWith({
+        target: "newLvmVg",
+        targetDevice: sdb,
+        targetPVDevices: [sda, sdc]
+      });
+    });
+  });
+});
diff --git a/web/src/components/storage/DeviceSelectorTable.jsx b/web/src/components/storage/DeviceSelectorTable.jsx
new file mode 100644
index 000000000..0653019f7
--- /dev/null
+++ b/web/src/components/storage/DeviceSelectorTable.jsx
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+import React from "react";
+import { _ } from "~/i18n";
+import { deviceSize } from '~/components/storage/utils';
+import { DeviceExtendedInfo, DeviceContentInfo } from "~/components/storage";
+import { ExpandableSelector } from "~/components/core";
+
+/**
+ * @typedef {import ("~/client/storage").ProposalSettings} ProposalSettings
+ * @typedef {import ("~/client/storage").StorageDevice} StorageDevice
+ */
+
+const DeviceInfo = ({ device }) => {
+  if (!device.sid) return _("Unused space");
+
+  return <DeviceExtendedInfo device={device} />;
+};
+
+const deviceColumns = [
+  { name: _("Device"), value: (device) => <DeviceInfo device={device} /> },
+  { name: _("Content"), value: (device) => <DeviceContentInfo device={device} /> },
+  { name: _("Size"), value: (device) => deviceSize(device.size), classNames: "sizes-column" }
+];
+
+export default function DeviceSelectorTable({ devices, selected, ...props }) {
+  return (
+    <ExpandableSelector
+      columns={deviceColumns}
+      items={devices}
+      itemIdKey="sid"
+      itemClassNames={(device) => {
+        if (!device.sid) {
+          return "dimmed-row";
+        }
+      }}
+      itemsSelected={selected}
+      className="devices-table"
+      {...props}
+    />
+  );
+}
diff --git a/web/src/components/storage/DevicesFormSelect.jsx b/web/src/components/storage/DevicesFormSelect.jsx
new file mode 100644
index 000000000..baf73b009
--- /dev/null
+++ b/web/src/components/storage/DevicesFormSelect.jsx
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+// @ts-check
+
+import React from "react";
+import { FormSelect, FormSelectOption } from '@patternfly/react-core';
+import { deviceSize } from '~/components/storage/utils';
+
+/**
+ * @typedef {import ("@patternfly/react-core").FormSelectProps} PFFormSelectProps
+ * @typedef {import ("~/client/storage").StorageDevice} StorageDevice
+ */
+
+/**
+ * A PF/Select for simple device selection
+ * @component
+ *
+ * @example <caption>Simple usage</caption>
+ *   import { devices, selected } from "somewhere";
+ *
+ *   <DevicesFormSelect devices={devices} selected={selected} />
+ *
+ * @typedef {object} DevicesFormSelectBaseProps
+ * @property {StorageDevice[]} props.devices - Devices to show in the selector.
+ * @property {StorageDevice} [props.selectedDevice] - Currently selected device. In case of
+ * @property {(StorageDevice) => void} props.onChange - Callback to be called when the selection changes
+ *
+ * @param {DevicesFormSelectBaseProps & Omit<PFFormSelectProps, "value" | "onChange" | "children">} props
+ */
+export default function DevicesFormSelect({ devices, selectedDevice, onChange, ...otherProps }) {
+  return (
+    /** @ts-expect-error: for some reason using otherProps makes TS complain */
+    <FormSelect
+      {...otherProps}
+      value={selectedDevice?.sid}
+      onChange={(_, value) => onChange(devices.find(d => d.sid === Number(value)))}
+    >
+      { devices.map(device => (
+        <FormSelectOption
+          key={device.sid}
+          value={device.sid}
+          label={`${device.name}, ${deviceSize(device.size)}`}
+        />
+      ))}
+    </FormSelect>
+  );
+}
diff --git a/web/src/components/storage/DevicesFormSelect.test.jsx b/web/src/components/storage/DevicesFormSelect.test.jsx
new file mode 100644
index 000000000..0040f9170
--- /dev/null
+++ b/web/src/components/storage/DevicesFormSelect.test.jsx
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+describe("DevicesFormSelect", () => {
+  it.todo("add examples for testing storage/DevicesFormSelect component");
+});
diff --git a/web/src/components/storage/DevicesManager.js b/web/src/components/storage/DevicesManager.js
new file mode 100644
index 000000000..5f7031856
--- /dev/null
+++ b/web/src/components/storage/DevicesManager.js
@@ -0,0 +1,215 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+// @ts-check
+
+import { compact, uniq } from "~/utils";
+
+/**
+ * @typedef {import ("~/client/storage").Action} Action
+ * @typedef {import ("~/client/storage").StorageDevice} StorageDevice
+ */
+
+/**
+ * Class for managing storage devices.
+ */
+export default class DevicesManager {
+  /**
+   * @param {StorageDevice[]} system - Devices representing the current state of the system.
+   * @param {StorageDevice[]} staging - Devices representing the target state of the system.
+   * @param {Action[]} actions - Actions to perform from system to staging.
+   */
+  constructor(system, staging, actions) {
+    this.system = system;
+    this.staging = staging;
+    this.actions = actions;
+  }
+
+  /**
+   * System device with the given SID.
+   *
+   * @param {Number} sid
+   * @returns {StorageDevice|undefined}
+   */
+  systemDevice(sid) {
+    return this.#device(sid, this.system);
+  }
+
+  /**
+   * Staging device with the given SID.
+   *
+   * @param {Number} sid
+   * @returns {StorageDevice|undefined}
+   */
+  stagingDevice(sid) {
+    return this.#device(sid, this.staging);
+  }
+
+  /**
+   * Whether the given device exists in system.
+   *
+   * @param {StorageDevice} device
+   * @returns {Boolean}
+   */
+  existInSystem(device) {
+    return this.#exist(device, this.system);
+  }
+
+  /**
+   * Whether the given device exists in staging.
+   *
+   * @param {StorageDevice} device
+   * @returns {Boolean}
+   */
+  existInStaging(device) {
+    return this.#exist(device, this.staging);
+  }
+
+  /**
+   * Whether the given device is going to be formatted.
+   *
+   * @param {StorageDevice} device
+   * @returns {Boolean}
+   */
+  hasNewFilesystem(device) {
+    if (!device.filesystem) return false;
+
+    const systemDevice = this.systemDevice(device.sid);
+    const systemFilesystemSID = systemDevice?.filesystem?.sid;
+
+    return device.filesystem.sid !== systemFilesystemSID;
+  }
+
+  /**
+   * Whether the given device is going to be shrunk.
+   *
+   * @param {StorageDevice} device
+   * @returns {Boolean}
+   */
+  isShrunk(device) {
+    return this.shrinkSize(device) > 0;
+  }
+
+  /**
+   * Amount of bytes the given device is going to be shrunk.
+   *
+   * @param {StorageDevice} device
+   * @returns {Number}
+   */
+  shrinkSize(device) {
+    const systemDevice = this.systemDevice(device.sid);
+    const stagingDevice = this.stagingDevice(device.sid);
+
+    if (!systemDevice || !stagingDevice) return 0;
+
+    const amount = systemDevice.size - stagingDevice.size;
+    return amount > 0 ? amount : 0;
+  }
+
+  /**
+   * Disk devices and LVM volume groups used for the installation.
+   *
+   * @note The used devices are extracted from the actions.
+   *
+   * @returns {StorageDevice[]}
+   */
+  usedDevices() {
+    const isTarget = (device) => device.isDrive || device.type === "lvmVg";
+
+    // Check in system devices to detect removals.
+    const targetSystem = this.system.filter(isTarget);
+    const targetStaging = this.staging.filter(isTarget);
+
+    const sids = targetSystem.concat(targetStaging)
+      .filter(d => this.#isUsed(d))
+      .map(d => d.sid);
+
+    return compact(uniq(sids).map(sid => this.stagingDevice(sid)));
+  }
+
+  /**
+   * Devices deleted.
+   *
+   * @note The devices are extracted from the actions.
+   *
+   * @returns {StorageDevice[]}
+   */
+  deletedDevices() {
+    return this.#deleteActionsDevice().filter(d => !d.isDrive);
+  }
+
+  /**
+   * Systems deleted.
+   *
+   * @returns {string[]}
+   */
+  deletedSystems() {
+    const systems = this.#deleteActionsDevice()
+      .filter(d => !d.partitionTable)
+      .map(d => d.systems)
+      .flat();
+    return compact(systems);
+  }
+
+  /**
+   * @param {number} sid
+   * @param {StorageDevice[]} source
+   * @returns {StorageDevice|undefined}
+   */
+  #device(sid, source) {
+    return source.find(d => d.sid === sid);
+  }
+
+  /**
+   * @param {StorageDevice} device
+   * @param {StorageDevice[]} source
+   * @returns {boolean}
+   */
+  #exist(device, source) {
+    return this.#device(device.sid, source) !== undefined;
+  }
+
+  /**
+   * @param {StorageDevice} device
+   * @returns {boolean}
+   */
+  #isUsed(device) {
+    const sids = uniq(compact(this.actions.map(a => a.device)));
+
+    const partitions = device.partitionTable?.partitions || [];
+    const lvmLvs = device.logicalVolumes || [];
+
+    return sids.includes(device.sid) ||
+      partitions.find(p => this.#isUsed(p)) !== undefined ||
+      lvmLvs.find(l => this.#isUsed(l)) !== undefined;
+  }
+
+  /**
+   * @returns {StorageDevice[]}
+   */
+  #deleteActionsDevice() {
+    const sids = this.actions
+      .filter(a => a.delete)
+      .map(a => a.device);
+    const devices = sids.map(sid => this.systemDevice(sid));
+    return compact(devices);
+  }
+}
diff --git a/web/src/components/storage/DevicesManager.test.js b/web/src/components/storage/DevicesManager.test.js
new file mode 100644
index 000000000..23636fc10
--- /dev/null
+++ b/web/src/components/storage/DevicesManager.test.js
@@ -0,0 +1,433 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+import DevicesManager from "./DevicesManager";
+
+let system;
+let staging;
+let actions;
+
+beforeEach(() => {
+  system = [];
+  staging = [];
+  actions = [];
+});
+
+describe("systemDevice", () => {
+  beforeEach(() => {
+    staging = [{ sid: 60, name: "/dev/sda" }];
+  });
+
+  describe("if there is no system device with the given SID", () => {
+    it("returns undefined", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      expect(manager.systemDevice(60)).toBeUndefined();
+    });
+  });
+
+  describe("if there is a system device with the given SID", () => {
+    beforeEach(() => {
+      system = [{ sid: 60, name: "/dev/sdb" }];
+    });
+
+    it("returns the system device", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      expect(manager.systemDevice(60).name).toEqual("/dev/sdb");
+    });
+  });
+});
+
+describe("stagingDevice", () => {
+  beforeEach(() => {
+    system = [{ sid: 60, name: "/dev/sda" }];
+  });
+
+  describe("if there is no staging device with the given SID", () => {
+    it("returns undefined", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      expect(manager.stagingDevice(60)).toBeUndefined();
+    });
+  });
+
+  describe("if there is a staging device with the given SID", () => {
+    beforeEach(() => {
+      staging = [{ sid: 60, name: "/dev/sdb" }];
+    });
+
+    it("returns the staging device", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      expect(manager.stagingDevice(60).name).toEqual("/dev/sdb");
+    });
+  });
+});
+
+describe("existInSystem", () => {
+  beforeEach(() => {
+    system = [{ sid: 61, name: "/dev/sda2" }];
+    staging = [{ sid: 60, name: "/dev/sda1" }];
+  });
+
+  describe("if the given device does not exist in system", () => {
+    it("returns false", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      expect(manager.existInSystem({ sid: 60 })).toEqual(false);
+    });
+  });
+
+  describe("if the given device exists in system", () => {
+    it("returns true", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      expect(manager.existInSystem({ sid: 61 })).toEqual(true);
+    });
+  });
+});
+
+describe("existInStaging", () => {
+  beforeEach(() => {
+    system = [{ sid: 61, name: "/dev/sda2" }];
+    staging = [{ sid: 60, name: "/dev/sda1" }];
+  });
+
+  describe("if the given device does not exist in staging", () => {
+    it("returns false", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      expect(manager.existInStaging({ sid: 61 })).toEqual(false);
+    });
+  });
+
+  describe("if the given device exists in staging", () => {
+    it("returns true", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      expect(manager.existInStaging({ sid: 60 })).toEqual(true);
+    });
+  });
+});
+
+describe("hasNewFilesystem", () => {
+  describe("if the given device has no file system", () => {
+    beforeEach(() => {
+      system = [{ sid: 60, name: "/dev/sda1", filesystem: { sid: 61 } }];
+      staging = [{ sid: 60, name: "/dev/sda1" }];
+    });
+
+    it("returns false", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      const device = manager.stagingDevice(60);
+      expect(manager.hasNewFilesystem(device)).toEqual(false);
+    });
+  });
+
+  describe("if the given device has no new file system", () => {
+    beforeEach(() => {
+      system = [{ sid: 60, name: "/dev/sda1", filesystem: { sid: 61 } }];
+      staging = [{ sid: 60, name: "/dev/sda1", filesystem: { sid: 61 } }];
+    });
+
+    it("returns false", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      const device = manager.stagingDevice(60);
+      expect(manager.hasNewFilesystem(device)).toEqual(false);
+    });
+  });
+
+  describe("if the given device has a new file system", () => {
+    beforeEach(() => {
+      system = [{ sid: 60, name: "/dev/sda1", filesystem: { sid: 61 } }];
+      staging = [{ sid: 60, name: "/dev/sda1", filesystem: { sid: 62 } }];
+    });
+
+    it("returns true", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      const device = manager.stagingDevice(60);
+      expect(manager.hasNewFilesystem(device)).toEqual(true);
+    });
+  });
+});
+
+describe("isShrunk", () => {
+  describe("if the device is new", () => {
+    beforeEach(() => {
+      system = [];
+      staging = [{ sid: 60, size: 2048 }];
+    });
+
+    it("returns false", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      const device = manager.stagingDevice(60);
+      expect(manager.isShrunk(device)).toEqual(false);
+    });
+  });
+
+  describe("if the device does not exist anymore", () => {
+    beforeEach(() => {
+      system = [{ sid: 60, size: 2048 }];
+      staging = [];
+    });
+
+    it("returns false", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      const device = manager.systemDevice(60);
+      expect(manager.isShrunk(device)).toEqual(false);
+    });
+  });
+
+  describe("if the size is kept", () => {
+    beforeEach(() => {
+      system = [{ sid: 60, size: 1024 }];
+      staging = [{ sid: 60, size: 1024 }];
+    });
+
+    it("returns false", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      const device = manager.stagingDevice(60);
+      expect(manager.isShrunk(device)).toEqual(false);
+    });
+  });
+
+  describe("if the size is more than initially", () => {
+    beforeEach(() => {
+      system = [{ sid: 60, size: 1024 }];
+      staging = [{ sid: 60, size: 2048 }];
+    });
+
+    it("returns false", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      const device = manager.stagingDevice(60);
+      expect(manager.isShrunk(device)).toEqual(false);
+    });
+  });
+
+  describe("if the size is less than initially", () => {
+    beforeEach(() => {
+      system = [{ sid: 60, size: 1024 }];
+      staging = [{ sid: 60, size: 512 }];
+    });
+
+    it("returns true", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      const device = manager.stagingDevice(60);
+      expect(manager.isShrunk(device)).toEqual(true);
+    });
+  });
+});
+
+describe("shrinkSize", () => {
+  describe("if the device is new", () => {
+    beforeEach(() => {
+      system = [];
+      staging = [{ sid: 60, size: 2048 }];
+    });
+
+    it("returns 0", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      const device = manager.stagingDevice(60);
+      expect(manager.shrinkSize(device)).toEqual(0);
+    });
+  });
+
+  describe("if the device does not exist anymore", () => {
+    beforeEach(() => {
+      system = [{ sid: 60, size: 2048 }];
+      staging = [];
+    });
+
+    it("returns 0", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      const device = manager.systemDevice(60);
+      expect(manager.shrinkSize(device)).toEqual(0);
+    });
+  });
+
+  describe("if the size is kept", () => {
+    beforeEach(() => {
+      system = [{ sid: 60, size: 1024 }];
+      staging = [{ sid: 60, size: 1024 }];
+    });
+
+    it("returns 0", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      const device = manager.stagingDevice(60);
+      expect(manager.shrinkSize(device)).toEqual(0);
+    });
+  });
+
+  describe("if the size is more than initially", () => {
+    beforeEach(() => {
+      system = [{ sid: 60, size: 1024 }];
+      staging = [{ sid: 60, size: 2048 }];
+    });
+
+    it("returns 0", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      const device = manager.stagingDevice(60);
+      expect(manager.shrinkSize(device)).toEqual(0);
+    });
+  });
+
+  describe("if the size is less than initially", () => {
+    beforeEach(() => {
+      system = [{ sid: 60, size: 1024 }];
+      staging = [{ sid: 60, size: 512 }];
+    });
+
+    it("returns the shrink amount", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      const device = manager.stagingDevice(60);
+      expect(manager.shrinkSize(device)).toEqual(512);
+    });
+  });
+});
+
+describe("usedDevices", () => {
+  beforeEach(() => {
+    system = [
+      { sid: 60, isDrive: false },
+      { sid: 61, isDrive: true },
+      { sid: 62, isDrive: true, partitionTable: { partitions: [{ sid: 67 }] } },
+      { sid: 63, isDrive: true, partitionTable: { partitions: [] } },
+      { sid: 64, isDrive: false, type: "lvmVg", logicalVolumes: [] },
+      { sid: 65, isDrive: false, type: "lvmVg", logicalVolumes: [] },
+      { sid: 66, isDrive: false, type: "lvmVg", logicalVolumes: [{ sid: 68 }] }
+    ];
+    staging = [
+      { sid: 60, isDrive: false },
+      // Partition removed
+      { sid: 62, isDrive: true, partitionTable: { partitions: [] } },
+      // Partition added
+      { sid: 63, isDrive: true, partitionTable: { partitions: [{ sid: 69 }] } },
+      { sid: 64, isDrive: false, type: "lvmVg", logicalVolumes: [] },
+      // Logical volume added
+      { sid: 65, isDrive: false, type: "lvmVg", logicalVolumes: [{ sid: 70 }, { sid: 71 }] },
+      // Logical volume removed
+      { sid: 66, isDrive: false, type: "lvmVg", logicalVolumes: [] }
+    ];
+  });
+
+  describe("if there are no actions", () => {
+    beforeEach(() => {
+      actions = [];
+    });
+
+    it("returns an empty list", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      expect(manager.usedDevices()).toEqual([]);
+    });
+  });
+
+  describe("if there are actions", () => {
+    beforeEach(() => {
+      actions = [
+        // This device is ignored because it is neither a drive nor a LVM VG.
+        { device: 60 },
+        // This device was removed.
+        { device: 61 },
+        // This partition was removed (belongs to device 62).
+        { device: 67 },
+        // This logical volume was removed (belongs to device 66).
+        { device: 68 },
+        // This partition was added (belongs to device 63).
+        { device: 69 },
+        // This logical volume was added (belongs to device 65).
+        { device: 70 },
+        // This logical volume was added (belongs to device 65).
+        { device: 71 }
+      ];
+    });
+
+    it("does not include removed disk devices or LVM volume groups", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      const sids = manager.usedDevices().map(d => d.sid)
+        .sort();
+      expect(sids).not.toContain(61);
+    });
+
+    it("includes all disk devices and LVM volume groups affected by the actions", () => {
+      const manager = new DevicesManager(system, staging, actions);
+      const sids = manager.usedDevices().map(d => d.sid)
+        .sort();
+      expect(sids).toEqual([62, 63, 65, 66]);
+    });
+  });
+});
+
+describe("deletedDevices", () => {
+  beforeEach(() => {
+    system = [
+      { sid: 60 },
+      { sid: 62 },
+      { sid: 63 },
+      { sid: 64 },
+      { sid: 65, isDrive: true }
+    ];
+    actions = [
+      { device: 60, delete: true },
+      // This device does not exist in system.
+      { device: 61, delete: true },
+      { device: 62, delete: false },
+      { device: 63, delete: true },
+      { device: 65, delete: true }
+    ];
+  });
+
+  it("includes all deleted devices", () => {
+    const manager = new DevicesManager(system, staging, actions);
+    const sids = manager.deletedDevices().map(d => d.sid)
+      .sort();
+    expect(sids).toEqual([60, 63]);
+  });
+});
+
+describe("deletedSystems", () => {
+  beforeEach(() => {
+    system = [
+      { sid: 60, systems: ["Windows XP"] },
+      { sid: 62, systems: ["Ubuntu"] },
+      {
+        sid: 63,
+        systems: ["openSUSE Leap", "openSUSE Tumbleweed"],
+        partitionTable: {
+          partitions: [{ sid: 65 }, { sid: 66 }]
+        }
+      },
+      { sid: 64 },
+      { sid: 65, systems: ["openSUSE Leap"] },
+      { sid: 66, systems: ["openSUSE Tumbleweed"] }
+    ];
+    actions = [
+      { device: 60, delete: true },
+      // This device does not exist in system.
+      { device: 61, delete: true },
+      { device: 62, delete: false },
+      { device: 63, delete: true },
+      { device: 65, delete: true },
+      { device: 66, delete: true }
+    ];
+  });
+
+  it("includes all deleted systems", () => {
+    const manager = new DevicesManager(system, staging, actions);
+    const systems = manager.deletedSystems();
+    expect(systems.length).toEqual(3);
+    expect(systems).toContain("Windows XP");
+    expect(systems).toContain("openSUSE Leap");
+    expect(systems).toContain("openSUSE Tumbleweed");
+  });
+});
diff --git a/web/src/components/storage/ProposalActionsSection.jsx b/web/src/components/storage/ProposalActionsDialog.jsx
similarity index 54%
rename from web/src/components/storage/ProposalActionsSection.jsx
rename to web/src/components/storage/ProposalActionsDialog.jsx
index 8d35563af..053f9d852 100644
--- a/web/src/components/storage/ProposalActionsSection.jsx
+++ b/web/src/components/storage/ProposalActionsDialog.jsx
@@ -20,21 +20,12 @@
  */
 
 import React, { useState } from "react";
-import {
-  List,
-  ListItem,
-  ExpandableSection,
-  Skeleton,
-} from "@patternfly/react-core";
+import { List, ListItem, ExpandableSection, } from "@patternfly/react-core";
 import { sprintf } from "sprintf-js";
-
 import { _, n_ } from "~/i18n";
-import { If, Section } from "~/components/core";
 import { partition } from "~/utils";
+import { If, Popup } from "~/components/core";
 
-// TODO: would be nice adding an aria-description to these lists, but aria-description still in
-// draft yet and aria-describedby should be used... which id not ideal right now
-// https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/aria-description
 const ActionsList = ({ actions }) => {
   // Some actions (e.g., deleting a LV) are reported as several actions joined by a line break
   const actionItems = (action, id) => {
@@ -53,15 +44,21 @@ const ActionsList = ({ actions }) => {
 };
 
 /**
- * Renders the list of actions to perform in the system
+ * Renders a dialog with the given list of actions
  * @component
  *
  * @param {object} props
- * @param {object[]} [props.actions=[]]
+ * @param {object[]} [props.actions=[]] - The actions to perform in the system.
+ * @param {boolean} [props.isOpen=false] - Whether the dialog is visible or not.
+ * @param {function} props.onClose - Whether the dialog is visible or not.
  */
-const ProposalActions = ({ actions = [] }) => {
+export default function ProposalActionsDialog({ actions = [], isOpen = false, onClose }) {
   const [isExpanded, setIsExpanded] = useState(false);
 
+  if (typeof onClose !== 'function') {
+    console.error("Missing ProposalActionsDialog#onClose callback");
+  }
+
   if (actions.length === 0) return null;
 
   const [generalActions, subvolActions] = partition(actions, a => !a.subvol);
@@ -72,66 +69,32 @@ const ProposalActions = ({ actions = [] }) => {
     : sprintf(n_("Show %d subvolume action", "Show %d subvolume actions", subvolActions.length), subvolActions.length);
 
   return (
-    <>
-      <ActionsList actions={generalActions} />
-      {subvolActions.length > 0 && (
-        <ExpandableSection
-          isIndented
-          isExpanded={isExpanded}
-          onToggle={() => setIsExpanded(!isExpanded)}
-          toggleText={toggleText}
-          className="expandable-actions"
-        >
-          <ActionsList actions={subvolActions} />
-        </ExpandableSection>
-      )}
-    </>
-  );
-};
-
-/**
- * @todo Create a component for rendering a customized skeleton
- */
-const ActionsSkeleton = () => {
-  return (
-    <>
-      <Skeleton width="80%" />
-      <Skeleton width="65%" />
-      <Skeleton width="70%" />
-      <Skeleton width="65%" />
-      <Skeleton width="40%" />
-    </>
-  );
-};
-
-/**
- * Section with the actions to perform in the system
- * @component
- *
- * @param {object} props
- * @param {object[]} [props.actions=[]]
- * @param {string[]} [props.errors=[]]
- * @param {boolean} [props.isLoading=false] - Whether the section content should be rendered as loading
- */
-export default function ProposalActionsSection({ actions = [], errors = [], isLoading = false }) {
-  if (isLoading) errors = [];
-
-  return (
-    <Section
+    <Popup
       // TRANSLATORS: The storage "Planned Actions" section's title. The
       // section shows a list of planned actions for the selected device, e.g.
       // "delete partition A", "create partition B with filesystem C", ...
       title={_("Planned Actions")}
-      // TRANSLATORS: The storage "Planned Actions" section's description
-      description={_("Actions to create the file systems and to ensure the new system boots.")}
-      id="storage-actions"
-      errors={errors}
+      isOpen={isOpen}
+      variant="large"
     >
+      <ActionsList actions={generalActions} />
       <If
-        condition={isLoading}
-        then={<ActionsSkeleton />}
-        else={<ProposalActions actions={actions} />}
+        condition={subvolActions.length > 0}
+        then={
+          <ExpandableSection
+            isIndented
+            isExpanded={isExpanded}
+            onToggle={() => setIsExpanded(!isExpanded)}
+            toggleText={toggleText}
+            className="expandable-actions"
+          >
+            <ActionsList actions={subvolActions} />
+          </ExpandableSection>
+        }
       />
-    </Section>
+      <Popup.Actions>
+        <Popup.SecondaryAction onClick={onClose}>{_("Close")}</Popup.SecondaryAction>
+      </Popup.Actions>
+    </Popup>
   );
 }
diff --git a/web/src/components/storage/ProposalActionsDialog.test.jsx b/web/src/components/storage/ProposalActionsDialog.test.jsx
new file mode 100644
index 000000000..cde3a95c5
--- /dev/null
+++ b/web/src/components/storage/ProposalActionsDialog.test.jsx
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) [2022-2023] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+import React from "react";
+import { screen, within, waitForElementToBeRemoved } from "@testing-library/react";
+import { plainRender } from "~/test-utils";
+import { ProposalActionsDialog } from "~/components/storage";
+
+const actions = [
+  { text: 'Create GPT on /dev/vdc', subvol: false, delete: false },
+  { text: 'Create partition /dev/vdc1 (8.00 MiB) as BIOS Boot Partition', subvol: false, delete: false },
+  { text: 'Create encrypted partition /dev/vdc2 (29.99 GiB) as LVM physical volume', subvol: false, delete: false },
+  { text: 'Create volume group system0 (29.98 GiB) with /dev/mapper/cr_vdc2 (29.99 GiB)', subvol: false, delete: false },
+  { text: 'Create LVM logical volume /dev/system0/root (20.00 GiB) on volume group system0 for / with btrfs', subvol: false, delete: false },
+];
+
+const subvolumeActions = [
+  { text: 'Create subvolume @ on /dev/system0/root (20.00 GiB)', subvol: true, delete: false },
+  { text: 'Create subvolume @/var on /dev/system0/root (20.00 GiB)', subvol: true, delete: false },
+  { text: 'Create subvolume @/usr/local on /dev/system0/root (20.00 GiB)', subvol: true, delete: false },
+  { text: 'Create subvolume @/srv on /dev/system0/root (20.00 GiB)', subvol: true, delete: false },
+  { text: 'Create subvolume @/root on /dev/system0/root (20.00 GiB)', subvol: true, delete: false },
+  { text: 'Create subvolume @/opt on /dev/system0/root (20.00 GiB)', subvol: true, delete: false },
+  { text: 'Create subvolume @/home on /dev/system0/root (20.00 GiB)', subvol: true, delete: false },
+  { text: 'Create subvolume @/boot/writable on /dev/system0/root (20.00 GiB)', subvol: true, delete: false },
+  { text: 'Create subvolume @/boot/grub2/x86_64-efi on /dev/system0/root (20.00 GiB)', subvol: true, delete: false },
+  { text: 'Create subvolume @/boot/grub2/i386-pc on /dev/system0/root (20.00 GiB)', subvol: true, delete: false }
+];
+
+const destructiveAction = { text: 'Delete ext4 on /dev/vdc', subvol: false, delete: true };
+
+const onCloseFn = jest.fn();
+
+it("renders nothing by default", () => {
+  const { container } = plainRender(<ProposalActionsDialog onClose={onCloseFn} />);
+  expect(container).toBeEmptyDOMElement();
+});
+
+it("renders nothing when isOpen=false", () => {
+  const { container } = plainRender(
+    <ProposalActionsDialog onClose={onCloseFn} isOpen={false} actions={actions} />
+  );
+  expect(container).toBeEmptyDOMElement();
+});
+
+describe("when isOpen", () => {
+  it("renders nothing if there are no actions", () => {
+    plainRender(<ProposalActionsDialog isOpen onClose={onCloseFn} actions={[]} />);
+
+    expect(screen.queryAllByText(/Delete/)).toEqual([]);
+    expect(screen.queryAllByText(/Create/)).toEqual([]);
+    expect(screen.queryAllByText(/Show/)).toEqual([]);
+  });
+
+  describe("and there are actions", () => {
+    it("renders a dialog with the list of actions", () => {
+      plainRender(<ProposalActionsDialog isOpen onClose={onCloseFn} actions={actions} />);
+
+      const dialog = screen.getByRole("dialog", { name: "Planned Actions" });
+      const actionsList = within(dialog).getByRole("list");
+      const actionsListItems = within(actionsList).getAllByRole("listitem");
+      expect(actionsListItems.map(i => i.textContent)).toEqual(actions.map(a => a.text));
+    });
+
+    it("triggers the onClose callback when user clicks the Close button", async () => {
+      const { user } = plainRender(<ProposalActionsDialog isOpen onClose={onCloseFn} actions={actions} />);
+      const closeButton = screen.getByRole("button", { name: "Close" });
+
+      await user.click(closeButton);
+
+      expect(onCloseFn).toHaveBeenCalled();
+    });
+
+    describe("when there is a destructive action", () => {
+      it("emphasizes the action", () => {
+        plainRender(
+          <ProposalActionsDialog isOpen onClose={onCloseFn} actions={[destructiveAction, ...actions]} />
+        );
+
+        // https://stackoverflow.com/a/63080940
+        const actionItems = screen.getAllByRole("listitem");
+        const destructiveActionItem = actionItems.find(item => item.textContent === destructiveAction.text);
+
+        expect(destructiveActionItem).toHaveClass("proposal-action--delete");
+      });
+    });
+
+    describe("when there are subvolume actions", () => {
+      it("does not render the subvolume actions", () => {
+        plainRender(
+          <ProposalActionsDialog isOpen onClose={onCloseFn} actions={[...actions, ...subvolumeActions]} />
+        );
+
+        // For now, we know that there are two lists and the subvolume list is the second one.
+        // The test could be simplified once we have aria-descriptions for the lists.
+        const [genericList, subvolList] = screen.getAllByRole("list", { hidden: true });
+        expect(genericList).not.toBeNull();
+        expect(subvolList).not.toBeNull();
+        const subvolItems = within(subvolList).queryAllByRole("listitem");
+        expect(subvolItems).toEqual([]);
+      });
+
+      it("renders the subvolume actions after clicking on 'show subvolumes'", async () => {
+        const { user } = plainRender(
+          <ProposalActionsDialog isOpen onClose={onCloseFn} actions={[...actions, ...subvolumeActions]} />
+        );
+
+        const link = screen.getByText(/Show.*subvolume actions/);
+
+        expect(screen.getAllByRole("list").length).toEqual(1);
+
+        await user.click(link);
+
+        waitForElementToBeRemoved(link);
+        screen.getByText(/Hide.*subvolume actions/);
+
+        // For now, we know that there are two lists and the subvolume list is the second one.
+        // The test could be simplified once we have aria-descriptions for the lists.
+        const [, subvolList] = screen.getAllByRole("list");
+        const subvolItems = within(subvolList).getAllByRole("listitem");
+
+        expect(subvolItems.map(i => i.textContent)).toEqual(subvolumeActions.map(a => a.text));
+      });
+    });
+  });
+});
diff --git a/web/src/components/storage/ProposalActionsSection.test.jsx b/web/src/components/storage/ProposalActionsSection.test.jsx
deleted file mode 100644
index 9864391d0..000000000
--- a/web/src/components/storage/ProposalActionsSection.test.jsx
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) [2022-2023] SUSE LLC
- *
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, contact SUSE LLC.
- *
- * To contact SUSE LLC about this file by physical or electronic mail, you may
- * find current contact information at www.suse.com.
- */
-
-import React from "react";
-import { screen, within, waitForElementToBeRemoved } from "@testing-library/react";
-import { plainRender } from "~/test-utils";
-import { ProposalActionsSection } from "~/components/storage";
-
-jest.mock("@patternfly/react-core", () => {
-  const original = jest.requireActual("@patternfly/react-core");
-
-  return {
-    ...original,
-    Skeleton: () => <div>PFSkeleton</div>
-  };
-});
-
-const actions = [
-  { text: 'Create GPT on /dev/vdc', subvol: false, delete: false },
-  { text: 'Create partition /dev/vdc1 (8.00 MiB) as BIOS Boot Partition', subvol: false, delete: false },
-  { text: 'Create encrypted partition /dev/vdc2 (29.99 GiB) as LVM physical volume', subvol: false, delete: false },
-  { text: 'Create volume group system0 (29.98 GiB) with /dev/mapper/cr_vdc2 (29.99 GiB)', subvol: false, delete: false },
-  { text: 'Create LVM logical volume /dev/system0/root (20.00 GiB) on volume group system0 for / with btrfs', subvol: false, delete: false },
-];
-
-const subvolumeActions = [
-  { text: 'Create subvolume @ on /dev/system0/root (20.00 GiB)', subvol: true, delete: false },
-  { text: 'Create subvolume @/var on /dev/system0/root (20.00 GiB)', subvol: true, delete: false },
-  { text: 'Create subvolume @/usr/local on /dev/system0/root (20.00 GiB)', subvol: true, delete: false },
-  { text: 'Create subvolume @/srv on /dev/system0/root (20.00 GiB)', subvol: true, delete: false },
-  { text: 'Create subvolume @/root on /dev/system0/root (20.00 GiB)', subvol: true, delete: false },
-  { text: 'Create subvolume @/opt on /dev/system0/root (20.00 GiB)', subvol: true, delete: false },
-  { text: 'Create subvolume @/home on /dev/system0/root (20.00 GiB)', subvol: true, delete: false },
-  { text: 'Create subvolume @/boot/writable on /dev/system0/root (20.00 GiB)', subvol: true, delete: false },
-  { text: 'Create subvolume @/boot/grub2/x86_64-efi on /dev/system0/root (20.00 GiB)', subvol: true, delete: false },
-  { text: 'Create subvolume @/boot/grub2/i386-pc on /dev/system0/root (20.00 GiB)', subvol: true, delete: false }
-];
-
-const destructiveAction = { text: 'Delete ext4 on /dev/vdc', subvol: false, delete: true };
-
-it("renders skeleton while loading", () => {
-  plainRender(<ProposalActionsSection isLoading actions={actions} />);
-
-  screen.getAllByText(/PFSkeleton/);
-});
-
-it("renders nothing when there is no actions", () => {
-  plainRender(<ProposalActionsSection actions={[]} />);
-
-  expect(screen.queryAllByText(/Delete/)).toEqual([]);
-  expect(screen.queryAllByText(/Create/)).toEqual([]);
-  expect(screen.queryAllByText(/Show/)).toEqual([]);
-});
-
-describe("when there are actions", () => {
-  it("renders an explanatory text", () => {
-    plainRender(<ProposalActionsSection actions={actions} />);
-
-    screen.getByText(/Actions to create/);
-  });
-
-  it("renders the list of actions", () => {
-    plainRender(<ProposalActionsSection actions={actions} />);
-
-    const actionsList = screen.getByRole("list");
-    const actionsListItems = within(actionsList).getAllByRole("listitem");
-    expect(actionsListItems.map(i => i.textContent)).toEqual(actions.map(a => a.text));
-  });
-
-  describe("when there is a destructive action", () => {
-    it("emphasizes the action", () => {
-      plainRender(<ProposalActionsSection actions={[destructiveAction, ...actions]} />);
-
-      // https://stackoverflow.com/a/63080940
-      const actionItems = screen.getAllByRole("listitem");
-      const destructiveActionItem = actionItems.find(item => item.textContent === destructiveAction.text);
-
-      expect(destructiveActionItem).toHaveClass("proposal-action--delete");
-    });
-  });
-
-  describe("when there are subvolume actions", () => {
-    it("does not render the subvolume actions", () => {
-      plainRender(<ProposalActionsSection actions={[...actions, ...subvolumeActions]} />);
-
-      // For now, we know that there are two lists and the subvolume list is the second one.
-      // The test could be simplified once we have aria-descriptions for the lists.
-      const [genericList, subvolList] = screen.getAllByRole("list", { hidden: true });
-      expect(genericList).not.toBeNull();
-      expect(subvolList).not.toBeNull();
-      const subvolItems = within(subvolList).queryAllByRole("listitem");
-      expect(subvolItems).toEqual([]);
-    });
-
-    it("renders the subvolume actions after clicking on 'show subvolumes'", async () => {
-      const { user } = plainRender(
-        <ProposalActionsSection actions={[...actions, ...subvolumeActions]} />
-      );
-
-      const link = screen.getByText(/Show.*subvolume actions/);
-
-      expect(screen.getAllByRole("list").length).toEqual(1);
-
-      await user.click(link);
-
-      waitForElementToBeRemoved(link);
-      screen.getByText(/Hide.*subvolume actions/);
-
-      // For now, we know that there are two lists and the subvolume list is the second one.
-      // The test could be simplified once we have aria-descriptions for the lists.
-      const [, subvolList] = screen.getAllByRole("list");
-      const subvolItems = within(subvolList).getAllByRole("listitem");
-
-      expect(subvolItems.map(i => i.textContent)).toEqual(subvolumeActions.map(a => a.text));
-    });
-  });
-});
diff --git a/web/src/components/storage/ProposalDeviceSection.jsx b/web/src/components/storage/ProposalDeviceSection.jsx
index df37eaf30..0b065a4c0 100644
--- a/web/src/components/storage/ProposalDeviceSection.jsx
+++ b/web/src/components/storage/ProposalDeviceSection.jsx
@@ -19,66 +19,54 @@
  * find current contact information at www.suse.com.
  */
 
+// @ts-check
+
 import React, { useState } from "react";
 import {
   Button,
-  Form,
   Skeleton,
-  Switch,
-  ToggleGroup, ToggleGroupItem,
-  Tooltip
 } from "@patternfly/react-core";
 
 import { _ } from "~/i18n";
-import { Icon } from "~/components/layout";
-import { If, Section, Popup } from "~/components/core";
-import { DeviceList, DeviceSelector } from "~/components/storage";
+import { DeviceSelectionDialog } from "~/components/storage";
 import { deviceLabel } from '~/components/storage/utils';
-import { noop } from "~/utils";
+import { If, Section } from "~/components/core";
+import { sprintf } from "sprintf-js";
+import { compact, noop } from "~/utils";
 
 /**
- * @typedef {import ("~/client/storage").ProposalManager.ProposalSettings} ProposalSettings
- * @typedef {import ("~/client/storage").DevicesManager.StorageDevice} StorageDevice
+ * @typedef {import ("~/client/storage").ProposalSettings} ProposalSettings
+ * @typedef {import ("~/client/storage").StorageDevice} StorageDevice
  */
 
 /**
- * Form for selecting the installation device.
- * @component
+ * Renders a button that allows changing the target device for installation.
  *
  * @param {object} props
- * @param {string} props.id - Form ID.
- * @param {StorageDevice} [props.current] - Currently selected device, if any.
- * @param {StorageDevice[]} [props.devices=[]] - Available devices for the selection.
- * @param {onSubmitFn} [props.onSubmit=noop] - On submit callback.
- *
- * @callback onSubmitFn
- * @param {string} device - Name of the selected device.
+ * @param {string} props.target
+ * @param {StorageDevice|undefined} props.targetDevice
+ * @param {StorageDevice[]} props.targetPVDevices
+ * @param {import("react").MouseEventHandler<HTMLButtonElement>} [props.onClick=noop]
  */
-const InstallationDeviceForm = ({
-  id,
-  current,
-  devices = [],
-  onSubmit = noop
-}) => {
-  const [device, setDevice] = useState(current || devices[0]);
-
-  const changeSelected = (deviceId) => {
-    setDevice(devices.find(d => d.sid === deviceId));
-  };
+const TargetDeviceButton = ({ target, targetDevice, targetPVDevices, onClick = noop }) => {
+  const label = () => {
+    if (target === "disk" && targetDevice) return deviceLabel(targetDevice);
+    if (target === "newLvmVg" && targetPVDevices.length > 0) {
+      if (targetPVDevices.length > 1) return _("new LVM volume group");
+
+      if (targetPVDevices.length === 1) {
+        // TRANSLATORS: %s is the disk used for the LVM physical volumes (eg. "/dev/sda, 80 GiB)
+        return sprintf(_("new LVM volume group on %s"), deviceLabel(targetPVDevices[0]));
+      }
+    }
 
-  const submitForm = (e) => {
-    e.preventDefault();
-    if (device !== undefined) onSubmit(device);
+    return _("No device selected yet");
   };
 
   return (
-    <Form id={id} onSubmit={submitForm}>
-      <DeviceSelector
-        selected={device}
-        devices={devices}
-        onChange={changeSelected}
-      />
-    </Form>
+    <Button variant="link" isInline onClick={onClick}>
+      {label()}
+    </Button>
   );
 };
 
@@ -86,302 +74,78 @@ const InstallationDeviceForm = ({
  * Allows to select the installation device.
  * @component
  *
- * @callback onChangeFn
- * @param {string} device - Name of the selected device.
- *
  * @param {object} props
- * @param {string} [props.current] - Device name, if any.
- * @param {StorageDevice[]} [props.devices=[]] - Available devices for the selection.
- * @param {boolean} [props.isLoading=false] - Whether to show the selector as loading.
- * @param {onChangeFn} [props.onChange=noop] - On change callback.
+ * @param {string} props.target - Installation target ("disk", "newLvmVg", "reusedLvmVg").
+ * @param {StorageDevice|undefined} props.targetDevice - Target device (for target "disk").
+ * @param {StorageDevice[]} props.targetPVDevices - Target devices for the LVM volume group (target "newLvmVg").
+ * @param {StorageDevice[]} props.devices - Available devices for installation.
+ * @param {boolean} props.isLoading
+ * @param {(target: Target) => void} props.onChange
+ *
+ * @typedef {object} Target
+ * @property {string} target
+ * @property {StorageDevice|undefined} targetDevice
+ * @property {StorageDevice[]} targetPVDevices
  */
 const InstallationDeviceField = ({
-  current,
-  devices = [],
-  isLoading = false,
-  onChange = noop
+  target,
+  targetDevice,
+  targetPVDevices,
+  devices,
+  isLoading,
+  onChange
 }) => {
-  const [device, setDevice] = useState(devices.find(d => d.name === current));
-  const [isFormOpen, setIsFormOpen] = useState(false);
-
-  const openForm = () => setIsFormOpen(true);
+  const [isDialogOpen, setIsDialogOpen] = useState(false);
 
-  const closeForm = () => setIsFormOpen(false);
+  const openDialog = () => setIsDialogOpen(true);
 
-  const acceptForm = (selectedDevice) => {
-    closeForm();
-    setDevice(selectedDevice);
-    onChange(selectedDevice);
-  };
+  const closeDialog = () => setIsDialogOpen(false);
 
-  /**
-   * Renders a button that allows changing selected device
-   *
-   * NOTE: if a device is already selected, its name and size will be used for
-   * the button text. Otherwise, a "No device selected" text will be shown.
-   *
-   * @param {object} props
-   * @param {StorageDevice|undefined} [props.current] - Currently selected device, if any.
-   */
-  const DeviceContent = ({ device }) => {
-    return (
-      <Button variant="link" isInline onClick={openForm}>
-        {device ? deviceLabel(device) : _("No device selected yet")}
-      </Button>
-    );
+  const onAccept = ({ target, targetDevice, targetPVDevices }) => {
+    closeDialog();
+    onChange({ target, targetDevice, targetPVDevices });
   };
 
   if (isLoading) {
     return <Skeleton screenreaderText={_("Waiting for information about selected device")} width="25%" />;
   }
 
-  const description = _("Select the device for installing the system.");
-
-  return (
-    <>
-      <div className="split">
-        <span>{_("Installation device")}</span>
-        <DeviceContent device={device} />
-      </div>
-      <Popup
-        title={_("Installation device")}
-        description={description}
-        isOpen={isFormOpen}
-      >
-        <If
-          condition={devices.length === 0}
-          then={_("No devices found.")}
-          else={
-            <InstallationDeviceForm
-              id="bootDeviceForm"
-              current={device}
-              devices={devices}
-              onSubmit={acceptForm}
-            />
-          }
-        />
-        <Popup.Actions>
-          <Popup.Confirm
-            form="bootDeviceForm"
-            type="submit"
-            isDisabled={devices.length === 0}
-          >
-            {_("Accept")}
-          </Popup.Confirm>
-          <Popup.Cancel onClick={closeForm} />
-        </Popup.Actions>
-      </Popup>
-    </>
-  );
-};
-
-/**
- * Form for configuring the system volume group.
- * @component
- *
- * @param {object} props
- * @param {string} props.id - Form ID.
- * @param {ProposalSettings} props.settings - Settings used for calculating a proposal.
- * @param {StorageDevice[]} [props.devices=[]] - Available storage devices.
- * @param {onSubmitFn} [props.onSubmit=noop] - On submit callback.
- * @param {onValidateFn} [props.onValidate=noop] - On validate callback.
- *
- * @callback onSubmitFn
- * @param {string[]} devices - Name of the selected devices.
- *
- * @callback onValidateFn
- * @param {boolean} valid
- */
-const LVMSettingsForm = ({
-  id,
-  settings,
-  devices = [],
-  onSubmit: onSubmitProp = noop,
-  onValidate = noop
-}) => {
-  const [vgDevices, setVgDevices] = useState(settings.systemVGDevices);
-  const [isBootDeviceSelected, setIsBootDeviceSelected] = useState(settings.systemVGDevices.length === 0);
-  const [editedDevices, setEditedDevices] = useState(false);
-
-  const selectBootDevice = () => {
-    setIsBootDeviceSelected(true);
-    onValidate(true);
-  };
-
-  const selectCustomDevices = () => {
-    setIsBootDeviceSelected(false);
-    const { bootDevice } = settings;
-    const customDevices = (vgDevices.length === 0 && !editedDevices) ? [bootDevice] : vgDevices;
-    setVgDevices(customDevices);
-    onValidate(customDevices.length > 0);
-  };
-
-  const onChangeDevices = (selection) => {
-    const selectedDevices = devices.filter(d => selection.includes(d.sid)).map(d => d.name);
-    setVgDevices(selectedDevices);
-    setEditedDevices(true);
-    onValidate(devices.length > 0);
-  };
-
-  const onSubmit = (e) => {
-    e.preventDefault();
-    const customDevices = isBootDeviceSelected ? [] : vgDevices;
-    onSubmitProp(customDevices);
-  };
-
-  const BootDevice = () => {
-    const bootDevice = devices.find(d => d.name === settings.bootDevice);
-
-    // FIXME: In this case, should be a "readOnly" selector.
-    return <DeviceList devices={[bootDevice]} />;
-  };
-
   return (
-    <Form id={id} onSubmit={onSubmit}>
-      <div className="split">
-        <span>{_("Devices for creating the volume group")}</span>
-        <ToggleGroup isCompact>
-          <ToggleGroupItem
-            text={_("Installation device")}
-            buttonId="bootDevice"
-            isSelected={isBootDeviceSelected}
-            onClick={selectBootDevice}
-          />
-          <ToggleGroupItem
-            text={_("Custom devices")}
-            buttonId="customDevices"
-            isSelected={!isBootDeviceSelected}
-            onClick={selectCustomDevices}
-          />
-        </ToggleGroup>
-      </div>
+    <div className="split">
+      <span>{_("Installation device")}</span>
+      <TargetDeviceButton
+        target={target}
+        targetDevice={targetDevice}
+        targetPVDevices={targetPVDevices}
+        onClick={openDialog}
+      />
       <If
-        condition={isBootDeviceSelected}
-        then={<BootDevice />}
-        else={
-          <DeviceSelector
-            isMultiple
-            selected={devices.filter(d => vgDevices?.includes(d.name))}
+        condition={isDialogOpen}
+        then={
+          <DeviceSelectionDialog
+            isOpen
+            target={target}
+            targetDevice={targetDevice}
+            targetPVDevices={targetPVDevices}
             devices={devices}
-            onChange={onChangeDevices}
+            onAccept={onAccept}
+            onCancel={closeDialog}
           />
         }
       />
-    </Form>
-  );
-};
-
-/**
- * Allows to select LVM and configure the system volume group.
- * @component
- *
- * @param {object} props
- * @param {ProposalSettings} props.settings - Settings used for calculating a proposal.
- * @param {StorageDevice[]} [props.devices=[]] - Available storage devices.
- * @param {boolean} [props.isChecked=false] - Whether LVM is selected.
- * @param {boolean} [props.isLoading=false] - Whether to show the selector as loading.
- * @param {onChangeFn} [props.onChange=noop] - On change callback.
- *
- * @callback onChangeFn
- * @param {boolean} lvm
- */
-const LVMField = ({
-  settings,
-  devices = [],
-  isChecked: isCheckedProp = false,
-  isLoading = false,
-  onChange: onChangeProp = noop
-}) => {
-  const [isChecked, setIsChecked] = useState(isCheckedProp);
-  const [isFormOpen, setIsFormOpen] = useState(false);
-  const [isFormValid, setIsFormValid] = useState(true);
-
-  const onChange = (_, value) => {
-    setIsChecked(value);
-    onChangeProp({ lvm: value, vgDevices: [] });
-  };
-
-  const openForm = () => setIsFormOpen(true);
-
-  const closeForm = () => setIsFormOpen(false);
-
-  const onValidateForm = (valid) => setIsFormValid(valid);
-
-  const onSubmitForm = (vgDevices) => {
-    closeForm();
-    onChangeProp({ vgDevices });
-  };
-
-  const description = _("Configuration of the system volume group. All the file systems will be \
-created in a logical volume of the system volume group.");
-
-  const LVMSettingsButton = () => {
-    return (
-      <Tooltip
-        content={_("Configure the LVM settings")}
-        entryDelay={400}
-        exitDelay={50}
-        position="right"
-      >
-        <button aria-label={_("LVM settings")} className="plain-control" onClick={openForm}>
-          <Icon name="tune" size="s" />
-        </button>
-      </Tooltip>
-    );
-  };
-
-  if (isLoading) return <Skeleton screenreaderText={_("Waiting for information about LVM")} width="25%" />;
-
-  return (
-    <div className="split">
-      <Switch
-        id="lvm"
-        label={_("Use logical volume management (LVM)")}
-        isReversed
-        isChecked={isChecked}
-        onChange={onChange}
-      />
-      <If condition={isChecked} then={<LVMSettingsButton />} />
-      <Popup
-        aria-label={_("LVM settings")}
-        title={_("System Volume Group")}
-        description={description}
-        isOpen={isFormOpen}
-      >
-        <LVMSettingsForm
-          id="lvmSettingsForm"
-          devices={devices}
-          settings={settings}
-          onSubmit={onSubmitForm}
-          onValidate={onValidateForm}
-        />
-        <Popup.Actions>
-          <Popup.Confirm
-            form="lvmSettingsForm"
-            type="submit"
-            isDisabled={!isFormValid}
-          >
-            {_("Accept")}
-          </Popup.Confirm>
-          <Popup.Cancel onClick={closeForm} />
-        </Popup.Actions>
-      </Popup>
     </div>
   );
 };
 
 /**
- * Section for editing the selected device
+ * Section for editing the target device for installation.
  * @component
  *
- * @callback onChangeFn
- * @param {object} settings
- *
  * @param {object} props
  * @param {ProposalSettings} props.settings
  * @param {StorageDevice[]} [props.availableDevices=[]]
- * @param {boolean} [isLoading=false]
- * @param {onChangeFn} [props.onChange=noop]
+ * @param {boolean} [props.isLoading=false]
+ * @param {(settings: object) => void} [props.onChange=noop]
  */
 export default function ProposalDeviceSection({
   settings,
@@ -389,21 +153,18 @@ export default function ProposalDeviceSection({
   isLoading = false,
   onChange = noop
 }) {
-  // FIXME: we should work with devices objects ASAP
-  const { bootDevice } = settings;
-
-  const changeBootDevice = (device) => {
-    if (device.name !== bootDevice) {
-      onChange({ bootDevice: device.name });
-    }
-  };
-
-  const changeLVM = ({ lvm, vgDevices }) => {
-    const settings = {};
-    if (lvm !== undefined) settings.lvm = lvm;
-    if (vgDevices !== undefined) settings.systemVGDevices = vgDevices;
-
-    onChange(settings);
+  const findDevice = (name) => availableDevices.find(a => a.name === name);
+
+  const target = settings.target;
+  const targetDevice = findDevice(settings.targetDevice);
+  const targetPVDevices = compact(settings.targetPVDevices?.map(findDevice) || []);
+
+  const changeTarget = ({ target, targetDevice, targetPVDevices }) => {
+    onChange({
+      target,
+      targetDevice: targetDevice?.name,
+      targetPVDevices: targetPVDevices.map(d => d.name)
+    });
   };
 
   const Description = () => (
@@ -419,22 +180,17 @@ Volume Group for installation.")
 
   return (
     <Section
-      // TRANSLATORS: The storage "Device" section's title
+      // TRANSLATORS: The storage "Device" section's title.
       title={_("Device")}
       description={<Description />}
     >
       <InstallationDeviceField
-        current={bootDevice}
-        devices={availableDevices}
-        isLoading={isLoading && bootDevice === undefined}
-        onChange={changeBootDevice}
-      />
-      <LVMField
-        settings={settings}
+        target={target}
+        targetDevice={targetDevice}
+        targetPVDevices={targetPVDevices}
         devices={availableDevices}
-        isChecked={settings.lvm === true}
-        isLoading={settings.lvm === undefined}
-        onChange={changeLVM}
+        isLoading={isLoading && target === undefined}
+        onChange={changeTarget}
       />
     </Section>
   );
diff --git a/web/src/components/storage/ProposalDeviceSection.test.jsx b/web/src/components/storage/ProposalDeviceSection.test.jsx
index 73cd46083..3a85b1224 100644
--- a/web/src/components/storage/ProposalDeviceSection.test.jsx
+++ b/web/src/components/storage/ProposalDeviceSection.test.jsx
@@ -66,63 +66,21 @@ const sdb = {
   udevPaths: ["pci-0000:00-19"]
 };
 
-const vda = {
-  sid: "59",
-  type: "disk",
-  vendor: "Micron",
-  model: "Micron 1100 SATA",
-  driver: ["ahci", "mmcblk"],
-  bus: "IDE",
-  transport: "usb",
-  dellBOSS: false,
-  sdCard: true,
-  active: true,
-  name: "/dev/vda",
-  size: 1024,
-  systems: ["Windows", "openSUSE Leap 15.2"],
-  udevIds: ["ata-Micron_1100_SATA_512GB_12563", "scsi-0ATA_Micron_1100_SATA_512GB"],
-  udevPaths: ["pci-0000:00-12", "pci-0000:00-12-ata"],
-  partitionTable: { type: "gpt", partitions: [] }
-};
-
-const md0 = {
-  sid: "62",
-  type: "md",
-  level: "raid0",
-  uuid: "12345:abcde",
-  members: ["/dev/vdb"],
-  active: true,
-  name: "/dev/md0",
-  size: 2048,
-  systems: [],
-  udevIds: [],
-  udevPaths: []
-};
-
-const md1 = {
-  sid: "63",
-  type: "md",
-  level: "raid0",
-  uuid: "12345:abcde",
-  members: ["/dev/vdc"],
-  active: true,
-  name: "/dev/md1",
-  size: 4096,
-  systems: [],
-  udevIds: [],
-  udevPaths: []
-};
-
-const props = {
-  settings: {
-    bootDevice: "/dev/sda",
-  },
-  availableDevices: [sda, sdb],
-  isLoading: false,
-  onChange: jest.fn()
-};
+let props;
 
 describe("ProposalDeviceSection", () => {
+  beforeEach(() => {
+    props = {
+      settings: {
+        target: "disk",
+        targetDevice: "/dev/sda",
+      },
+      availableDevices: [sda, sdb],
+      isLoading: false,
+      onChange: jest.fn()
+    };
+  });
+
   describe("Installation device field", () => {
     describe("when set as loading", () => {
       beforeEach(() => {
@@ -131,7 +89,7 @@ describe("ProposalDeviceSection", () => {
 
       describe("and selected device is not defined yet", () => {
         beforeEach(() => {
-          props.settings = { bootDevice: undefined };
+          props.settings.target = undefined;
         });
 
         it("renders a loading hint", () => {
@@ -140,257 +98,134 @@ describe("ProposalDeviceSection", () => {
         });
       });
     });
-    describe("when installation device is not selected yet", () => {
-      beforeEach(() => {
-        props.settings = { bootDevice: "" };
-      });
-
-      it("uses a 'No device selected yet' text for the selection button", async () => {
-        const { user } = plainRender(<ProposalDeviceSection {...props} />);
-        const button = screen.getByRole("button", { name: "No device selected yet" });
 
-        await user.click(button);
-
-        screen.getByRole("dialog", { name: "Installation device" });
-      });
-    });
-
-    describe("when installation device is selected", () => {
+    describe("when the target is a disk", () => {
       beforeEach(() => {
-        props.settings = { bootDevice: "/dev/sda" };
+        props.settings.target = "disk";
       });
 
-      it("uses its name as part of the text for the selection button", async () => {
-        const { user } = plainRender(<ProposalDeviceSection {...props} />);
-        const button = screen.getByRole("button", { name: /\/dev\/sda/ });
-
-        await user.click(button);
-
-        screen.getByRole("dialog", { name: "Installation device" });
-      });
-    });
-
-    it("allows changing the selected device", async () => {
-      const { user } = plainRender(<ProposalDeviceSection {...props} />);
-      const button = screen.getByRole("button", { name: "/dev/sda, 1 KiB" });
-
-      await user.click(button);
-
-      const selector = await screen.findByRole("dialog", { name: "Installation device" });
-      const sdbOption = within(selector).getByRole("radio", { name: /sdb/ });
-      const accept = within(selector).getByRole("button", { name: "Accept" });
-
-      await user.click(sdbOption);
-      await user.click(accept);
-
-      expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
-      expect(props.onChange).toHaveBeenCalledWith({ bootDevice: sdb.name });
-    });
-
-    it("allows canceling a device selection", async () => {
-      const { user } = plainRender(<ProposalDeviceSection {...props} />);
-      const button = screen.getByRole("button", { name: "/dev/sda, 1 KiB" });
-
-      await user.click(button);
-
-      const selector = await screen.findByRole("dialog", { name: "Installation device" });
-      const sdbOption = within(selector).getByRole("radio", { name: /sdb/ });
-      const cancel = within(selector).getByRole("button", { name: "Cancel" });
-
-      await user.click(sdbOption);
-      await user.click(cancel);
-
-      expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
-      expect(props.onChange).not.toHaveBeenCalled();
-    });
-
-    it("does not trigger the onChange callback when selection actually did not change", async () => {
-      const { user } = plainRender(<ProposalDeviceSection {...props} />);
-      const button = screen.getByRole("button", { name: "/dev/sda, 1 KiB" });
-
-      await user.click(button);
-
-      const selector = await screen.findByRole("dialog", { name: "Installation device" });
-      const sdaOption = within(selector).getByRole("radio", { name: /sda/ });
-      const sdbOption = within(selector).getByRole("radio", { name: /sdb/ });
-      const accept = within(selector).getByRole("button", { name: "Accept" });
+      describe("and installation device is not selected yet", () => {
+        beforeEach(() => {
+          props.settings.targetDevice = "";
+        });
 
-      // User selects a different device
-      await user.click(sdbOption);
-      // but then goes back to the selected device
-      await user.click(sdaOption);
-      // and clicks on Accept button
-      await user.click(accept);
+        it("uses a 'No device selected yet' text for the selection button", async () => {
+          const { user } = plainRender(<ProposalDeviceSection {...props} />);
+          const button = screen.getByRole("button", { name: "No device selected yet" });
 
-      expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
-      // There is no reason for triggering the onChange callback
-      expect(props.onChange).not.toHaveBeenCalled();
-    });
-  });
+          await user.click(button);
 
-  describe("LVM field", () => {
-    describe("if LVM setting is not set yet", () => {
-      beforeEach(() => {
-        props.settings = {};
+          screen.getByRole("dialog", { name: /Device for installing/i });
+        });
       });
 
-      it("does not render the LVM switch", () => {
-        plainRender(<ProposalDeviceSection {...props} />);
-
-        expect(screen.queryByLabelText(/Use logical volume/)).toBeNull();
-      });
-    });
+      describe("and an installation device is selected", () => {
+        beforeEach(() => {
+          props.settings.targetDevice = "/dev/sda";
+        });
 
-    describe("if LVM setting is set", () => {
-      beforeEach(() => {
-        props.settings = { lvm: false };
-      });
+        it("uses its name as part of the text for the selection button", async () => {
+          const { user } = plainRender(<ProposalDeviceSection {...props} />);
+          const button = screen.getByRole("button", { name: /\/dev\/sda/ });
 
-      it("renders the LVM switch", () => {
-        plainRender(<ProposalDeviceSection {...props} />);
+          await user.click(button);
 
-        screen.getByRole("checkbox", { name: /Use logical volume/ });
+          screen.getByRole("dialog", { name: /Device for installing/i });
+        });
       });
     });
 
-    describe("if LVM is set to true", () => {
+    describe("when the target is a new LVM volume group", () => {
       beforeEach(() => {
-        props.availableDevices = [vda, md0, md1];
-        props.settings = { bootDevice: "/dev/vda", lvm: true, systemVGDevices: [] };
-        props.onChange = jest.fn();
-      });
-
-      it("renders the LVM switch as selected", () => {
-        plainRender(<ProposalDeviceSection {...props} />);
-
-        const checkbox = screen.getByRole("checkbox", { name: /Use logical volume/ });
-        expect(checkbox).toBeChecked();
-      });
-
-      it("renders a button for changing the LVM settings", () => {
-        plainRender(<ProposalDeviceSection {...props} />);
-
-        screen.getByRole("button", { name: /LVM settings/ });
-      });
-
-      it("changes the selection on click", async () => {
-        const { user } = plainRender(<ProposalDeviceSection {...props} />);
-
-        const checkbox = screen.getByRole("checkbox", { name: /Use logical volume/ });
-        await user.click(checkbox);
-
-        expect(checkbox).not.toBeChecked();
-        expect(props.onChange).toHaveBeenCalled();
+        props.settings.target = "newLvmVg";
       });
 
-      describe("and user clicks on LVM settings", () => {
-        it("opens the LVM settings dialog", async () => {
-          const { user } = plainRender(<ProposalDeviceSection {...props} />);
-          const settingsButton = screen.getByRole("button", { name: /LVM settings/ });
-
-          await user.click(settingsButton);
-
-          const popup = await screen.findByRole("dialog");
-          within(popup).getByText("System Volume Group");
+      describe("and the target devices are not selected yet", () => {
+        beforeEach(() => {
+          props.settings.targetPVDevices = [];
         });
 
-        it("allows selecting either installation device or custom devices", async () => {
+        it("uses a 'No device selected yet' text for the selection button", async () => {
           const { user } = plainRender(<ProposalDeviceSection {...props} />);
-          const settingsButton = screen.getByRole("button", { name: /LVM settings/ });
+          const button = screen.getByRole("button", { name: "No device selected yet" });
 
-          await user.click(settingsButton);
+          await user.click(button);
 
-          const popup = await screen.findByRole("dialog");
-          screen.getByText("System Volume Group");
+          screen.getByRole("dialog", { name: /Device for installing/i });
+        });
+      });
 
-          within(popup).getByRole("button", { name: "Installation device" });
-          within(popup).getByRole("button", { name: "Custom devices" });
+      describe("and there is a selected device", () => {
+        beforeEach(() => {
+          props.settings.targetPVDevices = ["/dev/sda"];
         });
 
-        it("allows to set the installation device as system volume group", async () => {
+        it("uses its name as part of the text for the selection button", async () => {
           const { user } = plainRender(<ProposalDeviceSection {...props} />);
-          const settingsButton = screen.getByRole("button", { name: /LVM settings/ });
-
-          await user.click(settingsButton);
-
-          const popup = await screen.findByRole("dialog");
-          screen.getByText("System Volume Group");
+          const button = screen.getByRole("button", { name: /new LVM .* \/dev\/sda/ });
 
-          const bootDeviceButton = within(popup).getByRole("button", { name: "Installation device" });
-          const customDevicesButton = within(popup).getByRole("button", { name: "Custom devices" });
-          const acceptButton = within(popup).getByRole("button", { name: "Accept" });
+          await user.click(button);
 
-          await user.click(customDevicesButton);
-          await user.click(bootDeviceButton);
-          await user.click(acceptButton);
+          screen.getByRole("dialog", { name: /Device for installing/i });
+        });
+      });
 
-          expect(props.onChange).toHaveBeenCalledWith(
-            expect.objectContaining({ systemVGDevices: [] })
-          );
+      describe("and there are more than one selected device", () => {
+        beforeEach(() => {
+          props.settings.targetPVDevices = ["/dev/sda", "/dev/sdb"];
         });
 
-        it("allows customize the system volume group", async () => {
+        it("does not use the names as part of the text for the selection button", async () => {
           const { user } = plainRender(<ProposalDeviceSection {...props} />);
-          const settingsButton = screen.getByRole("button", { name: /LVM settings/ });
-
-          await user.click(settingsButton);
-
-          const popup = await screen.findByRole("dialog");
-          screen.getByText("System Volume Group");
-
-          const customDevicesButton = within(popup).getByRole("button", { name: "Custom devices" });
-          const acceptButton = within(popup).getByRole("button", { name: "Accept" });
+          const button = screen.getByRole("button", { name: "new LVM volume group" });
 
-          await user.click(customDevicesButton);
+          await user.click(button);
 
-          const vdaOption = within(popup).getByRole("row", { name: /vda/ });
-          const md0Option = within(popup).getByRole("row", { name: /md0/ });
-          const md1Option = within(popup).getByRole("row", { name: /md1/ });
-
-          // unselect the boot devices
-          await user.click(vdaOption);
-
-          await user.click(md0Option);
-          await user.click(md1Option);
-
-          await user.click(acceptButton);
-
-          expect(props.onChange).toHaveBeenCalledWith(
-            expect.objectContaining({ systemVGDevices: ["/dev/md0", "/dev/md1"] })
-          );
+          screen.getByRole("dialog", { name: /Device for installing/i });
         });
       });
     });
 
-    describe("if LVM is set to false", () => {
-      beforeEach(() => {
-        props.settings = { lvm: false };
-        props.onChange = jest.fn();
-      });
+    it("allows changing the selected device", async () => {
+      const { user } = plainRender(<ProposalDeviceSection {...props} />);
+      const button = screen.getByRole("button", { name: "/dev/sda, 1 KiB" });
 
-      it("renders the LVM switch as not selected", () => {
-        plainRender(<ProposalDeviceSection {...props} />);
+      await user.click(button);
 
-        const checkbox = screen.getByRole("checkbox", { name: /Use logical volume/ });
-        expect(checkbox).not.toBeChecked();
-      });
+      const selector = await screen.findByRole("dialog", { name: /Device for installing/ });
+      const diskGrid = within(selector).getByRole("grid", { name: /target disk/ });
+      const sdbRow = within(diskGrid).getByRole("row", { name: /sdb/ });
+      const sdbOption = within(sdbRow).getByRole("radio");
+      const accept = within(selector).getByRole("button", { name: "Confirm" });
 
-      it("does not render a button for changing the LVM settings", () => {
-        plainRender(<ProposalDeviceSection {...props} />);
+      await user.click(sdbOption);
+      await user.click(accept);
 
-        const button = screen.queryByRole("button", { name: /LVM settings/ });
-        expect(button).toBeNull();
+      expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
+      expect(props.onChange).toHaveBeenCalledWith({
+        target: "disk",
+        targetDevice: sdb.name,
+        targetPVDevices: []
       });
+    });
+
+    it("allows canceling a device selection", async () => {
+      const { user } = plainRender(<ProposalDeviceSection {...props} />);
+      const button = screen.getByRole("button", { name: "/dev/sda, 1 KiB" });
 
-      it("changes the selection on click", async () => {
-        const { user } = plainRender(<ProposalDeviceSection {...props} />);
+      await user.click(button);
 
-        const checkbox = screen.getByRole("checkbox", { name: /Use logical volume/ });
-        await user.click(checkbox);
+      const selector = await screen.findByRole("dialog", { name: /Device for installing/ });
+      const diskGrid = within(selector).getByRole("grid", { name: /target disk/ });
+      const sdbRow = within(diskGrid).getByRole("row", { name: /sdb/ });
+      const sdbOption = within(sdbRow).getByRole("radio");
+      const cancel = within(selector).getByRole("button", { name: "Cancel" });
 
-        expect(checkbox).toBeChecked();
-        expect(props.onChange).toHaveBeenCalled();
-      });
+      await user.click(sdbOption);
+      await user.click(cancel);
+
+      expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
+      expect(props.onChange).not.toHaveBeenCalled();
     });
   });
 });
diff --git a/web/src/components/storage/ProposalFileSystemsSection.jsx b/web/src/components/storage/ProposalFileSystemsSection.jsx
deleted file mode 100644
index 0b0e5f632..000000000
--- a/web/src/components/storage/ProposalFileSystemsSection.jsx
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) [2024] SUSE LLC
- *
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, contact SUSE LLC.
- *
- * To contact SUSE LLC about this file by physical or electronic mail, you may
- * find current contact information at www.suse.com.
- */
-
-import React from "react";
-import { _ } from "~/i18n";
-import { Section } from "~/components/core";
-import { ProposalVolumes } from "~/components/storage";
-import { noop } from "~/utils";
-
-/**
- * @typedef {import ("~/client/storage").ProposalManager.ProposalSettings} ProposalSettings
- * @typedef {import ("~/client/storage").ProposalManager.Volume} Volume
- */
-
-/**
- * Section for editing the proposal file systems
- * @component
- *
- * @callback onChangeFn
- * @param {object} settings
- *
- * @param {object} props
- * @param {ProposalSettings} props.settings
- * @param {Volume[]} [props.volumeTemplates=[]]
- * @param {boolean} [props.isLoading=false]
- * @param {onChangeFn} [props.onChange=noop]
- *
- */
-export default function ProposalFileSystemsSection({
-  settings,
-  volumeTemplates = [],
-  isLoading = false,
-  onChange = noop
-}) {
-  const { volumes = [] } = settings;
-
-  const changeVolumes = (volumes) => {
-    onChange({ volumes });
-  };
-
-  // Templates for already existing mount points are filtered out
-  const usefulTemplates = () => {
-    const mountPaths = volumes.map(v => v.mountPath);
-    return volumeTemplates.filter(t => (
-      t.mountPath.length > 0 && !mountPaths.includes(t.mountPath)
-    ));
-  };
-
-  const encryption = settings.encryptionPassword !== undefined && settings.encryptionPassword.length > 0;
-
-  return (
-    <Section title={_("File systems")}>
-      <ProposalVolumes
-        volumes={volumes}
-        templates={usefulTemplates()}
-        options={{ lvm: settings.lvm, encryption }}
-        isLoading={isLoading && settings.volumes === undefined}
-        onChange={changeVolumes}
-      />
-    </Section>
-  );
-}
diff --git a/web/src/components/storage/ProposalFileSystemsSection.test.jsx b/web/src/components/storage/ProposalFileSystemsSection.test.jsx
deleted file mode 100644
index 0b1493a5f..000000000
--- a/web/src/components/storage/ProposalFileSystemsSection.test.jsx
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) [2024] SUSE LLC
- *
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, contact SUSE LLC.
- *
- * To contact SUSE LLC about this file by physical or electronic mail, you may
- * find current contact information at www.suse.com.
- */
-
-import React from "react";
-import { screen, within } from "@testing-library/react";
-import { plainRender } from "~/test-utils";
-import { ProposalFileSystemsSection } from "~/components/storage";
-
-const props = {
-  settings: {},
-  isLoading: false,
-  onChange: jest.fn()
-};
-
-describe("ProposalFileSystemsSection", () => {
-  it("renders a section holding file systems related stuff", () => {
-    plainRender(<ProposalFileSystemsSection {...props} />);
-    screen.getByRole("region", { name: "File systems" });
-    screen.getByRole("grid", { name: /mount points/ });
-  });
-
-  it("requests a volume change when onChange callback is triggered", async () => {
-    const { user } = plainRender(<ProposalFileSystemsSection {...props} />);
-    const button = screen.getByRole("button", { name: "Actions" });
-
-    await user.click(button);
-
-    const menu = screen.getByRole("menu");
-    const reset = within(menu).getByRole("menuitem", { name: /Reset/ });
-
-    await user.click(reset);
-
-    expect(props.onChange).toHaveBeenCalledWith(
-      { volumes: expect.any(Array) }
-    );
-  });
-});
diff --git a/web/src/components/storage/ProposalPage.jsx b/web/src/components/storage/ProposalPage.jsx
index f39a4d9db..5099a8fca 100644
--- a/web/src/components/storage/ProposalPage.jsx
+++ b/web/src/components/storage/ProposalPage.jsx
@@ -26,13 +26,11 @@ import { useInstallerClient } from "~/context/installer";
 import { toValidationError, useCancellablePromise } from "~/utils";
 import { Page } from "~/components/core";
 import {
-  ProposalActionsSection,
   ProposalPageMenu,
-  ProposalSettingsSection,
-  ProposalSpacePolicySection,
   ProposalDeviceSection,
-  ProposalFileSystemsSection,
-  ProposalTransactionalInfo
+  ProposalTransactionalInfo,
+  ProposalSettingsSection,
+  ProposalResultSection
 } from "~/components/storage";
 import { IDLE } from "~/client/status";
 
@@ -42,6 +40,8 @@ const initialState = {
   volumeTemplates: [],
   encryptionMethods: [],
   settings: {},
+  system: [],
+  staging: [],
   actions: [],
   errors: []
 };
@@ -81,6 +81,11 @@ const reducer = (state, action) => {
       return { ...state, settings };
     }
 
+    case "UPDATE_DEVICES": {
+      const { system, staging } = action.payload;
+      return { ...state, system, staging };
+    }
+
     case "UPDATE_ERRORS": {
       const { errors } = action.payload;
       return { ...state, errors };
@@ -121,6 +126,12 @@ export default function ProposalPage() {
     return await cancellablePromise(client.proposal.getResult());
   }, [client, cancellablePromise]);
 
+  const loadDevices = useCallback(async () => {
+    const system = await cancellablePromise(client.system.getDevices()) || [];
+    const staging = await cancellablePromise(client.staging.getDevices()) || [];
+    return { system, staging };
+  }, [client, cancellablePromise]);
+
   const loadErrors = useCallback(async () => {
     const issues = await cancellablePromise(client.getErrors());
     return issues.map(toValidationError);
@@ -152,11 +163,14 @@ export default function ProposalPage() {
     const result = await loadProposalResult();
     if (result !== undefined) dispatch({ type: "UPDATE_RESULT", payload: { result } });
 
+    const devices = await loadDevices();
+    dispatch({ type: "UPDATE_DEVICES", payload: devices });
+
     const errors = await loadErrors();
     dispatch({ type: "UPDATE_ERRORS", payload: { errors } });
 
     if (result !== undefined) dispatch({ type: "STOP_LOADING" });
-  }, [calculateProposal, cancellablePromise, client, loadAvailableDevices, loadEncryptionMethods, loadErrors, loadProposalResult, loadVolumeTemplates]);
+  }, [calculateProposal, cancellablePromise, client, loadAvailableDevices, loadDevices, loadEncryptionMethods, loadErrors, loadProposalResult, loadVolumeTemplates]);
 
   const calculate = useCallback(async (settings) => {
     dispatch({ type: "START_LOADING" });
@@ -166,11 +180,14 @@ export default function ProposalPage() {
     const result = await loadProposalResult();
     dispatch({ type: "UPDATE_RESULT", payload: { result } });
 
+    const devices = await loadDevices();
+    dispatch({ type: "UPDATE_DEVICES", payload: devices });
+
     const errors = await loadErrors();
     dispatch({ type: "UPDATE_ERRORS", payload: { errors } });
 
     dispatch({ type: "STOP_LOADING" });
-  }, [calculateProposal, loadErrors, loadProposalResult]);
+  }, [calculateProposal, loadDevices, loadErrors, loadProposalResult]);
 
   useEffect(() => {
     load().catch(console.error);
@@ -179,7 +196,7 @@ export default function ProposalPage() {
   }, [client, load]);
 
   useEffect(() => {
-    const proposalLoaded = () => state.settings.bootDevice !== undefined;
+    const proposalLoaded = () => state.settings.targetDevice !== undefined;
 
     const statusHandler = (serviceStatus) => {
       // Load the proposal if no proposal has been loaded yet. This can happen if the proposal
@@ -199,50 +216,34 @@ export default function ProposalPage() {
     calculate(newSettings).catch(console.error);
   };
 
-  const PageContent = () => {
-    return (
-      <>
-        <ProposalTransactionalInfo
-          settings={state.settings}
-        />
-        <ProposalDeviceSection
-          settings={state.settings}
-          availableDevices={state.availableDevices}
-          isLoading={state.loading}
-          onChange={changeSettings}
-        />
-        <ProposalSettingsSection
-          availableDevices={state.availableDevices}
-          encryptionMethods={state.encryptionMethods}
-          settings={state.settings}
-          onChange={changeSettings}
-          isLoading={state.loading}
-        />
-        <ProposalFileSystemsSection
-          settings={state.settings}
-          volumeTemplates={state.volumeTemplates}
-          onChange={changeSettings}
-          isLoading={state.loading}
-        />
-        <ProposalSpacePolicySection
-          settings={state.settings}
-          onChange={changeSettings}
-          isLoading={state.loading}
-        />
-        <ProposalActionsSection
-          actions={state.actions}
-          errors={state.errors}
-          isLoading={state.loading}
-        />
-      </>
-    );
-  };
-
   return (
-    // TRANSLATORS: page title
+    // TRANSLATORS: Storage page title
     <Page icon="hard_drive" title={_("Storage")}>
-      <PageContent />
       <ProposalPageMenu />
+      <ProposalTransactionalInfo
+        settings={state.settings}
+      />
+      <ProposalDeviceSection
+        settings={state.settings}
+        availableDevices={state.availableDevices}
+        isLoading={state.loading}
+        onChange={changeSettings}
+      />
+      <ProposalSettingsSection
+        availableDevices={state.availableDevices}
+        encryptionMethods={state.encryptionMethods}
+        volumeTemplates={state.volumeTemplates}
+        settings={state.settings}
+        onChange={changeSettings}
+        isLoading={state.loading}
+      />
+      <ProposalResultSection
+        system={state.system}
+        staging={state.staging}
+        actions={state.actions}
+        errors={state.errors}
+        isLoading={state.loading}
+      />
     </Page>
   );
 }
diff --git a/web/src/components/storage/ProposalPage.test.jsx b/web/src/components/storage/ProposalPage.test.jsx
index 3b8464f84..516fff030 100644
--- a/web/src/components/storage/ProposalPage.test.jsx
+++ b/web/src/components/storage/ProposalPage.test.jsx
@@ -84,7 +84,13 @@ const storageMock = {
     getProductMountPoints: jest.fn().mockResolvedValue([]),
     getResult: jest.fn().mockResolvedValue(undefined),
     defaultVolume: jest.fn(mountPath => Promise.resolve({ mountPath })),
-    calculate: jest.fn().mockResolvedValue(0)
+    calculate: jest.fn().mockResolvedValue(0),
+  },
+  system: {
+    getDevices: jest.fn().mockResolvedValue([vda, vdb])
+  },
+  staging: {
+    getDevices: jest.fn().mockResolvedValue([vda])
   },
   getErrors: jest.fn().mockResolvedValue([]),
   isDeprecated: jest.fn().mockResolvedValue(false),
@@ -112,7 +118,7 @@ it("does not probe storage if the storage devices are not deprecated", async ()
 
 it("loads the proposal data", async () => {
   storage.proposal.getResult = jest.fn().mockResolvedValue(
-    { settings: { bootDevice: vda.name } }
+    { settings: { target: "disk", targetDevice: vda.name } }
   );
 
   installerRender(<ProposalPage />);
@@ -123,12 +129,12 @@ it("loads the proposal data", async () => {
   await screen.findByText(/\/dev\/vda/);
 });
 
-it("renders the settings, find space and actions sections", async () => {
+it("renders the device, settings and result sections", async () => {
   installerRender(<ProposalPage />);
 
+  await screen.findByText(/Device/);
   await screen.findByText(/Settings/);
-  await screen.findByText(/Find Space/);
-  await screen.findByText(/Planned Actions/);
+  await screen.findByText(/Result/);
 });
 
 describe("when the storage devices become deprecated", () => {
@@ -146,7 +152,7 @@ describe("when the storage devices become deprecated", () => {
   });
 
   it("loads the proposal data", async () => {
-    const result = { settings: { bootDevice: vda.name } };
+    const result = { settings: { target: "disk", targetDevice: vda.name } };
     storage.proposal.getResult = jest.fn().mockResolvedValue(result);
 
     const [mockFunction, callbacks] = createCallbackMock();
@@ -156,7 +162,7 @@ describe("when the storage devices become deprecated", () => {
 
     await screen.findByText(/\/dev\/vda/);
 
-    result.settings.bootDevice = vdb.name;
+    result.settings.targetDevice = vdb.name;
 
     const [onDeprecateCb] = callbacks;
     await act(() => onDeprecateCb());
@@ -186,7 +192,7 @@ describe("when there is no proposal yet", () => {
     screen.getAllByText(/PFSkeleton/);
 
     storage.proposal.getResult = jest.fn().mockResolvedValue(
-      { settings: { bootDevice: vda.name } }
+      { settings: { target: "disk", targetDevice: vda.name } }
     );
 
     const [onStatusChangeCb] = callbacks;
@@ -198,7 +204,7 @@ describe("when there is no proposal yet", () => {
 describe("when there is a proposal", () => {
   beforeEach(() => {
     storage.proposal.getResult = jest.fn().mockResolvedValue(
-      { settings: { bootDevice: vda.name } }
+      { settings: { target: "disk", targetDevice: vda.name } }
     );
   });
 
diff --git a/web/src/components/storage/ProposalResultSection.jsx b/web/src/components/storage/ProposalResultSection.jsx
new file mode 100644
index 000000000..0f4f60249
--- /dev/null
+++ b/web/src/components/storage/ProposalResultSection.jsx
@@ -0,0 +1,293 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+// @ts-check
+
+import React, { useState } from "react";
+import { Button, Skeleton } from "@patternfly/react-core";
+import { sprintf } from "sprintf-js";
+import { _, n_ } from "~/i18n";
+import { deviceChildren, deviceSize } from "~/components/storage/utils";
+import DevicesManager from "~/components/storage/DevicesManager";
+import { If, Section, Reminder, Tag, TreeTable } from "~/components/core";
+import { ProposalActionsDialog, FilesystemLabel } from "~/components/storage";
+
+/**
+ * @typedef {import ("~/client/storage").Action} Action
+ * @typedef {import ("~/client/storage").StorageDevice} StorageDevice
+ * @typedef {import("~/client/mixins").ValidationError} ValidationError
+ */
+
+/**
+ * Renders information about planned actions, allowing to check all of them and warning with a
+ * summary about the deletion ones, if any.
+ * @component
+ *
+ * @param {object} props
+ * @param {Action[]} props.actions
+ * @param {string[]} props.systems
+ */
+const DeletionsInfo = ({ actions, systems }) => {
+  const total = actions.length;
+
+  if (total === 0) return;
+
+  // TRANSLATORS: %d will be replaced by the amount of destructive actions
+  const warningTitle = sprintf(n_(
+    "There is %d destructive action planned",
+    "There are %d destructive actions planned",
+    total
+  ), total);
+
+  // FIXME: Use the Intl.ListFormat instead of the `join(", ")` used below.
+  // Most probably, a `listFormat` or similar wrapper should live in src/i18n.js or so.
+  // Read https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/ListFormat
+  return (
+    <Reminder title={warningTitle} variant="subtle">
+      <If
+        condition={systems.length > 0}
+        then={
+          <p>
+            {
+              // TRANSLATORS: This is part of a sentence to hint the user about affected systems.
+              // Eg. "Affecting Windows 11, openSUSE Leap 15, and Ubuntu 22.04"
+            }
+            {_("Affecting")} <strong>{systems.join(", ")}</strong>
+          </p>
+        }
+      />
+    </Reminder>
+  );
+};
+
+/**
+ * Renders needed UI elements to allow user check the proposal planned actions
+ * @component
+ *
+ * @param {object} props
+ * @param {Action[]} props.actions
+ */
+const ActionsInfo = ({ actions }) => {
+  const [showActions, setShowActions] = useState(false);
+  const onOpen = () => setShowActions(true);
+  const onClose = () => setShowActions(false);
+
+  return (
+    <>
+      <Button onClick={onOpen} variant="link" isInline>{_("Check all planned actions")}</Button>
+      <ProposalActionsDialog actions={actions} isOpen={showActions} onClose={onClose} />
+    </>
+  );
+};
+
+/**
+ * Renders a TreeTable rendering the devices proposal result.
+ * @component
+ *
+ * @param {object} props
+ * @param {DevicesManager} props.devicesManager
+ */
+const DevicesTreeTable = ({ devicesManager }) => {
+  const renderDeviceName = (item) => {
+    let name = item.sid && item.name;
+    // NOTE: returning a fragment here to avoid a weird React complaint when using a PF/Table +
+    // treeRow props.
+    if (!name) return <></>;
+
+    if (["partition", "lvmLv"].includes(item.type))
+      name = name.split("/").pop();
+
+    return (
+      <div className="split">
+        <span>{name}</span>
+      </div>
+    );
+  };
+
+  const renderNewLabel = (item) => {
+    if (!item.sid) return;
+
+    // FIXME New PVs over a disk is not detected as new.
+    if (!devicesManager.existInSystem(item) || devicesManager.hasNewFilesystem(item))
+      return <Tag variant="teal">{_("New")}</Tag>;
+  };
+
+  const renderContent = (item) => {
+    if (!item.sid)
+      return _("Unused space");
+    if (!item.partitionTable && item.systems?.length > 0)
+      return item.systems.join(", ");
+
+    return item.description;
+  };
+
+  const renderPTableType = (item) => {
+    // TODO: Create a map for partition table types and use an <abbr/> here.
+    const type = item.partitionTable?.type;
+    if (type) return <Tag><b>{type.toUpperCase()}</b></Tag>;
+  };
+
+  const renderDetails = (item) => {
+    return (
+      <>
+        <div>{renderNewLabel(item)}</div>
+        <div>{renderContent(item)} <FilesystemLabel device={item} /> {renderPTableType(item)}</div>
+      </>
+    );
+  };
+
+  const renderResizedLabel = (item) => {
+    if (!item.sid || !devicesManager.isShrunk(item)) return;
+
+    const sizeBefore = devicesManager.systemDevice(item.sid).size;
+
+    return (
+      <Tag variant="orange">
+        {
+          // TRANSLATORS: Label to indicate the device size before resizing, where %s is replaced by
+          // the original size (e.g., 3.00 GiB).
+          sprintf(_("Before %s"), deviceSize(sizeBefore))
+        }
+      </Tag>
+    );
+  };
+
+  const renderSize = (item) => {
+    return (
+      <div className="split">
+        {renderResizedLabel(item)}
+        {deviceSize(item.size)}
+      </div>
+    );
+  };
+
+  const renderMountPoint = (item) => item.sid && <em>{item.filesystem?.mountPath}</em>;
+
+  return (
+    <TreeTable
+      columns={[
+        { title: _("Device"), content: renderDeviceName },
+        { title: _("Mount Point"), content: renderMountPoint, classNames: "fit-content" },
+        { title: _("Details"), content: renderDetails, classNames: "details-column" },
+        { title: _("Size"), content: renderSize, classNames: "sizes-column" }
+      ]}
+      items={devicesManager.usedDevices()}
+      itemChildren={d => deviceChildren(d)}
+      rowClassNames={(item) => {
+        if (!item.sid) return "dimmed-row";
+      }}
+      className="proposal-result"
+    />
+  );
+};
+
+/**
+ * @todo Create a component for rendering a customized skeleton
+ */
+const ResultSkeleton = () => {
+  return (
+    <>
+      <Skeleton width="80%" />
+      <Skeleton width="65%" />
+      <Skeleton width="70%" />
+    </>
+  );
+};
+
+/**
+ * Content of the section.
+ * @component
+ *
+ * @param {object} props
+ * @param {StorageDevice[]} props.system
+ * @param {StorageDevice[]} props.staging
+ * @param {Action[]} props.actions
+ * @param {ValidationError[]} props.errors
+ */
+const SectionContent = ({ system, staging, actions, errors }) => {
+  if (errors.length) return;
+
+  const devicesManager = new DevicesManager(system, staging, actions);
+
+  return (
+    <>
+      <DeletionsInfo
+        actions={devicesManager.actions.filter(a => a.delete && !a.subvol)}
+        systems={devicesManager.deletedSystems()}
+      />
+      <ActionsInfo actions={actions} />
+      <DevicesTreeTable devicesManager={devicesManager} />
+    </>
+  );
+};
+
+/**
+ * Section holding the proposal result and actions to perform in the system
+ * @component
+ *
+ * @param {object} props
+ * @param {StorageDevice[]} [props.system=[]]
+ * @param {StorageDevice[]} [props.staging=[]]
+ * @param {Action[]} [props.actions=[]]
+ * @param {ValidationError[]} [props.errors=[]] - Validation errors
+ * @param {boolean} [props.isLoading=false] - Whether the section content should be rendered as loading
+ */
+export default function ProposalResultSection({
+  system = [],
+  staging = [],
+  actions = [],
+  errors = [],
+  isLoading = false
+}) {
+  if (isLoading) errors = [];
+  const totalActions = actions.length;
+
+  // TRANSLATORS: The description for the Result section in storage proposal
+  // page. %d will be replaced by the number of proposal actions.
+  const description = sprintf(n_(
+    "During installation, %d action will be performed to configure the system as displayed below",
+    "During installation, %d actions will be performed to configure the system as displayed below",
+    totalActions
+  ), totalActions);
+
+  return (
+    <Section
+      // TRANSLATORS: The storage "Result" section's title
+      title={_("Result")}
+      description={!isLoading && errors.length === 0 && description}
+      id="storage-result"
+      errors={errors}
+    >
+      <If
+        condition={isLoading}
+        then={<ResultSkeleton />}
+        else={
+          <SectionContent
+            system={system}
+            staging={staging}
+            actions={actions}
+            errors={errors}
+          />
+        }
+      />
+    </Section>
+  );
+}
diff --git a/web/src/components/storage/ProposalResultSection.test.jsx b/web/src/components/storage/ProposalResultSection.test.jsx
new file mode 100644
index 000000000..95f098f10
--- /dev/null
+++ b/web/src/components/storage/ProposalResultSection.test.jsx
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+import React from "react";
+import { screen, within } from "@testing-library/react";
+import { plainRender } from "~/test-utils";
+import { ProposalResultSection } from "~/components/storage";
+import { devices, actions } from "./test-data/full-result-example";
+
+const errorMessage = "Something went wrong, proposal not possible";
+const errors = [{ severity: 0, message: errorMessage }];
+const defaultProps = { system: devices.system, staging: devices.staging, actions };
+
+describe("ProposalResultSection", () => {
+  describe("when there are errors (proposal was not possible)", () => {
+    it("renders given errors", () => {
+      plainRender(<ProposalResultSection {...defaultProps} errors={errors} />);
+      expect(screen.queryByText(errorMessage)).toBeInTheDocument();
+    });
+
+    it("does not render a warning for delete actions", () => {
+      plainRender(<ProposalResultSection {...defaultProps} errors={errors} />);
+      expect(screen.queryByText(/Warning alert:/)).toBeNull();
+    });
+
+    it("does not render a treegrid node", () => {
+      plainRender(<ProposalResultSection {...defaultProps} errors={errors} />);
+      expect(screen.queryByRole("treegrid")).toBeNull();
+    });
+
+    it("does not render the link for opening the planned actions dialog", () => {
+      plainRender(<ProposalResultSection {...defaultProps} errors={errors} />);
+      expect(screen.queryByRole("button", { name: /planned actions/ })).toBeNull();
+    });
+  });
+
+  describe("when there are no errors (proposal was possible)", () => {
+    it("does not render a warning when there are not delete actions", () => {
+      const props = {
+        ...defaultProps,
+        actions: defaultProps.actions.filter(a => !a.delete)
+      };
+
+      plainRender(<ProposalResultSection {...props} />);
+      expect(screen.queryByText(/Warning alert:/)).toBeNull();
+    });
+
+    it("renders a reminder when there are delete actions", () => {
+      plainRender(<ProposalResultSection {...defaultProps} />);
+      const reminder = screen.getByRole("status");
+      within(reminder).getByText(/4 destructive/);
+    });
+
+    it("renders the affected systems in the deletion reminder, if any", () => {
+      // NOTE: simulate the deletion of vdc2 (sid: 79) for checking that
+      // affected systems are rendered in the warning summary
+      const props = {
+        ...defaultProps,
+        actions: [{ device: 79, delete: true }]
+      };
+
+      plainRender(<ProposalResultSection {...props} />);
+      // FIXME: below line reveals that warning wrapper deserves a role or
+      // something
+      const reminder = screen.getByRole("status");
+      within(reminder).getByText(/openSUSE/);
+    });
+
+    it("renders a treegrid including all relevant information about final result", () => {
+      plainRender(<ProposalResultSection {...defaultProps} />);
+      const treegrid = screen.getByRole("treegrid");
+      /**
+       * Expected rows for full-result-example
+       * --------------------------------------------------
+       * "/dev/vdc Disk GPT 30 GiB"
+       * "vdc1 New BIOS Boot Partition 8 MiB"
+       * "vdc3 swap New Swap Partition 1.5 GiB"
+       * "Unused space 3.49 GiB"
+       * "vdc2 openSUSE Leap 15.2, Fedora 10.30 5 GiB"
+       * "Unused space 1 GiB"
+       * "vdc4 Linux Before 2 GiB 1.5 GiB"
+       * "vdc5 / New Btrfs Partition 17.5 GiB"
+       *
+       * Device      Mount point      Details                                 Size
+       * -------------------------------------------------------------------------
+       * /dev/vdc                     Disk GPT                              30 GiB
+       *     vdc1                 New BIOS Boot Partition                    8 MiB
+       *     vdc3    swap         New Swap Partition                       1.5 GiB
+       *                              Unused space                        3.49 GiB
+       *     vdc2                     openSUSE Leap 15.2, Fedora 10.30       5 GiB
+       *                              Unused space                           1 GiB
+       *     vdc4                     Linux                   Before 2 GiB 1.5 GiB
+       *     vdc5    /            New Btrfs Partition                     17.5 GiB
+       * -------------------------------------------------------------------------
+       */
+      within(treegrid).getByRole("row", { name: "/dev/vdc Disk GPT 30 GiB" });
+      within(treegrid).getByRole("row", { name: "vdc1 New BIOS Boot Partition 8 MiB" });
+      within(treegrid).getByRole("row", { name: "vdc3 swap New Swap Partition 1.5 GiB" });
+      within(treegrid).getByRole("row", { name: "Unused space 3.49 GiB" });
+      within(treegrid).getByRole("row", { name: "vdc2 openSUSE Leap 15.2, Fedora 10.30 5 GiB" });
+      within(treegrid).getByRole("row", { name: "Unused space 1 GiB" });
+      within(treegrid).getByRole("row", { name: "vdc4 Linux Before 2 GiB 1.5 GiB" });
+      within(treegrid).getByRole("row", { name: "vdc5 / New Btrfs Partition 17.5 GiB" });
+    });
+
+    it("renders a button for opening the planned actions dialog", async () => {
+      const { user } = plainRender(<ProposalResultSection {...defaultProps} />);
+      const button = screen.getByRole("button", { name: /planned actions/ });
+
+      await user.click(button);
+
+      screen.getByRole("dialog", { name: "Planned Actions" });
+    });
+  });
+});
diff --git a/web/src/components/storage/ProposalSettingsSection.jsx b/web/src/components/storage/ProposalSettingsSection.jsx
index abc683030..f61b14f78 100644
--- a/web/src/components/storage/ProposalSettingsSection.jsx
+++ b/web/src/components/storage/ProposalSettingsSection.jsx
@@ -20,13 +20,15 @@
  */
 
 import React, { useEffect, useState } from "react";
-import { Checkbox, Form, Skeleton, Switch, Tooltip } from "@patternfly/react-core";
+import { Button, Checkbox, Form, Skeleton, Switch, Tooltip } from "@patternfly/react-core";
 
+import { sprintf } from "sprintf-js";
 import { _ } from "~/i18n";
+import { BootSelectionDialog, ProposalVolumes, ProposalSpacePolicyField } from "~/components/storage";
 import { If, PasswordAndConfirmationInput, Section, Popup } from "~/components/core";
 import { Icon } from "~/components/layout";
 import { noop } from "~/utils";
-import { hasFS } from "~/components/storage/utils";
+import { hasFS, deviceLabel } from "~/components/storage/utils";
 
 /**
  * @typedef {import ("~/client/storage").ProposalManager.ProposalSettings} ProposalSettings
@@ -130,16 +132,14 @@ const SnapshotsField = ({
 }) => {
   const rootVolume = (settings.volumes || []).find((i) => i.mountPath === "/");
 
-  const initialChecked = rootVolume !== undefined && hasFS(rootVolume, "Btrfs") && rootVolume.snapshots;
-  const [isChecked, setIsChecked] = useState(initialChecked);
-
   // no root volume is probably some error or still loading
   if (rootVolume === undefined) {
     return <Skeleton width="25%" />;
   }
 
+  const isChecked = rootVolume !== undefined && hasFS(rootVolume, "Btrfs") && rootVolume.snapshots;
+
   const switchState = (_, checked) => {
-    setIsChecked(checked);
     onChange({ active: checked, settings });
   };
 
@@ -268,12 +268,85 @@ const EncryptionField = ({
   );
 };
 
+/**
+ * Allows to select the boot config.
+ * @component
+ *
+ * @param {object} props
+ * @param {boolean} props.configureBoot
+ * @param {StorageDevice|undefined} props.bootDevice
+ * @param {StorageDevice|undefined} props.defaultBootDevice
+ * @param {StorageDevice[]} props.devices
+ * @param {boolean} props.isLoading
+ * @param {(boot: Boot) => void} props.onChange
+ *
+ * @typedef {object} Boot
+ * @property {boolean} configureBoot
+ * @property {StorageDevice} bootDevice
+ */
+const BootConfigField = ({
+  configureBoot,
+  bootDevice,
+  defaultBootDevice,
+  devices,
+  isLoading,
+  onChange
+}) => {
+  const [isDialogOpen, setIsDialogOpen] = useState(false);
+
+  const openDialog = () => setIsDialogOpen(true);
+
+  const closeDialog = () => setIsDialogOpen(false);
+
+  const onAccept = ({ configureBoot, bootDevice }) => {
+    closeDialog();
+    onChange({ configureBoot, bootDevice });
+  };
+
+  const label = _("Automatically configure any additional partition to boot the system");
+
+  const value = () => {
+    if (!configureBoot) return _("nowhere (manual boot setup)");
+
+    if (!bootDevice) return _("at the installation device");
+
+    // TRANSLATORS: %s is the disk used to configure the boot-related partitions (eg. "/dev/sda, 80 GiB)
+    return sprintf(_("at %s"), deviceLabel(bootDevice));
+  };
+
+  if (isLoading) {
+    return <Skeleton screenreaderText={_("Waiting for information about boot config")} width="25%" />;
+  }
+
+  return (
+    <div className="split">
+      <span>{label}</span>
+      <Button variant="link" isInline onClick={openDialog}>{value()}</Button>
+      <If
+        condition={isDialogOpen}
+        then={
+          <BootSelectionDialog
+            isOpen
+            configureBoot={configureBoot}
+            bootDevice={bootDevice}
+            defaultBootDevice={defaultBootDevice}
+            devices={devices}
+            onAccept={onAccept}
+            onCancel={closeDialog}
+          />
+        }
+      />
+    </div>
+  );
+};
+
 /**
  * Section for editing the proposal settings
  * @component
  *
  * @param {object} props
  * @param {ProposalSettings} props.settings
+ * @param {StorageDevice[]} [props.availableDevices=[]]
  * @param {String[]} [props.encryptionMethods=[]]
  * @param {onChangeFn} [props.onChange=noop]
  *
@@ -282,7 +355,10 @@ const EncryptionField = ({
  */
 export default function ProposalSettingsSection({
   settings,
+  availableDevices = [],
   encryptionMethods = [],
+  volumeTemplates = [],
+  isLoading = false,
   onChange = noop
 }) {
   const changeEncryption = ({ password, method }) => {
@@ -302,8 +378,36 @@ export default function ProposalSettingsSection({
     onChange({ volumes: settings.volumes });
   };
 
+  const changeVolumes = (volumes) => {
+    onChange({ volumes });
+  };
+
+  const changeSpacePolicy = (policy, actions) => {
+    onChange({ spacePolicy: policy, spaceActions: actions });
+  };
+
+  const changeBoot = ({ configureBoot, bootDevice }) => {
+    onChange({
+      configureBoot,
+      bootDevice: bootDevice?.name
+    });
+  };
+
   const encryption = settings.encryptionPassword !== undefined && settings.encryptionPassword.length > 0;
 
+  const { volumes = [], installationDevices = [] } = settings;
+
+  const bootDevice = availableDevices.find(d => d.name === settings.bootDevice);
+  const defaultBootDevice = availableDevices.find(d => d.name === settings.defaultBootDevice);
+
+  // Templates for already existing mount points are filtered out
+  const usefulTemplates = () => {
+    const mountPaths = volumes.map(v => v.mountPath);
+    return volumeTemplates.filter(t => (
+      t.mountPath.length > 0 && !mountPaths.includes(t.mountPath)
+    ));
+  };
+
   return (
     <>
       <Section title={_("Settings")}>
@@ -319,6 +423,28 @@ export default function ProposalSettingsSection({
           isLoading={settings.encryptionPassword === undefined}
           onChange={changeEncryption}
         />
+        <ProposalVolumes
+          volumes={volumes}
+          templates={usefulTemplates()}
+          options={{ lvm: settings.lvm, encryption }}
+          isLoading={isLoading && settings.volumes === undefined}
+          onChange={changeVolumes}
+        />
+        <BootConfigField
+          configureBoot={settings.configureBoot}
+          bootDevice={bootDevice}
+          defaultBootDevice={defaultBootDevice}
+          devices={availableDevices}
+          isLoading={isLoading}
+          onChange={changeBoot}
+        />
+        <ProposalSpacePolicyField
+          policy={settings.spacePolicy}
+          actions={settings.spaceActions}
+          devices={installationDevices}
+          isLoading={isLoading}
+          onChange={changeSpacePolicy}
+        />
       </Section>
     </>
   );
diff --git a/web/src/components/storage/ProposalSettingsSection.test.jsx b/web/src/components/storage/ProposalSettingsSection.test.jsx
index 3077cd790..29f7fc472 100644
--- a/web/src/components/storage/ProposalSettingsSection.test.jsx
+++ b/web/src/components/storage/ProposalSettingsSection.test.jsx
@@ -36,7 +36,10 @@ jest.mock("@patternfly/react-core", () => {
 let props;
 
 beforeEach(() => {
-  props = {};
+  props = {
+    settings: {},
+    onChange: jest.fn()
+  };
 });
 
 const rootVolume = { mountPath: "/", fsType: "Btrfs", outline: { snapshotsConfigurable: true } };
@@ -65,6 +68,28 @@ describe("if snapshots are not configurable", () => {
   });
 });
 
+it("renders a section holding file systems related stuff", () => {
+  plainRender(<ProposalSettingsSection {...props} />);
+  screen.getByRole("grid", { name: "Table with mount points" });
+  screen.getByRole("grid", { name: /mount points/ });
+});
+
+it("requests a volume change when onChange callback is triggered", async () => {
+  const { user } = plainRender(<ProposalSettingsSection {...props } />);
+  const button = screen.getByRole("button", { name: "Actions" });
+
+  await user.click(button);
+
+  const menu = screen.getByRole("menu");
+  const reset = within(menu).getByRole("menuitem", { name: /Reset/ });
+
+  await user.click(reset);
+
+  expect(props.onChange).toHaveBeenCalledWith(
+    { volumes: expect.any(Array) }
+  );
+});
+
 describe("Encryption field", () => {
   describe("if encryption password setting is not set yet", () => {
     beforeEach(() => {
diff --git a/web/src/components/storage/ProposalSpacePolicySection.jsx b/web/src/components/storage/ProposalSpacePolicyField.jsx
similarity index 54%
rename from web/src/components/storage/ProposalSpacePolicySection.jsx
rename to web/src/components/storage/ProposalSpacePolicyField.jsx
index c08135c0e..17455afb4 100644
--- a/web/src/components/storage/ProposalSpacePolicySection.jsx
+++ b/web/src/components/storage/ProposalSpacePolicyField.jsx
@@ -19,13 +19,13 @@
  * find current contact information at www.suse.com.
  */
 
-import React, { useEffect } from "react";
-import { FormSelect, FormSelectOption } from "@patternfly/react-core";
+import React, { useEffect, useState } from "react";
+import { Button, Form, FormSelect, FormSelectOption, Skeleton } from "@patternfly/react-core";
 
-import { _, N_ } from "~/i18n";
+import { _, N_, n_ } from "~/i18n";
 import { deviceSize } from '~/components/storage/utils';
-import { If, OptionsPicker, Section, SectionSkeleton } from "~/components/core";
-import { noop, useLocalStorage } from "~/utils";
+import { If, OptionsPicker, Popup, SectionSkeleton } from "~/components/core";
+import { noop } from "~/utils";
 import { sprintf } from "sprintf-js";
 import { Table, Thead, Tr, Th, Tbody, Td, TreeRowWrapper } from '@patternfly/react-table';
 
@@ -48,31 +48,57 @@ const SPACE_POLICIES = [
   {
     id: "delete",
     label: N_("Delete current content"),
-    description: N_("All partitions will be removed and any data in the disks will be lost.")
+    description: N_("All partitions will be removed and any data in the disks will be lost."),
+    summaryLabels: [
+      // TRANSLATORS: This is presented next to the label "Find space", so the whole sentence
+      // would read as "Find space deleting all content[...]"
+      N_("deleting all content of the installation device"),
+      // TRANSLATORS: This is presented next to the label "Find space", so the whole sentence
+      // would read as "Find space deleting all content[...]"
+      N_("deleting all content of the %d selected disks")
+    ]
   },
   {
     id: "resize",
     label: N_("Shrink existing partitions"),
-    description: N_("The data is kept, but the current partitions will be resized as needed.")
+    description: N_("The data is kept, but the current partitions will be resized as needed."),
+    summaryLabels: [
+      // TRANSLATORS: This is presented next to the label "Find space", so the whole sentence
+      // would read as "Find space shrinking partitions[...]"
+      N_("shrinking partitions of the installation device"),
+      // TRANSLATORS: This is presented next to the label "Find space", so the whole sentence
+      // would read as "Find space shrinking partitions[...]"
+      N_("shrinking partitions of the %d selected disks")
+    ]
   },
   {
     id: "keep",
     label: N_("Use available space"),
-    description: N_("The data is kept. Only the space not assigned to any partition will be used.")
+    description: N_("The data is kept. Only the space not assigned to any partition will be used."),
+    summaryLabels: [
+      // TRANSLATORS: This is presented next to the label "Find space", so the whole sentence
+      // would read as "Find space without modifying any partition".
+      N_("without modifying any partition")
+    ]
   },
   {
     id: "custom",
     label: N_("Custom"),
-    description: N_("Select what to do with each partition.")
+    description: N_("Select what to do with each partition."),
+    summaryLabels: [
+      // TRANSLATORS: This is presented next to the label "Find space", so the whole sentence
+      // would read as "Find space performing a custom set of actions".
+      N_("performing a custom set of actions")
+    ]
   }
 ];
 
 // Names of the columns for the policy actions.
 const columnNames = {
   device: N_("Used device"),
-  content: N_("Current content"),
+  content: N_("Details"),
   size: N_("Size"),
-  details: N_("Details"),
+  details: N_("Size details"),
   action: N_("Action")
 };
 
@@ -84,63 +110,23 @@ const columnNames = {
  * @param {StorageDevice} props.device
  */
 const DeviceDescriptionColumn = ({ device }) => {
-  return (
-    <>
-      <div>{device.name}</div>
-      <If
-        condition={device.isDrive}
-        then={<div className="fs-small">{`${device.vendor} ${device.model}`}</div>}
-      />
-    </>
-  );
+  if (device.isDrive || device.type === "lvmVg") return device.name;
+
+  return device.name.split("/").pop();
 };
 
 /**
- * Column content with information about the current content of the device.
+ * Column content with details about the device.
  * @component
  *
  * @param {object} props
  * @param {StorageDevice} props.device
  */
 const DeviceContentColumn = ({ device }) => {
-  const PartitionTableContent = () => {
-    return (
-      <div>
-        {/* TRANSLATORS: %s is replaced by partition table type (e.g., GPT) */}
-        {sprintf(_("%s partition table"), device.partitionTable.type.toUpperCase())}
-      </div>
-    );
-  };
-
-  const BlockContent = () => {
-    const renderContent = () => {
-      const systems = device.systems;
-      if (systems.length > 0) return systems.join(", ");
-
-      const filesystem = device.filesystem;
-      if (filesystem?.isEFI) return _("EFI system partition");
-      if (filesystem) {
-        // TRANSLATORS: %s is replaced by a file system type (e.g., btrfs).
-        return sprintf(_("%s file system"), filesystem?.type);
-      }
-
-      const component = device.component;
-      switch (component?.type) {
-        case "physical_volume":
-          // TRANSLATORS: %s is replaced by a LVM volume group name (e.g., /dev/vg0).
-          return sprintf(_("LVM physical volume of %s"), component.deviceNames[0]);
-        case "md_device":
-          // TRANSLATORS: %s is replaced by a RAID name (e.g., /dev/md0).
-          return sprintf(_("Member of RAID %s"), component.deviceNames[0]);
-        default:
-          return _("Not identified");
-      }
-    };
-
-    return <div>{renderContent()}</div>;
-  };
+  const systems = device.systems;
+  if (systems.length > 0) return systems.join(", ");
 
-  return (device.partitionTable ? <PartitionTableContent /> : <BlockContent />);
+  return device.description;
 };
 
 /**
@@ -151,7 +137,7 @@ const DeviceContentColumn = ({ device }) => {
  * @param {StorageDevice} props.device
  */
 const DeviceSizeColumn = ({ device }) => {
-  return <div>{deviceSize(device.size)}</div>;
+  return deviceSize(device.size);
 };
 
 /**
@@ -166,26 +152,16 @@ const DeviceDetailsColumn = ({ device }) => {
     if (device.filesystem) return null;
 
     const unused = device.partitionTable?.unpartitionedSize || 0;
-
-    return (
-      <div>
-        {/* TRANSLATORS: %s is replaced by a disk size (e.g., 20 GiB) */}
-        {sprintf(_("%s unused"), deviceSize(unused))}
-      </div>
-    );
+    // TRANSLATORS: %s is replaced by a disk size (e.g., 20 GiB)
+    return sprintf(_("%s unused"), deviceSize(unused));
   };
 
   const RecoverableSize = () => {
     const size = device.recoverableSize;
-
     if (size === 0) return null;
 
-    return (
-      <div>
-        {/* TRANSLATORS: %s is replaced by a disk size (e.g., 2 GiB) */}
-        {sprintf(_("Shrinkable by %s"), deviceSize(device.recoverableSize))}
-      </div>
-    );
+    // TRANSLATORS: %s is replaced by a disk size (e.g., 2 GiB)
+    return sprintf(_("Shrinkable by %s"), deviceSize(device.recoverableSize));
   };
 
   return (
@@ -250,7 +226,8 @@ const DeviceActionColumn = ({ device, action, isDisabled = false, onChange = noo
  */
 const DeviceRow = ({
   device,
-  settings,
+  policy,
+  actions,
   rowIndex,
   level = 1,
   setSize = 0,
@@ -260,6 +237,18 @@ const DeviceRow = ({
   onCollapse = noop,
   onChange = noop
 }) => {
+  // Generates the action value according to the policy.
+  const action = () => {
+    if (policy.id === "custom")
+      return actions.find(a => a.device === device.name)?.action || "keep";
+
+    const policyAction = { delete: "force_delete", resize: "resize", keep: "keep" };
+    return policyAction[policy.id];
+  };
+
+  const isDisabled = policy.id !== "custom";
+  const showAction = !device.partitionTable;
+
   const treeRow = {
     onCollapse,
     rowIndex,
@@ -273,31 +262,29 @@ const DeviceRow = ({
     }
   };
 
-  const spaceAction = settings.spaceActions.find(a => a.device === device.name);
-  const isDisabled = settings.spacePolicy !== "custom";
-  const showAction = !device.partitionTable;
-
   return (
     <TreeRowWrapper row={{ props: treeRow.props }}>
-      <Td dataLabel={columnNames.device} treeRow={treeRow}>
+      {/* eslint-disable agama-i18n/string-literals */}
+      <Td dataLabel={_(columnNames.device)} treeRow={treeRow}>
         <DeviceDescriptionColumn device={device} />
       </Td>
-      <Td dataLabel={columnNames.content}><DeviceContentColumn device={device} /></Td>
-      <Td dataLabel={columnNames.size}><DeviceSizeColumn device={device} /></Td>
-      <Td dataLabel={columnNames.details}><DeviceDetailsColumn device={device} /></Td>
-      <Td dataLabel={columnNames.action}>
+      <Td dataLabel={_(columnNames.content)}><DeviceContentColumn device={device} /></Td>
+      <Td dataLabel={_(columnNames.size)}><DeviceSizeColumn device={device} /></Td>
+      <Td dataLabel={_(columnNames.details)}><DeviceDetailsColumn device={device} /></Td>
+      <Td dataLabel={_(columnNames.action)}>
         <If
           condition={showAction}
           then={
             <DeviceActionColumn
               device={device}
-              action={spaceAction?.action || "keep"}
+              action={action()}
               isDisabled={isDisabled}
               onChange={onChange}
             />
           }
         />
       </Td>
+      {/* eslint-enable agama-i18n/string-literals */}
     </TreeRowWrapper>
   );
 };
@@ -310,31 +297,30 @@ const DeviceRow = ({
  * @param {ProposalSettings} props.settings
  * @param {(action: SpaceAction) => void} [props.onChange]
  */
-const SpaceActionsTable = ({ settings, onChange = noop }) => {
-  const [expandedDevices, setExpandedDevices] = useLocalStorage("storage-space-actions-expanded", []);
-  const [autoExpanded, setAutoExpanded] = useLocalStorage("storage-space-actions-auto-expanded", false);
+const SpaceActionsTable = ({ policy, actions, devices, onChange = noop }) => {
+  const [expandedDevices, setExpandedDevices] = useState([]);
+  const [autoExpanded, setAutoExpanded] = useState(false);
 
   useEffect(() => {
-    const policy = settings.spacePolicy;
-    const devices = settings.installationDevices.map(d => d.name);
-    let currentExpanded = devices.filter(d => expandedDevices.includes(d));
+    const devNames = devices.map(d => d.name);
+    let currentExpanded = devNames.filter(d => expandedDevices.includes(d));
 
-    if (policy === "custom" && !autoExpanded) {
-      currentExpanded = [...devices];
+    if (policy.id === "custom" && !autoExpanded) {
+      currentExpanded = [...devNames];
       setAutoExpanded(true);
-    } else if (policy !== "custom" && autoExpanded) {
+    } else if (policy.id !== "custom" && autoExpanded) {
       setAutoExpanded(false);
     }
 
     if (currentExpanded.sort().toString() !== expandedDevices.sort().toString()) {
       setExpandedDevices(currentExpanded);
     }
-  }, [autoExpanded, expandedDevices, setAutoExpanded, setExpandedDevices, settings]);
+  }, [autoExpanded, expandedDevices, setAutoExpanded, setExpandedDevices, policy, devices]);
 
   const renderRows = () => {
     const rows = [];
 
-    settings.installationDevices?.forEach((device, index) => {
+    devices?.forEach((device, index) => {
       const isExpanded = expandedDevices.includes(device.name);
       const children = device.partitionTable?.partitions;
 
@@ -348,7 +334,8 @@ const SpaceActionsTable = ({ settings, onChange = noop }) => {
         <DeviceRow
           key={device.name}
           device={device}
-          settings={settings}
+          policy={policy}
+          actions={actions}
           rowIndex={rows.length}
           setSize={children?.length || 0}
           posInSet={index}
@@ -363,7 +350,8 @@ const SpaceActionsTable = ({ settings, onChange = noop }) => {
           <DeviceRow
             key={child.name}
             device={child}
-            settings={settings}
+            policy={policy}
+            actions={actions}
             rowIndex={rows.length}
             level={2}
             posInSet={index}
@@ -405,17 +393,19 @@ const SpaceActionsTable = ({ settings, onChange = noop }) => {
 const SpacePolicyPicker = ({ currentPolicy, onChange = noop }) => {
   return (
     <OptionsPicker>
+      {/* eslint-disable agama-i18n/string-literals */}
       {SPACE_POLICIES.map((policy) => {
         return (
           <OptionsPicker.Option
             key={policy.id}
-            title={policy.label}
-            body={policy.description}
-            onClick={() => onChange(policy.id)}
+            title={_(policy.label)}
+            body={_(policy.description)}
+            onClick={() => onChange(policy)}
             isSelected={currentPolicy?.id === policy.id}
           />
         );
       })}
+      {/* eslint-enable agama-i18n/string-literals */}
     </OptionsPicker>
   );
 };
@@ -428,45 +418,137 @@ const SpacePolicyPicker = ({ currentPolicy, onChange = noop }) => {
  * @param {boolean} [isLoading=false]
  * @param {(settings: ProposalSettings) => void} [onChange]
  */
-export default function ProposalSpacePolicySection({
-  settings,
+const SpacePolicyForm = ({
+  id,
+  currentPolicy,
+  currentActions,
+  devices,
   isLoading = false,
-  onChange = noop
-}) {
-  const changeSpacePolicy = (policy) => {
-    onChange({ spacePolicy: policy });
-  };
+  onSubmit = noop
+}) => {
+  const [policy, setPolicy] = useState(currentPolicy);
+  const [actions, setActions] = useState(currentActions);
+  const [customUsed, setCustomUsed] = useState(false);
 
-  const changeSpaceActions = (spaceAction) => {
-    const spaceActions = settings.spaceActions.filter(a => a.device !== spaceAction.device);
+  // The selectors for the space action have to be initialized always to the same value
+  // (e.g., "keep") when the custom policy is selected for first time. The following two useEffect
+  // ensures that.
+
+  // Stores whether the custom policy has been used.
+  useEffect(() => {
+    if (policy.id === "custom" && !customUsed) setCustomUsed(true);
+  }, [policy, customUsed, setCustomUsed]);
+
+  // Resets actions (i.e., sets everything to "keep") if the custom policy has not been used yet.
+  useEffect(() => {
+    if (policy.id !== "custom" && !customUsed) setActions([]);
+  }, [policy, customUsed, setActions]);
+
+  const changeActions = (spaceAction) => {
+    const spaceActions = actions.filter(a => a.device !== spaceAction.device);
     if (spaceAction.action !== "keep") spaceActions.push(spaceAction);
 
-    onChange({ spaceActions });
+    setActions(spaceActions);
   };
 
-  const currentPolicy = SPACE_POLICIES.find(p => p.id === settings.spacePolicy) || SPACE_POLICIES[0];
+  const submitForm = (e) => {
+    e.preventDefault();
+    if (policy !== undefined) onSubmit(policy, actions);
+  };
 
   return (
-    <Section
-      // TRANSLATORS: The storage "Find Space" section's title
-      title={_("Find Space")}
-      // TRANSLATORS: The storage "Find space" sections's description
-      description={_("Allocating the file systems might need to find free space \
-in the devices listed below. Choose how to do it.")}
-    >
+    <Form id={id} onSubmit={submitForm}>
       <If
-        condition={isLoading && settings.spacePolicy === undefined}
+        condition={isLoading && policy === undefined}
         then={<SectionSkeleton numRows={4} />}
         else={
           <>
-            <SpacePolicyPicker currentPolicy={currentPolicy} onChange={changeSpacePolicy} />
+            <SpacePolicyPicker currentPolicy={policy} onChange={setPolicy} />
             <If
-              condition={settings.installationDevices?.length > 0}
-              then={<SpaceActionsTable settings={settings} onChange={changeSpaceActions} />}
+              condition={devices.length > 0}
+              then={
+                <SpaceActionsTable
+                  policy={policy}
+                  actions={actions}
+                  devices={devices}
+                  onChange={changeActions}
+                />
+              }
             />
           </>
         }
       />
-    </Section>
+    </Form>
+  );
+};
+
+const SpacePolicyButton = ({ policy, devices, onClick = noop }) => {
+  const Text = () => {
+    // eslint-disable-next-line agama-i18n/string-literals
+    if (policy.summaryLabels.length === 1) return _(policy.summaryLabels[0]);
+
+    // eslint-disable-next-line agama-i18n/string-literals
+    return sprintf(n_(policy.summaryLabels[0], policy.summaryLabels[1], devices.length), devices.length);
+  };
+
+  return <Button variant="link" isInline onClick={onClick}><Text /></Button>;
+};
+
+export default function ProposalSpacePolicyField({
+  policy,
+  actions = [],
+  devices = [],
+  isLoading = false,
+  onChange = noop
+}) {
+  const spacePolicy = SPACE_POLICIES.find(p => p.id === policy) || SPACE_POLICIES[0];
+  const [isFormOpen, setIsFormOpen] = useState(false);
+
+  const openForm = () => setIsFormOpen(true);
+  const closeForm = () => setIsFormOpen(false);
+
+  const acceptForm = (spacePolicy, actions) => {
+    closeForm();
+    onChange(spacePolicy.id, actions);
+  };
+
+  if (isLoading) {
+    return <Skeleton screenreaderText={_("Waiting for information about how to find space")} width="25%" />;
+  }
+
+  const description = _("Allocating the file systems might need to find free space \
+in the devices listed below. Choose how to do it.");
+
+  return (
+    <div className="split">
+      {/* TRANSLATORS: To be completed with the rest of a sentence like "deleting all content" */}
+      <span>{_("Find space")}</span>
+      <SpacePolicyButton policy={spacePolicy} devices={devices} onClick={openForm} />
+      <Popup
+        variant="large"
+        description={description}
+        title={_("Find Space")}
+        isOpen={isFormOpen}
+      >
+        <div className="stack">
+          <SpacePolicyForm
+            id="spacePolicyForm"
+            currentPolicy={spacePolicy}
+            currentActions={actions}
+            devices={devices}
+            onSubmit={acceptForm}
+          />
+        </div>
+        <Popup.Actions>
+          <Popup.Confirm
+            form="spacePolicyForm"
+            type="submit"
+          >
+            {_("Accept")}
+          </Popup.Confirm>
+          <Popup.Cancel onClick={closeForm} />
+        </Popup.Actions>
+      </Popup>
+    </div>
   );
 }
diff --git a/web/src/components/storage/ProposalSpacePolicyField.test.jsx b/web/src/components/storage/ProposalSpacePolicyField.test.jsx
new file mode 100644
index 000000000..a8b5bc9bc
--- /dev/null
+++ b/web/src/components/storage/ProposalSpacePolicyField.test.jsx
@@ -0,0 +1,359 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+import React from "react";
+import { screen, within } from "@testing-library/react";
+import { plainRender, resetLocalStorage } from "~/test-utils";
+import { ProposalSpacePolicyField } from "~/components/storage";
+
+const sda = {
+  sid: "59",
+  isDrive: true,
+  type: "disk",
+  vendor: "Micron",
+  model: "Micron 1100 SATA",
+  driver: ["ahci", "mmcblk"],
+  bus: "IDE",
+  busId: "",
+  transport: "usb",
+  dellBOSS: false,
+  sdCard: true,
+  active: true,
+  name: "/dev/sda",
+  size: 1024,
+  recoverableSize: 0,
+  systems : [],
+  udevIds: ["ata-Micron_1100_SATA_512GB_12563", "scsi-0ATA_Micron_1100_SATA_512GB"],
+  udevPaths: ["pci-0000:00-12", "pci-0000:00-12-ata"],
+};
+
+const sda1 = {
+  sid: "60",
+  isDrive: false,
+  type: "",
+  active: true,
+  name: "/dev/sda1",
+  size: 512,
+  recoverableSize: 128,
+  systems : [],
+  udevIds: [],
+  udevPaths: []
+};
+
+const sda2 = {
+  sid: "61",
+  isDrive: false,
+  type: "",
+  active: true,
+  name: "/dev/sda2",
+  size: 512,
+  recoverableSize: 0,
+  systems : [],
+  udevIds: [],
+  udevPaths: []
+};
+
+sda.partitionTable = {
+  type: "gpt",
+  partitions: [sda1, sda2],
+  unpartitionedSize: 512
+};
+
+const sdb = {
+  sid: "62",
+  isDrive: true,
+  type: "disk",
+  vendor: "Samsung",
+  model: "Samsung Evo 8 Pro",
+  driver: ["ahci"],
+  bus: "IDE",
+  busId: "",
+  transport: "",
+  dellBOSS: false,
+  sdCard: false,
+  active: true,
+  name: "/dev/sdb",
+  size: 2048,
+  recoverableSize: 0,
+  systems : [],
+  udevIds: [],
+  udevPaths: ["pci-0000:00-19"]
+};
+
+let policy;
+let devices;
+let actions;
+
+const openPopup = async (props = {}) => {
+  const allProps = { policy, devices, actions, ...props };
+  const { user } = plainRender(<ProposalSpacePolicyField { ...allProps } />);
+  const button = screen.getByRole("button");
+
+  await user.click(button);
+  const dialog = screen.getByRole("dialog", { name: "Find Space" });
+  return { user, dialog };
+};
+
+const expandRow = async (user, dialog, name) => {
+  const row = within(dialog).getByRole("row", { name });
+  const toggler = within(row).getByRole("button", { name: /expand/i });
+  await user.click(toggler);
+};
+
+const checkSpaceActions = async (deviceActions) => {
+  deviceActions.forEach(({ name, action }) => {
+    const row = screen.getByRole("row", { name });
+    const selector = within(row).getByRole("combobox", { name });
+    within(selector).getByRole("option", { name: action, selected: true });
+  });
+};
+
+beforeEach(() => {
+  devices = [sda, sdb];
+  policy = "keep";
+  actions = [
+    { device: "/dev/sda1", action: "force_delete" },
+    { device: "/dev/sda2", action: "resize" }
+  ];
+
+  resetLocalStorage();
+});
+
+describe("ProposalSpacePolicyField", () => {
+  it("renders a button for opening the space policy dialog", async () => {
+    const { user } = plainRender(<ProposalSpacePolicyField policy={policy} devices={devices} />);
+    const button = screen.getByRole("button");
+
+    await user.click(button);
+
+    screen.getByRole("dialog", { name: "Find Space" });
+  });
+
+  it("renders the button with a text according to given policy", () => {
+    const { rerender } = plainRender(<ProposalSpacePolicyField />);
+    screen.getByRole("button", { name: /deleting/ });
+    rerender(<ProposalSpacePolicyField policy="resize" />);
+    screen.getByRole("button", { name: /shrinking/ });
+  });
+
+  describe("within the dialog", () => {
+    it("renders the space policy picker", async () => {
+      const { dialog } = await openPopup();
+      const picker = within(dialog).getByRole("listbox");
+      within(picker).getByRole("option", { name: /delete/i });
+      within(picker).getByRole("option", { name: /resize/i });
+      within(picker).getByRole("option", { name: /available/i });
+      within(picker).getByRole("option", { name: /custom/i });
+    });
+
+    describe("when there are no installation devices", () => {
+      beforeEach(() => {
+        devices = [];
+      });
+
+      it("does not render the policy actions", async () => {
+        const { dialog } = await openPopup();
+        const actionsTree = within(dialog).queryByRole("treegrid", { name: "Actions to find space" });
+        expect(actionsTree).toBeNull();
+      });
+    });
+
+    describe("when there are installation devices", () => {
+      it("renders the policy actions", async () => {
+        const { dialog } = await openPopup();
+        within(dialog).getByRole("treegrid", { name: "Actions to find space" });
+      });
+    });
+
+    describe.each([
+      { id: 'delete', nameRegexp: /delete/i },
+      { id: 'resize', nameRegexp: /shrink/i },
+      { id: 'keep', nameRegexp: /the space not assigned/i }
+    ])("when space policy is '$id'", ({ id, nameRegexp }) => {
+      beforeEach(() => {
+        policy = id;
+      });
+
+      it("only renders '$id' option as selected", async () => {
+        const { dialog } = await openPopup();
+        const picker = within(dialog).getByRole("listbox");
+        within(picker).getByRole("option", { name: nameRegexp, selected: true });
+        expect(within(picker).getAllByRole("option", { selected: false }).length).toEqual(3);
+      });
+
+      it("does not allow to modify the space actions", async () => {
+        const { dialog } = await openPopup();
+        // NOTE: HTML `disabled` attribute removes the element from the a11y tree.
+        // That's why the test is using `hidden: true` here to look for disabled actions.
+        // https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/disabled
+        // https://testing-library.com/docs/queries/byrole/#hidden
+        // TODO: use a more inclusive way to disable the actions.
+        // https://css-tricks.com/making-disabled-buttons-more-inclusive/
+        const spaceActions = within(dialog).getAllByRole("combobox", { name: /Space action selector/, hidden: true });
+        expect(spaceActions.length).toEqual(3);
+      });
+    });
+
+    describe("when space policy is 'custom'", () => {
+      beforeEach(() => {
+        policy = "custom";
+      });
+
+      it("only renders 'custom' option as selected", async () => {
+        const { dialog } = await openPopup();
+        const picker = within(dialog).getByRole("listbox");
+        within(picker).getByRole("option", { name: /custom/i, selected: true });
+        expect(within(picker).getAllByRole("option", { selected: false }).length).toEqual(3);
+      });
+
+      it("allows to modify the space actions", async () => {
+        const { dialog } = await openPopup();
+        const spaceActions = within(dialog).getAllByRole("combobox", { name: /Space action selector/ });
+        expect(spaceActions.length).toEqual(3);
+      });
+    });
+
+    describe("DeviceActionColumn", () => {
+      it("renders the space actions selector for devices without partition table", async () => {
+        const { dialog } = await openPopup();
+        const sdaRow = within(dialog).getByRole("row", { name: /sda/ });
+        const sdaActionsSelector = within(sdaRow).queryByRole("combobox", { name: "Space action selector for /dev/sda" });
+        // sda has partition table, the selector shouldn't be found
+        expect(sdaActionsSelector).toBeNull();
+        const sdbRow = screen.getByRole("row", { name: /sdb/ });
+        // sdb does not have partition table, selector should be there
+        within(sdbRow).getByRole("combobox", { name: "Space action selector for /dev/sdb" });
+      });
+
+      it("does not renders the 'resize' option for drives", async () => {
+        const { dialog } = await openPopup();
+        const sdbRow = within(dialog).getByRole("row", { name: /sdb/ });
+        const spaceActionsSelector = within(sdbRow).getByRole("combobox", { name: "Space action selector for /dev/sdb" });
+        const resizeOption = within(spaceActionsSelector).queryByRole("option", { name: /resize/ });
+        expect(resizeOption).toBeNull();
+      });
+
+      it("renders the 'resize' option for devices other than drives", async () => {
+        const { user, dialog } = await openPopup();
+        const sdaRow = within(dialog).getByRole("row", { name: /sda/ });
+        const sdaToggler = within(sdaRow).getByRole("button", { name: /expand/i });
+        await user.click(sdaToggler);
+        const sda1Row = screen.getByRole("row", { name: /sda1/ });
+        const spaceActionsSelector = within(sda1Row).getByRole("combobox", { name: "Space action selector for /dev/sda1" });
+        within(spaceActionsSelector).getByRole("option", { name: /resize/ });
+      });
+
+      describe("when space policy is 'delete'", () => {
+        beforeEach(() => {
+          policy = "delete";
+        });
+
+        it("renders as selected the delete option", async () => {
+          const { user, dialog } = await openPopup();
+          await expandRow(user, dialog, /sda/);
+          await checkSpaceActions([
+            { name: /sda1/, action: /delete/i },
+            { name: /sda2/, action: /delete/i }
+          ]);
+        });
+      });
+
+      describe("when space policy is 'resize'", () => {
+        beforeEach(() => {
+          policy = "resize";
+        });
+
+        it("renders as selected the resize option", async () => {
+          const { user, dialog } = await openPopup();
+          await expandRow(user, dialog, /sda/);
+          await checkSpaceActions([
+            { name: /sda1/, action: /resize/i },
+            { name: /sda2/, action: /resize/i }
+          ]);
+        });
+      });
+
+      describe("when space policy is 'keep'", () => {
+        beforeEach(() => {
+          policy = "keep";
+        });
+
+        it("renders as selected the keep option", async () => {
+          const { user, dialog } = await openPopup();
+          await expandRow(user, dialog, /sda/);
+          await checkSpaceActions([
+            { name: /sda1/, action: /not modify/i },
+            { name: /sda2/, action: /not modify/i }
+          ]);
+        });
+      });
+
+      describe("when space policy is 'custom'", () => {
+        beforeEach(() => {
+          policy = "custom";
+        });
+
+        it("renders as selected the option matching the given device space action", async () => {
+          await openPopup();
+          await checkSpaceActions([
+            { name: /sda1/, action: /delete/i },
+            { name: /sda2/, action: /resize/i }
+          ]);
+        });
+      });
+    });
+  });
+
+  it("triggers the onChange callback when user accepts the dialog", async () => {
+    const onChangeFn = jest.fn();
+    const { user, dialog } = await openPopup({ onChange: onChangeFn });
+
+    // Select 'custom'
+    const picker = within(dialog).getByRole("listbox");
+    await user.selectOptions(
+      picker,
+      within(picker).getByRole("option", { name: /custom/i })
+    );
+
+    // Select custom actions
+    const sda1Row = within(dialog).getByRole("row", { name: /sda1/ });
+    const sda1Select = within(sda1Row).getByRole("combobox", { name: "Space action selector for /dev/sda1" });
+    await user.selectOptions(
+      sda1Select,
+      within(sda1Select).getByRole("option", { name: /delete/i })
+    );
+    const sda2Row = within(dialog).getByRole("row", { name: /sda2/ });
+    const sda2Select = within(sda2Row).getByRole("combobox", { name: "Space action selector for /dev/sda2" });
+    await user.selectOptions(
+      sda2Select,
+      within(sda2Select).getByRole("option", { name: /resize/i })
+    );
+
+    // Accept the result
+    const acceptButton = within(dialog).getByRole("button", { name: "Accept" });
+    await user.click(acceptButton);
+
+    expect(onChangeFn).toHaveBeenCalledWith(
+      "custom",
+      expect.arrayContaining([{ action: "resize", device: "/dev/sda2" }, { action: "force_delete", device: "/dev/sda1" }])
+    );
+  });
+});
diff --git a/web/src/components/storage/ProposalSpacePolicySection.test.jsx b/web/src/components/storage/ProposalSpacePolicySection.test.jsx
deleted file mode 100644
index 07f842ab8..000000000
--- a/web/src/components/storage/ProposalSpacePolicySection.test.jsx
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright (c) [2024] SUSE LLC
- *
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, contact SUSE LLC.
- *
- * To contact SUSE LLC about this file by physical or electronic mail, you may
- * find current contact information at www.suse.com.
- */
-
-import React from "react";
-import { screen, within } from "@testing-library/react";
-import { plainRender, resetLocalStorage } from "~/test-utils";
-import { ProposalSpacePolicySection } from "~/components/storage";
-
-const sda = {
-  sid: "59",
-  isDrive: true,
-  type: "disk",
-  vendor: "Micron",
-  model: "Micron 1100 SATA",
-  driver: ["ahci", "mmcblk"],
-  bus: "IDE",
-  busId: "",
-  transport: "usb",
-  dellBOSS: false,
-  sdCard: true,
-  active: true,
-  name: "/dev/sda",
-  size: 1024,
-  recoverableSize: 0,
-  systems : [],
-  udevIds: ["ata-Micron_1100_SATA_512GB_12563", "scsi-0ATA_Micron_1100_SATA_512GB"],
-  udevPaths: ["pci-0000:00-12", "pci-0000:00-12-ata"],
-};
-
-const sda1 = {
-  sid: "60",
-  isDrive: false,
-  type: "",
-  active: true,
-  name: "/dev/sda1",
-  size: 512,
-  recoverableSize: 128,
-  systems : [],
-  udevIds: [],
-  udevPaths: []
-};
-
-const sda2 = {
-  sid: "61",
-  isDrive: false,
-  type: "",
-  active: true,
-  name: "/dev/sda2",
-  size: 512,
-  recoverableSize: 0,
-  systems : [],
-  udevIds: [],
-  udevPaths: []
-};
-
-sda.partitionTable = {
-  type: "gpt",
-  partitions: [sda1, sda2],
-  unpartitionedSize: 512
-};
-
-const sdb = {
-  sid: "62",
-  isDrive: true,
-  type: "disk",
-  vendor: "Samsung",
-  model: "Samsung Evo 8 Pro",
-  driver: ["ahci"],
-  bus: "IDE",
-  busId: "",
-  transport: "",
-  dellBOSS: false,
-  sdCard: false,
-  active: true,
-  name: "/dev/sdb",
-  size: 2048,
-  recoverableSize: 0,
-  systems : [],
-  udevIds: [],
-  udevPaths: ["pci-0000:00-19"]
-};
-
-let settings;
-
-beforeEach(() => {
-  settings = {
-    installationDevices: [sda, sdb],
-    spacePolicy: "keep",
-    spaceActions: [
-      { device: "/dev/sda1", action: "force_delete" },
-      { device: "/dev/sda2", action: "resize" }
-    ],
-  };
-
-  resetLocalStorage();
-});
-
-describe("ProposalSpacePolicySection", () => {
-  it("renders the space policy picker", () => {
-    plainRender(<ProposalSpacePolicySection settings={settings} />);
-    const picker = screen.getByRole("listbox");
-    within(picker).getByRole("option", { name: /delete/i });
-    within(picker).getByRole("option", { name: /resize/i });
-    within(picker).getByRole("option", { name: /available/i });
-    within(picker).getByRole("option", { name: /custom/i });
-  });
-
-  it("triggers the onChange callback when user changes selected space policy", async () => {
-    const onChangeFn = jest.fn();
-    const { user } = plainRender(<ProposalSpacePolicySection settings={settings} onChange={onChangeFn} />);
-    const picker = screen.getByRole("listbox");
-    await user.selectOptions(
-      picker,
-      within(picker).getByRole("option", { name: /custom/i })
-    );
-    expect(onChangeFn).toHaveBeenCalledWith({ spacePolicy: "custom" });
-  });
-
-  describe("when there are no installation devices", () => {
-    beforeEach(() => {
-      settings.installationDevices = [];
-    });
-
-    it("does not render the policy actions", () => {
-      plainRender(<ProposalSpacePolicySection settings={settings} />);
-      const actions = screen.queryByRole("treegrid", { name: "Actions to find space" });
-      expect(actions).toBeNull();
-    });
-  });
-
-  describe("when there are installation devices", () => {
-    it("renders the policy actions", () => {
-      plainRender(<ProposalSpacePolicySection settings={settings} />);
-      screen.getByRole("treegrid", { name: "Actions to find space" });
-    });
-  });
-
-  describe.each([
-    { id: 'delete', nameRegexp: /delete/i },
-    { id: 'resize', nameRegexp: /shrink/i },
-    { id: 'keep', nameRegexp: /the space not assigned/i }
-  ])("when space policy is '$id'", ({ id, nameRegexp }) => {
-    beforeEach(() => {
-      settings.spacePolicy = id;
-    });
-
-    it("only renders '$id' option as selected", () => {
-      plainRender(<ProposalSpacePolicySection settings={settings} />);
-      const picker = screen.getByRole("listbox");
-      within(picker).getByRole("option", { name: nameRegexp, selected: true });
-      expect(within(picker).getAllByRole("option", { selected: false }).length).toEqual(3);
-    });
-
-    it("does not allow to modify the space actions", () => {
-      plainRender(<ProposalSpacePolicySection settings={settings} />);
-      // NOTE: HTML `disabled` attribute removes the element from the a11y tree.
-      // That's why the test is using `hidden: true` here to look for disabled actions.
-      // https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/disabled
-      // https://testing-library.com/docs/queries/byrole/#hidden
-      // TODO: use a more inclusive way to disable the actions.
-      // https://css-tricks.com/making-disabled-buttons-more-inclusive/
-      const spaceActions = screen.getAllByRole("combobox", { name: /Space action selector/, hidden: true });
-      expect(spaceActions.length).toEqual(3);
-    });
-  });
-
-  describe("when space policy is 'custom'", () => {
-    beforeEach(() => {
-      settings.spacePolicy = "custom";
-    });
-
-    it("only renders 'custom' option as selected", () => {
-      plainRender(<ProposalSpacePolicySection settings={settings} />);
-      const picker = screen.getByRole("listbox");
-      within(picker).getByRole("option", { name: /custom/i, selected: true });
-      expect(within(picker).getAllByRole("option", { selected: false }).length).toEqual(3);
-    });
-
-    it("allows to modify the space actions", () => {
-      plainRender(<ProposalSpacePolicySection settings={settings} />);
-      const spaceActions = screen.getAllByRole("combobox", { name: /Space action selector/ });
-      expect(spaceActions.length).toEqual(3);
-    });
-  });
-
-  describe("DeviceActionColumn", () => {
-    it("renders the space actions selector for devices without partition table", () => {
-      plainRender(<ProposalSpacePolicySection settings={settings} />);
-      const sdaRow = screen.getByRole("row", { name: /sda/ });
-      const sdaActionsSelector = within(sdaRow).queryByRole("combobox", { name: "Space action selector for /dev/sda" });
-      // sda has partition table, the selector shouldn't be found
-      expect(sdaActionsSelector).toBeNull();
-      const sdbRow = screen.getByRole("row", { name: /sdb/ });
-      // sdb does not have partition table, selector should be there
-      within(sdbRow).getByRole("combobox", { name: "Space action selector for /dev/sdb" });
-    });
-
-    it("does not renders the 'resize' option for drives", () => {
-      plainRender(<ProposalSpacePolicySection settings={settings} />);
-      const sdbRow = screen.getByRole("row", { name: /sdb/ });
-      const spaceActionsSelector = within(sdbRow).getByRole("combobox", { name: "Space action selector for /dev/sdb" });
-      const resizeOption = within(spaceActionsSelector).queryByRole("option", { name: /resize/ });
-      expect(resizeOption).toBeNull();
-    });
-
-    it("renders the 'resize' option for devices other than drives", async () => {
-      const { user } = plainRender(<ProposalSpacePolicySection settings={settings} />);
-      const sdaRow = screen.getByRole("row", { name: /sda/ });
-      const sdaToggler = within(sdaRow).getByRole("button", { name: /expand/i });
-      await user.click(sdaToggler);
-      const sda1Row = screen.getByRole("row", { name: /sda1/ });
-      const spaceActionsSelector = within(sda1Row).getByRole("combobox", { name: "Space action selector for /dev/sda1" });
-      within(spaceActionsSelector).getByRole("option", { name: /resize/ });
-    });
-
-    it("renders as selected the option matching the given device space action", async () => {
-      const { user } = plainRender(<ProposalSpacePolicySection settings={settings} />);
-      const sdaRow = screen.getByRole("row", { name: /sda/ });
-      const sdaToggler = within(sdaRow).getByRole("button", { name: /expand/i });
-      await user.click(sdaToggler);
-      const sda1Row = screen.getByRole("row", { name: /sda1/ });
-      const sda1SpaceActionsSelector = within(sda1Row).getByRole("combobox", { name: "Space action selector for /dev/sda1" });
-      within(sda1SpaceActionsSelector).getByRole("option", { name: /delete/i, selected: true });
-      const sda2Row = screen.getByRole("row", { name: /sda2/ });
-      const sda2SpaceActionsSelector = within(sda2Row).getByRole("combobox", { name: "Space action selector for /dev/sda2" });
-      within(sda2SpaceActionsSelector).getByRole("option", { name: /resize/i, selected: true });
-    });
-
-    it("triggers the onChange callback when user changes space action", async () => {
-      const onChangeFn = jest.fn();
-      const { user } = plainRender(
-        <ProposalSpacePolicySection settings={{ ...settings, spacePolicy: "custom" }} onChange={onChangeFn} />
-      );
-
-      const sda1Row = screen.getByRole("row", { name: /sda1/ });
-      const selector = within(sda1Row).getByRole("combobox", { name: "Space action selector for /dev/sda1" });
-      await user.selectOptions(
-        selector,
-        within(selector).getByRole("option", { name: /resize/i, selected: false })
-      );
-      expect(onChangeFn).toHaveBeenCalledWith(
-        expect.objectContaining({
-          spaceActions: expect.arrayContaining([{ action: "resize", device: "/dev/sda1" }])
-        })
-      );
-    });
-  });
-});
diff --git a/web/src/components/storage/ProposalVolumes.jsx b/web/src/components/storage/ProposalVolumes.jsx
index c7254ed6b..49af0b70a 100644
--- a/web/src/components/storage/ProposalVolumes.jsx
+++ b/web/src/components/storage/ProposalVolumes.jsx
@@ -408,6 +408,9 @@ export default function ProposalVolumes({
     <>
       <Toolbar>
         <ToolbarContent>
+          <ToolbarItem>
+            {_("File systems to create")}
+          </ToolbarItem>
           <ToolbarItem align={{ default: "alignRight" }}>
             <GeneralActions
               templates={templates}
diff --git a/web/src/components/storage/device-utils.jsx b/web/src/components/storage/device-utils.jsx
index 47e5377aa..d2f89962f 100644
--- a/web/src/components/storage/device-utils.jsx
+++ b/web/src/components/storage/device-utils.jsx
@@ -25,174 +25,188 @@ import { sprintf } from "sprintf-js";
 import { _ } from "~/i18n";
 import { noop } from "~/utils";
 import { Icon } from "~/components/layout";
-import { If, Selector } from "~/components/core";
+import { If, Selector, Tag } from "~/components/core";
 import { deviceSize } from "~/components/storage/utils";
 
 /**
  * @typedef {import ("~/client/storage").DeviceManager.StorageDevice} StorageDevice
  */
 
-/**
- * Content for a device item
- * @component
- *
- * @param {Object} props
- * @param {StorageDevice} props.device
- */
-const DeviceItem = ({ device }) => {
-  const BasicInfo = () => {
-    const DeviceIcon = () => {
-      const names = {
-        raid: "storage",
-        md: "storage"
-      };
+const FilesystemLabel = ({ device }) => {
+  const label = device.filesystem?.label;
+  if (label) return <Tag variant="gray-highlight"><b>{label}</b></Tag>;
+};
 
-      const name = names[device.type] || "hard_drive";
+const DeviceExtendedInfo = ({ device }) => {
+  const DeviceName = () => {
+    if (device.name === undefined) return null;
 
-      return <Icon name={name} />;
-    };
+    return <div>{device.name}</div>;
+  };
 
-    const DeviceSize = () => {
-      if (device.size === undefined) return null;
+  const DeviceType = () => {
+    let type;
 
-      return <div>{deviceSize(device.size)}</div>;
-    };
+    switch (device.type) {
+      case "multipath": {
+        // TRANSLATORS: multipath device type
+        type = _("Multipath");
+        break;
+      }
+      case "dasd": {
+        // TRANSLATORS: %s is replaced by the device bus ID
+        type = sprintf(_("DASD %s"), device.busId);
+        break;
+      }
+      case "md": {
+        // TRANSLATORS: software RAID device, %s is replaced by the RAID level, e.g. RAID-1
+        type = sprintf(_("Software %s"), device.level.toUpperCase());
+        break;
+      }
+      case "disk": {
+        if (device.sdCard) {
+          type = _("SD Card");
+        } else {
+          const technology = device.transport || device.bus;
+          type = technology
+            // TRANSLATORS: %s is substituted by the type of disk like "iSCSI" or "SATA"
+            ? sprintf(_("%s disk"), technology)
+            : _("Disk");
+        }
+      }
+    }
 
-    return (
-      <div>
-        <DeviceIcon />
-        <DeviceSize />
-      </div>
-    );
+    return <If condition={type} then={<div>{type}</div>} />;
   };
 
-  const ExtendedInfo = () => {
-    const DeviceName = () => {
-      if (device.name === undefined) return null;
-
-      return <div>{device.name}</div>;
-    };
+  const DeviceModel = () => {
+    if (!device.model || device.model === "") return null;
 
-    const DeviceType = () => {
-      let type;
+    return <div>{device.model}</div>;
+  };
 
-      switch (device.type) {
-        case "multipath": {
-          // TRANSLATORS: multipath device type
-          type = _("Multipath");
-          break;
-        }
-        case "dasd": {
-          // TRANSLATORS: %s is replaced by the device bus ID
-          type = sprintf(_("DASD %s"), device.busId);
-          break;
-        }
-        case "md": {
-          // TRANSLATORS: software RAID device, %s is replaced by the RAID level, e.g. RAID-1
-          type = sprintf(_("Software %s"), device.level.toUpperCase());
-          break;
-        }
-        case "disk": {
-          type = device.sdCard
-            ? _("SD Card")
-            // TRANSLATORS: %s is replaced by the device transport name, e.g. USB, SATA, SCSI...
-            : sprintf(_("Transport %s"), device.transport);
-        }
-      }
+  const MDInfo = () => {
+    if (device.type !== "md" || !device.members) return null;
 
-      return <If condition={type} then={<div>{type}</div>} />;
-    };
+    const members = device.members.map(m => m.split("/").at(-1));
 
-    const DeviceModel = () => {
-      if (!device.model || device.model === "") return null;
+    // TRANSLATORS: RAID details, %s is replaced by list of devices used by the array
+    return <div>{sprintf(_("Members: %s"), members.sort().join(", "))}</div>;
+  };
 
-      return <div>{device.model}</div>;
-    };
+  const RAIDInfo = () => {
+    if (device.type !== "raid") return null;
 
-    const MDInfo = () => {
-      if (device.type !== "md") return null;
+    const devices = device.devices.map(m => m.split("/").at(-1));
 
-      const members = device.members.map(m => m.split("/").at(-1));
+    // TRANSLATORS: RAID details, %s is replaced by list of devices used by the array
+    return <div>{sprintf(_("Devices: %s"), devices.sort().join(", "))}</div>;
+  };
 
-      // TRANSLATORS: RAID details, %s is replaced by list of devices used by the array
-      return <div>{sprintf(_("Members: %s"), members.sort().join(", "))}</div>;
-    };
+  const MultipathInfo = () => {
+    if (device.type !== "multipath") return null;
 
-    const RAIDInfo = () => {
-      if (device.type !== "raid") return null;
+    const wires = device.wires.map(m => m.split("/").at(-1));
 
-      const devices = device.devices.map(m => m.split("/").at(-1));
+    // TRANSLATORS: multipath details, %s is replaced by list of connections used by the device
+    return <div>{sprintf(_("Wires: %s"), wires.sort().join(", "))}</div>;
+  };
 
-      // TRANSLATORS: RAID details, %s is replaced by list of devices used by the array
-      return <div>{sprintf(_("Devices: %s"), devices.sort().join(", "))}</div>;
-    };
+  return (
+    <div>
+      <DeviceName />
+      <DeviceType />
+      <DeviceModel />
+      <MDInfo />
+      <RAIDInfo />
+      <MultipathInfo />
+    </div>
+  );
+};
 
-    const MultipathInfo = () => {
-      if (device.type !== "multipath") return null;
+const DeviceContentInfo = ({ device }) => {
+  const PTable = () => {
+    if (device.partitionTable === undefined) return null;
 
-      const wires = device.wires.map(m => m.split("/").at(-1));
+    const type = device.partitionTable.type.toUpperCase();
+    const numPartitions = device.partitionTable.partitions.length;
 
-      // TRANSLATORS: multipath details, %s is replaced by list of connections used by the device
-      return <div>{sprintf(_("Wires: %s"), wires.sort().join(", "))}</div>;
-    };
+    // TRANSLATORS: disk partition info, %s is replaced by partition table
+    // type (MS-DOS or GPT), %d is the number of the partitions
+    const text = sprintf(_("%s with %d partitions"), type, numPartitions);
 
     return (
       <div>
-        <DeviceName />
-        <DeviceType />
-        <DeviceModel />
-        <MDInfo />
-        <RAIDInfo />
-        <MultipathInfo />
+        <Icon name="folder" size="14" /> {text}
       </div>
     );
   };
 
-  const ContentInfo = () => {
-    const PTable = () => {
-      if (device.partitionTable === undefined) return null;
+  const Systems = () => {
+    if (!device.systems || device.systems.length === 0) return null;
 
-      const type = device.partitionTable.type.toUpperCase();
-      const numPartitions = device.partitionTable.partitions.length;
+    const System = ({ system }) => {
+      const logo = /windows/i.test(system) ? "windows_logo" : "linux_logo";
 
-      // TRANSLATORS: disk partition info, %s is replaced by partition table
-      // type (MS-DOS or GPT), %d is the number of the partitions
-      const text = sprintf(_("%s with %d partitions"), type, numPartitions);
-
-      return (
-        <div>
-          <Icon name="folder" size="14" /> {text}
-        </div>
-      );
+      return <div><Icon name={logo} size="14" /> {system}</div>;
     };
 
-    const Systems = () => {
-      if (device.systems.length === 0) return null;
-
-      const System = ({ system }) => {
-        const logo = /windows/i.test(system) ? "windows_logo" : "linux_logo";
-
-        return <div><Icon name={logo} size="14" /> {system}</div>;
-      };
+    return device.systems.map((s, i) => <System key={i} system={s} />);
+  };
 
-      return device.systems.map((s, i) => <System key={i} system={s} />);
-    };
+  // TODO: there is a lot of room for improvement here, but first we would need
+  // device.description (comes from YaST) to be way more granular
+  const Description = () => {
+    if (device.partitionTable) return null;
 
-    const NotFound = () => {
+    if (!device.sid || (!!device.model && device.model === device.description)) {
       // TRANSLATORS: status message, no existing content was found on the disk,
       // i.e. the disk is completely empty
       return <div><Icon name="folder_off" size="14" /> {_("No content found")}</div>;
+    }
+
+    return <div>{device.description} <FilesystemLabel device={device} /></div>;
+  };
+
+  return (
+    <div>
+      <PTable />
+      <Description />
+      <Systems />
+    </div>
+  );
+};
+
+/**
+ * Content for a device item
+ * @component
+ *
+ * @param {Object} props
+ * @param {StorageDevice} props.device
+ */
+const DeviceItem = ({ device }) => {
+  const BasicInfo = () => {
+    const DeviceIcon = () => {
+      const names = {
+        raid: "storage",
+        md: "storage"
+      };
+
+      const name = names[device.type] || "hard_drive";
+
+      return <Icon name={name} />;
     };
 
-    const hasContent = device.partitionTable || device.systems.length > 0;
+    const DeviceSize = () => {
+      if (device.size === undefined) return null;
+
+      return <div>{deviceSize(device.size)}</div>;
+    };
 
     return (
       <div>
-        <If
-          condition={hasContent}
-          then={<><PTable /><Systems /></>}
-          else={<NotFound />}
-        />
+        <DeviceIcon />
+        <DeviceSize />
       </div>
     );
   };
@@ -200,13 +214,15 @@ const DeviceItem = ({ device }) => {
   return (
     <div data-items-type="agama/storage-devices">
       <BasicInfo data-type="type-and-size" />
-      <ExtendedInfo />
-      <ContentInfo />
+      <DeviceExtendedInfo device={device} />
+      <DeviceContentInfo device={device} />
     </div>
   );
 };
 
 /**
+ * @todo This component is not used anymore. Remove it.
+ *
  * Component for listing storage devices.
  * @component
  *
@@ -232,6 +248,8 @@ const DeviceList = ({ devices, ...itemProps }) => {
 const renderDeviceOption = (device) => <DeviceItem device={device} />;
 
 /**
+ * @todo This component is not used anymore. Remove it.
+ *
  * Component for selecting storage devices.
  * @component
  *
@@ -266,4 +284,4 @@ const DeviceSelector = ({ devices, selected, isMultiple = false, onChange = noop
   );
 };
 
-export { DeviceList, DeviceSelector };
+export { DeviceList, DeviceSelector, DeviceContentInfo, DeviceExtendedInfo, FilesystemLabel };
diff --git a/web/src/components/storage/device-utils.test.jsx b/web/src/components/storage/device-utils.test.jsx
index 10e09e905..45d5b6864 100644
--- a/web/src/components/storage/device-utils.test.jsx
+++ b/web/src/components/storage/device-utils.test.jsx
@@ -143,6 +143,17 @@ const renderOptions = (Component) => {
       screen.getByText("Micron 1100 SATA");
     });
 
+    it("renders the partition table info", () => {
+      plainRender(<Component devices={[vda]} />);
+      screen.getByText("GPT with 2 partitions");
+    });
+
+    it("renders systems info", () => {
+      plainRender(<Component devices={[vda]} />);
+      screen.getByText("Windows 11");
+      screen.getByText("openSUSE Leap 15.2");
+    });
+
     describe("when device is a SDCard", () => {
       it("renders 'SD Card'", () => {
         const sdCard = { ...vda, sdCard: true };
@@ -151,26 +162,6 @@ const renderOptions = (Component) => {
       });
     });
 
-    describe("when content is given", () => {
-      it("renders the partition table info", () => {
-        plainRender(<Component devices={[vda]} />);
-        screen.getByText("GPT with 2 partitions");
-      });
-
-      it("renders systems info", () => {
-        plainRender(<Component devices={[vda]} />);
-        screen.getByText("Windows 11");
-        screen.getByText("openSUSE Leap 15.2");
-      });
-    });
-
-    describe("when content is not given", () => {
-      it("renders 'No content found'", () => {
-        plainRender(<Component devices={[multipath]} />);
-        screen.getByText("No content found");
-      });
-    });
-
     describe("when device is software RAID", () => {
       it("renders its level", () => {
         plainRender(<Component devices={[md0]} />);
diff --git a/web/src/components/storage/index.js b/web/src/components/storage/index.js
index d4dd30a18..e16fd5df5 100644
--- a/web/src/components/storage/index.js
+++ b/web/src/components/storage/index.js
@@ -22,11 +22,11 @@
 export { default as ProposalPage } from "./ProposalPage";
 export { default as ProposalPageMenu } from "./ProposalPageMenu";
 export { default as ProposalSettingsSection } from "./ProposalSettingsSection";
-export { default as ProposalSpacePolicySection } from "./ProposalSpacePolicySection";
+export { default as ProposalSpacePolicyField } from "./ProposalSpacePolicyField";
 export { default as ProposalDeviceSection } from "./ProposalDeviceSection";
-export { default as ProposalFileSystemsSection } from "./ProposalFileSystemsSection";
-export { default as ProposalActionsSection } from "./ProposalActionsSection";
 export { default as ProposalTransactionalInfo } from "./ProposalTransactionalInfo";
+export { default as ProposalActionsDialog } from "./ProposalActionsDialog";
+export { default as ProposalResultSection } from "./ProposalResultSection";
 export { default as ProposalVolumes } from "./ProposalVolumes";
 export { default as DASDPage } from "./DASDPage";
 export { default as DASDTable } from "./DASDTable";
@@ -34,5 +34,9 @@ export { default as DASDFormatProgress } from "./DASDFormatProgress";
 export { default as ZFCPPage } from "./ZFCPPage";
 export { default as ZFCPDiskForm } from "./ZFCPDiskForm";
 export { default as ISCSIPage } from "./ISCSIPage";
-export { DeviceList, DeviceSelector } from "./device-utils";
+export { DeviceList, DeviceSelector, DeviceContentInfo, DeviceExtendedInfo, FilesystemLabel } from "./device-utils";
 export { default as VolumeForm } from "./VolumeForm";
+export { default as BootSelectionDialog } from "./BootSelectionDialog";
+export { default as DeviceSelectionDialog } from "./DeviceSelectionDialog";
+export { default as DeviceSelectorTable } from "./DeviceSelectorTable";
+export { default as DevicesFormSelect } from "./DevicesFormSelect";
diff --git a/web/src/components/storage/test-data/full-result-example.js b/web/src/components/storage/test-data/full-result-example.js
new file mode 100644
index 000000000..901399432
--- /dev/null
+++ b/web/src/components/storage/test-data/full-result-example.js
@@ -0,0 +1,1446 @@
+export const settings = {
+  "bootDevice": "/dev/vdc",
+  "lvm": false,
+  "spacePolicy": "custom",
+  "spaceActions": [
+    {
+      "device": "/dev/vdc3",
+      "action": "force_delete"
+    },
+    {
+      "device": "/dev/vdc4",
+      "action": "resize"
+    },
+    {
+      "device": "/dev/vdc1",
+      "action": "force_delete"
+    }
+  ],
+  "systemVGDevices": [],
+  "encryptionPassword": "",
+  "encryptionMethod": "luks2",
+  "volumes": [
+    {
+      "mountPath": "/",
+      "fsType": "Btrfs",
+      "minSize": 18790481920,
+      "autoSize": true,
+      "snapshots": true,
+      "transactional": false,
+      "outline": {
+        "required": true,
+        "fsTypes": [
+          "Btrfs",
+          "Ext2",
+          "Ext3",
+          "Ext4",
+          "XFS"
+        ],
+        "supportAutoSize": true,
+        "snapshotsConfigurable": true,
+        "snapshotsAffectSizes": true,
+        "sizeRelevantVolumes": [
+          "/home"
+        ]
+      }
+    },
+    {
+      "mountPath": "swap",
+      "fsType": "Swap",
+      "minSize": 1610612736,
+      "maxSize": 1610612736,
+      "autoSize": false,
+      "snapshots": false,
+      "transactional": false,
+      "outline": {
+        "required": false,
+        "fsTypes": [
+          "Swap"
+        ],
+        "supportAutoSize": false,
+        "snapshotsConfigurable": false,
+        "snapshotsAffectSizes": false,
+        "sizeRelevantVolumes": []
+      }
+    }
+  ],
+  "installationDevices": [
+    {
+      "sid": 70,
+      "name": "/dev/vdc",
+      "description": "Disk",
+      "isDrive": true,
+      "type": "disk",
+      "vendor": "",
+      "model": "Disk",
+      "driver": [
+        "virtio-pci",
+        "virtio_blk"
+      ],
+      "bus": "None",
+      "busId": "",
+      "transport": "unknown",
+      "sdCard": false,
+      "dellBOSS": false,
+      "active": true,
+      "encrypted": false,
+      "start": 0,
+      "size": 32212254720,
+      "recoverableSize": 0,
+      "systems": [],
+      "udevIds": [],
+      "udevPaths": [
+        "pci-0000:09:00.0"
+      ],
+      "partitionTable": {
+        "type": "gpt",
+        "partitions": [
+          {
+            "sid": 78,
+            "name": "/dev/vdc1",
+            "description": "Part of md0",
+            "isDrive": false,
+            "type": "partition",
+            "active": true,
+            "encrypted": false,
+            "start": 2048,
+            "size": 5368709120,
+            "recoverableSize": 0,
+            "systems": [],
+            "udevIds": [],
+            "udevPaths": [
+              "pci-0000:09:00.0-part1"
+            ],
+            "isEFI": false,
+            "component": {
+              "type": "md_device",
+              "deviceNames": [
+                "/dev/md0"
+              ]
+            }
+          },
+          {
+            "sid": 79,
+            "name": "/dev/vdc2",
+            "description": "Part of md0",
+            "isDrive": false,
+            "type": "partition",
+            "active": true,
+            "encrypted": false,
+            "start": 10487808,
+            "size": 5368709120,
+            "recoverableSize": 0,
+            "systems": [
+              "openSUSE Leap 15.2",
+              "Fedora 10.30"
+            ],
+            "udevIds": [],
+            "udevPaths": [
+              "pci-0000:09:00.0-part2"
+            ],
+            "isEFI": false,
+            "component": {
+              "type": "md_device",
+              "deviceNames": [
+                "/dev/md0"
+              ]
+            }
+          },
+          {
+            "sid": 80,
+            "name": "/dev/vdc3",
+            "description": "XFS Partition",
+            "isDrive": false,
+            "type": "partition",
+            "active": true,
+            "encrypted": false,
+            "start": 20973568,
+            "size": 1073741824,
+            "recoverableSize": 0,
+            "systems": [],
+            "udevIds": [],
+            "udevPaths": [
+              "pci-0000:09:00.0-part3"
+            ],
+            "isEFI": false,
+            "filesystem": {
+              "sid": 92,
+              "type": "xfs"
+            }
+          },
+          {
+            "sid": 81,
+            "name": "/dev/vdc4",
+            "description": "Linux",
+            "isDrive": false,
+            "type": "partition",
+            "active": true,
+            "encrypted": false,
+            "start": 23070720,
+            "size": 2147483648,
+            "recoverableSize": 2147483136,
+            "systems": [],
+            "udevIds": [],
+            "udevPaths": [
+              "pci-0000:09:00.0-part4"
+            ],
+            "isEFI": false
+          }
+        ],
+        "unpartitionedSize": 18253611008,
+        "unusedSlots": [
+          {
+            "start": 27265024,
+            "size": 18252545536
+          }
+        ]
+      }
+    }
+  ]
+};
+
+export const devices = {
+  "system": [
+    {
+      "sid": 71,
+      "name": "/dev/vda",
+      "description": "Disk",
+      "isDrive": true,
+      "type": "disk",
+      "vendor": "",
+      "model": "Disk",
+      "driver": [
+        "virtio-pci",
+        "virtio_blk"
+      ],
+      "bus": "None",
+      "busId": "",
+      "transport": "unknown",
+      "sdCard": false,
+      "dellBOSS": false,
+      "active": true,
+      "encrypted": false,
+      "start": 0,
+      "size": 53687091200,
+      "recoverableSize": 0,
+      "systems": [],
+      "udevIds": [],
+      "udevPaths": [
+        "pci-0000:04:00.0"
+      ],
+      "partitionTable": {
+        "type": "gpt",
+        "partitions": [
+          {
+            "sid": 83,
+            "name": "/dev/vda1",
+            "description": "BIOS Boot Partition",
+            "isDrive": false,
+            "type": "partition",
+            "active": true,
+            "encrypted": false,
+            "start": 2048,
+            "size": 8388608,
+            "recoverableSize": 8388096,
+            "systems": [],
+            "udevIds": [],
+            "udevPaths": [
+              "pci-0000:04:00.0-part1"
+            ],
+            "isEFI": false
+          },
+          {
+            "sid": 84,
+            "name": "/dev/vda2",
+            "description": "PV of system",
+            "isDrive": false,
+            "type": "partition",
+            "active": true,
+            "encrypted": false,
+            "start": 18432,
+            "size": 53677637120,
+            "recoverableSize": 0,
+            "systems": [],
+            "udevIds": [],
+            "udevPaths": [
+              "pci-0000:04:00.0-part2"
+            ],
+            "isEFI": false,
+            "component": {
+              "type": "physical_volume",
+              "deviceNames": [
+                "/dev/system"
+              ]
+            }
+          }
+        ],
+        "unpartitionedSize": 1065472,
+        "unusedSlots": []
+      }
+    },
+    {
+      "sid": 69,
+      "name": "/dev/vdb",
+      "description": "Ext4 Disk",
+      "isDrive": true,
+      "type": "disk",
+      "vendor": "",
+      "model": "Disk",
+      "driver": [
+        "virtio-pci",
+        "virtio_blk"
+      ],
+      "bus": "None",
+      "busId": "",
+      "transport": "unknown",
+      "sdCard": false,
+      "dellBOSS": false,
+      "active": true,
+      "encrypted": false,
+      "start": 0,
+      "size": 5368709120,
+      "recoverableSize": 0,
+      "systems": [],
+      "udevIds": [],
+      "udevPaths": [
+        "pci-0000:08:00.0"
+      ],
+      "filesystem": {
+        "sid": 87,
+        "type": "ext4"
+      }
+    },
+    {
+      "sid": 70,
+      "name": "/dev/vdc",
+      "description": "Disk",
+      "isDrive": true,
+      "type": "disk",
+      "vendor": "",
+      "model": "Disk",
+      "driver": [
+        "virtio-pci",
+        "virtio_blk"
+      ],
+      "bus": "None",
+      "busId": "",
+      "transport": "unknown",
+      "sdCard": false,
+      "dellBOSS": false,
+      "active": true,
+      "encrypted": false,
+      "start": 0,
+      "size": 32212254720,
+      "recoverableSize": 0,
+      "systems": [],
+      "udevIds": [],
+      "udevPaths": [
+        "pci-0000:09:00.0"
+      ],
+      "partitionTable": {
+        "type": "gpt",
+        "partitions": [
+          {
+            "sid": 78,
+            "name": "/dev/vdc1",
+            "description": "Part of md0",
+            "isDrive": false,
+            "type": "partition",
+            "active": true,
+            "encrypted": false,
+            "start": 2048,
+            "size": 5368709120,
+            "recoverableSize": 0,
+            "systems": [],
+            "udevIds": [],
+            "udevPaths": [
+              "pci-0000:09:00.0-part1"
+            ],
+            "isEFI": false,
+            "component": {
+              "type": "md_device",
+              "deviceNames": [
+                "/dev/md0"
+              ]
+            }
+          },
+          {
+            "sid": 79,
+            "name": "/dev/vdc2",
+            "description": "Part of md0",
+            "isDrive": false,
+            "type": "partition",
+            "active": true,
+            "encrypted": false,
+            "start": 10487808,
+            "size": 5368709120,
+            "recoverableSize": 0,
+            "systems": [
+              "openSUSE Leap 15.2",
+              "Fedora 10.30"
+            ],
+            "udevIds": [],
+            "udevPaths": [
+              "pci-0000:09:00.0-part2"
+            ],
+            "isEFI": false,
+            "component": {
+              "type": "md_device",
+              "deviceNames": [
+                "/dev/md0"
+              ]
+            }
+          },
+          {
+            "sid": 80,
+            "name": "/dev/vdc3",
+            "description": "XFS Partition",
+            "isDrive": false,
+            "type": "partition",
+            "active": true,
+            "encrypted": false,
+            "start": 20973568,
+            "size": 1073741824,
+            "recoverableSize": 0,
+            "systems": [],
+            "udevIds": [],
+            "udevPaths": [
+              "pci-0000:09:00.0-part3"
+            ],
+            "isEFI": false,
+            "filesystem": {
+              "sid": 92,
+              "type": "xfs"
+            }
+          },
+          {
+            "sid": 81,
+            "name": "/dev/vdc4",
+            "description": "Linux",
+            "isDrive": false,
+            "type": "partition",
+            "active": true,
+            "encrypted": false,
+            "start": 23070720,
+            "size": 2147483648,
+            "recoverableSize": 2147483136,
+            "systems": [],
+            "udevIds": [],
+            "udevPaths": [
+              "pci-0000:09:00.0-part4"
+            ],
+            "isEFI": false
+          }
+        ],
+        "unpartitionedSize": 18253611008,
+        "unusedSlots": [
+          {
+            "start": 27265024,
+            "size": 18252545536
+          }
+        ]
+      }
+    },
+    {
+      "sid": 72,
+      "name": "/dev/md0",
+      "description": "Disk",
+      "isDrive": false,
+      "type": "md",
+      "level": "raid0",
+      "uuid": "644aeee1:5f5b946a:4da99758:3f85b3ea",
+      "devices": [
+        {
+          "sid": 78,
+          "name": "/dev/vdc1",
+          "description": "Part of md0",
+          "isDrive": false,
+          "type": "partition",
+          "active": true,
+          "encrypted": false,
+          "start": 2048,
+          "size": 5368709120,
+          "recoverableSize": 0,
+          "systems": [],
+          "udevIds": [],
+          "udevPaths": [
+            "pci-0000:09:00.0-part1"
+          ],
+          "isEFI": false,
+          "component": {
+            "type": "md_device",
+            "deviceNames": [
+              "/dev/md0"
+            ]
+          }
+        },
+        {
+          "sid": 79,
+          "name": "/dev/vdc2",
+          "description": "Part of md0",
+          "isDrive": false,
+          "type": "partition",
+          "active": true,
+          "encrypted": false,
+          "start": 10487808,
+          "size": 5368709120,
+          "recoverableSize": 0,
+          "systems": [
+            "openSUSE Leap 15.2",
+            "Fedora 10.30"
+          ],
+          "udevIds": [],
+          "udevPaths": [
+            "pci-0000:09:00.0-part2"
+          ],
+          "isEFI": false,
+          "component": {
+            "type": "md_device",
+            "deviceNames": [
+              "/dev/md0"
+            ]
+          }
+        }
+      ],
+      "active": true,
+      "encrypted": false,
+      "start": 0,
+      "size": 10737287168,
+      "recoverableSize": 0,
+      "systems": [],
+      "udevIds": [
+        "md-uuid-644aeee1:5f5b946a:4da99758:3f85b3ea"
+      ],
+      "udevPaths": [],
+      "partitionTable": {
+        "type": "gpt",
+        "partitions": [
+          {
+            "sid": 86,
+            "name": "/dev/md0p1",
+            "description": "Ext4 Partition",
+            "isDrive": false,
+            "type": "partition",
+            "active": true,
+            "encrypted": false,
+            "start": 2048,
+            "size": 2147483648,
+            "recoverableSize": 2040147968,
+            "systems": [],
+            "udevIds": [
+              "md-uuid-644aeee1:5f5b946a:4da99758:3f85b3ea-part1"
+            ],
+            "udevPaths": [],
+            "isEFI": false,
+            "filesystem": {
+              "sid": 93,
+              "type": "ext4"
+            }
+          }
+        ],
+        "unpartitionedSize": 8589803520,
+        "unusedSlots": [
+          {
+            "start": 4196352,
+            "size": 8588738048
+          }
+        ]
+      }
+    },
+    {
+      "sid": 73,
+      "name": "/dev/system",
+      "description": "LVM",
+      "isDrive": false,
+      "type": "lvmVg",
+      "size": 53674508288,
+      "physicalVolumes": [
+        {
+          "sid": 84,
+          "name": "/dev/vda2",
+          "description": "PV of system",
+          "isDrive": false,
+          "type": "partition",
+          "active": true,
+          "encrypted": false,
+          "start": 18432,
+          "size": 53677637120,
+          "recoverableSize": 0,
+          "systems": [],
+          "udevIds": [],
+          "udevPaths": [
+            "pci-0000:04:00.0-part2"
+          ],
+          "isEFI": false,
+          "component": {
+            "type": "physical_volume",
+            "deviceNames": [
+              "/dev/system"
+            ]
+          }
+        }
+      ],
+      "logicalVolumes": [
+        {
+          "sid": 75,
+          "name": "/dev/system/root",
+          "description": "Ext4 LV",
+          "isDrive": false,
+          "type": "lvmLv",
+          "active": true,
+          "encrypted": false,
+          "start": 0,
+          "size": 51527024640,
+          "recoverableSize": 30647779328,
+          "systems": [],
+          "udevIds": [],
+          "udevPaths": [],
+          "filesystem": {
+            "sid": 88,
+            "type": "ext4",
+            "mountPath": "/"
+          }
+        },
+        {
+          "sid": 76,
+          "name": "/dev/system/swap",
+          "description": "Swap LV",
+          "isDrive": false,
+          "type": "lvmLv",
+          "active": true,
+          "encrypted": false,
+          "start": 0,
+          "size": 2147483648,
+          "recoverableSize": 2143289344,
+          "systems": [],
+          "udevIds": [],
+          "udevPaths": [],
+          "filesystem": {
+            "sid": 90,
+            "type": "swap",
+            "mountPath": "swap"
+          }
+        }
+      ]
+    },
+    {
+      "sid": 75,
+      "name": "/dev/system/root",
+      "description": "Ext4 LV",
+      "isDrive": false,
+      "type": "lvmLv",
+      "active": true,
+      "encrypted": false,
+      "start": 0,
+      "size": 51527024640,
+      "recoverableSize": 30647779328,
+      "systems": [],
+      "udevIds": [],
+      "udevPaths": [],
+      "filesystem": {
+        "sid": 88,
+        "type": "ext4",
+        "mountPath": "/"
+      }
+    },
+    {
+      "sid": 76,
+      "name": "/dev/system/swap",
+      "description": "Swap LV",
+      "isDrive": false,
+      "type": "lvmLv",
+      "active": true,
+      "encrypted": false,
+      "start": 0,
+      "size": 2147483648,
+      "recoverableSize": 2143289344,
+      "systems": [],
+      "udevIds": [],
+      "udevPaths": [],
+      "filesystem": {
+        "sid": 90,
+        "type": "swap",
+        "mountPath": "swap"
+      }
+    },
+    {
+      "sid": 83,
+      "name": "/dev/vda1",
+      "description": "BIOS Boot Partition",
+      "isDrive": false,
+      "type": "partition",
+      "active": true,
+      "encrypted": false,
+      "start": 2048,
+      "size": 8388608,
+      "recoverableSize": 8388096,
+      "systems": [],
+      "udevIds": [],
+      "udevPaths": [
+        "pci-0000:04:00.0-part1"
+      ],
+      "isEFI": false
+    },
+    {
+      "sid": 84,
+      "name": "/dev/vda2",
+      "description": "PV of system",
+      "isDrive": false,
+      "type": "partition",
+      "active": true,
+      "encrypted": false,
+      "start": 18432,
+      "size": 53677637120,
+      "recoverableSize": 0,
+      "systems": [],
+      "udevIds": [],
+      "udevPaths": [
+        "pci-0000:04:00.0-part2"
+      ],
+      "isEFI": false,
+      "component": {
+        "type": "physical_volume",
+        "deviceNames": [
+          "/dev/system"
+        ]
+      }
+    },
+    {
+      "sid": 78,
+      "name": "/dev/vdc1",
+      "description": "Part of md0",
+      "isDrive": false,
+      "type": "partition",
+      "active": true,
+      "encrypted": false,
+      "start": 2048,
+      "size": 5368709120,
+      "recoverableSize": 0,
+      "systems": [],
+      "udevIds": [],
+      "udevPaths": [
+        "pci-0000:09:00.0-part1"
+      ],
+      "isEFI": false,
+      "component": {
+        "type": "md_device",
+        "deviceNames": [
+          "/dev/md0"
+        ]
+      }
+    },
+    {
+      "sid": 79,
+      "name": "/dev/vdc2",
+      "description": "Part of md0",
+      "isDrive": false,
+      "type": "partition",
+      "active": true,
+      "encrypted": false,
+      "start": 10487808,
+      "size": 5368709120,
+      "recoverableSize": 0,
+      "systems": [
+        "openSUSE Leap 15.2",
+        "Fedora 10.30"
+      ],
+      "udevIds": [],
+      "udevPaths": [
+        "pci-0000:09:00.0-part2"
+      ],
+      "isEFI": false,
+      "component": {
+        "type": "md_device",
+        "deviceNames": [
+          "/dev/md0"
+        ]
+      }
+    },
+    {
+      "sid": 80,
+      "name": "/dev/vdc3",
+      "description": "XFS Partition",
+      "isDrive": false,
+      "type": "partition",
+      "active": true,
+      "encrypted": false,
+      "start": 20973568,
+      "size": 1073741824,
+      "recoverableSize": 0,
+      "systems": [],
+      "udevIds": [],
+      "udevPaths": [
+        "pci-0000:09:00.0-part3"
+      ],
+      "isEFI": false,
+      "filesystem": {
+        "sid": 92,
+        "type": "xfs"
+      }
+    },
+    {
+      "sid": 81,
+      "name": "/dev/vdc4",
+      "description": "Linux",
+      "isDrive": false,
+      "type": "partition",
+      "active": true,
+      "encrypted": false,
+      "start": 23070720,
+      "size": 2147483648,
+      "recoverableSize": 2147483136,
+      "systems": [],
+      "udevIds": [],
+      "udevPaths": [
+        "pci-0000:09:00.0-part4"
+      ],
+      "isEFI": false
+    },
+    {
+      "sid": 86,
+      "name": "/dev/md0p1",
+      "description": "Ext4 Partition",
+      "isDrive": false,
+      "type": "partition",
+      "active": true,
+      "encrypted": false,
+      "start": 2048,
+      "size": 2147483648,
+      "recoverableSize": 2040147968,
+      "systems": [],
+      "udevIds": [
+        "md-uuid-644aeee1:5f5b946a:4da99758:3f85b3ea-part1"
+      ],
+      "udevPaths": [],
+      "isEFI": false,
+      "filesystem": {
+        "sid": 93,
+        "type": "ext4"
+      }
+    }
+  ],
+  "staging": [
+    {
+      "sid": 71,
+      "name": "/dev/vda",
+      "description": "Disk",
+      "isDrive": true,
+      "type": "disk",
+      "vendor": "",
+      "model": "Disk",
+      "driver": [
+        "virtio-pci",
+        "virtio_blk"
+      ],
+      "bus": "None",
+      "busId": "",
+      "transport": "unknown",
+      "sdCard": false,
+      "dellBOSS": false,
+      "active": true,
+      "encrypted": false,
+      "start": 0,
+      "size": 53687091200,
+      "recoverableSize": 0,
+      "systems": [],
+      "udevIds": [],
+      "udevPaths": [
+        "pci-0000:04:00.0"
+      ],
+      "partitionTable": {
+        "type": "gpt",
+        "partitions": [
+          {
+            "sid": 83,
+            "name": "/dev/vda1",
+            "description": "BIOS Boot Partition",
+            "isDrive": false,
+            "type": "partition",
+            "active": true,
+            "encrypted": false,
+            "start": 2048,
+            "size": 8388608,
+            "recoverableSize": 8388096,
+            "systems": [],
+            "udevIds": [],
+            "udevPaths": [
+              "pci-0000:04:00.0-part1"
+            ],
+            "isEFI": false
+          },
+          {
+            "sid": 84,
+            "name": "/dev/vda2",
+            "description": "PV of system",
+            "isDrive": false,
+            "type": "partition",
+            "active": true,
+            "encrypted": false,
+            "start": 18432,
+            "size": 53677637120,
+            "recoverableSize": 0,
+            "systems": [],
+            "udevIds": [],
+            "udevPaths": [
+              "pci-0000:04:00.0-part2"
+            ],
+            "isEFI": false,
+            "component": {
+              "type": "physical_volume",
+              "deviceNames": [
+                "/dev/system"
+              ]
+            }
+          }
+        ],
+        "unpartitionedSize": 1065472,
+        "unusedSlots": []
+      }
+    },
+    {
+      "sid": 69,
+      "name": "/dev/vdb",
+      "description": "Ext4 Disk",
+      "isDrive": true,
+      "type": "disk",
+      "vendor": "",
+      "model": "Disk",
+      "driver": [
+        "virtio-pci",
+        "virtio_blk"
+      ],
+      "bus": "None",
+      "busId": "",
+      "transport": "unknown",
+      "sdCard": false,
+      "dellBOSS": false,
+      "active": true,
+      "encrypted": false,
+      "start": 0,
+      "size": 5368709120,
+      "recoverableSize": 0,
+      "systems": [],
+      "udevIds": [],
+      "udevPaths": [
+        "pci-0000:08:00.0"
+      ],
+      "filesystem": {
+        "sid": 87,
+        "type": "ext4"
+      }
+    },
+    {
+      "sid": 70,
+      "name": "/dev/vdc",
+      "description": "Disk",
+      "isDrive": true,
+      "type": "disk",
+      "vendor": "",
+      "model": "Disk",
+      "driver": [
+        "virtio-pci",
+        "virtio_blk"
+      ],
+      "bus": "None",
+      "busId": "",
+      "transport": "unknown",
+      "sdCard": false,
+      "dellBOSS": false,
+      "active": true,
+      "encrypted": false,
+      "start": 0,
+      "size": 32212254720,
+      "recoverableSize": 0,
+      "systems": [],
+      "udevIds": [],
+      "udevPaths": [
+        "pci-0000:09:00.0"
+      ],
+      "partitionTable": {
+        "type": "gpt",
+        "partitions": [
+          {
+            "sid": 79,
+            "name": "/dev/vdc2",
+            "description": "Linux RAID",
+            "isDrive": false,
+            "type": "partition",
+            "active": true,
+            "encrypted": false,
+            "start": 10487808,
+            "size": 5368709120,
+            "recoverableSize": 5368708608,
+            "systems": [
+              "openSUSE Leap 15.2",
+              "Fedora 10.30"
+            ],
+            "udevIds": [],
+            "udevPaths": [
+              "pci-0000:09:00.0-part2"
+            ],
+            "isEFI": false
+          },
+          {
+            "sid": 81,
+            "name": "/dev/vdc4",
+            "description": "Linux",
+            "isDrive": false,
+            "type": "partition",
+            "active": true,
+            "encrypted": false,
+            "start": 23070720,
+            "size": 1608515584,
+            "recoverableSize": 1608515072,
+            "systems": [],
+            "udevIds": [],
+            "udevPaths": [
+              "pci-0000:09:00.0-part4"
+            ],
+            "isEFI": false
+          },
+          {
+            "sid": 459,
+            "name": "/dev/vdc1",
+            "description": "BIOS Boot Partition",
+            "isDrive": false,
+            "type": "partition",
+            "active": true,
+            "encrypted": false,
+            "start": 2048,
+            "size": 8388608,
+            "recoverableSize": 8388096,
+            "systems": [],
+            "udevIds": [],
+            "udevPaths": [
+              "pci-0000:09:00.0-part1"
+            ],
+            "isEFI": false
+          },
+          {
+            "sid": 460,
+            "name": "/dev/vdc3",
+            "description": "Swap Partition",
+            "isDrive": false,
+            "type": "partition",
+            "active": true,
+            "encrypted": false,
+            "start": 18432,
+            "size": 1610612736,
+            "recoverableSize": 1610571776,
+            "systems": [],
+            "udevIds": [],
+            "udevPaths": [
+              "pci-0000:09:00.0-part3"
+            ],
+            "isEFI": false,
+            "filesystem": {
+              "sid": 461,
+              "type": "swap",
+              "mountPath": "swap"
+            }
+          },
+          {
+            "sid": 463,
+            "name": "/dev/vdc5",
+            "description": "Btrfs Partition",
+            "isDrive": false,
+            "type": "partition",
+            "active": true,
+            "encrypted": false,
+            "start": 26212352,
+            "size": 18791513600,
+            "recoverableSize": 18523078144,
+            "systems": [],
+            "udevIds": [],
+            "udevPaths": [
+              "pci-0000:09:00.0-part5"
+            ],
+            "isEFI": false,
+            "filesystem": {
+              "sid": 464,
+              "type": "btrfs",
+              "mountPath": "/"
+            }
+          }
+        ],
+        "unpartitionedSize": 4824515072,
+        "unusedSlots": [
+          {
+            "start": 3164160,
+            "size": 3749707776
+          },
+          {
+            "start": 20973568,
+            "size": 1073741824
+          }
+        ]
+      }
+    },
+    {
+      "sid": 73,
+      "name": "/dev/system",
+      "description": "LVM",
+      "isDrive": false,
+      "type": "lvmVg",
+      "size": 53674508288,
+      "physicalVolumes": [
+        {
+          "sid": 84,
+          "name": "/dev/vda2",
+          "description": "PV of system",
+          "isDrive": false,
+          "type": "partition",
+          "active": true,
+          "encrypted": false,
+          "start": 18432,
+          "size": 53677637120,
+          "recoverableSize": 0,
+          "systems": [],
+          "udevIds": [],
+          "udevPaths": [
+            "pci-0000:04:00.0-part2"
+          ],
+          "isEFI": false,
+          "component": {
+            "type": "physical_volume",
+            "deviceNames": [
+              "/dev/system"
+            ]
+          }
+        }
+      ],
+      "logicalVolumes": [
+        {
+          "sid": 75,
+          "name": "/dev/system/root",
+          "description": "Ext4 LV",
+          "isDrive": false,
+          "type": "lvmLv",
+          "active": true,
+          "encrypted": false,
+          "start": 0,
+          "size": 51527024640,
+          "recoverableSize": 30647779328,
+          "systems": [],
+          "udevIds": [],
+          "udevPaths": [],
+          "filesystem": {
+            "sid": 88,
+            "type": "ext4",
+            "mountPath": "/"
+          }
+        },
+        {
+          "sid": 76,
+          "name": "/dev/system/swap",
+          "description": "Swap LV",
+          "isDrive": false,
+          "type": "lvmLv",
+          "active": true,
+          "encrypted": false,
+          "start": 0,
+          "size": 2147483648,
+          "recoverableSize": 2143289344,
+          "systems": [],
+          "udevIds": [],
+          "udevPaths": [],
+          "filesystem": {
+            "sid": 90,
+            "type": "swap",
+            "mountPath": "swap"
+          }
+        }
+      ]
+    },
+    {
+      "sid": 75,
+      "name": "/dev/system/root",
+      "description": "Ext4 LV",
+      "isDrive": false,
+      "type": "lvmLv",
+      "active": true,
+      "encrypted": false,
+      "start": 0,
+      "size": 51527024640,
+      "recoverableSize": 30647779328,
+      "systems": [],
+      "udevIds": [],
+      "udevPaths": [],
+      "filesystem": {
+        "sid": 88,
+        "type": "ext4",
+        "mountPath": "/"
+      }
+    },
+    {
+      "sid": 76,
+      "name": "/dev/system/swap",
+      "description": "Swap LV",
+      "isDrive": false,
+      "type": "lvmLv",
+      "active": true,
+      "encrypted": false,
+      "start": 0,
+      "size": 2147483648,
+      "recoverableSize": 2143289344,
+      "systems": [],
+      "udevIds": [],
+      "udevPaths": [],
+      "filesystem": {
+        "sid": 90,
+        "type": "swap",
+        "mountPath": "swap"
+      }
+    },
+    {
+      "sid": 83,
+      "name": "/dev/vda1",
+      "description": "BIOS Boot Partition",
+      "isDrive": false,
+      "type": "partition",
+      "active": true,
+      "encrypted": false,
+      "start": 2048,
+      "size": 8388608,
+      "recoverableSize": 8388096,
+      "systems": [],
+      "udevIds": [],
+      "udevPaths": [
+        "pci-0000:04:00.0-part1"
+      ],
+      "isEFI": false
+    },
+    {
+      "sid": 84,
+      "name": "/dev/vda2",
+      "description": "PV of system",
+      "isDrive": false,
+      "type": "partition",
+      "active": true,
+      "encrypted": false,
+      "start": 18432,
+      "size": 53677637120,
+      "recoverableSize": 0,
+      "systems": [],
+      "udevIds": [],
+      "udevPaths": [
+        "pci-0000:04:00.0-part2"
+      ],
+      "isEFI": false,
+      "component": {
+        "type": "physical_volume",
+        "deviceNames": [
+          "/dev/system"
+        ]
+      }
+    },
+    {
+      "sid": 79,
+      "name": "/dev/vdc2",
+      "description": "Linux RAID",
+      "isDrive": false,
+      "type": "partition",
+      "active": true,
+      "encrypted": false,
+      "start": 10487808,
+      "size": 5368709120,
+      "recoverableSize": 5368708608,
+      "systems": [
+        "openSUSE Leap 15.2",
+        "Fedora 10.30"
+      ],
+      "udevIds": [],
+      "udevPaths": [
+        "pci-0000:09:00.0-part2"
+      ],
+      "isEFI": false
+    },
+    {
+      "sid": 81,
+      "name": "/dev/vdc4",
+      "description": "Linux",
+      "isDrive": false,
+      "type": "partition",
+      "active": true,
+      "encrypted": false,
+      "start": 23070720,
+      "size": 1608515584,
+      "recoverableSize": 1608515072,
+      "systems": [],
+      "udevIds": [],
+      "udevPaths": [
+        "pci-0000:09:00.0-part4"
+      ],
+      "isEFI": false
+    },
+    {
+      "sid": 459,
+      "name": "/dev/vdc1",
+      "description": "BIOS Boot Partition",
+      "isDrive": false,
+      "type": "partition",
+      "active": true,
+      "encrypted": false,
+      "start": 2048,
+      "size": 8388608,
+      "recoverableSize": 8388096,
+      "systems": [],
+      "udevIds": [],
+      "udevPaths": [
+        "pci-0000:09:00.0-part1"
+      ],
+      "isEFI": false
+    },
+    {
+      "sid": 460,
+      "name": "/dev/vdc3",
+      "description": "Swap Partition",
+      "isDrive": false,
+      "type": "partition",
+      "active": true,
+      "encrypted": false,
+      "start": 18432,
+      "size": 1610612736,
+      "recoverableSize": 1610571776,
+      "systems": [],
+      "udevIds": [],
+      "udevPaths": [
+        "pci-0000:09:00.0-part3"
+      ],
+      "isEFI": false,
+      "filesystem": {
+        "sid": 461,
+        "type": "swap",
+        "mountPath": "swap"
+      }
+    },
+    {
+      "sid": 463,
+      "name": "/dev/vdc5",
+      "description": "Btrfs Partition",
+      "isDrive": false,
+      "type": "partition",
+      "active": true,
+      "encrypted": false,
+      "start": 26212352,
+      "size": 18791513600,
+      "recoverableSize": 18523078144,
+      "systems": [],
+      "udevIds": [],
+      "udevPaths": [
+        "pci-0000:09:00.0-part5"
+      ],
+      "isEFI": false,
+      "filesystem": {
+        "sid": 464,
+        "type": "btrfs",
+        "mountPath": "/"
+      }
+    }
+  ]
+};
+
+export const actions = [
+  {
+    "device": 86,
+    "text": "Delete partition /dev/md0p1 (2.00 GiB)",
+    "subvol": false,
+    "delete": true
+  },
+  {
+    "device": 72,
+    "text": "Delete RAID0 /dev/md0 (10.00 GiB)",
+    "subvol": false,
+    "delete": true
+  },
+  {
+    "device": 80,
+    "text": "Delete partition /dev/vdc3 (1.00 GiB)",
+    "subvol": false,
+    "delete": true
+  },
+  {
+    "device": 78,
+    "text": "Delete partition /dev/vdc1 (5.00 GiB)",
+    "subvol": false,
+    "delete": true
+  },
+  {
+    "device": 81,
+    "text": "Shrink partition /dev/vdc4 from 2.00 GiB to 1.50 GiB",
+    "subvol": false,
+    "delete": false
+  },
+  {
+    "device": 459,
+    "text": "Create partition /dev/vdc1 (8.00 MiB) as BIOS Boot Partition",
+    "subvol": false,
+    "delete": false
+  },
+  {
+    "device": 460,
+    "text": "Create partition /dev/vdc3 (1.50 GiB) for swap",
+    "subvol": false,
+    "delete": false
+  },
+  {
+    "device": 463,
+    "text": "Create partition /dev/vdc5 (17.50 GiB) for / with btrfs",
+    "subvol": false,
+    "delete": false
+  },
+  {
+    "device": 467,
+    "text": "Create subvolume @ on /dev/vdc5 (17.50 GiB)",
+    "subvol": true,
+    "delete": false
+  },
+  {
+    "device": 482,
+    "text": "Create subvolume @/boot/grub2/x86_64-efi on /dev/vdc5 (17.50 GiB)",
+    "subvol": true,
+    "delete": false
+  },
+  {
+    "device": 480,
+    "text": "Create subvolume @/boot/grub2/i386-pc on /dev/vdc5 (17.50 GiB)",
+    "subvol": true,
+    "delete": false
+  },
+  {
+    "device": 478,
+    "text": "Create subvolume @/var on /dev/vdc5 (17.50 GiB)",
+    "subvol": true,
+    "delete": false
+  },
+  {
+    "device": 476,
+    "text": "Create subvolume @/usr/local on /dev/vdc5 (17.50 GiB)",
+    "subvol": true,
+    "delete": false
+  },
+  {
+    "device": 474,
+    "text": "Create subvolume @/srv on /dev/vdc5 (17.50 GiB)",
+    "subvol": true,
+    "delete": false
+  },
+  {
+    "device": 472,
+    "text": "Create subvolume @/root on /dev/vdc5 (17.50 GiB)",
+    "subvol": true,
+    "delete": false
+  },
+  {
+    "device": 470,
+    "text": "Create subvolume @/opt on /dev/vdc5 (17.50 GiB)",
+    "subvol": true,
+    "delete": false
+  },
+  {
+    "device": 468,
+    "text": "Create subvolume @/home on /dev/vdc5 (17.50 GiB)",
+    "subvol": true,
+    "delete": false
+  }
+];
diff --git a/web/src/components/storage/utils.js b/web/src/components/storage/utils.js
index 082756b08..7817acd4e 100644
--- a/web/src/components/storage/utils.js
+++ b/web/src/components/storage/utils.js
@@ -19,6 +19,7 @@
  * find current contact information at www.suse.com.
  */
 
+// @ts-check
 // cspell:ignore xbytes
 
 import xbytes from "xbytes";
@@ -27,7 +28,8 @@ import { N_ } from "~/i18n";
 
 /**
  * @typedef {import ("~/client/storage").Volume} Volume
- * @typedef {import ("~/clients/storage").StorageDevice} StorageDevice
+ * @typedef {import ("~/client/storage").StorageDevice} StorageDevice
+ * @typedef {import ("~/client/storage").PartitionSlot} PartitionSlot
  */
 
 /**
@@ -121,7 +123,7 @@ const deviceSize = (size) => {
 const parseToBytes = (size) => {
   if (!size || size === undefined || size === "") return 0;
 
-  const value = xbytes.parseSize(size, { iec: true }) || parseInt(size);
+  const value = xbytes.parseSize(size.toString(), { iec: true }) || parseInt(size.toString());
 
   // Avoid decimals resulting from the conversion. D-Bus iface only accepts integer
   return Math.trunc(value);
@@ -140,6 +142,33 @@ const deviceLabel = (device) => {
   return size ? `${name}, ${deviceSize(size)}` : name;
 };
 
+/**
+ * Sorted list of children devices (i.e., partitions and unused slots or logical volumes).
+ * @function
+ *
+ * @note This method could be directly provided by the device object. For now, the method is kept
+ * here because the elements considered as children (e.g., partitions + unused slots) is not a
+ * semantic storage concept but a helper for UI components.
+ *
+ * @param {StorageDevice} device
+ * @returns {(StorageDevice|PartitionSlot)[]}
+ */
+const deviceChildren = (device) => {
+  const partitionTableChildren = (partitionTable) => {
+    const { partitions, unusedSlots } = partitionTable;
+    const children = partitions.concat(unusedSlots);
+    return children.sort((a, b) => a.start < b.start ? -1 : 1);
+  };
+
+  const lvmVgChildren = (lvmVg) => {
+    return lvmVg.logicalVolumes.sort((a, b) => a.name < b.name ? -1 : 1);
+  };
+
+  if (device.partitionTable) return partitionTableChildren(device.partitionTable);
+  if (device.type === "lvmVg") return lvmVgChildren(device);
+  return [];
+};
+
 /**
  * Checks if volume uses given fs. This method works same as in backend
  * case insensitive.
@@ -193,6 +222,7 @@ export {
   SIZE_METHODS,
   SIZE_UNITS,
   deviceLabel,
+  deviceChildren,
   deviceSize,
   parseToBytes,
   splitSize,
diff --git a/web/src/components/storage/utils.test.js b/web/src/components/storage/utils.test.js
index e5eb3cf0a..c144b123a 100644
--- a/web/src/components/storage/utils.test.js
+++ b/web/src/components/storage/utils.test.js
@@ -22,6 +22,7 @@
 import {
   deviceSize,
   deviceLabel,
+  deviceChildren,
   parseToBytes,
   splitSize,
   hasFS,
@@ -49,6 +50,66 @@ describe("deviceLabel", () => {
   });
 });
 
+describe("deviceChildren", () => {
+  let device;
+
+  describe("if the device has partition table", () => {
+    beforeEach(() => {
+      device = {
+        sid: 60,
+        partitionTable: {
+          partitions: [
+            { sid: 61 },
+            { sid: 62 },
+          ],
+          unusedSlots: [
+            { start: 1, size: 1024 },
+            { start: 2345, size: 512 }
+          ]
+        }
+      };
+    });
+
+    it("returns the partitions and unused slots", () => {
+      const children = deviceChildren(device);
+      expect(children.length).toEqual(4);
+      device.partitionTable.partitions.forEach(p => expect(children).toContainEqual(p));
+      device.partitionTable.unusedSlots.forEach(s => expect(children).toContainEqual(s));
+    });
+  });
+
+  describe("if the device is a LVM volume group", () => {
+    beforeEach(() => {
+      device = {
+        sid: 60,
+        type: "lvmVg",
+        logicalVolumes: [
+          { sid: 61 },
+          { sid: 62 },
+          { sid: 63 }
+        ]
+      };
+    });
+
+    it("returns the logical volumes", () => {
+      const children = deviceChildren(device);
+      expect(children.length).toEqual(3);
+      device.logicalVolumes.forEach(l => expect(children).toContainEqual(l));
+    });
+  });
+
+  describe("if the device has neither partition table nor logical volumes", () => {
+    beforeEach(() => {
+      device = { sid: 60 };
+    });
+
+    it("returns an empty list", () => {
+      const children = deviceChildren(device);
+      expect(children.length).toEqual(0);
+    });
+  });
+});
+
 describe("parseToBytes", () => {
   it("returns bytes from given input", () => {
     expect(parseToBytes(1024)).toEqual(1024);
diff --git a/web/src/context/installerL10n.jsx b/web/src/context/installerL10n.jsx
index 9db8512c8..057e34d97 100644
--- a/web/src/context/installerL10n.jsx
+++ b/web/src/context/installerL10n.jsx
@@ -26,6 +26,8 @@ import React, { useCallback, useEffect, useState } from "react";
 import { useCancellablePromise, locationReload, setLocationSearch } from "~/utils";
 import cockpit from "../lib/cockpit";
 import { useInstallerClient } from "./installer";
+import agama from "~/agama";
+import supportedLanguages from "~/languages.json";
 
 const L10nContext = React.createContext(null);
 
@@ -49,37 +51,43 @@ function useInstallerL10n() {
 }
 
 /**
- * Current language according to Cockpit (in xx_XX format).
+ * Current language (in xx_XX format).
  *
- * It takes the language from the CockpitLang cookie.
+ * It takes the language from the agamaLang cookie.
  *
  * @return {string|undefined} Undefined if language is not set.
  */
-function cockpitLanguage() {
+function agamaLanguage() {
   // language from cookie, empty string if not set (regexp taken from Cockpit)
   // https://github.com/cockpit-project/cockpit/blob/98a2e093c42ea8cd2431cf15c7ca0e44bb4ce3f1/pkg/shell/shell-modals.jsx#L91
-  const languageString = decodeURIComponent(document.cookie.replace(/(?:(?:^|.*;\s*)CockpitLang\s*=\s*([^;]*).*$)|^.*$/, "$1"));
+  const languageString = decodeURIComponent(document.cookie.replace(/(?:(?:^|.*;\s*)agamaLang\s*=\s*([^;]*).*$)|^.*$/, "$1"));
   if (languageString) {
     return languageString.toLowerCase();
   }
 }
 
 /**
- * Helper function for storing the Cockpit language.
+ * Helper function for storing the Agama language.
  *
- * Automatically converts the language from xx_XX to xx-xx, as it is the one used by Cockpit.
+ * Automatically converts the language from xx_XX to xx-xx, as it is the one used by Agama.
  *
  * @param {string} language - The new locale (e.g., "cs", "cs_CZ").
  * @return {boolean} True if the locale was changed.
  */
-function storeCockpitLanguage(language) {
-  const current = cockpitLanguage();
+function storeAgamaLanguage(language) {
+  const current = agamaLanguage();
   if (current === language) return false;
 
   // Code taken from Cockpit.
-  const cookie = "CockpitLang=" + encodeURIComponent(language) + "; path=/; expires=Sun, 16 Jul 3567 06:23:41 GMT";
+  const cookie = "agamaLang=" + encodeURIComponent(language) + "; path=/; expires=Sun, 16 Jul 3567 06:23:41 GMT";
   document.cookie = cookie;
+
+  // for backward compatibility, CockpitLang cookie is needed to load correct po.js content from Cockpit
+  // TODO: remove after dropping Cockpit completely
+  const cockpit_cookie = "CockpitLang=" + encodeURIComponent(language) + "; path=/; expires=Sun, 16 Jul 3567 06:23:41 GMT";
+  document.cookie = cockpit_cookie;
   window.localStorage.setItem("cockpit.lang", language);
+
   return true;
 }
 
@@ -147,7 +155,7 @@ function navigatorLanguages() {
  * @return {string|undefined} Undefined if none of the given languages is supported.
  */
 function findSupportedLanguage(languages) {
-  const supported = Object.keys(cockpit.manifests.agama?.locales || {});
+  const supported = Object.keys(supportedLanguages);
 
   for (const candidate of languages) {
     const [language, country] = candidate.split("-");
@@ -227,16 +235,16 @@ function InstallerL10nProvider({ children }) {
     const wanted = lang || languageFromQuery();
 
     if (wanted === "xx" || wanted === "xx-xx") {
-      cockpit.language = wanted;
+      agama.language = wanted;
       setLanguage(wanted);
       return;
     }
 
-    const current = cockpitLanguage();
+    const current = agamaLanguage();
     const candidateLanguages = [wanted, current].concat(navigatorLanguages()).filter(l => l);
     const newLanguage = findSupportedLanguage(candidateLanguages) || "en-us";
 
-    let mustReload = storeCockpitLanguage(newLanguage);
+    let mustReload = storeAgamaLanguage(newLanguage);
     mustReload = await storeInstallerLanguage(newLanguage) || mustReload;
 
     if (mustReload) {
diff --git a/web/src/context/installerL10n.test.jsx b/web/src/context/installerL10n.test.jsx
index 4327927a9..3361c84b5 100644
--- a/web/src/context/installerL10n.test.jsx
+++ b/web/src/context/installerL10n.test.jsx
@@ -40,23 +40,19 @@ const client = {
   onDisconnect: jest.fn()
 };
 
+jest.mock("~/languages.json", () => ({
+  "es-ar": "Español (Argentina)",
+  "cs-cz": "čeština",
+  "en-us": "English (US)",
+  "es-es": "Español"
+}));
+
 jest.mock("~/lib/cockpit", () => ({
-  gettext: term => term,
-  manifests: {
-    agama: {
-      locales: {
-        "es-ar": "Español (Argentina)",
-        "cs-cz": "čeština",
-        "en-us": "English (US)",
-        "es-es": "Español"
-      }
-    }
-  },
   spawn: jest.fn().mockResolvedValue()
 }));
 
 // Helper component that displays a translated message depending on the
-// CockpitLang value.
+// agamaLang value.
 const TranslatedContent = () => {
   const text = {
     "cs-cz": "ahoj",
@@ -65,7 +61,7 @@ const TranslatedContent = () => {
     "es-ar": "hola!",
   };
 
-  const regexp = /CockpitLang=([^;]+)/;
+  const regexp = /agamaLang=([^;]+)/;
   const found = document.cookie.match(regexp);
   if (!found) return <>{text["en-us"]}</>;
 
@@ -85,7 +81,7 @@ describe("InstallerL10nProvider", () => {
   // remove the Cockpit language cookie after each test
   afterEach(() => {
     // setting a cookie with already expired date removes it
-    document.cookie = "CockpitLang=; path=/; expires=" + new Date(0).toUTCString();
+    document.cookie = "agamaLang=; path=/; expires=" + new Date(0).toUTCString();
   });
 
   describe("when no URL query parameter is set", () => {
@@ -95,7 +91,7 @@ describe("InstallerL10nProvider", () => {
 
     describe("when the Cockpit language is already set", () => {
       beforeEach(() => {
-        document.cookie = "CockpitLang=en-us; path=/;";
+        document.cookie = "agamaLang=en-us; path=/;";
         getUILocaleFn.mockResolvedValueOnce("en_US.UTF-8");
       });
 
@@ -115,7 +111,7 @@ describe("InstallerL10nProvider", () => {
 
     describe("when the Cockpit language is set to an unsupported language", () => {
       beforeEach(() => {
-        document.cookie = "CockpitLang=de-de; path=/;";
+        document.cookie = "agamaLang=de-de; path=/;";
         getUILocaleFn.mockResolvedValueOnce("de_DE.UTF-8");
         getUILocaleFn.mockResolvedValueOnce("es_ES.UTF-8");
       });
@@ -200,7 +196,7 @@ describe("InstallerL10nProvider", () => {
 
     describe("when the Cockpit language is already set to 'cs-cz'", () => {
       beforeEach(() => {
-        document.cookie = "CockpitLang=cs-cz; path=/;";
+        document.cookie = "agamaLang=cs-cz; path=/;";
         getUILocaleFn.mockResolvedValueOnce("cs_CZ.UTF-8");
       });
 
@@ -215,7 +211,7 @@ describe("InstallerL10nProvider", () => {
         await screen.findByText("ahoj");
         expect(setUILocaleFn).not.toHaveBeenCalled();
 
-        expect(document.cookie).toEqual("CockpitLang=cs-cz");
+        expect(document.cookie).toMatch(/agamaLang=cs-cz/);
         expect(utils.locationReload).not.toHaveBeenCalled();
         expect(utils.setLocationSearch).not.toHaveBeenCalled();
       });
@@ -223,7 +219,7 @@ describe("InstallerL10nProvider", () => {
 
     describe("when the Cockpit language is set to 'en-us'", () => {
       beforeEach(() => {
-        document.cookie = "CockpitLang=en-us; path=/;";
+        document.cookie = "agamaLang=en-us; path=/;";
         getUILocaleFn.mockResolvedValueOnce("en_US");
         getUILocaleFn.mockResolvedValueOnce("cs_CZ");
         setUILocaleFn.mockResolvedValue();
diff --git a/web/src/i18n.js b/web/src/i18n.js
index 2850a2927..ac78dd7f5 100644
--- a/web/src/i18n.js
+++ b/web/src/i18n.js
@@ -20,19 +20,19 @@
  */
 
 /**
- * This is a wrapper module for i18n functions. Currently it uses the cockpit
- * implementation but the wrapper allows easy transition to another backend if
- * needed.
+ * This is a wrapper module for i18n functions. Currently it uses the
+ * implementation similar to cockpit but the wrapper allows easy transition to
+ * another backend if needed.
  */
 
-import cockpit from "./lib/cockpit";
+import agama from "~/agama";
 
 /**
  * Tests whether a special testing language is used.
  *
  * @returns {boolean} true if the testing language is set
  */
-const isTestingLanguage = () => cockpit.language === "xx";
+const isTestingLanguage = () => agama.language === "xx";
 
 /**
  * "Translate" the string to special "xx" testing language.
@@ -72,7 +72,7 @@ const xTranslate = (str) => {
  * @param {string} str the input string to translate
  * @return {string} translated or original text
  */
-const _ = (str) => isTestingLanguage() ? xTranslate(str) : cockpit.gettext(str);
+const _ = (str) => isTestingLanguage() ? xTranslate(str) : agama.gettext(str);
 
 /**
  * Similar to the _() function. This variant returns singular or plural form
@@ -88,7 +88,7 @@ const _ = (str) => isTestingLanguage() ? xTranslate(str) : cockpit.gettext(str);
 const n_ = (str1, strN, n) => {
   return isTestingLanguage()
     ? xTranslate((n === 1) ? str1 : strN)
-    : cockpit.ngettext(str1, strN, n);
+    : agama.ngettext(str1, strN, n);
 };
 
 /**
diff --git a/web/src/i18n.test.js b/web/src/i18n.test.js
index 6cf351315..60f7db390 100644
--- a/web/src/i18n.test.js
+++ b/web/src/i18n.test.js
@@ -20,14 +20,14 @@
  */
 
 import { _, n_, N_, Nn_ } from "~/i18n";
-import cockpit from "./lib/cockpit";
+import agama from "~/agama";
 
 // mock the cockpit gettext functions
-jest.mock("./lib/cockpit");
+jest.mock("~/agama");
 const gettextFn = jest.fn();
-cockpit.gettext.mockImplementation(gettextFn);
+agama.gettext.mockImplementation(gettextFn);
 const ngettextFn = jest.fn();
-cockpit.ngettext.mockImplementation(ngettextFn);
+agama.ngettext.mockImplementation(ngettextFn);
 
 // some testing texts
 const text = "text to translate";
@@ -36,7 +36,7 @@ const pluralText = "plural text to translate";
 
 describe("i18n", () => {
   describe("_", () => {
-    it("calls the cockpit.gettext() implementation", () => {
+    it("calls the agama.gettext() implementation", () => {
       _(text);
 
       expect(gettextFn).toHaveBeenCalledWith(text);
@@ -44,7 +44,7 @@ describe("i18n", () => {
   });
 
   describe("n_", () => {
-    it("calls the cockpit.ngettext() implementation", () => {
+    it("calls the agama.ngettext() implementation", () => {
       n_(singularText, pluralText, 1);
 
       expect(ngettextFn).toHaveBeenCalledWith(singularText, pluralText, 1);
diff --git a/web/src/languages.json b/web/src/languages.json
new file mode 100644
index 000000000..ead0f2a4a
--- /dev/null
+++ b/web/src/languages.json
@@ -0,0 +1,12 @@
+{
+    "ca-es": "Català",
+    "de-de": "Deutsch",
+    "en-us": "English",
+    "es-es": "Español",
+    "fr-fr": "Français",
+    "id-id": "Indonesia",
+    "ja-jp": "日本語",
+    "nl-nl": "Nederlands",
+    "sv-se": "Svenska",
+    "zh-Hans": "中文"
+}
\ No newline at end of file
diff --git a/web/src/lib/webpack-manifests-handler.js b/web/src/lib/webpack-manifests-handler.js
deleted file mode 100644
index 49be997c2..000000000
--- a/web/src/lib/webpack-manifests-handler.js
+++ /dev/null
@@ -1,48 +0,0 @@
-const fs = require("fs");
-const path = require("path");
-
-const manifestFile = path.join(__dirname, "..", "manifest.json");
-
-// this function is injected as a string into the resulting JS file
-const updateAgamaManifest = (data) => {
-  if (typeof cockpit === "object" && cockpit.manifests) {
-    cockpit.manifests.agama = data;
-  }
-};
-
-// This function processes the webpack HTTP proxy request for manifests.js file.
-//
-// Patching the original JS code is difficult so rather inject code
-// which rewrites the Agama manifest data with new content.
-//
-// @see https://github.com/http-party/node-http-proxy#modify-response
-//
-// @param proxyRes HTTP proxy resource
-// @param req HTTP request
-// @param res HTTP response
-module.exports = function (proxyRes, req, res) {
-  // collect parts of the original response
-  const body = [];
-
-  proxyRes.on("data", function (chunk) {
-    body.push(chunk);
-  });
-
-  proxyRes.on("end", function () {
-    // forward the original status code
-    res.statusCode = proxyRes.statusCode;
-
-    // patch the response only on success otherwise there
-    // might be some unexpected content (HTML error page)
-    if (proxyRes.statusCode === 200 && fs.existsSync(manifestFile)) {
-      const manifest = fs.readFileSync(manifestFile);
-      // use an immediately-invoked function expression to inject the new
-      // manifest content
-      res.end(Buffer.concat(body).toString() + "((" +
-        updateAgamaManifest.toString() + ")(" + manifest + "));");
-    } else {
-      // otherwise just return the original content
-      res.end(Buffer.concat(body).toString());
-    }
-  });
-};
diff --git a/web/src/lib/webpack-po-handler.js b/web/src/lib/webpack-po-handler.js
new file mode 100644
index 000000000..9d9a51a38
--- /dev/null
+++ b/web/src/lib/webpack-po-handler.js
@@ -0,0 +1,33 @@
+const fs = require("fs");
+const path = require("path");
+
+// Cockpit internally returns the "po.<LANG>.js" file content for the
+// "po.js" request, reimplement it with a simple redirection (the JS file
+// only exists in the webpack memory, we cannot read it from disk)
+//
+// This function processes the webpack HTTP request.
+//
+// @param req HTTP request
+// @param res HTTP response
+module.exports = function (req, res) {
+  // the regexp was taken from the original Cockpit code :-)
+  const language = req.headers.cookie.replace(/(?:(?:^|.*;\s*)agamaLang\s*=\s*([^;]*).*$)|^.*$/, "$1") || "";
+  // the cookie uses "pt-br" format while the PO file is "pt_BR" :-/
+  let [lang, country] = language.split("-");
+  country = country?.toUpperCase();
+
+  // first check the full locale ("pt_BR") PO file
+  if (fs.existsSync(path.join(__dirname, "..", "..", "po", `${lang}_${country}.po`))) {
+    res.redirect(`/po.${lang}_${country}.js`);
+  } else {
+    // then check the language part only ("pt") PO file
+    if (fs.existsSync(path.join(__dirname, "..", "..", "po", `${lang}.po`))) {
+      res.redirect(`/po.${lang}.js`);
+    } else {
+      if (lang !== "en") console.log(`translation "${language}" not found`);
+      // Cockpit returns an empty script if the translation file is missing
+      res.set("Content-Type", "application/javascript");
+      res.send("");
+    }
+  }
+};
diff --git a/web/src/manifest.json b/web/src/manifest.json
index 8450b73d9..2e2bd4cff 100644
--- a/web/src/manifest.json
+++ b/web/src/manifest.json
@@ -7,13 +7,5 @@
         "index": {
             "label": "Agama"
         }
-    },
-    "locales": {
-        "en-us": "English",
-        "id-id": "Indonesia",
-        "fr-fr": "Français",
-        "ja-jp": "日本語",
-        "es-es": "Español",
-        "sv-se": "Svenska"
     }
-}
\ No newline at end of file
+}
diff --git a/web/src/utils.js b/web/src/utils.js
index 5197d8ee1..6d715a1b9 100644
--- a/web/src/utils.js
+++ b/web/src/utils.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2022-2023] SUSE LLC
+ * Copyright (c) [2022-2024] SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -66,6 +66,28 @@ const partition = (collection, filter) => {
   return [pass, fail];
 };
 
+/**
+ * Generates a new array without null and undefined values.
+ * @function
+ *
+ * @param {Array} collection
+ * @returns {Array}
+ */
+function compact(collection) {
+  return collection.filter(e => e !== null && e !== undefined);
+}
+
+/**
+ * Generates a new array without duplicates.
+ * @function
+ *
+ * @param {Array} collection
+ * @returns {Array}
+ */
+function uniq(collection) {
+  return [...new Set(collection)];
+}
+
 /**
  * Simple utility function to help building className conditionally
  *
@@ -353,6 +375,8 @@ export {
   noop,
   isObject,
   partition,
+  compact,
+  uniq,
   classNames,
   useCancellablePromise,
   useLocalStorage,
diff --git a/web/src/utils.test.js b/web/src/utils.test.js
index 8be48355c..5d340828f 100644
--- a/web/src/utils.test.js
+++ b/web/src/utils.test.js
@@ -20,7 +20,7 @@
  */
 
 import {
-  classNames, partition, noop, toValidationError,
+  classNames, partition, compact, uniq, noop, toValidationError,
   localConnection, remoteConnection, isObject
 } from "./utils";
 
@@ -41,6 +41,22 @@ describe("partition", () => {
   });
 });
 
+describe("compact", () => {
+  it("removes null and undefined values", () => {
+    expect(compact([])).toEqual([]);
+    expect(compact([undefined, null, "", 0, 1, NaN, false, true]))
+      .toEqual(["", 0, 1, NaN, false, true]);
+  });
+});
+
+describe("uniq", () => {
+  it("removes duplicated values", () => {
+    expect(uniq([])).toEqual([]);
+    expect(uniq([undefined, null, null, 0, 1, NaN, false, true, false, "test"]))
+      .toEqual([undefined, null, 0, 1, NaN, false, true, "test"]);
+  });
+});
+
 describe("classNames", () => {
   it("join given arguments, ignoring falsy values", () => {
     expect(classNames(
diff --git a/web/tsconfig.json b/web/tsconfig.json
index 3a117e098..bde7ef8c0 100644
--- a/web/tsconfig.json
+++ b/web/tsconfig.json
@@ -5,6 +5,7 @@
     "noEmit": true,
     "target": "esnext",
     "moduleResolution": "node",
+    "resolveJsonModule": true,
     "allowJs": true,
     "jsx": "react",
     "allowSyntheticDefaultImports": true,
diff --git a/web/webpack.config.js b/web/webpack.config.js
index 0a6864ee8..82db9f3bb 100644
--- a/web/webpack.config.js
+++ b/web/webpack.config.js
@@ -12,7 +12,7 @@ const StylelintPlugin = require('stylelint-webpack-plugin');
 const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
 const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
 const webpack = require('webpack');
-const manifests_handler = require("./src/lib/webpack-manifests-handler");
+const po_handler = require("./src/lib/webpack-po-handler");
 
 /* A standard nodejs and webpack pattern */
 const production = process.env.NODE_ENV === 'production';
@@ -44,6 +44,9 @@ const copy_files = [
 const plugins = [
   new Copy({ patterns: copy_files }),
   new Extract({ filename: "[name].css" }),
+  // the wrapper sets the main code called in the po.js files,
+  // the PO_DATA tag is replaced by the real translation data
+  new CockpitPoPlugin({ wrapper: "agama.locale(PO_DATA);" }),
   development && new ReactRefreshWebpackPlugin({ overlay: false }),
   // replace the "process.env.WEBPACK_SERVE" text in the source code by
   // the current value of the environment variable, that variable is set to
@@ -118,6 +121,12 @@ module.exports = {
     // hot replacement does not support wss:// transport when running over https://,
     // as a workaround use sockjs (which uses standard https:// protocol)
     webSocketServer: "sockjs",
+
+    // special handling for the "po.js" requests specially
+    setupMiddlewares: (middlewares, devServer) => {
+      devServer.app.get("/po.js", po_handler);
+      return middlewares;
+    }
   },
   devtool: "source-map",
   stats: "errors-warnings",