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

[merge] fix conflictÂ

Browse Source
This commit is contained in:
Philip Müller 2019-01-09 19:12:21 +01:00
parent e7989dff81
commit 1d91ecbef8
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/locale/LocalePage.cpp
View File

@ -388,6 +388,7 @@ std::pair< QString, QString > LocalePage::prettyLocaleStatus( const LocaleConfig
using CalamaresUtils::LocaleLabel; using CalamaresUtils::LocaleLabel;
LocaleLabel lang( lc.language(), LocaleLabel::LabelFormat::AlwaysWithCountry ); LocaleLabel lang( lc.language(), LocaleLabel::LabelFormat::AlwaysWithCountry );
LocaleLabel num( lc.lc_numeric, LocaleLabel::LabelFormat::AlwaysWithCountry );
return std::make_pair< QString, QString >( return std::make_pair< QString, QString >(
tr( "The system language will be set to %1." ).arg( lang.label() ), tr( "The system language will be set to %1." ).arg( lang.label() ),
@ -459,8 +460,6 @@ LocalePage::guessLocaleConfiguration() const
} }
<<<<<<< HEAD
=======
void void
LocalePage::updateGlobalLocale() LocalePage::updateGlobalLocale()
{ {
@ -470,7 +469,6 @@ LocalePage::updateGlobalLocale()
} }
>>>>>>> 44211ee19a30eb062508bba565da274c53b16a71
void void
LocalePage::updateGlobalStorage() LocalePage::updateGlobalStorage()
{ {