diff --git a/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp b/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp
index 44b164fcd..915cad4b7 100644
--- a/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp
+++ b/src/modules/partition/jobs/ChangeFilesystemLabelJob.cpp
@@ -31,14 +31,14 @@ ChangeFilesystemLabelJob::ChangeFilesystemLabelJob( Device* device, Partition* p
QString
ChangeFilesystemLabelJob::prettyName() const
{
- return tr( "Setting filesystem label on %1…", "@status" ).arg( partition()->partitionPath() );
+ return tr( "Set filesystem label on %1", "@title" ).arg( partition()->partitionPath() );
}
QString
ChangeFilesystemLabelJob::prettyDescription() const
{
- return tr( "Setting filesystem label %1 to partition %2…", "@status" )
+ return tr( "Set filesystem label %1 to partition %2", "@info" )
.arg( m_label )
.arg( partition()->partitionPath() );
}
@@ -47,7 +47,9 @@ ChangeFilesystemLabelJob::prettyDescription() const
QString
ChangeFilesystemLabelJob::prettyStatusMessage() const
{
- return prettyDescription();
+ return tr( "Setting filesystem label %1 to partition %2…", "@status" )
+ .arg( m_label )
+ .arg( partition()->partitionPath() );
}
@@ -79,5 +81,6 @@ ChangeFilesystemLabelJob::exec()
return Calamares::JobResult::ok();
}
return Calamares::JobResult::error(
- tr( "The installer failed to update partition table on disk '%1'.", "@info" ).arg( m_device->name() ), report.toText() );
+ tr( "The installer failed to update partition table on disk '%1'.", "@info" ).arg( m_device->name() ),
+ report.toText() );
}
diff --git a/src/modules/partition/jobs/ClearMountsJob.cpp b/src/modules/partition/jobs/ClearMountsJob.cpp
index 5e9a159c4..6229b5932 100644
--- a/src/modules/partition/jobs/ClearMountsJob.cpp
+++ b/src/modules/partition/jobs/ClearMountsJob.cpp
@@ -329,7 +329,8 @@ tryVGDisable( const QString& vgName )
vgProcess.start( "vgchange", { "-an", vgName } );
vgProcess.waitForFinished();
return ( vgProcess.exitCode() == 0 )
- ? MessageAndPath { QT_TRANSLATE_NOOP( "ClearMountsJob", "Successfully disabled volume group %1.", "@info" ), vgName }
+ ? MessageAndPath { QT_TRANSLATE_NOOP( "ClearMountsJob", "Successfully disabled volume group %1.", "@info" ),
+ vgName }
: MessageAndPath {};
}
@@ -368,7 +369,7 @@ ClearMountsJob::ClearMountsJob( Device* device )
QString
ClearMountsJob::prettyName() const
{
- return tr( "Clearing mounts for partitioning operations on %1…", "@status" ).arg( m_deviceNode );
+ return tr( "Clear mounts for partitioning operations on %1", "@title" ).arg( m_deviceNode );
}
QString
diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp
index 5d6973a43..429bf26ff 100644
--- a/src/modules/partition/jobs/CreatePartitionJob.cpp
+++ b/src/modules/partition/jobs/CreatePartitionJob.cpp
@@ -178,7 +178,7 @@ CreatePartitionJob::prettyName() const
QString entries = prettyGptEntries( m_partition );
if ( !entries.isEmpty() )
{
- return tr( "Creating new %1MiB partition on %3 (%2) with entries %4…", "@status" )
+ return tr( "Create new %1MiB partition on %3 (%2) with entries %4", "@title" )
.arg( Calamares::BytesToMiB( m_partition->capacity() ) )
.arg( m_device->name() )
.arg( m_device->deviceNode() )
@@ -186,14 +186,14 @@ CreatePartitionJob::prettyName() const
}
else
{
- return tr( "Creating new %1MiB partition on %3 (%2)…", "@status" )
+ return tr( "Create new %1MiB partition on %3 (%2)", "@title" )
.arg( Calamares::BytesToMiB( m_partition->capacity() ) )
.arg( m_device->name() )
.arg( m_device->deviceNode() );
}
}
- return tr( "Creating new %2MiB partition on %4 (%3) with file system %1…" "@status" )
+ return tr( "Create new %2MiB partition on %4 (%3) with file system %1", "@title" )
.arg( userVisibleFS( m_partition->fileSystem() ) )
.arg( Calamares::BytesToMiB( m_partition->capacity() ) )
.arg( m_device->name() )
@@ -209,8 +209,9 @@ CreatePartitionJob::prettyDescription() const
QString entries = prettyGptEntries( m_partition );
if ( !entries.isEmpty() )
{
- return tr( "Creating new %1MiB partition on %3 (%2) with entries "
- "%4…", "@status" )
+ return tr( "Create new %1MiB partition on %3 (%2) with entries "
+ "%4",
+ "@info" )
.arg( Calamares::BytesToMiB( m_partition->capacity() ) )
.arg( m_device->name() )
.arg( m_device->deviceNode() )
@@ -218,15 +219,16 @@ CreatePartitionJob::prettyDescription() const
}
else
{
- return tr( "Creating new %1MiB partition on %3 (%2)…", "@status" )
+ return tr( "Create new %1MiB partition on %3 (%2)", "@info" )
.arg( Calamares::BytesToMiB( m_partition->capacity() ) )
.arg( m_device->name() )
.arg( m_device->deviceNode() );
}
}
- return tr( "Creating new %2MiB partition on %4 "
- "(%3) with file system %1…", "@status" )
+ return tr( "Create new %2MiB partition on %4 "
+ "(%3) with file system %1",
+ "@info" )
.arg( userVisibleFS( m_partition->fileSystem() ) )
.arg( Calamares::BytesToMiB( m_partition->capacity() ) )
.arg( m_device->name() )
diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp
index f6b061476..357c1e210 100644
--- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp
+++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp
@@ -176,7 +176,7 @@ FillGlobalStorageJob::FillGlobalStorageJob( const Config*, QList< Device* > devi
QString
FillGlobalStorageJob::prettyName() const
{
- return tr( "Setting partition information…", "@status" );
+ return tr( "Set partition information", "@title" );
}
@@ -205,15 +205,16 @@ FillGlobalStorageJob::prettyDescription() const
{
if ( !features.isEmpty() )
{
- lines.append( tr( "Installing %1 on new %2 system partition "
- "with features %3…", "@status" )
+ lines.append( tr( "Install %1 on new %2 system partition "
+ "with features %3",
+ "@info" )
.arg( Calamares::Branding::instance()->shortProductName() )
.arg( fsType )
.arg( features ) );
}
else
{
- lines.append( tr( "Installing %1 on new %2 system partition…", "@status" )
+ lines.append( tr( "Install %1 on new %2 system partition", "@info" )
.arg( Calamares::Branding::instance()->shortProductName() )
.arg( fsType ) );
}
@@ -222,16 +223,18 @@ FillGlobalStorageJob::prettyDescription() const
{
if ( !features.isEmpty() )
{
- lines.append( tr( "Setting up new %2 partition with mount point "
- "%1 and features %3…", "@status" )
+ lines.append( tr( "Set up new %2 partition with mount point "
+ "%1 and features %3",
+ "@info" )
.arg( mountPoint )
.arg( fsType )
.arg( features ) );
}
else
{
- lines.append( tr( "Setting up new %2 partition with mount point "
- "%1%3…", "@status" )
+ lines.append( tr( "Set up new %2 partition with mount point "
+ "%1%3",
+ "@info" )
.arg( mountPoint )
.arg( fsType )
.arg( features ) );
@@ -244,8 +247,9 @@ FillGlobalStorageJob::prettyDescription() const
{
if ( !features.isEmpty() )
{
- lines.append( tr( "Installing %2 on %3 system partition %1"
- " with features %4…", "@status" )
+ lines.append( tr( "Install %2 on %3 system partition %1"
+ " with features %4",
+ "@info" )
.arg( path )
.arg( Calamares::Branding::instance()->shortProductName() )
.arg( fsType )
@@ -253,7 +257,7 @@ FillGlobalStorageJob::prettyDescription() const
}
else
{
- lines.append( tr( "Installing %2 on %3 system partition %1…", "@status" )
+ lines.append( tr( "Install %2 on %3 system partition %1", "@info" )
.arg( path )
.arg( Calamares::Branding::instance()->shortProductName() )
.arg( fsType ) );
@@ -263,8 +267,9 @@ FillGlobalStorageJob::prettyDescription() const
{
if ( !features.isEmpty() )
{
- lines.append( tr( "Setting up %3 partition %1 with mount point "
- "%2 and features %4…", "@status" )
+ lines.append( tr( "Set up %3 partition %1 with mount point "
+ "%2 and features %4",
+ "@info" )
.arg( path )
.arg( mountPoint )
.arg( fsType )
@@ -272,8 +277,9 @@ FillGlobalStorageJob::prettyDescription() const
}
else
{
- lines.append( tr( "Setting up %3 partition %1 with mount point "
- "%2%4…", "@status" )
+ lines.append( tr( "Set up %3 partition %1 with mount point "
+ "%2%4…",
+ "@info" )
.arg( path )
.arg( mountPoint )
.arg( fsType )
@@ -287,7 +293,7 @@ FillGlobalStorageJob::prettyDescription() const
QVariant bootloaderMap = createBootLoaderMap();
if ( !m_bootLoaderPath.isEmpty() )
{
- lines.append( tr( "Installing boot loader on %1…", "@status" ).arg( m_bootLoaderPath ) );
+ lines.append( tr( "Install boot loader on %1…", "@info" ).arg( m_bootLoaderPath ) );
}
return lines.join( "
" );
}
diff --git a/src/modules/partition/jobs/FormatPartitionJob.cpp b/src/modules/partition/jobs/FormatPartitionJob.cpp
index 4f5f6584d..e373cec40 100644
--- a/src/modules/partition/jobs/FormatPartitionJob.cpp
+++ b/src/modules/partition/jobs/FormatPartitionJob.cpp
@@ -36,7 +36,7 @@ FormatPartitionJob::FormatPartitionJob( Device* device, Partition* partition )
QString
FormatPartitionJob::prettyName() const
{
- return tr( "Formatting partition %1 (file system: %2, size: %3 MiB) on %4…", "@status" )
+ return tr( "Format partition %1 (file system: %2, size: %3 MiB) on %4", "@title" )
.arg( m_partition->partitionPath() )
.arg( userVisibleFS( m_partition->fileSystem() ) )
.arg( m_partition->capacity() / 1024 / 1024 )
@@ -46,8 +46,9 @@ FormatPartitionJob::prettyName() const
QString
FormatPartitionJob::prettyDescription() const
{
- return tr( "Formatting %3MiB partition %1 with "
- "file system %2…", "@status" )
+ return tr( "Format %3MiB partition %1 with "
+ "file system %2",
+ "@info" )
.arg( m_partition->partitionPath() )
.arg( userVisibleFS( m_partition->fileSystem() ) )
.arg( m_partition->capacity() / 1024 / 1024 );
@@ -60,8 +61,7 @@ FormatPartitionJob::prettyStatusMessage() const
? m_partition->partitionPath()
: tr( "%1 (%2)", "partition label %1 (device path %2)" )
.arg( m_partition->label(), m_partition->partitionPath() );
- return tr( "Formatting partition %1 with "
- "file system %2…", "@status" )
+ return tr( "Formatting partition %1 with file system %2…", "@status" )
.arg( partitionLabel, userVisibleFS( m_partition->fileSystem() ) );
}
diff --git a/src/modules/partition/jobs/ResizePartitionJob.cpp b/src/modules/partition/jobs/ResizePartitionJob.cpp
index d8eda20b4..3aec41358 100644
--- a/src/modules/partition/jobs/ResizePartitionJob.cpp
+++ b/src/modules/partition/jobs/ResizePartitionJob.cpp
@@ -36,16 +36,13 @@ ResizePartitionJob::ResizePartitionJob( Device* device, Partition* partition, qi
QString
ResizePartitionJob::prettyName() const
{
- // FIXME: Copy PM ResizeOperation code which generates a description of the
- // operation
- return tr( "Resizing partition %1…", "@status" ).arg( partition()->partitionPath() );
+ return tr( "Resize partition %1", "@title" ).arg( partition()->partitionPath() );
}
QString
ResizePartitionJob::prettyDescription() const
{
- return tr( "Resizing %2MiB partition %1 to "
- "%3MiB…", "@status" )
+ return tr( "Resize %2MiB partition %1 to %3MiB", "@info" )
.arg( partition()->partitionPath() )
.arg( ( BytesToMiB( m_oldLastSector - m_oldFirstSector + 1 ) * partition()->sectorSize() ) )
.arg( ( BytesToMiB( m_newLastSector - m_newFirstSector + 1 ) * partition()->sectorSize() ) );
@@ -54,8 +51,7 @@ ResizePartitionJob::prettyDescription() const
QString
ResizePartitionJob::prettyStatusMessage() const
{
- return tr( "Resizing %2MiB partition %1 to "
- "%3MiB…", "@status" )
+ return tr( "Resizing %2MiB partition %1 to %3MiB…", "@status" )
.arg( partition()->partitionPath() )
.arg( ( BytesToMiB( m_oldLastSector - m_oldFirstSector + 1 ) * partition()->sectorSize() ) )
.arg( ( BytesToMiB( m_newLastSector - m_newFirstSector + 1 ) * partition()->sectorSize() ) );
diff --git a/src/modules/partition/jobs/ResizeVolumeGroupJob.cpp b/src/modules/partition/jobs/ResizeVolumeGroupJob.cpp
index a749bb010..a6427116e 100644
--- a/src/modules/partition/jobs/ResizeVolumeGroupJob.cpp
+++ b/src/modules/partition/jobs/ResizeVolumeGroupJob.cpp
@@ -25,7 +25,7 @@ ResizeVolumeGroupJob::ResizeVolumeGroupJob( Device*, LvmDevice* device, QVector<
QString
ResizeVolumeGroupJob::prettyName() const
{
- return tr( "Resizing volume group named %1 from %2 to %3…", "@status" )
+ return tr( "Resize volume group named %1 from %2 to %3", "@title" )
.arg( m_device->name() )
.arg( currentPartitions() )
.arg( targetPartitions() );
@@ -34,7 +34,8 @@ ResizeVolumeGroupJob::prettyName() const
QString
ResizeVolumeGroupJob::prettyDescription() const
{
- return tr( "Resizing volume group named %1 from %2 to %3…", "@status" )
+ return tr( "Resize volume group named %1 from %2 to %3",
+ "@info" )
.arg( m_device->name() )
.arg( currentPartitions() )
.arg( targetPartitions() );