diff --git a/web/src/components/storage/InstallationDeviceField.jsx b/web/src/components/storage/InstallationDeviceField.jsx
index d17ef1c67f..2fbfbb8bcb 100644
--- a/web/src/components/storage/InstallationDeviceField.jsx
+++ b/web/src/components/storage/InstallationDeviceField.jsx
@@ -23,11 +23,14 @@
import React from "react";
import { Link } from "react-router-dom";
-import { Skeleton } from "@patternfly/react-core";
+import {
+ Card, CardHeader, CardTitle, CardBody, CardFooter, Skeleton
+} from "@patternfly/react-core";
import { ButtonLink, CardField } from "~/components/core";
import { _ } from "~/i18n";
import { deviceLabel } from '~/components/storage/utils';
import { sprintf } from "sprintf-js";
+import textStyles from '@patternfly/react-styles/css/utilities/Text/text';
/**
* @typedef {import ("~/client/storage").ProposalTarget} ProposalTarget
@@ -48,13 +51,16 @@ const DESCRIPTION = _("Main disk or LVM Volume Group for installation.");
* @returns {string}
*/
const targetValue = (target, targetDevice, targetPVDevices) => {
- if (target === "DISK" && targetDevice) return deviceLabel(targetDevice);
+ if (target === "DISK" && targetDevice) {
+ // TRANSLATORS: %s is the installation disk (eg. "/dev/sda, 80 GiB)
+ return sprintf(_("File systems created as new partitions at %s"), deviceLabel(targetDevice));
+ }
if (target === "NEW_LVM_VG" && targetPVDevices.length > 0) {
- if (targetPVDevices.length > 1) return _("new LVM volume group");
+ if (targetPVDevices.length > 1) return _("File systems created at a 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]));
+ return sprintf(_("File systems created at a new LVM volume group on %s"), deviceLabel(targetPVDevices[0]));
}
}
@@ -94,15 +100,20 @@ export default function InstallationDeviceField({
value = targetValue(target, targetDevice, targetPVDevices);
return (
-
- : {_("Change")}
- }
- />
+
+
+
+
diff --git a/web/src/components/storage/ProposalResultSection.jsx b/web/src/components/storage/ProposalResultSection.jsx
index 335e91c61d..3398226dd2 100644
--- a/web/src/components/storage/ProposalResultSection.jsx
+++ b/web/src/components/storage/ProposalResultSection.jsx
@@ -90,9 +90,15 @@ const DeletionsInfo = ({ actions, systems }) => {
* @param {object} props
* @param {Action[]} props.actions
*/
-const ActionsInfo = ({ onClick }) => {
+const ActionsInfo = ({ numActions, onClick }) => {
+ // TRANSLATORS: %d will be replaced by the number of proposal actions.
+ const text = sprintf(
+ n_("Check the planned action", "Check the %d planned actions", numActions),
+ numActions
+ );
+
return (
-
+
);
};
@@ -140,24 +146,15 @@ const SectionContent = ({ system, staging, actions, errors, isLoading, onActions
if (errors.length) return;
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);
-
const devicesManager = new DevicesManager(system, staging, actions);
return (
-
{description}
a.delete && !a.subvol)}
systems={devicesManager.deletedSystems()}
/>
-
+
);
@@ -188,6 +185,8 @@ export default function ProposalResultSection({
const openDrawer = () => setDrawerOpen(true);
const closeDrawer = () => setDrawerOpen(false);
+ const description = _("During installation, some actions will be performed to configure the system as displayed below.");
+
return (
@@ -212,7 +211,7 @@ export default function ProposalResultSection({
-
{_("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.")}
+
{description}
diff --git a/web/src/components/storage/SpacePolicyField.jsx b/web/src/components/storage/SpacePolicyField.jsx
index ebbbc287cd..943e3df9eb 100644
--- a/web/src/components/storage/SpacePolicyField.jsx
+++ b/web/src/components/storage/SpacePolicyField.jsx
@@ -88,7 +88,7 @@ export default function SpacePolicyField({
description={_("Allocating the file systems might need to find free space \
in the installation device(s).")}
actions={
- isLoading ? :
+ isLoading ? :
}
>
{isDialogOpen &&
diff --git a/web/src/components/storage/utils.js b/web/src/components/storage/utils.js
index 9998449271..6f1dd58373 100644
--- a/web/src/components/storage/utils.js
+++ b/web/src/components/storage/utils.js
@@ -78,11 +78,8 @@ const SPACE_POLICIES = [
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")
+ // would read as "Find space deleting current content". Keep it short
+ N_("deleting current content")
]
},
{
@@ -91,11 +88,8 @@ const SPACE_POLICIES = [
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")
+ // would read as "Find space shrinking partitions". Keep it short.
+ N_("shrinking partitions")
]
},
{
@@ -104,7 +98,7 @@ const SPACE_POLICIES = [
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".
+ // would read as "Find space without modifying any partition". Keep it short.
N_("without modifying any partition")
]
},
@@ -114,8 +108,8 @@ const SPACE_POLICIES = [
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")
+ // would read as "Find space with custom actions". Keep it short.
+ N_("with custom actions")
]
}
];