From fefa73650189ab718a125c60911614397d74076f Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Fri, 10 Apr 2015 13:31:49 +0200 Subject: [PATCH] Use instead of in all instances. --- src/modules/greeting/GreetingPage.cpp | 4 +-- src/modules/locale/LCLocaleDialog.cpp | 2 +- src/modules/partition/gui/AlongsidePage.cpp | 2 +- src/modules/partition/gui/ChoicePage.cpp | 30 +++++++++---------- .../partition/gui/PartitionViewStep.cpp | 2 +- src/modules/partition/gui/ReplacePage.cpp | 4 +-- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/modules/greeting/GreetingPage.cpp b/src/modules/greeting/GreetingPage.cpp index 9d97e26da..1ef830908 100644 --- a/src/modules/greeting/GreetingPage.cpp +++ b/src/modules/greeting/GreetingPage.cpp @@ -145,8 +145,8 @@ GreetingPage::GreetingPage( QWidget* parent ) .arg( CALAMARES_APPLICATION_NAME ), tr( "

%1


" - "%2
" - "for %3

" + "%2
" + "for %3

" "Copyright 2014 Teo Mrnjavac <teo@kde.org>
" "Thanks to: Anke Boersma, Aurélien Gâteau, Kevin Kofler, Philip Müller, " "Pier Luigi Fiorini and Rohan Garg.

" diff --git a/src/modules/locale/LCLocaleDialog.cpp b/src/modules/locale/LCLocaleDialog.cpp index f97a28989..55b03f7ea 100644 --- a/src/modules/locale/LCLocaleDialog.cpp +++ b/src/modules/locale/LCLocaleDialog.cpp @@ -39,7 +39,7 @@ LCLocaleDialog::LCLocaleDialog( const QString& guessedLCLocale, upperText->setWordWrap( true ); upperText->setText( tr( "The system locale setting affects the language and character " "set for some command line user interface elements.
" - "The current setting is %1." ) + "The current setting is %1." ) .arg( guessedLCLocale ) ); mainLayout->addWidget( upperText ); setMinimumWidth( upperText->fontMetrics().height() * 24 ); diff --git a/src/modules/partition/gui/AlongsidePage.cpp b/src/modules/partition/gui/AlongsidePage.cpp index 3904e0c80..ee8772fbb 100644 --- a/src/modules/partition/gui/AlongsidePage.cpp +++ b/src/modules/partition/gui/AlongsidePage.cpp @@ -164,7 +164,7 @@ AlongsidePage::init( PartitionCoreModule* core , const OsproberEntryList& osprob connect( m_splitterWidget, &PartitionSplitterWidget::partitionResized, this, [ this ]( const QString& path, qint64 size, qint64 sizeNext ) { - m_sizeLabel->setText( tr( "With this operation, the partition %1 which contains " + m_sizeLabel->setText( tr( "With this operation, the partition %1 which contains " "%4 will be shrunk " "to %2MB and a new %3MB partition will be created for %5." ) .arg( path ) diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index 0b4a5b32a..849c929b6 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -116,13 +116,13 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn "What would you like to do?" ) ); if ( core->deviceModel()->rowCount() < 2 ) - eraseButton->setText( tr( "Erase disk and install %1
" + eraseButton->setText( tr( "Erase disk and install %1
" "Warning: This will delete all of your programs, " "documents, photos, music, and any other files." ) .arg( Calamares::Branding::instance()-> string( Calamares::Branding::ShortVersionedName ) ) ); else - eraseButton->setText( tr( "Erase disk and install %1
" + eraseButton->setText( tr( "Erase disk and install %1
" "You will be offered a choice of which disk to erase." ) .arg( Calamares::Branding::instance()-> string( Calamares::Branding::ShortVersionedName ) ) ); @@ -142,7 +142,7 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn "What would you like to do?" ) .arg( osName ) ); - alongsideButton->setText( tr( "Install %2 alongside %1
" + alongsideButton->setText( tr( "Install %2 alongside %1
" "The installer will shrink the %1 volume to make room for %2. " "You can choose which operating system you want each time the " "computer starts up." ) @@ -151,7 +151,7 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn string( Calamares::Branding::ShortVersionedName ) ) ); if ( core->deviceModel()->rowCount() < 2 ) - eraseButton->setText( tr( "Erase entire disk with %1 and install %2
" + eraseButton->setText( tr( "Erase entire disk with %1 and install %2
" "Warning: This will erase the whole disk and " "delete all of your %1 programs, " "documents, photos, music, and any other files." ) @@ -159,12 +159,12 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn .arg( Calamares::Branding::instance()-> string( Calamares::Branding::ShortVersionedName ) ) ); else - eraseButton->setText( tr( "Erase disk and install %1
" + eraseButton->setText( tr( "Erase disk and install %1
" "You will be offered a choice of which disk to erase." ) .arg( Calamares::Branding::instance()-> string( Calamares::Branding::ShortVersionedName ) ) ); - replaceButton->setText( tr( "Replace a partition with %1
" + replaceButton->setText( tr( "Replace a partition with %1
" "You will be offered a choice of which partition to erase." ) .arg( Calamares::Branding::instance()-> string( Calamares::Branding::ShortVersionedName ) ) ); @@ -176,7 +176,7 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn m_messageLabel->setText( tr( "This computer already has an operating system on it. " "What would you like to do?" ) ); - alongsideButton->setText( tr( "Install %1 alongside your current operating system
" + alongsideButton->setText( tr( "Install %1 alongside your current operating system
" "The installer will shrink an existing volume to make room for %2. " "You can choose which operating system you want each time the " "computer starts up." ) @@ -184,18 +184,18 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn string( Calamares::Branding::ShortVersionedName ) ) ); if ( core->deviceModel()->rowCount() < 2 ) - eraseButton->setText( tr( "Erase disk and install %1
" + eraseButton->setText( tr( "Erase disk and install %1
" "Warning: This will delete all of your programs, " "documents, photos, music, and any other files." ) .arg( Calamares::Branding::instance()-> string( Calamares::Branding::ShortVersionedName ) ) ); else - eraseButton->setText( tr( "Erase disk and install %1
" + eraseButton->setText( tr( "Erase disk and install %1
" "You will be offered a choice of which disk to erase." ) .arg( Calamares::Branding::instance()-> string( Calamares::Branding::ShortVersionedName ) ) ); - replaceButton->setText( tr( "Replace a partition with %1
" + replaceButton->setText( tr( "Replace a partition with %1
" "You will be offered a choice of which partition to erase." ) .arg( Calamares::Branding::instance()-> string( Calamares::Branding::ShortVersionedName ) ) ); @@ -223,7 +223,7 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn m_messageLabel->setText( tr( "This computer currently has multiple operating systems on it. " "What would you like to do?" ) ); - alongsideButton->setText( tr( "Install %1 alongside your current operating systems
" + alongsideButton->setText( tr( "Install %1 alongside your current operating systems
" "The installer will shrink an existing volume to make room for %2. " "You can choose which operating system you want each time the " "computer starts up." ) @@ -231,18 +231,18 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn string( Calamares::Branding::ShortVersionedName ) ) ); if ( core->deviceModel()->rowCount() < 2 ) - eraseButton->setText( tr( "Erase disk and install %1
" + eraseButton->setText( tr( "Erase disk and install %1
" "Warning: This will delete all of your programs, " "documents, photos, music, and any other files." ) .arg( Calamares::Branding::instance()-> string( Calamares::Branding::ShortVersionedName ) ) ); else - eraseButton->setText( tr( "Erase disk and install %1
" + eraseButton->setText( tr( "Erase disk and install %1
" "You will be offered a choice of which disk to erase." ) .arg( Calamares::Branding::instance()-> string( Calamares::Branding::ShortVersionedName ) ) ); - replaceButton->setText( tr( "Replace a partition with %1
" + replaceButton->setText( tr( "Replace a partition with %1
" "You will be offered a choice of which partition to erase." ) .arg( Calamares::Branding::instance()-> string( Calamares::Branding::ShortVersionedName ) ) ); @@ -258,7 +258,7 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn PrettyRadioButton* somethingElseButton = new PrettyRadioButton; CALAMARES_RETRANSLATE( - somethingElseButton->setText( tr( "Manual partitioning
" + somethingElseButton->setText( tr( "Manual partitioning
" "You can create or resize partitions yourself, or choose " "multiple partitions for %1." ) .arg( Calamares::Branding::instance()-> diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index a221471a8..d1f1f986b 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -184,7 +184,7 @@ PartitionViewStep::createSummaryWidget() const QList< PartitionCoreModule::SummaryInfo > list = m_core->createSummaryInfo(); for ( const auto& info : list ) { - QLabel* diskInfoLabel = new QLabel( tr( "Disk %1 (%2)" ) + QLabel* diskInfoLabel = new QLabel( tr( "Disk %1 (%2)" ) .arg( info.deviceNode ) .arg( info.deviceName ) ); formLayout->addRow( diskInfoLabel ); diff --git a/src/modules/partition/gui/ReplacePage.cpp b/src/modules/partition/gui/ReplacePage.cpp index 8f42cccee..a6d3a61ec 100644 --- a/src/modules/partition/gui/ReplacePage.cpp +++ b/src/modules/partition/gui/ReplacePage.cpp @@ -203,7 +203,7 @@ ReplacePage::onPartitionSelected() if ( partition->capacity() < requiredSpaceB ) { updateStatus( CalamaresUtils::Fail, - tr( "%4

" + tr( "%4

" "The partition %1 is too small for %2. Please select a partition " "with capacity at least %3 GiB." ) .arg( partition->partitionPath() ) @@ -217,7 +217,7 @@ ReplacePage::onPartitionSelected() } updateStatus( CalamaresUtils::PartitionPartition, - tr( "%3

" + tr( "%3

" "%1 will be installed on %2.
" "Warning: all data on partition" "%2 will be lost.")