diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index 6f4473014..9056ba273 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -369,6 +369,8 @@ KeyboardPage::onActivate()
     {
         const auto langParts = lang.split( '_', QString::SkipEmptyParts );
 
+        // Note that this his string is not fit for display purposes!
+        // It doesn't come from QLocale::nativeCountryName.
         QString country = QLocale::countryToString( QLocale( lang ).country() );
         cDebug() << " .. extracted country" << country << "::" << langParts;
 
diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp
index 9aad283c6..50f2d9889 100644
--- a/src/modules/locale/LocalePage.cpp
+++ b/src/modules/locale/LocalePage.cpp
@@ -477,8 +477,13 @@ LocalePage::prettyLCLocale( const QString& lcLocale ) const
 
     QLocale locale( localeString );
     //: Language (Country)
-    return tr( "%1 (%2)" ).arg( QLocale::languageToString( locale.language() ) )
-                          .arg( QLocale::countryToString( locale.country() ) );
+    const QString lang = !locale.nativeLanguageName().isEmpty() ?
+                         locale.nativeLanguageName() :
+                         QLocale::languageToString( locale.language() );
+    const QString country = !locale.nativeCountryName().isEmpty() ?
+                            locale.nativeCountryName() :
+                            QLocale::countryToString( locale.country() );
+    return tr( "%1 (%2)" ).arg( lang ).arg( country );
 }
 
 void
diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp
index 0a1d2fb7d..4fc44e0d5 100644
--- a/src/modules/welcome/WelcomePage.cpp
+++ b/src/modules/welcome/WelcomePage.cpp
@@ -345,4 +345,3 @@ WelcomePage::focusInEvent( QFocusEvent* e )
         ui->languageWidget->setFocus();
     e->accept();
 }
-