napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'translation-fixes'

Browse Source
This commit is contained in:
Adriaan de Groot 2019-04-11 10:29:01 -04:00
commit b2bd63b2e0
7 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libcalamaresui/utils/CalamaresUtilsGui.cpp
View File

@ -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();

10
src/modules/partition/core/DeviceModel.cpp
View File

@ -80,16 +80,24 @@ 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,
CalamaresUtils::Original,

1
src/modules/partition/gui/PartitionLabelsView.cpp
View File

@ -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 )

8
src/modules/partition/gui/VolumeGroupBaseDialog.ui
View File

@ -89,7 +89,7 @@
<item row="4" column="2">
<widget class="QLabel" name="totalSize">
<property name="text">
<string>---</string>
<string notr="true">---</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@ -109,7 +109,7 @@
<item row="5" column="2">
<widget class="QLabel" name="usedSize">
<property name="text">
<string>---</string>
<string notr="true">---</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@ -129,7 +129,7 @@
<item row="6" column="2">
<widget class="QLabel" name="totalSectors">
<property name="text">
<string>---</string>
<string notr="true">---</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@ -149,7 +149,7 @@
<item row="7" column="2">
<widget class="QLabel" name="lvQuantity">
<property name="text">
<string>---</string>
<string notr="true">---</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>

2
src/modules/plasmalnf/page_plasmalnf.ui
View File

@ -17,7 +17,7 @@
<item>
<widget class="QLabel" name="generalExplanation">
<property name="text">
<string>Placeholder</string>
<string notr="true">Placeholder</string>
</property>
<property name="wordWrap">
<bool>true</bool>

12
src/modules/tracking/page_trackingstep.ui
View File

@ -120,7 +120,7 @@ margin-left: 2em;</string>
</sizepolicy>
</property>
<property name="text">
<string>TextLabel</string>
<string notr="true">TextLabel</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@ -130,7 +130,7 @@ margin-left: 2em;</string>
<item>
<widget class="QToolButton" name="installPolicyButton">
<property name="text">
<string>...</string>
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="page_trackingstep.qrc">
@ -182,7 +182,7 @@ margin-left: 2em;</string>
</sizepolicy>
</property>
<property name="text">
<string>TextLabel</string>
<string notr="true">TextLabel</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@ -192,7 +192,7 @@ margin-left: 2em;</string>
<item>
<widget class="QToolButton" name="machinePolicyButton">
<property name="text">
<string>...</string>
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="page_trackingstep.qrc">
@ -244,7 +244,7 @@ margin-left: 2em;</string>
</sizepolicy>
</property>
<property name="text">
<string>TextLabel</string>
<string notr="true">TextLabel</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@ -254,7 +254,7 @@ margin-left: 2em;</string>
<item>
<widget class="QToolButton" name="userPolicyButton">
<property name="text">
<string>...</string>
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="page_trackingstep.qrc">

8
src/modules/users/page_usersetup.ui
View File

@ -197,7 +197,7 @@
<string notr="true">font-weight: normal</string>
</property>
<property name="text">
<string>&lt;Username extra label 2 text&gt;</string>
<string notr="true">&lt;Username extra label 2 text&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@ -303,7 +303,7 @@
<item>
<widget class="QLabel" name="hostname_extra_label_2">
<property name="styleSheet">
<string>font-weight: normal</string>
<string notr="true">font-weight: normal</string>
</property>
<property name="text">
<string>&lt;small&gt;This name will be used if you make the computer visible to others on a network.&lt;/small&gt;</string>
@ -434,7 +434,7 @@
<item>
<widget class="QLabel" name="password_extra_label_3">
<property name="styleSheet">
<string>font-weight: normal</string>
<string notr="true">font-weight: normal</string>
</property>
<property name="text">
<string>&lt;small&gt;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.&lt;/small&gt;</string>
@ -595,7 +595,7 @@
<item>
<widget class="QLabel" name="labelExtraRootPassword">
<property name="styleSheet">
<string>font-weight: normal</string>
<string notr="true">font-weight: normal</string>
</property>
<property name="text">
<string>&lt;small&gt;Enter the same password twice, so that it can be checked for typing errors.&lt;/small&gt;</string>