From 95897bf83b542368956eee10bbf04815d59d76e6 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 11 Apr 2019 09:49:38 -0400 Subject: [PATCH 1/7] [users] Mark as not-translated --- src/modules/users/page_usersetup.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/users/page_usersetup.ui b/src/modules/users/page_usersetup.ui index ccd0e37fa..b979b00b3 100644 --- a/src/modules/users/page_usersetup.ui +++ b/src/modules/users/page_usersetup.ui @@ -197,7 +197,7 @@ font-weight: normal - <Username extra label 2 text> + <Username extra label 2 text> true From d0e1e46df2ac3e026bb8e8b8ec0c25ba5fda0bb8 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 11 Apr 2019 09:54:42 -0400 Subject: [PATCH 2/7] [users] Don't translate CSS --- src/modules/users/page_usersetup.ui | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/users/page_usersetup.ui b/src/modules/users/page_usersetup.ui index b979b00b3..c93912c01 100644 --- a/src/modules/users/page_usersetup.ui +++ b/src/modules/users/page_usersetup.ui @@ -303,7 +303,7 @@ - font-weight: normal + font-weight: normal <small>This name will be used if you make the computer visible to others on a network.</small> @@ -434,7 +434,7 @@ - font-weight: normal + font-weight: normal <small>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.</small> @@ -595,7 +595,7 @@ - font-weight: normal + font-weight: normal <small>Enter the same password twice, so that it can be checked for typing errors.</small> From 369c5f4619741e2170c44afe0d965ca580da0394 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 11 Apr 2019 09:59:58 -0400 Subject: [PATCH 3/7] [tracking] Don't translate placeholder text --- src/modules/tracking/page_trackingstep.ui | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/tracking/page_trackingstep.ui b/src/modules/tracking/page_trackingstep.ui index 60dd9cacb..ae2ed11b8 100644 --- a/src/modules/tracking/page_trackingstep.ui +++ b/src/modules/tracking/page_trackingstep.ui @@ -120,7 +120,7 @@ margin-left: 2em; - TextLabel + TextLabel true @@ -130,7 +130,7 @@ margin-left: 2em; - ... + ... @@ -182,7 +182,7 @@ margin-left: 2em; - TextLabel + TextLabel true @@ -192,7 +192,7 @@ margin-left: 2em; - ... + ... @@ -244,7 +244,7 @@ margin-left: 2em; - TextLabel + TextLabel true @@ -254,7 +254,7 @@ margin-left: 2em; - ... + ... From 78d6b51c3c63d9bc43efcde595400b2df95fecd3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 11 Apr 2019 10:01:34 -0400 Subject: [PATCH 4/7] [partition] Don't translate placeholder --- --- src/modules/partition/gui/VolumeGroupBaseDialog.ui | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/partition/gui/VolumeGroupBaseDialog.ui b/src/modules/partition/gui/VolumeGroupBaseDialog.ui index f84cf22d0..0640eca00 100644 --- a/src/modules/partition/gui/VolumeGroupBaseDialog.ui +++ b/src/modules/partition/gui/VolumeGroupBaseDialog.ui @@ -89,7 +89,7 @@ - --- + --- Qt::AlignCenter @@ -109,7 +109,7 @@ - --- + --- Qt::AlignCenter @@ -129,7 +129,7 @@ - --- + --- Qt::AlignCenter @@ -149,7 +149,7 @@ - --- + --- Qt::AlignCenter From b6cd1c576a8f2ffd4fddedf0359c4f35bfdc7b9b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 11 Apr 2019 10:06:10 -0400 Subject: [PATCH 5/7] [plasmalnf] Don't translate placeholder text --- src/modules/plasmalnf/page_plasmalnf.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/plasmalnf/page_plasmalnf.ui b/src/modules/plasmalnf/page_plasmalnf.ui index 6da6647fd..7b3c8c96f 100644 --- a/src/modules/plasmalnf/page_plasmalnf.ui +++ b/src/modules/plasmalnf/page_plasmalnf.ui @@ -17,7 +17,7 @@ - Placeholder + Placeholder true From e664370b28736d52622a4013253ab7f1021fc08d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 11 Apr 2019 10:28:09 -0400 Subject: [PATCH 6/7] [libcalamaresui] Use modern tr() annotation --- src/libcalamaresui/utils/CalamaresUtilsGui.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp index a7783af3e..69924f1b8 100644 --- a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp +++ b/src/libcalamaresui/utils/CalamaresUtilsGui.cpp @@ -266,7 +266,8 @@ LocaleLabel::LocaleLabel( const QString& locale, LabelFormat format ) : m_locale( LocaleLabel::getLocale( locale ) ) , m_localeId( locale ) { - QString longFormat = QObject::tr( "%1 (%2)", "Language (Country)" ); + //: language[name] (country[name]) + QString longFormat = QObject::tr( "%1 (%2)" ); QString sortKey = QLocale::languageToString( m_locale.language() ); QString languageName = m_locale.nativeLanguageName(); From 1a063a9b5dbd89433748a4c7ab16306a89cdb261 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 11 Apr 2019 10:28:35 -0400 Subject: [PATCH 7/7] [partition] Use modern tr() annotation --- src/modules/partition/core/DeviceModel.cpp | 10 +++++++++- src/modules/partition/gui/PartitionLabelsView.cpp | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/modules/partition/core/DeviceModel.cpp b/src/modules/partition/core/DeviceModel.cpp index 260315729..e1d63f26c 100644 --- a/src/modules/partition/core/DeviceModel.cpp +++ b/src/modules/partition/core/DeviceModel.cpp @@ -80,15 +80,23 @@ DeviceModel::data( const QModelIndex& index, int role ) const else { if ( device->logicalSize() >= 0 && device->totalLogical() >= 0 ) + { + //: device[name] - size[number] (device-node[name]) return tr( "%1 - %2 (%3)" ) .arg( device->name() ) .arg( KFormat().formatByteSize( device->capacity() ) ) .arg( device->deviceNode() ); - // Newly LVM VGs don't have capacity property yet (i.e. always has 1B capacity), so don't show it for a while + } else + { + // Newly LVM VGs don't have capacity property yet (i.e. + // always has 1B capacity), so don't show it for a while. + // + //: device[name] - (device-node[name]) return tr( "%1 - (%2)" ) .arg( device->name() ) .arg( device->deviceNode() ); + } } case Qt::DecorationRole: return CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionDisk, diff --git a/src/modules/partition/gui/PartitionLabelsView.cpp b/src/modules/partition/gui/PartitionLabelsView.cpp index 0a0850844..36774cd20 100644 --- a/src/modules/partition/gui/PartitionLabelsView.cpp +++ b/src/modules/partition/gui/PartitionLabelsView.cpp @@ -230,6 +230,7 @@ PartitionLabelsView::buildTexts( const QModelIndex& index ) const PartitionModel::SizeColumn ) .data().toString(); else + //: size[number] filesystem[name] secondLine = tr( "%1 %2" ) .arg( index.sibling( index.row(), PartitionModel::SizeColumn )