diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts
index 2af33e45b..ba1da0175 100644
--- a/lang/calamares_en.ts
+++ b/lang/calamares_en.ts
@@ -29,8 +29,9 @@
AutoMountManagementJob
-
- Manage auto-mount settings
+
+ @status
+
@@ -56,22 +57,26 @@
- Master Boot Record of %1
+ @info
+ Master Boot Record of %1
- Boot Partition
+ @info
+ Boot Partition
- System Partition
+ @info
+ System Partition
- Do not install a boot loader
+ @label
+ Do not install a boot loader
@@ -633,19 +638,28 @@ The installer will quit and all changes will be lost.
ChangeFilesystemLabelJob
-
- Set filesystem label on %1.
+
+ @title
+ Set filesystem label on %1
-
- Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>.
+
+ @info
+
-
-
+
+
+ @status
+
+
+
+
+
- The installer failed to update partition table on disk '%1'.
+ @info
+ The installer failed to update partition table on disk '%1'.
@@ -658,68 +672,72 @@ The installer will quit and all changes will be lost.
ChoicePage
-
-
-
- Select storage de&vice:
-
-
-
-
-
-
-
- Current:
-
-
-
-
- After:
- <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself.
-
-
-
- Reuse %1 as home partition for %2.
- <strong>Select a partition to shrink, then drag the bottom bar to resize</strong>
-
-
- %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
+
+
+ @label
+ Select storage de&vice:
-
-
- Boot loader location:
+
+
+
+
+
+ @label
+ Current:
+
+
+
+
+ @label
+ After:
+
+
+
+
+ @label
+ Reuse %1 as home partition for %2. {1 ?} {2?}
+
+
+
+
+ @info, %1 is partition name, %4 is product name
+ %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.
- <strong>Select a partition to install on</strong>
+ @label
+ <strong>Select a partition to install on</strong>
- An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
+ @info, %1 is product name
+ An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.
- The EFI system partition at %1 will be used for starting %2.
+ @info, %1 is partition path, %2 is product name
+ The EFI system partition at %1 will be used for starting %2.
- EFI system partition:
+ @label
+ EFI system partition:
@@ -773,37 +791,50 @@ The installer will quit and all changes will be lost.
- This storage device has one of its partitions <strong>mounted</strong>.
+ @info
+ This storage device has one of its partitions <strong>mounted</strong>.
- This storage device is a part of an <strong>inactive RAID</strong> device.
+ @info
+ This storage device is a part of an <strong>inactive RAID</strong> device.
-
- No Swap
+
+ @label
+
-
- Reuse Swap
+
+ @label
+
- Swap (no Hibernate)
+ @label
+ Swap (no Hibernate)
- Swap (with Hibernate)
+ @label
+ Swap (with Hibernate)
- Swap to file
+ @label
+ Swap to file
+
+
+
+
+ @label
+
@@ -836,12 +867,14 @@ The installer will quit and all changes will be lost.
- Clear mounts for partitioning operations on %1
+ @title
+ Clear mounts for partitioning operations on %1
-
- Clearing mounts for partitioning operations on %1.
+
+ @status
+ Clearing mounts for partitioning operations on %1. {1…?}
@@ -853,13 +886,10 @@ The installer will quit and all changes will be lost.
ClearTempMountsJob
-
- Clear all temporary mounts.
-
-
-
- Clearing all temporary mounts.
+
+ @status
+
@@ -1008,34 +1038,35 @@ The installer will quit and all changes will be lost.
OK!
-
+ Package Selection
-
+ Please pick a product from the list. The selected product will be installed.
-
+ Packages
-
+ Install option: <strong>%1</strong>
-
+ None
- Summary
+ @label
+ Summary
@@ -1200,76 +1231,90 @@ The installer will quit and all changes will be lost.
- En&crypt
+ @action
+ En&crypt
- Logical
+ @label
+ Logical
- Primary
+ @label
+ Primary
- GPT
+ @label
+ GPT
- Mountpoint already in use. Please select another one.
+ @info
+ Mountpoint already in use. Please select another one.
- Mountpoint must start with a <tt>/</tt>.
+ @info
+ Mountpoint must start with a <tt>/</tt>.CreatePartitionJob
-
- Create new %1MiB partition on %3 (%2) with entries %4.
+
+ @title
+ Create new %1MiB partition on %3 (%2) with entries %4. {1M?} {3 ?} {2)?} {4?}
-
- Create new %1MiB partition on %3 (%2).
+
+ @title
+
-
- Create new %2MiB partition on %4 (%3) with file system %1.
+
+ @title
+ Create new %2MiB partition on %4 (%3) with file system %1
-
- Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>.
+
+ @info
+
-
-
- Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2).
+
+
+ @info
+
-
-
- Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>.
+
+
+ @info
+
-
-
-
- Creating new %1 partition on %2.
+
+
+
+ @status
+ Creating new %1 partition on %2. {1 ?} {2…?}
-
+
- The installer failed to create partition on disk '%1'.
+ @info
+ The installer failed to create partition on disk '%1'.
@@ -1304,18 +1349,16 @@ The installer will quit and all changes will be lost.
CreatePartitionTableJob
-
- Create new %1 partition table on %2.
+
+
+ @status
+ Creating new %1 partition table on %2. {1 ?} {2…?}
-
- Create new <strong>%1</strong> partition table on <strong>%2</strong> (%3).
-
-
-
-
- Creating new %1 partition table on %2.
+
+ @status
+
@@ -1332,29 +1375,33 @@ The installer will quit and all changes will be lost.
-
- Create user <strong>%1</strong>.
-
-
-
-
- Preserving home directory
+
+
-
- Creating user %1
+
+ @status
+ Creating user %1…
+
+
+
+
+ @status
+
- Configuring user %1
+ @status
+ Configuring user %1
-
- Setting file permissions
+
+ @status
+
@@ -1362,25 +1409,24 @@ The installer will quit and all changes will be lost.
- Create Volume Group
+ @title
+ Create Volume GroupCreateVolumeGroupJob
-
- Create new volume group named %1.
+
+
+ @status
+ Creating new volume group named %1. {1…?}
-
- Create new volume group named <strong>%1</strong>.
-
-
-
-
- Creating new volume group named %1.
+
+ @status
+
@@ -1393,13 +1439,15 @@ The installer will quit and all changes will be lost.
-
- Deactivate volume group named %1.
+
+ @status
+
-
- Deactivate volume group named <strong>%1</strong>.
+
+ @status
+
@@ -1411,18 +1459,16 @@ The installer will quit and all changes will be lost.
DeletePartitionJob
-
- Delete partition %1.
+
+
+ @status
+ Deleting partition %1. {1…?}
-
- Delete partition <strong>%1</strong>.
-
-
-
-
- Deleting partition %1.
+
+ @status
+
@@ -1607,11 +1653,13 @@ The installer will quit and all changes will be lost.
- Please enter the same passphrase in both boxes.
+ @tooltip
+ Please enter the same passphrase in both boxes.
-
+
+ @tooltip
@@ -1633,57 +1681,68 @@ The installer will quit and all changes will be lost.
- Set partition information
+ @title
+ Set partition information
- Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
+ @info
+ Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em>
-
-
- Install %1 on <strong>new</strong> %2 system partition.
+
+
+ @info
+
-
-
- Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>.
+
+
+ @info
+
-
-
- Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3.
+
+
+ @info
+ Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. {2 ?} {1<?} {3?}
-
-
- Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>.
+
+
+ @info
+
-
-
- Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>.
+
+
+ @info
+
-
-
- Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4.
+
+
+ @info
+
-
-
- Install %2 on %3 system partition <strong>%1</strong>.
+
+
+ @info
+ Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. {3 ?} {1<?} {2<?} {4…?}
-
-
- Install boot loader on <strong>%1</strong>.
+
+
+ @info
+
-
-
- Setting up mount points.
+
+
+ @status
+
@@ -1752,24 +1811,27 @@ The installer will quit and all changes will be lost.
FormatPartitionJob
-
- Format partition %1 (file system: %2, size: %3 MiB) on %4.
+
+ @title
+ Format partition %1 (file system: %2, size: %3 MiB) on %4. {1 ?} {2,?} {3 ?} {4?}
-
- Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>.
+
+ @info
+
-
+ partition label %1 (device path %2)%1 (%2)
-
-
- Formatting partition %1 with file system %2.
+
+
+ @status
+ Formatting partition %1 with file system %2. {1 ?} {2…?}
@@ -2984,32 +3046,38 @@ The installer will quit and all changes will be lost.
- Home
+ @label
+ Home
- Boot
+ @label
+ Boot
- EFI system
+ @label
+ EFI system
- Swap
+ @label
+ Swap
- New partition for %1
+ @label
+ New partition for %1
- New partition
+ @label
+ New partition
@@ -3024,38 +3092,45 @@ The installer will quit and all changes will be lost.
- Free Space
+ @title
+ Free Space
-
- New partition
+
+ @title
+
- Name
+ @title
+ Name
- File System
+ @title
+ File System
- File System Label
+ @title
+ File System Label
- Mount Point
+ @title
+ Mount Point
- Size
+ @title
+ Size
@@ -3133,16 +3208,6 @@ The installer will quit and all changes will be lost.
PartitionViewStep
-
-
-
- Gathering system information...
-
-
-
-
- Partitions
-
@@ -3158,16 +3223,6 @@ The installer will quit and all changes will be lost.
No partitions will be changed.
-
-
-
- Current:
-
-
-
-
- After:
-
@@ -3219,6 +3274,30 @@ The installer will quit and all changes will be lost.
The filesystem must have flag <strong>%1</strong> set.
+
+
+
+ @status
+
+
+
+
+
+ @label
+ Partitions
+
+
+
+
+ @label
+ Current:
+
+
+
+
+ @label
+ After:
+
@@ -3264,8 +3343,9 @@ The installer will quit and all changes will be lost.
PlasmaLnfJob
-
- Plasma Look-and-Feel Job
+
+ @status
+
@@ -3292,15 +3372,17 @@ The installer will quit and all changes will be lost.
- Look-and-Feel
+ @label
+ Look-and-FeelPreserveFiles
-
- Saving files for later ...
+
+ @status
+
@@ -3420,11 +3502,6 @@ Output:
(no mount point)
-
-
-
- Unpartitioned space or unknown partition table
-
@@ -3449,6 +3526,12 @@ Output:
@partition infoswap
+
+
+
+ @info
+ Unpartitioned space or unknown partition table
+ Recommended
@@ -3464,8 +3547,9 @@ Output:
RemoveUserJob
-
- Remove live user from target system
+
+ @status
+
@@ -3473,13 +3557,15 @@ Output:
-
- Remove Volume Group named %1.
+
+ @status
+
-
- Remove Volume Group named <strong>%1</strong>.
+
+ @status
+
@@ -3593,22 +3679,25 @@ Output:
ResizePartitionJob
-
-
- Resize partition %1.
+
+
+ @title
+ Resize partition %1
-
-
- Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>.
+
+
+ @info
+
-
-
- Resizing %2MiB partition %1 to %3MiB.
+
+
+ @status
+
-
+ The installer failed to resize partition %1 on disk '%2'.
@@ -3618,24 +3707,32 @@ Output:
- Resize Volume Group
+ @title
+ Resize Volume GroupResizeVolumeGroupJob
-
-
- Resize volume group named %1 from %2 to %3.
+
+ @title
+ Resize volume group named %1 from %2 to %3. {1 ?} {2 ?} {3?}
-
- Resize volume group named <strong>%1</strong> from <strong>%2</strong> to <strong>%3</strong>.
+
+ @info
+
-
+
+
+ @status
+
+
+
+ The installer failed to resize a volume group named '%1'.
@@ -3652,13 +3749,15 @@ Output:
ScanningDialog
-
- Scanning storage devices...
+
+ @status
+
-
- Partitioning
+
+ @status
+
@@ -3675,8 +3774,9 @@ Output:
-
- Setting hostname %1.
+
+ @status
+ Setting hostname %1. {1…?}
@@ -3740,81 +3840,96 @@ Output:
SetPartFlagsJob
-
- Set flags on partition %1.
+
+ @title
+ Set flags on partition %1
-
- Set flags on %1MiB %2 partition.
+
+ @title
+
-
- Set flags on new partition.
+
+ @title
+
-
- Clear flags on partition <strong>%1</strong>.
+
+ @info
+
-
- Clear flags on %1MiB <strong>%2</strong> partition.
+
+ @info
+
-
- Clear flags on new partition.
+
+ @info
+
-
- Flag partition <strong>%1</strong> as <strong>%2</strong>.
+
+ @info
+
-
-
- Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>.
+
+
+ @info
+
-
-
- Flag new partition as <strong>%1</strong>.
+
+
+ @info
+
-
-
- Clearing flags on partition <strong>%1</strong>.
+
+
+ @status
+
-
-
- Clearing flags on %1MiB <strong>%2</strong> partition.
+
+
+ @status
+
-
-
- Clearing flags on new partition.
+
+
+ @status
+
-
-
- Setting flags <strong>%2</strong> on partition <strong>%1</strong>.
+
+
+ @status
+
-
-
- Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition.
+
+
+ @status
+
-
-
- Setting flags <strong>%1</strong> on new partition.
+
+
+ @status
+
-
+ The installer failed to set flags on partition %1.
@@ -3828,8 +3943,9 @@ Output:
-
- Setting password for user %1.
+
+ @status
+ Setting password for user %1. {1…?}
@@ -3902,8 +4018,9 @@ Output:
SetupGroupsJob
-
- Preparing groups.
+
+ @status
+
@@ -3921,8 +4038,9 @@ Output:
SetupSudoJob
-
- Configure <pre>sudo</pre> users.
+
+ @status
+
@@ -3939,8 +4057,9 @@ Output:
ShellProcessJob
-
- Shell Processes Job
+
+ @status
+
@@ -3989,8 +4108,9 @@ Output:
-
- Sending installation feedback.
+
+ @status
+
@@ -4012,8 +4132,9 @@ Output:
-
- Configuring KDE user feedback.
+
+ @status
+
@@ -4041,8 +4162,9 @@ Output:
-
- Configuring machine feedback.
+
+ @status
+
@@ -4104,15 +4226,17 @@ Output:
- Feedback
+ @title
+ FeedbackUmountJob
-
- Unmount file systems.
+
+ @status
+
@@ -4270,11 +4394,6 @@ Output:
&Release notes
-
-
-
- %1 support
-
@@ -4287,13 +4406,20 @@ Output:
@title
+
+
+
+ @action
+
+ WelcomeQmlViewStep
- Welcome
+ @title
+ Welcome
@@ -4301,15 +4427,17 @@ Output:
- Welcome
+ @title
+ WelcomeZfsJob
-
- Create ZFS pools and datasets
+
+ @status
+
@@ -4752,21 +4880,11 @@ Output:
What is your name?
-
-
-
- Your Full Name
- What name do you want to use to log in?
-
-
-
- Login Name
-
@@ -4787,11 +4905,6 @@ Output:
What is the name of this computer?
-
-
-
- Computer Name
-
@@ -4812,16 +4925,21 @@ Output:
Password
-
-
-
- Repeat Password
- Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.
+
+
+
+
+
+
+
+
+
+
@@ -4837,11 +4955,31 @@ Output:
Log in automatically without asking for the password
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.
+
+
+
+
+
@@ -4857,16 +4995,6 @@ Output:
Choose a root password to keep your account safe.
-
-
-
- Root Password
-
-
-
-
- Repeat Root Password
-
@@ -4885,21 +5013,11 @@ Output:
What is your name?
-
-
-
- Your Full Name
- What name do you want to use to log in?
-
-
-
- Login Name
-
@@ -4920,10 +5038,20 @@ Output:
What is the name of this computer?
+
+
+
+
+
+
+
+
+
+
-
- Computer Name
+
+
@@ -4952,8 +5080,18 @@ Output:
-
- Repeat Password
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4975,16 +5113,6 @@ Output:
Choose a root password to keep your account safe.
-
-
-
- Root Password
-
-
-
-
- Repeat Root Password
-
@@ -5022,13 +5150,13 @@ Output:
-
- Known issues
+
+
-
- Release notes
+
+
@@ -5052,13 +5180,13 @@ Output:
-
- Known issues
+
+
-
- Release notes
+
+
diff --git a/lang/python.pot b/lang/python.pot
index 7e6a6f974..eea91f978 100644
--- a/lang/python.pot
+++ b/lang/python.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-27 20:44+0100\n"
+"POT-Creation-Date: 2024-01-14 21:33+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -68,17 +68,17 @@ msgstr ""
msgid "SLIM config file {!s} does not exist"
msgstr ""
-#: src/modules/displaymanager/main.py:935
+#: src/modules/displaymanager/main.py:938
msgid "No display managers selected for the displaymanager module."
msgstr ""
-#: src/modules/displaymanager/main.py:936
+#: src/modules/displaymanager/main.py:939
msgid ""
"The displaymanagers list is empty or undefined in both globalstorage and "
"displaymanager.conf."
msgstr ""
-#: src/modules/displaymanager/main.py:1023
+#: src/modules/displaymanager/main.py:1026
msgid "Display manager configuration was incomplete"
msgstr ""