summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan de Groot <groot@kde.org>2019-05-09 08:02:52 -0400
committerAdriaan de Groot <groot@kde.org>2019-05-09 08:13:58 -0400
commit53230d73e2b20f5c6470cd74cc86602712255d1a (patch)
tree76b72ca9ea1f60dafabbf7b8ac987bf62bbb1487
parentb08de96315be5dc7fb86fb2c87681ddd2fe7a1b8 (diff)
[partition] Replace user-visible MB with MiB
-rw-r--r--src/modules/partition/jobs/CreatePartitionJob.cpp4
-rw-r--r--src/modules/partition/jobs/FormatPartitionJob.cpp4
-rw-r--r--src/modules/partition/jobs/ResizePartitionJob.cpp8
-rw-r--r--src/modules/partition/jobs/SetPartitionFlagsJob.cpp10
4 files changed, 13 insertions, 13 deletions
diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp
index 119ecb12c..9f8a01004 100644
--- a/src/modules/partition/jobs/CreatePartitionJob.cpp
+++ b/src/modules/partition/jobs/CreatePartitionJob.cpp
@@ -41,7 +41,7 @@ CreatePartitionJob::CreatePartitionJob( Device* device, Partition* partition )
QString
CreatePartitionJob::prettyName() const
{
- return tr( "Create new %2MB partition on %4 (%3) with file system %1." )
+ return tr( "Create new %2MiB partition on %4 (%3) with file system %1." )
.arg( m_partition->fileSystem().name() )
.arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) )
.arg( m_device->name() )
@@ -52,7 +52,7 @@ CreatePartitionJob::prettyName() const
QString
CreatePartitionJob::prettyDescription() const
{
- return tr( "Create new <strong>%2MB</strong> partition on <strong>%4</strong> "
+ return tr( "Create new <strong>%2MiB</strong> partition on <strong>%4</strong> "
"(%3) with file system <strong>%1</strong>." )
.arg( m_partition->fileSystem().name() )
.arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) )
diff --git a/src/modules/partition/jobs/FormatPartitionJob.cpp b/src/modules/partition/jobs/FormatPartitionJob.cpp
index dcc1c7142..0d43dfdb3 100644
--- a/src/modules/partition/jobs/FormatPartitionJob.cpp
+++ b/src/modules/partition/jobs/FormatPartitionJob.cpp
@@ -38,7 +38,7 @@ FormatPartitionJob::FormatPartitionJob( Device* device, Partition* partition )
QString
FormatPartitionJob::prettyName() const
{
- return tr( "Format partition %1 (file system: %2, size: %3 MB) on %4." )
+ return tr( "Format partition %1 (file system: %2, size: %3 MiB) on %4." )
.arg( m_partition->partitionPath() )
.arg( m_partition->fileSystem().name() )
.arg( m_partition->capacity() / 1024 / 1024 )
@@ -49,7 +49,7 @@ FormatPartitionJob::prettyName() const
QString
FormatPartitionJob::prettyDescription() const
{
- return tr( "Format <strong>%3MB</strong> partition <strong>%1</strong> with "
+ return tr( "Format <strong>%3MiB</strong> partition <strong>%1</strong> with "
"file system <strong>%2</strong>." )
.arg( m_partition->partitionPath() )
.arg( m_partition->fileSystem().name() )
diff --git a/src/modules/partition/jobs/ResizePartitionJob.cpp b/src/modules/partition/jobs/ResizePartitionJob.cpp
index c0477cafe..bac4c7a6c 100644
--- a/src/modules/partition/jobs/ResizePartitionJob.cpp
+++ b/src/modules/partition/jobs/ResizePartitionJob.cpp
@@ -52,8 +52,8 @@ ResizePartitionJob::prettyName() const
QString
ResizePartitionJob::prettyDescription() const
{
- return tr( "Resize <strong>%2MB</strong> partition <strong>%1</strong> to "
- "<strong>%3MB</strong>." )
+ return tr( "Resize <strong>%2MiB</strong> partition <strong>%1</strong> to "
+ "<strong>%3MiB</strong>." )
.arg( partition()->partitionPath() )
.arg( ( BytesToMiB( m_oldLastSector - m_oldFirstSector + 1 ) * partition()->sectorSize() ) )
.arg( ( BytesToMiB( m_newLastSector - m_newFirstSector + 1 ) * partition()->sectorSize() ) );
@@ -63,8 +63,8 @@ ResizePartitionJob::prettyDescription() const
QString
ResizePartitionJob::prettyStatusMessage() const
{
- return tr( "Resizing %2MB partition %1 to "
- "%3MB." )
+ return tr( "Resizing %2MiB partition %1 to "
+ "%3MiB." )
.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/SetPartitionFlagsJob.cpp b/src/modules/partition/jobs/SetPartitionFlagsJob.cpp
index fee987479..d79f70479 100644
--- a/src/modules/partition/jobs/SetPartitionFlagsJob.cpp
+++ b/src/modules/partition/jobs/SetPartitionFlagsJob.cpp
@@ -49,7 +49,7 @@ SetPartFlagsJob::prettyName() const
return tr( "Set flags on partition %1." ).arg( partition()->partitionPath() );
if ( !partition()->fileSystem().name().isEmpty() )
- return tr( "Set flags on %1MB %2 partition." )
+ return tr( "Set flags on %1MiB %2 partition." )
.arg( BytesToMiB( partition()->capacity() ) )
.arg( partition()->fileSystem().name() );
@@ -68,7 +68,7 @@ SetPartFlagsJob::prettyDescription() const
.arg( partition()->partitionPath() );
if ( !partition()->fileSystem().name().isEmpty() )
- return tr( "Clear flags on %1MB <strong>%2</strong> partition." )
+ return tr( "Clear flags on %1MiB <strong>%2</strong> partition." )
.arg( BytesToMiB( partition()->capacity() ) )
.arg( partition()->fileSystem().name() );
@@ -82,7 +82,7 @@ SetPartFlagsJob::prettyDescription() const
.arg( flagsList.join( ", " ) );
if ( !partition()->fileSystem().name().isEmpty() )
- return tr( "Flag %1MB <strong>%2</strong> partition as "
+ return tr( "Flag %1MiB <strong>%2</strong> partition as "
"<strong>%3</strong>." )
.arg( BytesToMiB( partition()->capacity() ) )
.arg( partition()->fileSystem().name() )
@@ -104,7 +104,7 @@ SetPartFlagsJob::prettyStatusMessage() const
.arg( partition()->partitionPath() );
if ( !partition()->fileSystem().name().isEmpty() )
- return tr( "Clearing flags on %1MB <strong>%2</strong> partition." )
+ return tr( "Clearing flags on %1MiB <strong>%2</strong> partition." )
.arg( BytesToMiB( partition()->capacity() ) )
.arg( partition()->fileSystem().name() );
@@ -119,7 +119,7 @@ SetPartFlagsJob::prettyStatusMessage() const
if ( !partition()->fileSystem().name().isEmpty() )
return tr( "Setting flags <strong>%3</strong> on "
- "%1MB <strong>%2</strong> partition." )
+ "%1MiB <strong>%2</strong> partition." )
.arg( BytesToMiB( partition()->capacity() ) )
.arg( partition()->fileSystem().name() )
.arg( flagsList.join( ", " ) );